diff --git a/src/platforms/hosted/cli.c b/src/platforms/hosted/cli.c
index f5a9750..e0c1f91 100644
--- a/src/platforms/hosted/cli.c
+++ b/src/platforms/hosted/cli.c
@@ -137,12 +137,14 @@ static void cl_help(char **argv)
 		"\t[-n NUMBER] [-j] [-C] [-t | -T] [-e] [-p] [-R[h]] [-H] [-M STRING ...]\n"
 		"\t[-f | -m] [-E | -w | -V | -r] [-a ADDR] [-S number] [file]]\n"
 		"\n"
+		"The default is to start a debug server at localhost:2000\n\n"
+		"Single-shot and verbosity options [-h | -l | -vBITMASK]:\n"
 		"\t-h, --help       Show the version and this help, then exit\n"
 		"\t-l, --list       List available supported probes\n"
-		"\t-v, --verbose    <bitmask> Set the output verbosity level based on some combination of:\n"
+		"\t-v, --verbose    Set the output verbosity level based on some combination of:\n"
 		"\t                   1 = INFO, 2 = GDB, 4 = TARGET, 8 = PROBE, 16 = WIRE\n"
 		"\n"
-		"Probe selection arguments (If used, choose one):\n"
+		"Probe selection arguments [-d PATH | -P NUMBER | -s SERIAL | -c TYPE]:\n"
 		"\t-d, --device     <path> Use a serial device at the given path (Deprecated!)\n"
 		"\t-P, --probe      <number> Use the <number>th debug probe found while scanning the\n"
 		"\t                   system, see the output from list for the order\n"
@@ -150,7 +152,8 @@ static void cl_help(char **argv)
 		"\t-c, --ftdi-type  <type> Select the FTDI-based debug probe with of the given\n"
 		"\t                   type (cable)\n"
 		"\n"
-		"General configuration options:\n"
+		"General configuration options: [-n NUMBER] [-j] [-C] [-t | -T] [-e] [-p] [-R[h]]\n"
+		"                               [-H] [-M STRING ...]\n"
 		"\t-n, --number     <scan-number> Select the target device at the given position in the\n"
 		"\t                   scan chain (use the -t option to get a scan chain listing)\n"
 		"\t-j, --jtag       Use JTAG instead of SWD\n"
@@ -170,11 +173,11 @@ static void cl_help(char **argv)
 		"\t                   If the command contains spaces, use quotes around the\n"
 		"\t                   complete command\n"
 		"\n"
-		"SWD-specific configuration options:\n"
+		"SWD-specific configuration options [-f FREQUENCY | -m TARGET]:\n"
 		"\t-f, --freq       <frequency> Set an operating frequency for SWD\n"
 		"\t-m, --mult-drop  <target> Use the given target ID for selection in SWD multi-drop\n"
 		"\n"
-		"Flash operation options:\n"
+		"Flash operation selection options [-E | -w | -V | -r]:\n"
 		"\t-E, --erase      Erase the target device Flash\n"
 		"\t-w, --write      Write the specified binary file to the target device\n"
 		"\t                   Flash (the default)\n"
@@ -182,7 +185,7 @@ static void cl_help(char **argv)
 		"\t                   binary file\n"
 		"\t-r, --read       Read the target device Flash\n"
 		"\n"
-		"Flash operation modifier options:\n"
+		"Flash operation modifiers options: [-a ADDR] [-S number] [FILE]\n"
 		"\t-a, --addr       <addr> Start address for the given Flash operation (defaults to\n"
 		"\t                   the start of Flash)\n"
 		"\t-S, --byte-count <number> Number of bytes to work on in the Flash operation (default\n"