diff --git a/src/ChatCommands.cc b/src/ChatCommands.cc
index 77a86457..4d3d2996 100644
--- a/src/ChatCommands.cc
+++ b/src/ChatCommands.cc
@@ -874,27 +874,28 @@ struct ChatCommandDefinition {
 };
 
 static const unordered_map<u16string, ChatCommandDefinition> chat_commands({
-    {u"allevent"  , {command_lobby_event_all   , u"usage:\nallevent <name/ID>"}},
-    {u"ann"       , {command_announce          , u"usage:\nann <message>"}},
-    {u"arrow"     , {command_arrow             , u"usage:\narrow <color>"}},
-    {u"ax"        , {command_ax                , u"usage:\nax <message>"}},
-    {u"ban"       , {command_ban               , u"usage:\nban <name-or-number>"}},
-    {u"bbchar"    , {command_convert_char_to_bb, u"usage:\nbbchar <user> <pass> <1-4>"}},
-    {u"changebank", {command_change_bank       , u"usage:\nchangebank <bank name>"}},
-    {u"cheat"     , {command_cheat             , u"usage:\nduh"}},
-    {u"edit"      , {command_edit              , u"usage:\nedit <stat> <value>"}},
-    {u"event"     , {command_lobby_event       , u"usage:\nevent <name>"}},
-    {u"infhp"     , {command_infinite_hp       , u"usage:\nduh"}},
-    {u"inftp"     , {command_infinite_tp       , u"usage:\nduh"}},
-    {u"item"      , {command_item              , u"usage:\nitem <item-code>"}},
-    {u"kick"      , {command_kick              , u"usage:\nkick <name-or-number>"}},
-    {u"li"        , {command_lobby_info        , u"usage:\nli"}},
-    {u"password"  , {command_password          , u"usage:\nlock [password]\nomit password to\nunlock game"}},
-    {u"maxlevel"  , {command_max_level         , u"usage:\nmax_level <level>"}},
-    {u"minlevel"  , {command_min_level         , u"usage:\nmin_level <level>"}},
-    {u"silence"   , {command_silence           , u"usage:\nsilence <name-or-number>"}},
-    {u"type"      , {command_lobby_type        , u"usage:\ntype <name>"}},
-    {u"warp"      , {command_warp              , u"usage:\nwarp <area-number>"}},
+    // TODO: implement command_help and actually use the usage strings here
+    {u"allevent"  , {command_lobby_event_all   , u"Usage:\nallevent <name/ID>"}},
+    {u"ann"       , {command_announce          , u"Usage:\nann <message>"}},
+    {u"arrow"     , {command_arrow             , u"Usage:\narrow <color>"}},
+    {u"ax"        , {command_ax                , u"Usage:\nax <message>"}},
+    {u"ban"       , {command_ban               , u"Usage:\nban <name-or-number>"}},
+    {u"bbchar"    , {command_convert_char_to_bb, u"Usage:\nbbchar <user> <pass> <1-4>"}},
+    {u"changebank", {command_change_bank       , u"Usage:\nchangebank <bank name>"}},
+    {u"cheat"     , {command_cheat             , u"Usage:\ncheat"}},
+    {u"edit"      , {command_edit              , u"Usage:\nedit <stat> <value>"}},
+    {u"event"     , {command_lobby_event       , u"Usage:\nevent <name>"}},
+    {u"infhp"     , {command_infinite_hp       , u"Usage:\ninfhp"}},
+    {u"inftp"     , {command_infinite_tp       , u"Usage:\ninftp"}},
+    {u"item"      , {command_item              , u"Usage:\nitem <item-code>"}},
+    {u"kick"      , {command_kick              , u"Usage:\nkick <name-or-number>"}},
+    {u"li"        , {command_lobby_info        , u"Usage:\nli"}},
+    {u"password"  , {command_password          , u"Usage:\nlock [password]\nomit password to\nunlock game"}},
+    {u"maxlevel"  , {command_max_level         , u"Usage:\nmax_level <level>"}},
+    {u"minlevel"  , {command_min_level         , u"Usage:\nmin_level <level>"}},
+    {u"silence"   , {command_silence           , u"Usage:\nsilence <name-or-number>"}},
+    {u"type"      , {command_lobby_type        , u"Usage:\ntype <name>"}},
+    {u"warp"      , {command_warp              , u"Usage:\nwarp <area-number>"}},
 });
 
 // this function is called every time any player sends a chat beginning with a dollar sign.