diff --git a/src/command_line_options.cpp b/src/command_line_options.cpp
index fa19c73..e6097ab 100644
--- a/src/command_line_options.cpp
+++ b/src/command_line_options.cpp
@@ -122,11 +122,9 @@ CommandLineOptions::CommandLineOptions() :
     .add_option(OPTION_HELP_DEVICES,  0,  "help-devices", "", "list supported devices")
     .add_option(OPTION_SILENT,       's', "silent",  "",  "do not display events on console")
     .add_option(OPTION_QUIET,         0,  "quiet",   "",  "do not display startup text")
-    .add_option(OPTION_ID,           'i', "id",      "N", "use controller with id N (default: 0)")
-    .add_option(OPTION_WID,          'w', "wid",     "N", "use wireless controller with wid N (default: 0)")
     .add_option(OPTION_LIST_CONTROLLER, 'L', "list-controller", "", "list available controllers")
     .add_option(OPTION_LIST_SUPPORTED_DEVICES, 0, "list-supported-devices", "", "list supported devices (used by xboxdrv-daemon.py)")
-    .add_option(OPTION_LIST_SUPPORTED_DEVICES_XPAD, 0, "list-supported-devices-xpad", "", "list supported devices (used by xboxdrv-daemon.py)")
+    .add_option(OPTION_LIST_SUPPORTED_DEVICES_XPAD, 0, "list-supported-devices-xpad", "", "list supported devices in xpad.c style")
     .add_option(OPTION_TEST_RUMBLE,  'R', "test-rumble", "", "map rumbling to LT and RT (for testing only)")
     .add_option(OPTION_NO_UINPUT,     0,  "no-uinput",   "", "do not try to start uinput event dispatching")
     .add_option(OPTION_MIMIC_XPAD,    0,  "mimic-xpad",  "", "Causes xboxdrv to use the same axis and button names as the xpad kernel driver")
@@ -134,12 +132,15 @@ CommandLineOptions::CommandLineOptions() :
     .add_newline()
 
     .add_text("Device Options: ")
+    .add_option(OPTION_ID,           'i', "id",      "N", "use controller with id N (default: 0)")
+    .add_option(OPTION_WID,          'w', "wid",     "N", "use wireless controller with wid N (default: 0)")
     .add_option(OPTION_DEVICE_BY_PATH, 0, "device-by-path", "BUS:DEV", "Use device BUS:DEV, do not do any scanning")
     .add_option(OPTION_DEVICE_BY_ID,   0, "device-by-id",   "VENDOR:PRODUCT", "Use device that matches VENDOR:PRODUCT (as returned by lsusb)")
+    .add_option(OPTION_TYPE,               0, "type",             "TYPE", "Ignore autodetection and enforce controller type (xbox, xbox-mat, xbox360, xbox360-wireless, xbox360-guitar)")
     .add_newline()
 
     .add_text("Status Options: ")
-    .add_option(OPTION_LED,     'l', "led",    "NUM", "set LED status, see --list-led-values (default: 0)")
+    .add_option(OPTION_LED,     'l', "led",    "NUM", "set LED status, see --help-led (default: 0)")
     .add_option(OPTION_RUMBLE,  'r', "rumble", "L,R", "set the speed for both rumble motors [0-255] (default: 0,0)")
     .add_option(OPTION_QUIT,    'q', "quit",   "",    "only set led and rumble status then quit")
     .add_newline()
@@ -151,7 +152,6 @@ CommandLineOptions::CommandLineOptions() :
     .add_option(OPTION_TRIGGER_AS_ZAXIS,   0, "trigger-as-zaxis", "",     "Combine LT and RT to form a zaxis instead")
     .add_option(OPTION_DPAD_AS_BUTTON,     0, "dpad-as-button",   "",     "DPad sends button instead of axis events")
     .add_option(OPTION_DPAD_ONLY,          0, "dpad-only",        "",     "Both sticks are ignored, only DPad sends out axis events")
-    .add_option(OPTION_TYPE,               0, "type",             "TYPE", "Ignore autodetection and enforce controller type (xbox, xbox-mat, xbox360, xbox360-wireless, xbox360-guitar)")
     .add_option(OPTION_BUTTONMAP,         'b', "buttonmap",      "MAP",   "Remap the buttons as specified by MAP (example: B=A,X=A,Y=A)")
     .add_option(OPTION_AXISMAP,           'a', "axismap",        "MAP",   "Remap the axis as specified by MAP (example: -Y1=Y1,X1=X2)")
     .add_option(OPTION_NAME,               0, "name",             "DEVNAME", "Changes the descriptive name the device will have")