diff --git a/MCGalaxy/Commands/CPE/CmdTexture.cs b/MCGalaxy/Commands/CPE/CmdTexture.cs
index ab7e07564..3bef82680 100644
--- a/MCGalaxy/Commands/CPE/CmdTexture.cs
+++ b/MCGalaxy/Commands/CPE/CmdTexture.cs
@@ -80,10 +80,10 @@ namespace MCGalaxy.Commands.CPE {
                     Player.Message(p, "Reset level textures to server default");
                 } else if (url.CaselessEnds(".png")) {
                     p.level.Config.Terrain = url;
-                    Player.Message(p, "Set level's default terrain to " + url);
+                    Player.Message(p, "Set level's terrain to " + url);
                 } else if (url.CaselessEnds(".zip")) {
                     p.level.Config.TexturePack = url;
-                    Player.Message(p, "Set level's default texture pack to " + url);
+                    Player.Message(p, "Set level's texture pack to " + url);
                 }
                 UpdateLevel(p);
             } else {
diff --git a/MCGalaxy/Network/Socket/TcpSocket.cs b/MCGalaxy/Network/Socket/TcpSocket.cs
index 8a05d4fef..1d872c727 100644
--- a/MCGalaxy/Network/Socket/TcpSocket.cs
+++ b/MCGalaxy/Network/Socket/TcpSocket.cs
@@ -140,7 +140,7 @@ namespace MCGalaxy.Network {
             } else {
                 Buffer.BlockCopy(buffer, 0, sendBuffer, 0, buffer.Length);
             }
-            
+
             sendArgs.SetBuffer(0, buffer.Length);
             // SendAsync returns false if completed sync
             return socket.SendAsync(sendArgs);
diff --git a/MCGalaxy/Server/Server.Init.cs b/MCGalaxy/Server/Server.Init.cs
index a6cc3acf8..e6487df31 100644
--- a/MCGalaxy/Server/Server.Init.cs
+++ b/MCGalaxy/Server/Server.Init.cs
@@ -131,7 +131,7 @@ namespace MCGalaxy {
             InitLavaSurvival();
             MainScheduler.QueueRepeat(BlockQueue.Loop, null, 
                                       TimeSpan.FromMilliseconds(BlockQueue.Interval));
-            Critical.QueueRepeat(ServerTasks.LocationChecks, null,
+            Critical.QueueRepeat(ServerTasks.TickPlayers, null,
                                  TimeSpan.FromMilliseconds(20));
 
             Logger.Log(LogType.SystemActivity, "Finished setting up server, finding classicube.net url..");
diff --git a/MCGalaxy/Server/Tasks/ServerTasks.cs b/MCGalaxy/Server/Tasks/ServerTasks.cs
index 9df779339..3904cdfb5 100644
--- a/MCGalaxy/Server/Tasks/ServerTasks.cs
+++ b/MCGalaxy/Server/Tasks/ServerTasks.cs
@@ -37,7 +37,7 @@ namespace MCGalaxy.Tasks {
         }
         
         
-        internal static void LocationChecks(SchedulerTask task) {
+        internal static void TickPlayers(SchedulerTask task) {
             Player[] players = PlayerInfo.Online.Items;
             players = PlayerInfo.Online.Items;
             int delay = players.Length == 0 ? 100 : 20;