diff --git a/Commands/Information/CmdPClients.cs b/Commands/Information/CmdPClients.cs
index ce33538f0..cd6eb5668 100644
--- a/Commands/Information/CmdPClients.cs
+++ b/Commands/Information/CmdPClients.cs
@@ -64,7 +64,7 @@ namespace MCGalaxy.Commands {
         }
 
         public override void Help(Player p) {
-            Player.SendMessage(p, "/pcount - Lists the clients players are using, and who uses which client.");
+            Player.SendMessage(p, "/pclients - Lists the clients players are using, and who uses which client.");
         }
     }
 }
diff --git a/Commands/Information/CmdPlayers.cs b/Commands/Information/CmdPlayers.cs
index a32dff66f..451c36608 100644
--- a/Commands/Information/CmdPlayers.cs
+++ b/Commands/Information/CmdPlayers.cs
@@ -31,10 +31,10 @@ namespace MCGalaxy.Commands
         public CmdPlayers() { }
 
         public override void Use(Player p, string message) {
-            DisplayPlayers(p, message, text => Player.SendMessage(p, text));
+            DisplayPlayers(p, message, text => Player.SendMessage(p, text), true);
         }
         
-        public static void DisplayPlayers(Player p, string message, Action<string> output) {
+        public static void DisplayPlayers(Player p, string message, Action<string> output, bool showHidden) {
             if (message != "") {
                 Group grp = Group.Find(message);
                 if( grp == null ) {
@@ -45,6 +45,7 @@ namespace MCGalaxy.Commands
                 
                 foreach (Player pl in PlayerInfo.players) {
                     if (pl.group != grp) continue;
+                    if (pl.hidden && !showHidden) continue;
                     if (!pl.hidden || p == null || p.group.Permission > LevelPermission.Operator) {
                         string name = Colors.StripColours(pl.DisplayName);
                         if (Server.afkset.Contains(pl.name)) name += "-afk";
@@ -75,6 +76,7 @@ namespace MCGalaxy.Commands
             int totalPlayers = 0;
             
             foreach (Player pl in PlayerInfo.players) {
+            	if (pl.hidden && !showHidden) continue;
                 if (!pl.hidden || p == null || p.group.Permission > LevelPermission.Operator) {
                     totalPlayers++;
                     string name = Colors.StripColours(pl.DisplayName);
diff --git a/IRC/ForgeBot.cs b/IRC/ForgeBot.cs
index 3a6575299..7050623ba 100644
--- a/IRC/ForgeBot.cs
+++ b/IRC/ForgeBot.cs
@@ -171,7 +171,7 @@ namespace MCGalaxy {
             string ircCmd = parts[0].ToLower();
             if (ircCmd == ".who" || ircCmd == ".players") {
                 try {
-                    CmdPlayers.DisplayPlayers(null, "", text => Pm(user.Nick, text));
+                    CmdPlayers.DisplayPlayers(null, "", text => Pm(user.Nick, text), false);
                 } catch (Exception e) {
                     Server.ErrorLog(e);
                 }
@@ -207,7 +207,7 @@ namespace MCGalaxy {
             string ircCmd = parts[0].ToLower();
             if (ircCmd == ".who" || ircCmd == ".players") {
                 try {
-                    CmdPlayers.DisplayPlayers(null, "", text => Say(text, false, true));
+                    CmdPlayers.DisplayPlayers(null, "", text => Say(text, false, true), false);
                 } catch (Exception e) {
                     Server.ErrorLog(e);
                 }
diff --git a/Player/Player.cs b/Player/Player.cs
index 914c43978..163a03961 100644
--- a/Player/Player.cs
+++ b/Player/Player.cs
@@ -2035,6 +2035,8 @@ return;
                         case "zz": cmd = "static"; message = "cuboid " + message; break;
                         case "fetch": cmd = "summon"; break;
                         case "ranks": cmd = "help"; message = "ranks"; break;
+                        case "j":
+                        case "join": cmd = "goto"; break;
 
                         default: retry = false; break; //Unknown command, then
                     }
diff --git a/Player/PlayerBot.cs b/Player/PlayerBot.cs
index 82eea70f8..b27f06fc8 100644
--- a/Player/PlayerBot.cs
+++ b/Player/PlayerBot.cs
@@ -90,6 +90,7 @@ namespace MCGalaxy {
                     }
                 }
             }
+            movement = false;
 
             if (Waypoints.Count == 0)
             {
@@ -115,7 +116,7 @@ namespace MCGalaxy {
             else
             {
                 bool skip = false;
-                movement = false;
+                
 
                 retry: switch (Waypoints[currentPoint].type)
                 {
@@ -270,7 +271,7 @@ namespace MCGalaxy {
                 if (currentPoint == Waypoints.Count) currentPoint = 0;
             }
 
-            if (!movement)
+            if (!movement && Waypoints.Count > 0)
             {
                 if (rot[0] < 245) rot[0] += 8;
                 else rot[0] = 0;