diff --git a/Assets/Scripts/Interface/Terminal.cs b/Assets/Scripts/Interface/Terminal.cs
index 9756751..c7d0e10 100644
--- a/Assets/Scripts/Interface/Terminal.cs
+++ b/Assets/Scripts/Interface/Terminal.cs
@@ -61,18 +61,20 @@ namespace NeonTea.Quakeball.Interface {
 
             RegisterCommand("help", args => {
                 if (args.Length == 0) {
-                    Println($"<color={ERROR_COLOR}>Need at least 1 command to give help for</color>");
-                    return false;
+                    foreach (string command in Commands.Keys) {
+                        string help = Helps.ContainsKey(command) ? Helps[command] : "No help info";
+                        Println($"{command}: {help}");
+                    }
                 }
                 foreach (string command in args) {
                     if (Helps.ContainsKey(command)) {
                         Println($"help {command}: {Helps[command]}");
                     } else {
-                        Println($"<color={ERROR_COLOR}>command {command} not found.</color>");
+                        Println($"<color={ERROR_COLOR}>Help for command {command} not found.</color>");
                     }
                 }
                 return true;
-            });
+            }, "help [command [...]] - Displays help information for the given commands");
 
             Println($"<color={INFO_COLOR}>Welcome to Quakeball!</color>");
         }
diff --git a/Assets/Scripts/Networking/NetChaperone.cs b/Assets/Scripts/Networking/NetChaperone.cs
index 8ca61de..aeee67c 100644
--- a/Assets/Scripts/Networking/NetChaperone.cs
+++ b/Assets/Scripts/Networking/NetChaperone.cs
@@ -23,8 +23,8 @@ namespace NeonTea.Quakeball.Networking {
         private void Start() {
             if (Terminal.Singleton != null) {
                 Terminal = Terminal.Singleton;
-                Terminal.RegisterCommand("host", Host, "host [<port>] [<address>] - Hosts server at given address and port.");
-                Terminal.RegisterCommand("join", Join, "join [<address>] [<port>] - Tries to join a server at given address and port.");
+                Terminal.RegisterCommand("host", Host, "host [port] [address] - Hosts server at given address and port.");
+                Terminal.RegisterCommand("join", Join, "join [address] [port] - Tries to join a server at given address and port.");
             }
         }