diff --git a/degesch.c b/degesch.c
index e525e3d..ba0e952 100644
--- a/degesch.c
+++ b/degesch.c
@@ -6358,7 +6358,6 @@ handle_command_topic (struct app_context *ctx, char *arguments)
 	if (!server_command_check (ctx, "topic", true))
 		return true;
 
-	// FIXME: currently the topic can't start with a channel name
 	struct server *s = ctx->current_buffer->server;
 	char *channel_name = try_get_channel (ctx, &arguments);
 	if (!channel_name)
@@ -6568,7 +6567,7 @@ handle_command_connect (struct app_context *ctx, char *arguments)
 static bool
 handle_command_disconnect (struct app_context *ctx, char *arguments)
 {
-	// TODO: try to take server name from arguments
+	// TODO: take server name from the first argument, if any
 	struct server *s = NULL;
 	if (ctx->current_buffer->type == BUFFER_GLOBAL)
 		buffer_send_error (ctx, ctx->current_buffer,
@@ -6611,7 +6610,6 @@ handle_command_names (struct app_context *ctx, char *arguments)
 	if (!server_command_check (ctx, "names", true))
 		return true;
 
-	// TODO: use our list of channel_users instead if we know the channel
 	struct server *s = ctx->current_buffer->server;
 	char *channel_name = try_get_channel (ctx, &arguments);
 	if (!channel_name)
@@ -6826,19 +6824,19 @@ g_command_handlers[] =
 	  handle_command_invite },
 
 	{ "connect",    "Connect to the server",
-	  "[server]",
+	  "[<server>]",
 	  handle_command_connect },
 	{ "disconnect", "Disconnect from the server",
-	  "[reason]",
+	  "[<reason>]",
 	  handle_command_disconnect },
 	{ "list",       "List channels and their topic",
-	  "[<channel>[,<channel>...]] [<server>]",
+	  "[<channel>[,<channel>...]] [<target>]",
 	  handle_command_list },
 	{ "names",      "List users on channel",
 	  "[<channel>[,<channel>...]]",
 	  handle_command_names },
 	{ "who",        "List users",
-	  "[<mask>]",
+	  "[<mask> [o]]",
 	  handle_command_who },
 	{ "whois",      "Get user information",
 	  "[<target>] <mask>",
@@ -6848,7 +6846,7 @@ g_command_handlers[] =
 	  handle_command_whowas },
 
 	{ "motd",       "Get the Message of The Day",
-	  NULL,
+	  "[<target>]",
 	  handle_command_motd },
 	{ "stats",      "Query server statistics",
 	  "[<query> [<target>]]",