diff --git a/Commands/Information/CmdMapInfo.cs b/Commands/Information/CmdMapInfo.cs
index 66bf13003..ca905bb7a 100644
--- a/Commands/Information/CmdMapInfo.cs
+++ b/Commands/Information/CmdMapInfo.cs
@@ -74,10 +74,12 @@ namespace MCGalaxy.Commands {
             }
             Player.Message(p, "  BlockDB (Used for /b) is {0}", data.blockDB ? "&aEnabled" : "&cDisabled");
             ShowPermissions(p, data);
-            Player.Message(p, "Use %T/mi env {0} %Sto see environment settings.", data.Name);
+            Player.Message(p, "Use %T/mi env {0} %Sto see environment settings.", data.Name);            
+            if (!Server.zombie.IsZombieMap(data.Name)) return;         
             
-            if (!Server.zombie.IsZombieMap(data.Name)) return;
-            Player.Message(p, "Map authors: " + data.Authors);
+            string[] authors = data.Authors.Replace(" ", "").Split(',');
+            Player.Message(p, "Map authors: {0}",
+                           authors.Join(n => PlayerInfo.GetColoredName(p, n)));
             int winChance = data.TotalRounds == 0 ? 100 : (data.HumanRounds * 100) / data.TotalRounds;
             Player.Message(p, "&a{0} %Srounds played total, &a{1}% %Swin chance for humans.", 
                            data.TotalRounds, winChance);
diff --git a/Games/ZombieSurvival/ZombieGame.Game.cs b/Games/ZombieSurvival/ZombieGame.Game.cs
index 004a5284b..5ffe54e0b 100644
--- a/Games/ZombieSurvival/ZombieGame.Game.cs
+++ b/Games/ZombieSurvival/ZombieGame.Game.cs
@@ -83,10 +83,14 @@ namespace MCGalaxy.Games {
             if (Server.votingforlevel && HandleVote(p, message)) return true;
             
             if (message[0] == '~' && message.Length > 1) {
-                Player[] players = p.Game.Infected ? Infected.Items : Alive.Items;
+                Player[] players = PlayerInfo.Online.Items;
                 string type = p.Game.Infected ? " &cto zombies%S: " : " &ato humans%S: ";
-                foreach (Player pl in players)
-                    pl.SendMessage(p.ColoredName + type + message.Substring(1));
+                
+                foreach (Player pl in players) {
+                    if (!pl.level.name.CaselessEq(CurLevelName)) continue;
+                    if (pl.Game.Referee || pl.Game.Infected == p.Game.Infected)
+                        pl.SendMessage(p.ColoredName + type + message.Substring(1));
+                }
                 return true;
             } else if (message[0] == '`' && message.Length > 1) {
                 if (p.Game.Team == null) {
@@ -142,8 +146,11 @@ namespace MCGalaxy.Games {
                                  "%SPillaring " + (CurLevel.Pillaring ? "&aYes" : "&cNo") +
                                  "%S, Type is &a" + CurLevel.BuildType);
                 
-                if (CurLevel.Authors != "")
-                    p.SendMessage("It was created by " + CurLevel.Authors);
+                if (CurLevel.Authors != "") {
+                    string[] authors = CurLevel.Authors.Replace(" ", "").Split(',');
+                    Player.Message(p, "It was created by {0}",
+                                   authors.Join(n => PlayerInfo.GetColoredName(p, n)));
+                }
                 PlayerMoneyChanged(p);
                 UpdatePlayerStatus(p);