29 files changed, 599 insertions, 368 deletions

diff --git a/MCServer/Plugins/Core/README.md b/MCServer/Plugins/Core/README.md
index bec3eb22b..04cba0aa2 100644
--- a/MCServer/Plugins/Core/README.md
+++ b/MCServer/Plugins/Core/README.md
@@ -8,6 +8,7 @@ Commands
 
  * /back
  * /ban
+ * /clear
  * /downfall
  * /give
  * /gm
@@ -15,6 +16,7 @@ Commands
  * /help
  * /i
  * /item
+ * /kill
  * /kick
  * /locate
  * /me
diff --git a/MCServer/Plugins/Core/back.lua b/MCServer/Plugins/Core/back.lua
index 7afd5436f..201e0bb42 100644
--- a/MCServer/Plugins/Core/back.lua
+++ b/MCServer/Plugins/Core/back.lua
@@ -1,9 +1,10 @@
 function HandleBackCommand( Split, Player )
 	if BackCoords[Player:GetName()] == nil then
-		Player:SendMessage(cChatColor.Rose .. "[INFO] " .. cChatColor.White .. "No known last position")
+		SendMessageFailure(Player, "No known last position")
+		return true
 	else
 		Player:TeleportToCoords(BackCoords[Player:GetName()].x, BackCoords[Player:GetName()].y, BackCoords[Player:GetName()].z)
-		Player:SendMessage(cChatColor.Green .. "[INFO] " .. cChatColor.White .. "Teleported back to your last known position")
+		SendMessageSuccess(Player, "Teleported back to your last known position")
 	end
 	return true
-end
\ No newline at end of file
+end
diff --git a/MCServer/Plugins/Core/ban-unban.lua b/MCServer/Plugins/Core/ban-unban.lua
index 480e5633e..1db99fda5 100644
--- a/MCServer/Plugins/Core/ban-unban.lua
+++ b/MCServer/Plugins/Core/ban-unban.lua
@@ -1,45 +1,49 @@
 function HandleBanCommand( Split, Player )
+
 	if( #Split < 2 ) then
-		Player:SendMessage(cChatColor.Yellow .. "[INFO] " .. cChatColor.White .. "Usage: /ban [Player] <Reason>" )
+		SendMessage( Player, "Usage: /ban [Player] <Reason>" )
 		return true
 	end
 
 	local Reason = cChatColor.Red .. "You have been banned." .. cChatColor.White .. " Did you do something illegal?"
 	if( #Split > 2 ) then
-		Reason = table.concat(Split, " ", 3)
+		Reason = table.concat( Split, " ", 3 )
 	end
-	
+
 	if KickPlayer(Split[2], Reason) == false then
-		BannedPlayersIni:DeleteValue("Banned", Split[2])
-		BannedPlayersIni:SetValueB("Banned", Split[2], true)
+		BannedPlayersIni:DeleteValue( "Banned", Split[2] )
+		BannedPlayersIni:SetValueB( "Banned", Split[2], true )
 		BannedPlayersIni:WriteFile()
-		Player:SendMessage(cChatColor.Green .. "[INFO] " .. cChatColor.White .. "Could not find player, but banned anyway" )
+		SendMessageFailure( Player, "Could not find player, but banned anyway" )
 	else
-		BannedPlayersIni:DeleteValue("Banned", Split[2])
-		BannedPlayersIni:SetValueB("Banned", Split[2], true)
+		BannedPlayersIni:DeleteValue( "Banned", Split[2] )
+		BannedPlayersIni:SetValueB( "Banned", Split[2], true )
 		BannedPlayersIni:WriteFile()
-		Player:SendMessage(cChatColor.Green .. "[INFO] " .. cChatColor.White .. "Successfully kicked and banned player" )
+		SendMessageSuccess( Player, "Successfully kicked and banned player" )
 	end
 	return true
+
 end
 
 function HandleUnbanCommand( Split, Player )
+
 	if( #Split < 2 ) then
-		Player:SendMessage(cChatColor.Yellow .. "[INFO] " .. cChatColor.White .. "Usage: /unban [Player]" )
+		SendMessage( Player, "Usage: /unban [Player]" )
 		return true
 	end
-	
+
 	if( BannedPlayersIni:GetValueB("Banned", Split[2], false) == false ) then
-		Player:SendMessage(cChatColor.Rose .. "[INFO] " .. cChatColor.White .. Split[2] .. " is not banned!" )
+		SendMessageFailure( Player, "Player is not banned!" )
 		return true
 	end
-	
+
 	BannedPlayersIni:DeleteValue("Banned", Split[2])
 	BannedPlayersIni:SetValueB("Banned", Split[2], false)
 	BannedPlayersIni:WriteFile()
 
 	LOGINFO( Player:GetName() .. " is unbanning " .. Split[2] )
-	Player:SendMessage(cChatColor.Green .. "[INFO] " .. cChatColor.White .. "Unbanning " .. Split[2] )
+	SendMessageSuccess( Player, "Unbanning " .. Split[2] )
 
 	return true
-end
\ No newline at end of file
+
+end
diff --git a/MCServer/Plugins/Core/clear.lua b/MCServer/Plugins/Core/clear.lua
new file mode 100644
index 000000000..aae2e897e
--- /dev/null
+++ b/MCServer/Plugins/Core/clear.lua
@@ -0,0 +1,25 @@
+function HandleClearCommand( Split, Player )
+
+  if (Split[2] == nil) then
+     SendMessage( Player, "Usage: /clear <player>" )
+     return true
+  end
+
+  local InventoryCleared = false;
+  local ClearInventory = function(OtherPlayer)
+    if (OtherPlayer:GetName() == Split[2]) then
+      OtherPlayer:GetInventory():Clear()
+      InventoryCleared = true
+    end
+  end
+
+  cRoot:Get():FindAndDoWithPlayer(Split[2], ClearInventory);
+  if (InventoryCleared) then
+    SendMessageSuccess( Player, "You cleared the inventory of " .. Split[2] )
+    return true
+  else
+    SendMessageFailure( Player, "Player not found" )
+    return true
+  end
+
+end
diff --git a/MCServer/Plugins/Core/console.lua b/MCServer/Plugins/Core/console.lua
index 3b8c50b62..44fdc83ff 100644
--- a/MCServer/Plugins/Core/console.lua
+++ b/MCServer/Plugins/Core/console.lua
@@ -2,7 +2,7 @@
 
 function InitConsoleCommands()
 	local PluginMgr = cPluginManager:Get();
-	
+
 	-- Please keep the list alpha-sorted
 	PluginMgr:BindConsoleCommand("ban",                  HandleConsoleBan,                  " ~ Bans a player by name");
 	PluginMgr:BindConsoleCommand("banlist ips",          HandleConsoleBanList,              " - Lists all players banned by IP");
@@ -21,7 +21,7 @@ function InitConsoleCommands()
 	PluginMgr:BindConsoleCommand("setversion",           HandleConsoleVersion,              " ~ Sets server version reported to 1.4+ clients");
 	PluginMgr:BindConsoleCommand("unban",                HandleConsoleUnban,                " ~ Unbans a player by name");
 	PluginMgr:BindConsoleCommand("unload",               HandleConsoleUnload,               " - Unloads all unused chunks");
-	
+
 end
 
 function HandleConsoleGive(Split)
@@ -37,7 +37,7 @@ function HandleConsoleGive(Split)
 		local FoundItem = StringToItem(Split[3] .. ":" .. Split[5], Item)
 	else
 		local FoundItem = StringToItem(Split[3], Item)
-	end	
+	end
 	if not IsValidItem(Item.m_ItemType) then  -- StringToItem does not check if item is valid
 		FoundItem = false
 	end
@@ -63,10 +63,10 @@ function HandleConsoleGive(Split)
 	local function giveItems(newPlayer)
 		local ItemsGiven = newPlayer:GetInventory():AddItem(Item)
 		if ItemsGiven == ItemAmount then
-			newPlayer:SendMessage(cChatColor.Green .. "[INFO] " .. cChatColor.White .. "There you go!" )
+			SendMessageSuccess( newPlayer, "There you go!" )
 			LOG("Gave " .. newPlayer:GetName() .. " " .. Item.m_ItemCount .. " times " .. Item.m_ItemType .. ":" .. Item.m_ItemDamage)
 		else
-			Player:SendMessage( cChatColor.Rose .. "[INFO] " .. cChatColor.White .. "Not enough space in inventory, only gave " .. ItemsGiven)
+			SendMessageFailure( Player, "Not enough space in inventory, only gave " .. ItemsGiven)
 			return true, "Only " .. Item.m_ItemCount .. " out of " .. ItemsGiven .. "items could be delivered."
 		end
 	end
@@ -86,13 +86,13 @@ end
 function HandleConsoleBan(Split)
 	if (#Split < 2) then
 		return true, "Usage: ban [Player] <Reason>";
-	end	
-	
+	end
+
 	local Reason = cChatColor.Red .. "You have been banned." .. cChatColor.White .. " Did you do something illegal?"
 	if( #Split > 2 ) then
 		Reason = table.concat(Split, " ", 3)
 	end
-	
+
 	if KickPlayer(Split[2], Reason) == false then
 		BannedPlayersIni:DeleteValue("Banned", Split[2])
 		BannedPlayersIni:SetValueB("Banned", Split[2], true)
@@ -109,30 +109,32 @@ function HandleConsoleBan(Split)
 end
 
 function HandleConsoleUnban(Split)
-	if( #Split < 2 ) then		
-		return true, "Usage: unban [Player]"
+
+	if #Split < 2 then
+		return true, "Usage: /unban [Player]"
 	end
-	
+
 	if( BannedPlayersIni:GetValueB("Banned", Split[2], false) == false ) then
 		return true, Split[2] .. " is not banned!"
 	end
-	
+
 	BannedPlayersIni:SetValueB("Banned", Split[2], false, false)
 	BannedPlayersIni:WriteFile()
 
 	local Server = cRoot:Get():GetServer()
 	return true, "Unbanned " .. Split[2]
+
 end
 
 function HandleConsoleBanList(Split)
 	if (#Split == 1) then
 		return true, BanListByName();
 	end
-	
+
 	if (string.lower(Split[2]) == "ips") then
 		return true, BanListByIPs();
 	end
-	
+
 	return true, "Unknown banlist subcommand";
 end
 
@@ -146,15 +148,15 @@ function HandleConsoleHelp(Split)
 			MaxLength = CmdLen;
 		end
 	end
-	
+
 	cPluginManager:Get():ForEachConsoleCommand(AddToTable);
-	
+
 	-- Sort the table:
 	local CompareCommands = function(a, b)
 		return a[1] < b[1];  -- compare command strings
 	end
 	table.sort(Commands, CompareCommands);
-	
+
 	local Out = "";
 	Out = "'-' denotes no prefix, '~' denotes that a value is required.\n"
 	for i, Command in ipairs(Commands) do
@@ -185,14 +187,14 @@ function HandleConsoleListGroups(Split)
 	if (not(GroupsIni:ReadFile())) then
 		return true, "No groups found";
 	end
-	
+
 	-- Read the groups:
 	Number = GroupsIni:NumKeys();
 	Groups = {};
 	for i = 0, Number do
 		table.insert(Groups, GroupsIni:KeyName(i))
 	end
-	
+
 	-- Output the groups, concatenated to a string:
 	local Out = "Groups:\n"
 	Out = Out .. table.concat(Groups, ", ");
@@ -204,9 +206,9 @@ function HandleConsoleNumChunks(Split)
 	local AddNumChunks = function(World)
 		Output[World:GetName()] = World:GetNumChunks();
 	end;
-	
+
 	cRoot:Get():ForEachWorld(AddNumChunks);
-	
+
 	local Total = 0;
 	local Out = "";
 	for name, num in pairs(Output) do
@@ -214,7 +216,7 @@ function HandleConsoleNumChunks(Split)
 		Total = Total + num;
 	end
 	Out = Out .. "Total: " .. Total .. " chunks\n";
-	
+
 	return true, Out;
 end
 
@@ -227,9 +229,9 @@ function HandleConsolePlayers(Split)
 		end
 		table.insert(PlayersInWorlds[WorldName], Player:GetName() .. " @ " ..  Player:GetIP());
 	end
-	
+
 	cRoot:Get():ForEachPlayer(AddToTable);
-	
+
 	local Out = "";
 	for WorldName, Players in pairs(PlayersInWorlds) do
 		Out = Out .. "World " .. WorldName .. ":\n";
@@ -237,7 +239,7 @@ function HandleConsolePlayers(Split)
 			Out = Out .. "  " .. PlayerName .. "\n";
 		end
 	end
-	
+
 	return true, Out;
 end
 
@@ -247,7 +249,7 @@ function HandleConsoleVersion(Split)
 		local Version = cRoot:Get():GetPrimaryServerVersion();
 		return true, "Primary server version: #" .. Version .. ", " .. cRoot:GetProtocolVersionTextFromInt(Version);
 	end
-	
+
 	-- Set new value as the version:
 	cRoot:Get():SetPrimaryServerVersion(tonumber(Split[2]));
 	local Version = cRoot:Get():GetPrimaryServerVersion();
@@ -259,36 +261,36 @@ function HandleConsoleRank(Split)
 		return true, "Usage: /rank [Player] [Group]";
 	end
 	local Out = "";
-	
+
 	-- Read the groups.ini file:
 	local GroupsIni = cIniFile("groups.ini")
 	if (not(GroupsIni:ReadFile())) then
 		Out = "Could not read groups.ini, creating anew!\n"
 	end
-	
+
 	-- Find the group:
 	if (GroupsIni:FindKey(Split[3]) == -1) then
 		return true, Out .. "Group does not exist";
 	end
-	
+
 	-- Read the users.ini file:
 	local UsersIni = cIniFile("users.ini");
 	if (not(UsersIni:ReadFile())) then
 		Out = Out .. "Could not read users.ini, creating anew!\n";
 	end
-	
+
 	-- Write the new group value to users.ini:
 	UsersIni:DeleteKey(Split[2]);
 	UsersIni:GetValueSet(Split[2], "Groups", Split[3]);
 	UsersIni:WriteFile();
-	
+
 	-- Reload the player's permissions:
 	cRoot:Get():ForEachWorld(
 		function (World)
 			World:ForEachPlayer(
 				function (Player)
 					if (Player:GetName() == Split[2]) then
-						Player:SendMessage(cChatColor.Yellow .. "[INFO] " .. cChatColor.White .. "You were moved to group " .. Split[3]);
+						SendMessage( Player, "You were moved to group " .. Split[3] )
 						Player:LoadPermissionsFromDisk();
 					end
 				end
@@ -328,7 +330,7 @@ function HandleConsoleUnload(Split)
 	local UnloadChunks = function(World)
 		World:UnloadUnusedChunks();
 	end
-	
+
 	local Out = "Num loaded chunks before: " .. cRoot:Get():GetTotalChunkCount() .. "\n";
 	cRoot:Get():ForEachWorld(UnloadChunks);
 	Out = Out .. "Num loaded chunks after: " .. cRoot:Get():GetTotalChunkCount();
@@ -357,4 +359,4 @@ end
 function BanListByIPs()
 	-- TODO: No IP ban implemented yet
 	return "";
-end
\ No newline at end of file
+end
diff --git a/MCServer/Plugins/Core/give.lua b/MCServer/Plugins/Core/give.lua
index ba3a1eb41..04f01614d 100644
--- a/MCServer/Plugins/Core/give.lua
+++ b/MCServer/Plugins/Core/give.lua
@@ -2,32 +2,33 @@ function HandleGiveCommand(Split, Player)
 
 	-- Make sure there are a correct number of arguments.
 	if #Split ~= 3 and #Split ~= 4 and #Split ~= 5 then
-		Player:SendMessage( cChatColor.Yellow .. "[INFO] " .. cChatColor.White .. "Usage: /give <player> <item> [amount] [meta]" )
+		SendMessage( Player, "Usage: /give <player> <item> [amount] [meta]" )
 		return true
 	end
 
 	-- Get the item from the arguments and check it's valid.
 	local Item = cItem()
 	if #Split == 5 then
-		local FoundItem = StringToItem(Split[3] .. ":" .. Split[5], Item)
+		local FoundItem = StringToItem( Split[3] .. ":" .. Split[5], Item )
 	else
-		local FoundItem = StringToItem(Split[3], Item)
-	end	
-	if not IsValidItem(Item.m_ItemType) then  -- StringToItem does not check if item is valid
+		local FoundItem = StringToItem( Split[3], Item )
+	end
+
+	if not IsValidItem( Item.m_ItemType ) then  -- StringToItem does not check if item is valid
 		FoundItem = false
 	end
 
 	if not FoundItem  then
-		Player:SendMessage(cChatColor.Rose .. "[INFO] " .. cChatColor.White .. "Invalid item id or name!" )
+		SendMessageFailure( Player, "Invalid item id or name!" )
 		return true
 	end
 
 	-- Work out how many items the user wants.
 	local ItemAmount = 1
 	if #Split > 3 then
-		ItemAmount = tonumber(Split[4])
+		ItemAmount = tonumber( Split[4] )
 		if ItemAmount == nil or ItemAmount < 1 or ItemAmount > 512 then
-			Player:SendMessage(cChatColor.Rose .. "[INFO] " .. cChatColor.White .. "Invalid amount!" )
+			SendMessageFailure( Player, "Invalid amount!" )
 			return true
 		end
 	end
@@ -37,27 +38,27 @@ function HandleGiveCommand(Split, Player)
 	-- Get the playername from the split.
 	local playerName = Split[2]
 
-	local function giveItems(newPlayer)
-		local ItemsGiven = newPlayer:GetInventory():AddItem(Item)
+	local function giveItems( newPlayer )
+		local ItemsGiven = newPlayer:GetInventory():AddItem( Item )
 		if ItemsGiven == ItemAmount then
-			newPlayer:SendMessage(cChatColor.Green .. "[INFO] " .. cChatColor.White .. "You were given " .. Item.m_ItemCount .. " of " .. Item.m_ItemType .. "." )
+			SendMessageSuccess( newPlayer, "You were given " .. Item.m_ItemCount .. " of " .. Item.m_ItemType .. "." )
 			if not newPlayer == Player then
-				Player:SendMessage(cChatColor.Green .. "[INFO] " .. cChatColor.White .. "Items given!" )
+				SendMessageSuccess( Player, "Items given!" )
 			end
-			LOG("Gave " .. newPlayer:GetName() .. " " .. Item.m_ItemCount .. " times " .. Item.m_ItemType .. ":" .. Item.m_ItemDamage)
+			LOG("Gave " .. newPlayer:GetName() .. " " .. Item.m_ItemCount .. " times " .. Item.m_ItemType .. ":" .. Item.m_ItemDamage )
 		else
-			Player:SendMessage( cChatColor.Rose .. "[INFO] " .. cChatColor.White .. "Not enough space in inventory, only gave " .. ItemsGiven)
+			SendMessageFailure( Player, "Not enough space in inventory, only gave " .. ItemsGiven )
 			LOG( "Player " .. Player:GetName() .. " asked for " .. Item.m_ItemCount .. " times " .. Item.m_ItemType .. ":" .. Item.m_ItemDamage ..", but only could fit " .. ItemsGiven )
 		end
 		return true
 	end
 
 	-- Finally give the items to the player.
-	itemStatus = cRoot:Get():FindAndDoWithPlayer(playerName, giveItems)
+	itemStatus = cRoot:Get():FindAndDoWithPlayer( playerName, giveItems )
 
 	-- Check to make sure that giving items was successful.
 	if not itemStatus then
-		Player:SendMessage( cChatColor.Rose .. "[INFO] " .. cChatColor.White .. "There was no player that matched your query.")
+		SendMessageFailure( Player, "There was no player that matched your query." )
 	end
 
 	return true
diff --git a/MCServer/Plugins/Core/gm.lua b/MCServer/Plugins/Core/gm.lua
index 5aa6cb2f3..8e6a1a12f 100644
--- a/MCServer/Plugins/Core/gm.lua
+++ b/MCServer/Plugins/Core/gm.lua
@@ -1,8 +1,11 @@
 function HandleChangeGMCommand( Split, Player )
+
 	if( #Split ~= 2 ) then
-		Player:SendMessage(cChatColor.Yellow .. "[INFO] " .. cChatColor.White .. "Usage: /gm [GameMode (0|1)]" )
+		SendMessage( Player, "Usage: /gm [0|1]" )
 		return true
 	end
-	Player:SetGameMode(Split[2])
+
+	Player:SetGameMode( Split[2] )
 	return true
-end
\ No newline at end of file
+
+end
diff --git a/MCServer/Plugins/Core/help.lua b/MCServer/Plugins/Core/help.lua
index 9ec79e056..fe8c50492 100644
--- a/MCServer/Plugins/Core/help.lua
+++ b/MCServer/Plugins/Core/help.lua
@@ -1,41 +1,43 @@
-function HandleHelpCommand(Split, Player)
+function HandleHelpCommand( Split, Player )
+
 	local PluginManager = cRoot:Get():GetPluginManager()
-	
-	local LinesPerPage = 8;
-	local CurrentPage = 1;
-	local CurrentLine = 0;
-	local PageRequested = 1;
-	local Output = {};
-	
+
+	local LinesPerPage = 8
+	local CurrentPage = 1
+	local CurrentLine = 0
+	local PageRequested = 1
+	local Output = {}
+
 	if (#Split == 2) then
-		PageRequested = tonumber(Split[2]);
+		PageRequested = tonumber( Split[2] )
 	end
-	
-	local Process = function(Command, Permission, HelpString)
-		if not(Player:HasPermission(Permission)) then
-			return false;
-		end;
+
+	local Process = function( Command, Permission, HelpString )
+		if not (Player:HasPermission(Permission)) then
+			return false
+		end
 		if (HelpString == "") then
-			return false;
-		end;
+			return false
+		end
 
-		CurrentLine = CurrentLine + 1;
-		CurrentPage = math.floor(CurrentLine / LinesPerPage) + 1;
+		CurrentLine = CurrentLine + 1
+		CurrentPage = math.floor( CurrentLine / LinesPerPage ) + 1
 		if (CurrentPage ~= PageRequested) then
-			return false;
-		end;
-		table.insert(Output, cChatColor.Blue .. Command .. HelpString);
+			return false
+		end
+		table.insert( Output, Command .. HelpString )
 	end
 
-	PluginManager:ForEachCommand(Process);
+	PluginManager:ForEachCommand( Process )
 
 	-- CurrentPage now contains the total number of pages, and Output has the individual help lines to be sent
 
-	Player:SendMessage(cChatColor.Purple .. "---------- [COMMANDS HELP " .. cChatColor.Gold .. "(Page " .. PageRequested .. " / " .. CurrentPage .. ")" .. cChatColor.Purple .. "] -----------");
-	Player:SendMessage(cChatColor.Purple .. "'-' means no prefix, '~' means a value is required.");
-	for idx, msg in ipairs(Output) do
-		Player:SendMessage(msg);
-	end;
-	
+	SendMessage( Player, "Page " .. PageRequested .. " out of " .. CurrentPage .. "." )
+	SendMessage( Player, "'-' means no prefix, '~' means a value is required." )
+	for idx, msg in ipairs( Output ) do
+		SendMessage( Player, msg )
+	end
+
 	return true
-end
\ No newline at end of file
+
+end
diff --git a/MCServer/Plugins/Core/item.lua b/MCServer/Plugins/Core/item.lua
index 37a2b8cf5..069291122 100644
--- a/MCServer/Plugins/Core/item.lua
+++ b/MCServer/Plugins/Core/item.lua
@@ -1,7 +1,7 @@
-function HandleItemCommand(Split, Player)
+function HandleItemCommand( Split, Player )
 
 	if ((#Split ~= 2) and (#Split ~=3)) then
-		Player:SendMessage(cChatColor.Yellow .. "[INFO] " .. cChatColor.White .. "Usage: /i <item>[:meta] [amount]" )
+		SendMessage( Player, "Usage: /i <item>[:meta] [amount]" )
 		return true
 	end
 
@@ -20,7 +20,7 @@ function HandleItemCommand(Split, Player)
 		newSplit[5] = itemSplit[2]
 	end
 
-	HandleGiveCommand(newSplit, Player)
+	HandleGiveCommand( newSplit, Player )
 	return true
-	
-end
\ No newline at end of file
+
+end
diff --git a/MCServer/Plugins/Core/kick.lua b/MCServer/Plugins/Core/kick.lua
index c396f9232..bcea1bd8b 100644
--- a/MCServer/Plugins/Core/kick.lua
+++ b/MCServer/Plugins/Core/kick.lua
@@ -1,42 +1,46 @@
 function HandleKickCommand( Split, Player )
+
 	if( #Split < 2 ) then
-		Player:SendMessage(cChatColor.Yellow .. "[INFO] " .. cChatColor.White .. "Usage: /kick [Player] <Reason>" )
+		SendMessage( Player, "Usage: /kick [Player] <Reason>" )
 		return true
 	end
-	
+
 	local Reason = "You have been kicked"
-	if( #Split > 2 ) then
-		Reason = table.concat(Split, " ", 3)
+	if ( #Split > 2 ) then
+		Reason = table.concat( Split, " ", 3 )
 	end
-	
+
 	if( KickPlayer( Split[2], Reason ) == false ) then
-		Player:SendMessage(cChatColor.Rose .. "[INFO] " .. cChatColor.White .. "Could not find player " .. Split[2] )
+		SendMessageFailure( Player, "Could not find player " .. Split[2] )
 	end
 
 	return true
+
 end
 
 --- Kicks a player by name, with the specified reason; returns bool whether found and player's real name
-function KickPlayer(PlayerName, Reason)
-	local RealName = "";
+function KickPlayer( PlayerName, Reason )
+
+	local RealName = ""
 	if (Reason == nil) then
-		Reason = "You have been kicked";
+		Reason = "You have been kicked"
 	end
-	
-	local FoundPlayerCallback = function(a_Player)
+
+	local FoundPlayerCallback = function( a_Player )
 		RealName = a_Player:GetName()
 
 		local Server = cRoot:Get():GetServer()
 		LOGINFO( "'" .. RealName .. "' is being kicked for ( "..Reason..") " )
 		Server:SendMessage("Kicking " .. RealName)
 
-		a_Player:GetClientHandle():Kick(Reason);
+		a_Player:GetClientHandle():Kick(Reason)
 	end
 
-	if (not(cRoot:Get():FindAndDoWithPlayer( PlayerName, FoundPlayerCallback))) then
+	if not cRoot:Get():FindAndDoWithPlayer( PlayerName, FoundPlayerCallback ) then
 		-- Could not find player
-		return false;
+		return false
 	end
-	
-	return true, RealName;  -- Player has been kicked
-end
\ No newline at end of file
+
+	return true, RealName  -- Player has been kicked
+
+end
diff --git a/MCServer/Plugins/Core/kill.lua b/MCServer/Plugins/Core/kill.lua
new file mode 100644
index 000000000..d36c9d271
--- /dev/null
+++ b/MCServer/Plugins/Core/kill.lua
@@ -0,0 +1,34 @@
+function HandleKillCommand( Split, Player )
+
+	if (Split[2] == nil) then
+		Player:TakeDamage(dtInVoid, nil, 1000, 1000, 0)
+		return true
+	end
+
+	local HasKilled = false;
+	local KillPlayer = function(OtherPlayer)
+		if (OtherPlayer:GetName() == Split[2]) then
+				if (OtherPlayer:GetGameMode() == 1) then
+					HasKilled = creative
+				end
+				if (OtherPlayer:GetGameMode() == 0) then
+					OtherPlayer:TakeDamage(dtInVoid, nil, 1000, 1000, 0)
+					HasKilled = true
+				end
+		 end
+	end
+
+	cRoot:Get():FindAndDoWithPlayer(Split[2], KillPlayer);
+	if (HasKilled == creative) then
+		SendMessageFailure( Player, "Player " .. Split[2] .. " is in creative mode" )
+		return true
+	end
+	if (HasKilled) then
+		SendMessageSuccess( Player, "Player " .. Split[2] .. " is killed" )
+		return true
+	else
+		SendMessageFailure( Player, "Player not found" )
+		return true
+	end
+
+end
diff --git a/MCServer/Plugins/Core/locate.lua b/MCServer/Plugins/Core/locate.lua
index 9e0b50d8b..f5df698c9 100644
--- a/MCServer/Plugins/Core/locate.lua
+++ b/MCServer/Plugins/Core/locate.lua
@@ -1,4 +1,4 @@
 function HandleLocateCommand( Split, Player )
-	Player:SendMessage(cChatColor.Yellow .. "[INFO] " .. cChatColor.White .. string.format("You are at [X:%0.2f Y:%0.2f Z:%0.2f] in world %s", Player:GetPosX(), Player:GetPosY(), Player:GetPosZ(), Player:GetWorld():GetName()) )
+	SendMessage( Player, string.format("You are at [X:%0.2f Y:%0.2f Z:%0.2f] in world %s", Player:GetPosX(), Player:GetPosY(), Player:GetPosZ(), Player:GetWorld():GetName()) )
 	return true
-end
\ No newline at end of file
+end
diff --git a/MCServer/Plugins/Core/main.lua b/MCServer/Plugins/Core/main.lua
index 9c476a48c..da4d1e84e 100644
--- a/MCServer/Plugins/Core/main.lua
+++ b/MCServer/Plugins/Core/main.lua
@@ -4,180 +4,188 @@ BannedPlayersIni = {}
 WhiteListIni = {}
 BackCoords = {}
 Messages = {}
+Destination = {}
 --END VARIABLES
 
 --COMMENCE AWESOMENESS!
-function Initialize(Plugin)
+function Initialize( Plugin )
 	PLUGIN = Plugin
 
-	Plugin:SetName("Core")
-	Plugin:SetVersion(13)
+	Plugin:SetName( "Core" )
+	Plugin:SetVersion( 13 )
 
-	--ADD HOOKS    
+	--ADD HOOKS
 	PluginManager = cRoot:Get():GetPluginManager()
-	PluginManager:AddHook(Plugin, cPluginManager.HOOK_PLAYER_JOINED)
-	PluginManager:AddHook(Plugin, cPluginManager.HOOK_DISCONNECT)
-	PluginManager:AddHook(Plugin, cPluginManager.HOOK_PLAYER_BREAKING_BLOCK)
-	PluginManager:AddHook(Plugin, cPluginManager.HOOK_PLAYER_PLACING_BLOCK)
-	PluginManager:AddHook(Plugin, cPluginManager.HOOK_LOGIN)
-	PluginManager:AddHook(Plugin, cPluginManager.HOOK_KILLING)
-	PluginManager:AddHook(Plugin, cPluginManager.HOOK_CRAFTING_NO_RECIPE)
-	PluginManager:AddHook(Plugin, cPluginManager.HOOK_CHAT) -- used in web_chat.lua
-	PluginManager:AddHook(Plugin, cPluginManager.HOOK_PLAYER_MOVING)
+	PluginManager:AddHook( Plugin, cPluginManager.HOOK_PLAYER_JOINED )
+	PluginManager:AddHook( Plugin, cPluginManager.HOOK_DISCONNECT )
+	PluginManager:AddHook( Plugin, cPluginManager.HOOK_PLAYER_BREAKING_BLOCK )
+	PluginManager:AddHook( Plugin, cPluginManager.HOOK_PLAYER_PLACING_BLOCK )
+	PluginManager:AddHook( Plugin, cPluginManager.HOOK_LOGIN )
+	PluginManager:AddHook( Plugin, cPluginManager.HOOK_KILLING )
+	PluginManager:AddHook( Plugin, cPluginManager.HOOK_CRAFTING_NO_RECIPE )
+	PluginManager:AddHook( Plugin, cPluginManager.HOOK_CHAT ) -- used in web_chat.lua
+	PluginManager:AddHook( Plugin, cPluginManager.HOOK_PLAYER_MOVING )
 
 	--PLEASE ALPHA SORT http://elmosaukko.com/sort-alphabetically/ THIS LIST
-	--BIND COMMANDS    
-	PluginManager:BindCommand("/back",            "core.back",            HandleBackCommand,            " - Return to your last position");
-	PluginManager:BindCommand("/ban",             "core.ban",             HandleBanCommand,             " ~ Ban a player");
-	PluginManager:BindCommand("/downfall",        "core.downfall",        HandleDownfallCommand,        " - Toggles the weather");
-	PluginManager:BindCommand("/give",            "core.give",            HandleGiveCommand,            " ~ Give someone an item");
-	PluginManager:BindCommand("/gm",              "core.changegm",        HandleChangeGMCommand,        " ~ Change your gamemode");
-	PluginManager:BindCommand("/groups",          "core.groups",          HandleGroupsCommand,          " - Shows a list of all the groups");
-	PluginManager:BindCommand("/help",            "core.help",            HandleHelpCommand,            " ~ Show available commands");
+	--BIND COMMANDS
+	PluginManager:BindCommand("/back",            "core.back",            HandleBackCommand,            " - Return to your last position")
+	PluginManager:BindCommand("/ban",             "core.ban",             HandleBanCommand,             " ~ Ban a player")
+	PluginManager:BindCommand("/clear",           "core.clear",           HandleClearCommand,           " - Clear the inventory of some player")
+	PluginManager:BindCommand("/give",            "core.give",            HandleGiveCommand,            " ~ Give someone an item")
+	PluginManager:BindCommand("/gm",              "core.changegm",        HandleChangeGMCommand,        " ~ Change your gamemode")
+	PluginManager:BindCommand("/groups",          "core.groups",          HandleGroupsCommand,          " - Shows a list of all the groups")
+	PluginManager:BindCommand("/help",            "core.help",            HandleHelpCommand,            " ~ Show available commands")
 	PluginManager:BindCommand("/i",               "core.give",            HandleItemCommand,            "")
 	PluginManager:BindCommand("/item",            "core.give",            HandleItemCommand,            " - Give yourself an item.")
-	PluginManager:BindCommand("/kick",            "core.kick",            HandleKickCommand,            " ~ Kick a player");
-	PluginManager:BindCommand("/locate",          "core.locate",          HandleLocateCommand,          " - Show your current server coordinates");
-	PluginManager:BindCommand("/me",              "core.me",              HandleMeCommand,              " ~ Tell what you are doing");
-	PluginManager:BindCommand("/motd",            "core.motd",            HandleMOTDCommand,            " - Show message of the day");
-	PluginManager:BindCommand("/plugins",         "core.plugins",         HandlePluginsCommand,         " - Show list of plugins");
-	PluginManager:BindCommand("/portal",          "core.portal",          HandlePortalCommand,          " ~ Move to a different world");  
-	PluginManager:BindCommand("/rank",            "core.rank",            HandleRankCommand,            " ~ Add someone to a group");
-	PluginManager:BindCommand("/regen",           "core.regen",           HandleRegenCommand,           " ~ Regenerates a chunk, current or specified");
-	PluginManager:BindCommand("/reload",          "core.reload",          HandleReloadCommand,          " - Reload all plugins");
-	PluginManager:BindCommand("/save-all",        "core.save-all",        HandleSaveAllCommand,         " - Saves all your worlds");
-	PluginManager:BindCommand("/spawn",           "core.spawn",           HandleSpawnCommand,           " - Return to the spawn");
-	PluginManager:BindCommand("/stop",            "core.stop",            HandleStopCommand,            " - Stops the server");
-	PluginManager:BindCommand("/time",            "core.time",            HandleTimeCommand,            " ~ Sets the time of day");
-	PluginManager:BindCommand("/top",             "core.top",             HandleTopCommand,             " - Teleport yourself to the top most block");
-	PluginManager:BindCommand("/tp",              "core.teleport",        HandleTPCommand,              " ~ Teleport yourself to a player");
-	PluginManager:BindCommand("/tpa",             "core.teleport",        HandleTPACommand,             " ~ Ask to teleport yourself to a player");
-	PluginManager:BindCommand("/tpaccept",        "core.teleport",        HandleTPAcceptCommand,        " ~ Accept a teleportation request");
-	PluginManager:BindCommand("/unban",           "core.unban",           HandleUnbanCommand,           " ~ Unban a player");
+	PluginManager:BindCommand("/kick",            "core.kick",            HandleKickCommand,            " ~ Kick a player")
+	PluginManager:BindCommand("/kill",            "core.kill",            HandleKillCommand,            " - Kill some player")
+	PluginManager:BindCommand("/locate",          "core.locate",          HandleLocateCommand,          " - Show your current server coordinates")
+	PluginManager:BindCommand("/me",              "core.me",              HandleMeCommand,              " ~ Tell what you are doing")
+	PluginManager:BindCommand("/motd",            "core.motd",            HandleMOTDCommand,            " - Show message of the day")
+	PluginManager:BindCommand("/msg",             "core.tell",            HandleTellCommand,            "")
+	PluginManager:BindCommand("/plugins",         "core.plugins",         HandlePluginsCommand,         " - Show list of plugins")
+	PluginManager:BindCommand("/portal",          "core.portal",          HandlePortalCommand,          " ~ Move to a different world")
+	PluginManager:BindCommand("/rank",            "core.rank",            HandleRankCommand,            " ~ Add someone to a group")
+	PluginManager:BindCommand("/regen",           "core.regen",           HandleRegenCommand,           " ~ Regenerates a chunk, current or specified")
+	PluginManager:BindCommand("/reload",          "core.reload",          HandleReloadCommand,          " - Reload all plugins")
+	PluginManager:BindCommand("/save-all",        "core.save-all",        HandleSaveAllCommand,         " - Saves all your worlds")
+	PluginManager:BindCommand("/spawn",           "core.spawn",           HandleSpawnCommand,           " - Return to the spawn")
+	PluginManager:BindCommand("/stop",            "core.stop",            HandleStopCommand,            " - Stops the server")
+	PluginManager:BindCommand("/tell",            "core.tell",            HandleTellCommand,            " ~ Send a private message")
+	PluginManager:BindCommand("/time",            "core.time",            HandleTimeCommand,            " ~ Sets the time of day")
+	PluginManager:BindCommand("/toggledownfall",  "core.toggledownfall",  HandleDownfallCommand,        " - Toggles the weather")
+	PluginManager:BindCommand("/top",             "core.top",             HandleTopCommand,             " - Teleport yourself to the top most block")
+	PluginManager:BindCommand("/tp",              "core.teleport",        HandleTPCommand,              " ~ Teleport yourself to a player")
+	PluginManager:BindCommand("/tpa",             "core.teleport",        HandleTPACommand,             " ~ Ask to teleport yourself to a player")
+	PluginManager:BindCommand("/tpaccept",        "core.teleport",        HandleTPAcceptCommand,        " ~ Accept a teleportation request")
+	PluginManager:BindCommand("/unban",           "core.unban",           HandleUnbanCommand,           " ~ Unban a player")
 	PluginManager:BindCommand("/viewdistance",    "core.viewdistance",    HandleViewDistanceCommand,    " [".. cClientHandle.MIN_VIEW_DISTANCE .."-".. cClientHandle.MAX_VIEW_DISTANCE .."] - Change your view distance")
-	PluginManager:BindCommand("/worlds",          "core.worlds",          HandleWorldsCommand,          " - Shows a list of all the worlds");
+	PluginManager:BindCommand("/weather",         "core.weather",         HandleWeatherCommand,         " ~ Change world weather")
+	PluginManager:BindCommand("/worlds",          "core.worlds",          HandleWorldsCommand,          " - Shows a list of all the worlds")
 
-	InitConsoleCommands();
+	InitConsoleCommands()
 
 	--LOAD SETTINGS
-	IniFile = cIniFile("settings.ini")
-	if ( IniFile:ReadFile() == true ) then
-		HardCore = IniFile:GetValueSet("GameMode", "Hardcore", "false")
+	IniFile = cIniFile( "settings.ini" )
+	if IniFile:ReadFile() == true then
+		HardCore = IniFile:GetValueSet( "GameMode", "Hardcore", "false" )
 		IniFile:WriteFile()
 	end
-	
+
 	WorldsSpawnProtect = {}
-	local KeyIdx = IniFile:FindKey("Worlds") --(FIND WHERE 'WORLDS' KEY IS LOCATED)
-	local NumValues = (IniFile:GetNumValues( KeyIdx )) --(HOW MANY VALUES ARE THERE?)
+	local KeyIdx = IniFile:FindKey( "Worlds" ) --(FIND WHERE 'WORLDS' KEY IS LOCATED)
+	local NumValues = IniFile:GetNumValues( KeyIdx ) --(HOW MANY VALUES ARE THERE?)
 	for i = 0, NumValues - 1 do --(FOR EVERY WORLD KEY, TAKING ACCOUNT OF OFF BY ONE ERRORS)
-		WorldIni = cIniFile(IniFile:GetValue(KeyIdx, i) .. "/world.ini")
+		WorldIni = cIniFile( IniFile:GetValue(KeyIdx, i) .. "/world.ini" )
 		if WorldIni:ReadFile() == true then
-			WorldsSpawnProtect[IniFile:GetValue(KeyIdx, i)]  = WorldIni:GetValueSetI("SpawnProtect", "ProtectRadius", 10)
+			WorldsSpawnProtect[IniFile:GetValue(KeyIdx, i)] = WorldIni:GetValueSetI( "SpawnProtect", "ProtectRadius", 10 )
 			WorldIni:WriteFile()
 		end
 	end
 	WorldsWorldLimit = {}
-	local KeyIdx = IniFile:FindKey("Worlds") --(FIND WHERE 'WORLDS' KEY IS LOCATED)
-	local NumValues = (IniFile:GetNumValues( KeyIdx )) --(HOW MANY VALUES ARE THERE?)
+	local KeyIdx = IniFile:FindKey( "Worlds" ) --(FIND WHERE 'WORLDS' KEY IS LOCATED)
+	local NumValues = IniFile:GetNumValues( KeyIdx ) --(HOW MANY VALUES ARE THERE?)
 	for i = 0, NumValues - 1 do --(FOR EVERY WORLD KEY, TAKING ACCOUNT OF OFF BY ONE ERRORS)
-	   WorldIni = cIniFile(IniFile:GetValue(KeyIdx, i) .. "/world.ini")
+	   WorldIni = cIniFile( IniFile:GetValue(KeyIdx, i) .. "/world.ini" )
 	   if WorldIni:ReadFile() == true then
-			WorldsWorldLimit[IniFile:GetValue(KeyIdx, i)]  = WorldIni:GetValueSetI("WorldLimit", "LimitRadius", 0)
+			WorldsWorldLimit[IniFile:GetValue(KeyIdx, i)] = WorldIni:GetValueSetI( "WorldLimit", "LimitRadius", 0 )
 			WorldIni:WriteFile()
 		end
 	end
 
 	--LOAD WHITELIST
 	WhiteListIni = cIniFile( Plugin:GetLocalDirectory() .. "/whitelist.ini" )
-	if ( WhiteListIni:ReadFile() == true ) then
-		if( WhiteListIni:GetValueB("WhiteListSettings", "WhiteListOn", false) == true ) then
-			if( WhiteListIni:GetNumValues("WhiteList") > 0 ) then
-				LOGINFO("Core: loaded "  .. WhiteListIni:GetNumValues('WhiteList') .. " whitelisted players.")
+	if WhiteListIni:ReadFile() == true then
+		if WhiteListIni:GetValueB( "WhiteListSettings", "WhiteListOn", false ) == true  then
+			if WhiteListIni:GetNumValues( "WhiteList" ) > 0 then
+				LOGINFO( "Core: loaded "  .. WhiteListIni:GetNumValues('WhiteList') .. " whitelisted players." )
 			else
-				LOGWARN("WARNING: WhiteList is on, but there are no people in the whitelist!")
+				LOGWARN( "WARNING: WhiteList is on, but there are no people in the whitelist!" )
 			end
 		end
 	else
-		WhiteListIni:SetValueB("WhiteListSettings", "WhiteListOn", false )
-		WhiteListIni:SetValue("WhiteList", "", "")	-- So it adds an empty header
-		WhiteListIni:DeleteValue("WhiteList", "") -- And remove the value
-		WhiteListIni:KeyComment("WhiteList", "PlayerName=1")
-		if( WhiteListIni:WriteFile() == false ) then
-			LOGWARN("WARNING: Could not write to whitelist.ini")
+		WhiteListIni:SetValueB( "WhiteListSettings", "WhiteListOn", false )
+		WhiteListIni:SetValue( "WhiteList", "", "" )	-- So it adds an empty header
+		WhiteListIni:DeleteValue( "WhiteList", "" ) -- And remove the value
+		WhiteListIni:KeyComment( "WhiteList", "PlayerName=1" )
+		if WhiteListIni:WriteFile() == false then
+			LOGWARN( "WARNING: Could not write to whitelist.ini" )
 		end
 	end
 
 	--LOAD BANNED (BAD LUCK, BRO)
 	BannedPlayersIni = cIniFile( Plugin:GetLocalDirectory() .. "/banned.ini" )
-	if ( BannedPlayersIni:ReadFile() == true ) then
-		if( BannedPlayersIni:GetNumValues("Banned") > 0 ) then
-			LOGINFO("Core: loaded "  .. BannedPlayersIni:GetNumValues("Banned") .. " banned players.")
+	if BannedPlayersIni:ReadFile() == true then
+		if BannedPlayersIni:GetNumValues( "Banned" ) > 0 then
+			LOGINFO( "Core: loaded "  .. BannedPlayersIni:GetNumValues("Banned") .. " banned players." )
 		end
 	else
-		BannedPlayersIni:SetValue("Banned", "", "")	-- So it adds an empty header
-		BannedPlayersIni:DeleteValue("Banned", "") -- And remove the value
-		BannedPlayersIni:KeyComment("Banned", "PlayerName=1")
-		if( BannedPlayersIni:WriteFile() == false ) then
-			LOGWARN("WARNING: Could not write to banned.ini")
+		BannedPlayersIni:SetValue( "Banned", "", "" ) -- So it adds an empty header
+		BannedPlayersIni:DeleteValue( "Banned", "" ) -- And remove the value
+		BannedPlayersIni:KeyComment( "Banned", "PlayerName=1" )
+		if BannedPlayersIni:WriteFile() == false then
+			LOGWARN( "WARNING: Could not write to banned.ini" )
 		end
 	end
 
 	--ADD WEB INTERFACE TABULATES
-	Plugin:AddWebTab("Manage Server",   HandleRequest_ManageServer);
-	Plugin:AddWebTab("Server Settings", HandleRequest_ServerSettings);
-	Plugin:AddWebTab("Chat",            HandleRequest_Chat);
-	Plugin:AddWebTab("Playerlist",      HandleRequest_PlayerList);
-	Plugin:AddWebTab("Whitelist",       HandleRequest_WhiteList);
-	Plugin:AddWebTab("Permissions",     HandleRequest_Permissions);
-	Plugin:AddWebTab("Manage Plugins",  HandleRequest_ManagePlugins);
+	Plugin:AddWebTab( "Manage Server",   HandleRequest_ManageServer )
+	Plugin:AddWebTab( "Server Settings", HandleRequest_ServerSettings )
+	Plugin:AddWebTab( "Chat",            HandleRequest_Chat )
+	Plugin:AddWebTab( "Playerlist",      HandleRequest_PlayerList )
+	Plugin:AddWebTab( "Whitelist",       HandleRequest_WhiteList )
+	Plugin:AddWebTab( "Permissions",     HandleRequest_Permissions )
+	Plugin:AddWebTab( "Manage Plugins",  HandleRequest_ManagePlugins )
 
 	LoadMotd()
 	LOG( "Initialized " .. Plugin:GetName() .. " v." .. Plugin:GetVersion() )
 
 	return true
+
 end
 --AWESOMENESS STILL GOING!
 
 --BEGIN SPAWNPROTECT LOGFILE CODE (COURTSEY OF BEARBIN)
-function WriteLog(breakPlace, X, Y, Z, player, id, meta)
+function WriteLog( breakPlace, X, Y, Z, player, id, meta )
+
 	local logText = {}
 
-	table.insert(logText, player)
-	table.insert(logText, " tried to ")
+	table.insert( logText, player )
+	table.insert( logText, " tried to " )
 
 	if breakPlace == 0 then
-		table.insert(logText, "break ")
+		table.insert( logText, "break " )
 	else
-		table.insert(logText, "place ")
+		table.insert( logText, "place " )
 	end
 
 
-	table.insert(logText, ItemToString(cItem(id, 1, meta)))
-	table.insert(logText, " at ")
-	table.insert(logText, tostring(X))
-	table.insert(logText, ", ")
-	table.insert(logText, tostring(Y))
-	table.insert(logText, ", ")
-	table.insert(logText, tostring(Z))
-	table.insert(logText, ".")
+	table.insert( logText, ItemToString(cItem(id, 1, meta)) )
+	table.insert( logText, " at ")
+	table.insert( logText, tostring(X) )
+	table.insert( logText, ", ")
+	table.insert( logText, tostring(Y) )
+	table.insert( logText, ", ")
+	table.insert( logText, tostring(Z) )
+	table.insert( logText, "." )
 
-	LOGINFO(table.concat(logText,''))
+	LOGINFO( table.concat( logText, '') )
 
 	if LOGTOFILE then
-		local logFile = io.open( Plugin:GetLocalDirectory() .. '/blocks.log', 'a')
-		logFile:write(table.concat(logText,'').."\n")
+		local logFile = io.open( Plugin:GetLocalDirectory() .. '/blocks.log', 'a' )
+		logFile:write( table.concat( logText, '' ) .. "\n" )
 		logFile:close()
 	end
 
 	return
 end
-	
-function WarnPlayer(Player)
-	Player:SendMessage(cChatColor.Rose .. "[INFO] " .. cChatColor.White .. "Go further from spawn to build")
-	return
+
+function WarnPlayer( Player )
+	SendMessageFailure( Player, "Go further from spawn to build" )
+	return true
 end
 
 function OnDisable()
-	LOG( "Disabled Core!")
+	LOG( "Disabled Core!" )
 end
 --END AWESOMENESS :'(
diff --git a/MCServer/Plugins/Core/me.lua b/MCServer/Plugins/Core/me.lua
index 783c15556..73fb60f73 100644
--- a/MCServer/Plugins/Core/me.lua
+++ b/MCServer/Plugins/Core/me.lua
@@ -1,15 +1,20 @@
 function HandleMeCommand( Split, Player )
-  table.remove(Split, 1);
-	local Message = "";
-	for i, Text in ipairs(Split) do
-		Message = Message .. " " .. Text;
+
+	table.remove( Split, 1 )
+	local Message = ""
+
+	for i, Text in ipairs( Split ) do
+		Message = Message .. " " .. Text
 	end
-	if  (Split[1] == nil) then
-		Player:SendMessage(cChatColor.Yellow .. "[INFO] " .. cChatColor.White .. "Usage: /me <action>")
+
+	if Split[1] == nil then
+		SendMessage( Player, "Usage: /me <action>" )
 		return true
 	end
-	if (Split[1] ~= nil) then
-		cRoot:Get():GetServer():BroadcastChat(Player:GetName() .. "" .. Message);
+
+	if Split[1] ~= nil then
+		cRoot:Get():GetServer():BroadcastChat( Player:GetName() .. "" .. Message )
 		return true
 	end
+
 end
diff --git a/MCServer/Plugins/Core/messages.lua b/MCServer/Plugins/Core/messages.lua
new file mode 100644
index 000000000..91a4a7337
--- /dev/null
+++ b/MCServer/Plugins/Core/messages.lua
@@ -0,0 +1,27 @@
+-- Use prefixes or not.
+-- If set to true, messages are prefixed, e. g. "[FATAL]". If false, messages are colored.
+g_UsePrefixes = true
+
+function SendMessage(a_Player, a_Message)
+	if (g_UsePrefixes) then
+		a_Player:SendMessage(cChatColor.Yellow .. "[INFO] " .. cChatColor.White .. a_Message)
+	else
+		a_Player:SendMessage(cChatColor.Yellow .. a_Message)
+	end
+end
+
+function SendMessageSuccess(a_Player, a_Message)
+	if (g_UsePrefixes) then
+		a_Player:SendMessage(cChatColor.Green .. "[INFO] " .. cChatColor.White .. a_Message)
+	else
+		a_Player:SendMessage(cChatColor.Green .. a_Message)
+	end
+end
+
+function SendMessageFailure(a_Player, a_Message)
+	if (g_UsePrefixes) then
+		a_Player:SendMessage(cChatColor.Red .. "[INFO] " .. cChatColor.White .. a_Message)
+	else
+		a_Player:SendMessage(cChatColor.Red .. a_Message)
+	end
+end
diff --git a/MCServer/Plugins/Core/motd.lua b/MCServer/Plugins/Core/motd.lua
index cbcad2b98..edeec78b7 100644
--- a/MCServer/Plugins/Core/motd.lua
+++ b/MCServer/Plugins/Core/motd.lua
@@ -4,32 +4,36 @@ function HandleMOTDCommand( Split, Player )
 end
 
 function LoadMotd()
-	local File = io.open("motd.txt", "r")
+
+	local File = io.open( "motd.txt", "r" )
+
 	-- Check if the file 'motd.txt' exists, else create it.
 	if not File then
-		CreateFile = io.open("motd.txt", "w")
+		CreateFile = io.open( "motd.txt", "w" )
 		CreateFile:write("@6Welcome to the MCServer test server!\n@6http://www.mc-server.org/\n@6Type /help for all commands")
 		CreateFile:close()
 	else
 		File:close()
 	end
-	for line in io.lines("motd.txt") do
+
+	for line in io.lines( "motd.txt" ) do
 		local TempMessage = line
 		-- Do a for loop that goes to each char in the line.
-		for I=1, string.len(TempMessage) do
+		for I=1, string.len( TempMessage ) do
 			-- If the char is a '@' then check if the next char represents a color.
-			if string.sub(TempMessage, I, I) == "@" then
-				local Char = string.sub(TempMessage, I + 1, I + 1)
-				local Color = ReturnColorFromChar(TempMessage, Char)
+			if string.sub( TempMessage, I, I ) == "@" then
+				local Char = string.sub( TempMessage, I + 1, I + 1 )
+				local Color = ReturnColorFromChar( TempMessage, Char )
 				-- If the next char represented a color then put the color in the string.
-				if (Color ~= nil) then
-					TempMessage = string.gsub(TempMessage, "@" .. Char, Color)
+				if Color ~= nil then
+					TempMessage = string.gsub( TempMessage, "@" .. Char, Color )
 				end
 			end
 		end
 		-- Add the message to the list of messages.
 		Messages[#Messages + 1] = TempMessage
 	end
+
 end
 
 function ShowMOTDTo( Player )
@@ -39,6 +43,7 @@ function ShowMOTDTo( Player )
 end
 
 function ReturnColorFromChar( Split, char )
+
 	-- Check if the char represents a color. Else return nil.
 	if char == "0" then
 		return cChatColor.Black
@@ -85,4 +90,5 @@ function ReturnColorFromChar( Split, char )
 	elseif char == "r" then
 		return cChatColor.Plain
 	end
-end
\ No newline at end of file
+
+end
diff --git a/MCServer/Plugins/Core/plugins.lua b/MCServer/Plugins/Core/plugins.lua
index 66b6b4d90..352c80bb3 100644
--- a/MCServer/Plugins/Core/plugins.lua
+++ b/MCServer/Plugins/Core/plugins.lua
@@ -1,15 +1,17 @@
 function HandlePluginsCommand( Split, Player )
+
 	local PluginManager = cRoot:Get():GetPluginManager()
 	local PluginList = PluginManager:GetAllPlugins()
 
 	local PluginTable = {}
 	for k, Plugin in pairs( PluginList ) do
-		if ( Plugin ) then
-			table.insert(PluginTable, Plugin:GetName() )
+		if Plugin then
+			table.insert( PluginTable, Plugin:GetName() )
 		end
 	end
 
-	Player:SendMessage(cChatColor.Yellow .. "[INFO] " .. cChatColor.White .. "There are " .. #PluginTable .. " loaded plugins")
-	Player:SendMessage(cChatColor.Gold .. table.concat(PluginTable, cChatColor.Gold.." ") )
+	SendMessage( Player, "There are " .. #PluginTable .. " loaded plugins" )
+	SendMessage( Player, table.concat( PluginTable , " " ) )
 	return true
-end
\ No newline at end of file
+
+end
diff --git a/MCServer/Plugins/Core/portal-worlds.lua b/MCServer/Plugins/Core/portal-worlds.lua
index da48f1637..1112cbc8a 100644
--- a/MCServer/Plugins/Core/portal-worlds.lua
+++ b/MCServer/Plugins/Core/portal-worlds.lua
@@ -1,24 +1,27 @@
 function HandlePortalCommand( Split, Player )
+
 	if( #Split ~= 2 ) then
-		Player:SendMessage(cChatColor.Yellow .. "[INFO] " .. cChatColor.White .. "Usage: /portal [WorldName]" )
-		return true	
+		SendMessage( Player, "Usage: /portal [WorldName]" )
+		return true
 	end
-	
+
 	if( Player:MoveToWorld(Split[2]) == false ) then
-		Player:SendMessage(cChatColor.Rose .. "[INFO] " .. cChatColor.White .. "Could not move to world " .. Split[2] .. "!" )
+		SendMessageFailure( Player, "Could not move to world " .. Split[2] .. "!" )
 		return true
 	end
-	
-	
-	Player:SendMessage(cChatColor.Green .. "[INFO] " .. cChatColor.White .. "Moved successfully to '" .. Split[2] .. "'! :D" )
+
+	SendMessageSuccess( Player, "Moved successfully to '" .. Split[2] .. "'! :D" )
 	return true
+
 end
 
 function HandleWorldsCommand( Split, Player )
+
 	local SettingsIni = cIniFile("settings.ini")
 	if SettingsIni:ReadFile() == false then
-		Player:SendMessage(cChatColor.Yellow .. "[INFO] " .. cChatColor.White .. "No worlds found" )
+		SendMessageFailure( Player, "No worlds found" )
 	end
+
 	Number = SettingsIni:NumValues("Worlds") - 1
 	Worlds = {}
 	for i=0, SettingsIni:GetNumKeys() - 1 do
@@ -27,10 +30,12 @@ function HandleWorldsCommand( Split, Player )
 			break
 		end
 	end
+
 	for i=0, Number	do
-		table.insert( Worlds, SettingsIni:GetValue( Key, i) )
+		table.insert( Worlds, SettingsIni:GetValue( Key, i ) )
 	end
-	Player:SendMessage(cChatColor.Yellow .. "[INFO] " .. cChatColor.White .. "Found " .. #Worlds .. " worlds" )
-	Player:SendMessage(cChatColor.Gold .. table.concat( Worlds, ", " ) )
+	SendMessage( Player, "Found " .. #Worlds .. " worlds" )
+	SendMessage( Player, table.concat( Worlds, ", " ) )
 	return true
-end
\ No newline at end of file
+
+end
diff --git a/MCServer/Plugins/Core/rank-groups.lua b/MCServer/Plugins/Core/rank-groups.lua
index bb7d2ae5c..6233daa29 100644
--- a/MCServer/Plugins/Core/rank-groups.lua
+++ b/MCServer/Plugins/Core/rank-groups.lua
@@ -1,48 +1,63 @@
 function HandleRankCommand( Split, Player )
+
 	if Split[2] == nil or Split[3] == nil then
-		Player:SendMessage(cChatColor.Yellow .. "[INFO] " .. cChatColor.White .. "Usage: /rank [Player] [Group]")
+		SendMessage( Player, "Usage: /rank [Player] [Group]" )
 		return true
 	end
-	local GroupsIni = cIniFile("groups.ini")
-	if( GroupsIni:ReadFile() == false ) then
-		LOG("Could not read groups.ini!")
+
+	local GroupsIni = cIniFile( "groups.ini" )
+	if GroupsIni:ReadFile() == false then
+		LOG( "Could not read groups.ini!" )
 	end
+
 	if GroupsIni:FindKey(Split[3]) == -1 then
-		Player:SendMessage(cChatColor.Rose .. "[INFO] " .. cChatColor.White .. "Group does not exist")
+		SendMessageFailure( Player, "Group does not exist" )
 		return true
 	end
+
 	local UsersIni = cIniFile("users.ini")
-	if( UsersIni:ReadFile() == false ) then
-		LOG("Could not read users.ini!")
+	if UsersIni:ReadFile() == false then
+		LOG( "Could not read users.ini!" )
 	end
-	UsersIni:DeleteKey(Split[2])
-	UsersIni:GetValueSet(Split[2], "Groups", Split[3])
+
+	UsersIni:DeleteKey( Split[2] )
+	UsersIni:GetValueSet( Split[2], "Groups", Split[3] )
 	UsersIni:WriteFile()
+
 	local loopPlayers = function( Player )
 		if Player:GetName() == Split[2] then
-			Player:SendMessage(cChatColor.Green .. "[INFO] " .. cChatColor.White .. "You were moved to group " .. Split[3] )
+			SendMessageSuccess( Player, "You were moved to group " .. Split[3] )
 			Player:LoadPermissionsFromDisk()
 		end
 	end
+
 	local loopWorlds = function ( World )
 		World:ForEachPlayer( loopPlayers )
 	end
+
 	cRoot:Get():ForEachWorld( loopWorlds )
-	Player:SendMessage(cChatColor.Green .. "[INFO] " .. cChatColor.White .. "Player " .. Split[2] .. " Was moved to " .. Split[3])
+	SendMessageSuccess( Player, "Player " .. Split[2] .. " Was moved to " .. Split[3] )
+
 	return true
+
 end
 
 function HandleGroupsCommand( Split, Player )
-	local GroupsIni = cIniFile("groups.ini")
+
+	local GroupsIni = cIniFile( "groups.ini" )
 	if GroupsIni:ReadFile() == false then
-		Player:SendMessage(cChatColor.Rose .. "[INFO] " .. cChatColor.White .. "No groups found" )
+		SendMessageFailure( Player, "No groups found" )
 	end
+
 	Number = GroupsIni:NumKeys() - 1
 	Groups = {}
 	for i=0, Number do
-		table.insert( Groups, GroupsIni:KeyName(i) )
+		table.insert( Groups, GroupsIni:KeyName( i ) )
 	end
-	Player:SendMessage(cChatColor.Yellow .. "[INFO] " .. cChatColor.White .. "Found " .. #Groups .. " groups" )
-	Player:SendMessage(cChatColor.Gold .. table.concat( Groups, " " ) )
+
+	SendMessage( Player, "Found " .. #Groups .. " groups" )
+	SendMessage( Player, table.concat( Groups, " " ) )
+
 	return true
-end
\ No newline at end of file
+
+end
diff --git a/MCServer/Plugins/Core/regen.lua b/MCServer/Plugins/Core/regen.lua
index 176396734..e76f5cb5c 100644
--- a/MCServer/Plugins/Core/regen.lua
+++ b/MCServer/Plugins/Core/regen.lua
@@ -1,18 +1,20 @@
 function HandleRegenCommand(Split, Player)
-	if ((#Split == 2) or (#Split > 3)) then
-		Player:SendMessage(cChatColor.Yellow .. "[INFO] " .. cChatColor.White .. "Usage: '/regeneratechunk' or '/regeneratechunk [X] [Z]'");
-		return true;
+
+	if #Split == 2 or #Split > 3 then
+		SendMessage( Player, "Usage: '/regeneratechunk' or '/regeneratechunk [X] [Z]'" )
+		return true
 	end
-	
-	local X = Player:GetChunkX();
-	local Z = Player:GetChunkZ();
-	
-	if (#Split == 3) then
-		X = Split[2];
-		Z = Split[3];
+
+	local X = Player:GetChunkX()
+	local Z = Player:GetChunkZ()
+
+	if #Split == 3 then
+		X = Split[2]
+		Z = Split[3]
 	end
-	
-	Player:SendMessage(cChatColor.Green .. "[INFO] " .. cChatColor.White .. "Regenerating chunk ["..X..", "..Z.."]");
-	Player:GetWorld():RegenerateChunk(X, Z);
-	return true;
-end
\ No newline at end of file
+
+	SendMessageSuccess( Player, "Regenerating chunk ["..X..", "..Z.."]")
+	Player:GetWorld():RegenerateChunk(X, Z)
+	return true
+
+end
diff --git a/MCServer/Plugins/Core/save-reload-stop.lua b/MCServer/Plugins/Core/save-reload-stop.lua
index 976052fc7..8c50da237 100644
--- a/MCServer/Plugins/Core/save-reload-stop.lua
+++ b/MCServer/Plugins/Core/save-reload-stop.lua
@@ -1,22 +1,28 @@
 function HandleSaveAllCommand( Split, Player )
-	cRoot:Get():SaveAllChunks();
+
+	cRoot:Get():SaveAllChunks()
 	local Server = cRoot:Get():GetServer()
 	Server:SendMessage(cChatColor.Rose .. "[WARNING] " .. cChatColor.White .. "Saving all worlds!")
-	return true;
+	return true
+
 end
 
 function HandleStopCommand( Split, Player )
+
 	Server = cRoot:Get():GetServer()
 	local Server = cRoot:Get():GetServer()
 	Server:SendMessage(cChatColor.Red .. "[WARNING] " .. cChatColor.White .. "Server is terminating!" )
 	cRoot:Get():QueueExecuteConsoleCommand("stop")
 	return true
+
 end
 
 function HandleReloadCommand( Split, Player )
+
 	Server = cRoot:Get():GetServer()
 	local Server = cRoot:Get():GetServer()
 	Server:SendMessage(cChatColor.Rose .. "[WARNING] " .. cChatColor.White .. "Reloading all plugins!" )
 	cRoot:Get():GetPluginManager():ReloadPlugins()
 	return true
-end
\ No newline at end of file
+
+end
diff --git a/MCServer/Plugins/Core/spawn.lua b/MCServer/Plugins/Core/spawn.lua
index d1ef7399b..120c241fc 100644
--- a/MCServer/Plugins/Core/spawn.lua
+++ b/MCServer/Plugins/Core/spawn.lua
@@ -1,7 +1,9 @@
 function HandleSpawnCommand(Split, Player)
+
 	World = Player:GetWorld()
 	SetBackCoordinates(Player)
 	Player:TeleportToCoords(World:GetSpawnX(), World:GetSpawnY(), World:GetSpawnZ())
-	Player:SendMessage(cChatColor.Green .. "[INFO] " .. cChatColor.White .. "Returned to world spawn" )
+	SendMessageSuccess( Player, "Returned to world spawn" )
 	return true
-end
\ No newline at end of file
+
+end
diff --git a/MCServer/Plugins/Core/teleport.lua b/MCServer/Plugins/Core/teleport.lua
index 1e2cab6f7..70aee131c 100644
--- a/MCServer/Plugins/Core/teleport.lua
+++ b/MCServer/Plugins/Core/teleport.lua
@@ -1,80 +1,100 @@
 function HandleTPCommand(a_Split, a_Player)
-	if ((#a_Split == 2) or (#a_Split == 3)) then
+
+	if #a_Split == 2 or #a_Split == 3 then
+
 		-- Teleport to player specified in a_Split[2], tell them unless a_Split[3] equals "-h":
-		TeleportToPlayer(a_Player, a_Split[2], (a_Split[3] ~= "-h"));
-		return true;
-	elseif (#a_Split == 4) then
+		TeleportToPlayer( a_Player, a_Split[2], (a_Split[3] ~= "-h") )
+		return true
+
+	elseif #a_Split == 4 then
+
 		-- Teleport to XYZ coords specified in a_Split[2, 3, 4]:
-		SetBackCoordinates(a_Player);
-		a_Player:TeleportToCoords(a_Split[2], a_Split[3], a_Split[4]);
-		a_Player:SendMessage(cChatColor.Green .. "[INFO] " .. cChatColor.White .. "You teleported to [X:" .. a_Split[2] .. " Y:" .. a_Split[3] .. " Z:" .. a_Split[4] .. "]");
-		return true;
+		SetBackCoordinates(a_Player)
+		a_Player:TeleportToCoords( a_Split[2], a_Split[3], a_Split[4] )
+		SendMessageSuccess( a_Player, "You teleported to [X:" .. a_Split[2] .. " Y:" .. a_Split[3] .. " Z:" .. a_Split[4] .. "]" )
+		return true
+
 	else
-		a_Player:SendMessage(cChatColor.Yellow .. "[INFO] " .. cChatColor.White .. "Usage: /tp [PlayerName] (-h) or /tp [X Y Z]" )
+		SendMessage( a_Player, "Usage: /tp [PlayerName] (-h) or /tp [X Y Z]" )
 		return true
 	end
+
 end
 
 function HandleTPACommand( Split, Player )
+
 	if Split[2] == nil then
-		Player:SendMessage(cChatColor.Yellow .. "[INFO] " .. cChatColor.White .. "Usage: /tpa [Player]" )
+		SendMessage( Player, "Usage: /tpa [Player]" )
 		return true
 	end
+
 	local loopPlayer = function( OtherPlayer )
 		if OtherPlayer:GetName() == Split[2] then
-			OtherPlayer:SendMessage(cChatColor.Yellow .. "[INFO] " .. cChatColor.White .. Player:GetName() .. " send a teleport request" )
-			Player:SendMessage(cChatColor.Green .. "[INFO] " .. cChatColor.White .. "You send a teleport request to " .. OtherPlayer:GetName() )
+			SendMessage( OtherPlayer, Player:GetName() .. " send a teleport request" )
+			SendMessageSuccess( Player, "You send a teleport request to " .. OtherPlayer:GetName() )
 			Destination[OtherPlayer:GetName()] = Player:GetName()
 		end
 	end
+
 	local loopWorlds = function( World )
 		World:ForEachPlayer( loopPlayer )
 	end
+
 	cRoot:Get():ForEachWorld( loopWorlds )
 	return true
+
 end
 
 function HandleTPAcceptCommand( Split, Player )
+
 	if Destination[Player:GetName()] == nil then
-		Player:SendMessage(cChatColor.Rose .. "[INFO] " .. cChatColor.White .. "Nobody has send you a teleport request" )
+		SendMessageFailure( Player, "Nobody has send you a teleport request" )
 		return true
 	end
+
 	local loopPlayer = function( OtherPlayer )
 		if Destination[Player:GetName()] == OtherPlayer:GetName() then
 			if OtherPlayer:GetWorld():GetName() ~= Player:GetWorld():GetName() then
 				OtherPlayer:MoveToWorld( Player:GetWorld():GetName() )
 			end
 			OtherPlayer:TeleportToEntity( Player )
-			Player:SendMessage(cChatColor.Yellow .. "[INFO] " .. cChatColor.White .. OtherPlayer:GetName() .. " teleported to you" )
-			OtherPlayer:SendMessage(cChatColor.Green .. "[INFO] " .. cChatColor.White .. "You teleported to " .. Player:GetName() )
+			SendMessage( Player, OtherPlayer:GetName() .. " teleported to you" )
+			SendMessageSuccess( OtherPlayer, "You teleported to " .. Player:GetName() )
 			Destination[Player:GetName()] = nil
 		end
 	end
+
 	local loopWorlds = function( World )
 		World:ForEachPlayer( loopPlayer )
 	end
+
 	cRoot:Get():ForEachWorld( loopWorlds )
 	return true
+
 end
 
 -- Teleports a_SrcPlayer to a player named a_DstPlayerName; if a_TellDst is true, will send a notice to the destination player
-function TeleportToPlayer(a_SrcPlayer, a_DstPlayerName, a_TellDst)
+function TeleportToPlayer( a_SrcPlayer, a_DstPlayerName, a_TellDst )
+
 	local teleport = function(OtherPlayer)
-		if (OtherPlayer == a_SrcPlayer) then
+
+		if OtherPlayer == a_SrcPlayer then
 			-- Asked to teleport to self?
-			a_SrcPlayer:SendMessage(cChatColor.Rose .. "[INFO] " .. cChatColor.White .. "Y' can't teleport to yerself!");
+			SendMessageFailure( a_SrcPlayer, "Y' can't teleport to yerself!" )
 		else
-			SetBackCoordinates(a_SrcPlayer);
-			a_SrcPlayer:TeleportToEntity(OtherPlayer);
-			a_SrcPlayer:SendMessage(cChatColor.Green .. "[INFO] " .. cChatColor.White .. "You teleported to " .. OtherPlayer:GetName() .. "!");
+			SetBackCoordinates( a_SrcPlayer )
+			a_SrcPlayer:TeleportToEntity( OtherPlayer )
+			SendMessageSuccess( a_SrcPlayer, "You teleported to " .. OtherPlayer:GetName() .. "!" )
 			if (a_TellDst) then
-				OtherPlayer:SendMessage(cChatColor.Yellow .. "[INFO] " .. cChatColor.White .. Player:GetName().." teleported to you!");
+				SendMessage( OtherPlayer, Player:GetName().." teleported to you!" )
 			end
 		end
+
 	end
-	
-	local World = a_SrcPlayer:GetWorld();
-	if (not(World:DoWithPlayer(a_DstPlayerName, teleport))) then
-		a_SrcPlayer:SendMessage(cChatColor.Rose .. "[INFO] " .. cChatColor.White .. "Can't find player " .. a_DstPlayerName);
+
+	local World = a_SrcPlayer:GetWorld()
+	if not World:DoWithPlayer(a_DstPlayerName, teleport) then
+		SendMessageFailure( a_SrcPlayer, "Can't find player " .. a_DstPlayerName)
 	end
-end
\ No newline at end of file
+
+end
diff --git a/MCServer/Plugins/Core/tell.lua b/MCServer/Plugins/Core/tell.lua
new file mode 100644
index 000000000..7d5a44f34
--- /dev/null
+++ b/MCServer/Plugins/Core/tell.lua
@@ -0,0 +1,37 @@
+function HandleTellCommand(Split, Player, OtherPlayer)
+	if (Split[2] == nil) or (Split[3] == nil) then
+		Player:SendMessage(cChatColor.Yellow .. "[INFO] " .. "Usage: /tell [playername] [message]")
+		return true
+	end
+	
+	local SendMessage = function(OtherPlayer)
+		
+		Sender = Player:GetName()
+		Reciever = Split[2]
+	
+		if (OtherPlayer:GetName() == Split[2]) then
+			Server = cRoot:Get():GetServer()
+			FullMsg = ""
+		
+			for i,v in ipairs(Split) do
+				if(i>2) then
+					if(FullMsg == "") then
+						FullMsg = v
+					else
+						FullMsg = FullMsg .. " " .. v
+					end	
+				end
+			end
+    
+			Player:SendMessage(cChatColor.Green .. "[INFO] " .. "Message to player " .. Reciever .. " sent!" )
+			OtherPlayer:SendMessage(cChatColor.Orange .. "[MSG: " .. Sender .. " ] " .. FullMsg )
+		else
+			Player:SendMessage(cChatColor.Red .. 'Player "' ..Split[2].. '" not found')
+		end
+	end
+
+	cRoot:Get():ForEachPlayer(SendMessage)
+	return true;
+end
+
+
diff --git a/MCServer/Plugins/Core/time.lua b/MCServer/Plugins/Core/time.lua
index fd2816f23..affc0656d 100644
--- a/MCServer/Plugins/Core/time.lua
+++ b/MCServer/Plugins/Core/time.lua
@@ -1,23 +1,26 @@
 function HandleTimeCommand( Split, Player )
-	if Split[2] == nil then 
-		Player:SendMessage(cChatColor.Yellow .. "[INFO] " .. cChatColor.White .. "Usage: /time [Day/Night/Set/Add]" )
+
+	if Split[2] == nil then
+		SendMessage( Player, "Usage: /time [Day/Night/Set/Add]" )
 		return true
 	end
+
 	local Server = cRoot:Get():GetServer()
-	if( string.upper( Split[2] ) == "DAY") then
+	if string.upper( Split[2] ) == "DAY" then
 		Player:GetWorld():SetTimeOfDay( 0 )
 		Server:SendMessage(cChatColor.Green .. "[INFO] " .. cChatColor.White .. "Time was set to daytime" )
-	elseif( string.upper( Split[2] ) == "NIGHT") then
+	elseif string.upper( Split[2] ) == "NIGHT" then
 		Player:GetWorld():SetTimeOfDay( 12000 + 1000 )
-		Server:SendMessage(cChatColor.Green .. "[INFO] " .. cChatColor.White .. "Time was set to night time" )
-	elseif( string.upper(Split[2]) == "SET" ) and ( tonumber(Split[3]) ~= nil) then
+		Server:SendMessage( cChatColor.Green .. "[INFO] " .. cChatColor.White .. "Time was set to night time" )
+	elseif string.upper( Split[2] ) == "SET" and tonumber( Split[3] ) ~= nil then
 		Player:GetWorld():SetTimeOfDay( tonumber(Split[3]) )
-		Server:SendMessage(cChatColor.Green .. "[INFO] " .. cChatColor.White .. "Time was set to " .. Split[3] )
-	elseif( string.upper(Split[2]) == "ADD" ) and ( tonumber(Split[3]) ~= nil) then
+		Server:SendMessage( cChatColor.Green .. "[INFO] " .. cChatColor.White .. "Time was set to " .. Split[3] )
+	elseif string.upper( Split[2] ) == "ADD" and tonumber( Split[3] ) ~= nil then
 		Player:GetWorld():SetTimeOfDay( Player:GetWorld():GetTimeOfDay() + Split[3] )
-		Server:SendMessage(cChatColor.Green .. "[INFO] " .. cChatColor.White .. Split[3] .. "Was added to the time" )
+		Server:SendMessage( cChatColor.Green .. "[INFO] " .. cChatColor.White .. Split[3] .. "Was added to the time" )
 	else
-		Player:SendMessage(cChatColor.Yellow .. "[INFO] " .. cChatColor.White .. "Usage: /time [Day/Night/Set/Add]" )
+		SendMessage( Player, "Usage: /time [Day/Night/Set/Add]" )
 	end
 	return true
+
 end
diff --git a/MCServer/Plugins/Core/top.lua b/MCServer/Plugins/Core/top.lua
index 916582543..f85910475 100644
--- a/MCServer/Plugins/Core/top.lua
+++ b/MCServer/Plugins/Core/top.lua
@@ -1,11 +1,13 @@
 function HandleTopCommand( Split, Player )
+
 	local World = Player:GetWorld()
-	
+
 	local PlayerPos = Player:GetPosition()
-	local Height = World:GetHeight( math.floor(PlayerPos.x), math.floor(PlayerPos.z) )
+	local Height = World:GetHeight( math.floor( PlayerPos.x ), math.floor( PlayerPos.z ) )
 	SetBackCoordinates( Player )
 	Player:TeleportToCoords( PlayerPos.x, Height+1, PlayerPos.z )
-	Player:SendMessage(cChatColor.Green .. "[INFO] " .. cChatColor.White .. "Teleported to the topmost block")
-	
+	SendMessageSuccess( Player, "Teleported to the topmost block" )
+
 	return true
-end
\ No newline at end of file
+
+end
diff --git a/MCServer/Plugins/Core/viewdistance.lua b/MCServer/Plugins/Core/viewdistance.lua
index 2cf96d8bc..9b2066cbf 100644
--- a/MCServer/Plugins/Core/viewdistance.lua
+++ b/MCServer/Plugins/Core/viewdistance.lua
@@ -1,10 +1,12 @@
 function HandleViewDistanceCommand( Split, Player )
+
 	if( #Split ~= 2 ) then
-		Player:SendMessage(cChatColor.Yellow .. "[INFO] " .. cChatColor.White .. "Usage: /viewdistance [".. cClientHandle.MIN_VIEW_DISTANCE .."-".. cClientHandle.MAX_VIEW_DISTANCE .."]" )
+		SendMessage( Player, "Usage: /viewdistance [".. cClientHandle.MIN_VIEW_DISTANCE .."-".. cClientHandle.MAX_VIEW_DISTANCE .."]" )
 		return true
 	end
-	
+
 	Player:GetClientHandle():SetViewDistance( Split[2] )
-	Player:SendMessage(cChatColor.Green .. "[INFO] " .. cChatColor.White .. "Your view distance has been set to " .. Player:GetClientHandle():GetViewDistance() )
+	SendMessageSuccess( Player, "Your view distance has been set to " .. Player:GetClientHandle():GetViewDistance() )
 	return true
-end
\ No newline at end of file
+
+end
diff --git a/MCServer/Plugins/Core/weather.lua b/MCServer/Plugins/Core/weather.lua
index a03cad3ab..220c2a5cb 100644
--- a/MCServer/Plugins/Core/weather.lua
+++ b/MCServer/Plugins/Core/weather.lua
@@ -1,10 +1,21 @@
-function HandleDownfallCommand( Split, Player )
-	World = Player:GetWorld()
-	if World:GetWeather() == 0 then
-		World:SetWeather(1)
-	else
-		World:SetWeather(0)
+function HandleWeatherCommand(Split, Player)
+
+	if #Split ~= 2 then
+		SendMessage( Player, "Usage: /weather [clear/rain/thunder]" )
+		return true
 	end
-	Player:SendMessage(cChatColor.Green .. "[INFO] " .. cChatColor.White .. "Downfall toggled")
+
+	if (Split[2] == "clear") then
+		Player:GetWorld():SetWeather(0)
+		SendMessageSuccess( Player, "Downfall stopped" )
+	elseif (Split[2] == "rain") then
+		Player:GetWorld():SetWeather(1)
+		SendMessageSuccess( Player, "Let it rain!" )
+	elseif (Split[2] == "thunder") then
+		Player:GetWorld():SetWeather(2)
+		SendMessageSuccess( Player, "Thundery showers activate!")
+	end
+	
 	return true
-end
\ No newline at end of file
+
+end
diff --git a/MCServer/Plugins/Core/web_permissions.lua b/MCServer/Plugins/Core/web_permissions.lua
index 7a8af56e9..dff35ca29 100644
--- a/MCServer/Plugins/Core/web_permissions.lua
+++ b/MCServer/Plugins/Core/web_permissions.lua
@@ -10,15 +10,15 @@ local function ShowUsersTable()
 	local Content = "<h4>Users</h4>"
 
 	local NumUsers = UsersIni:GetNumKeys()
-	
+
 	Content = Content .. "<table>"
-	
+
 	if( NumUsers > 0 ) then
 		Content = Content .. "<tr><th></th><th>User</th><th>Groups</th></tr>"
-	
+
 		for i=0, NumUsers-1 do
 			local UserName = UsersIni:GetKeyName( i )
-		
+
 			Content = Content .. "<tr>"
 			Content = Content .. "<td style='width: 10px;'>" .. i .. ".</td>"
 			Content = Content .. "<td>" .. UserName .. "</td>"
@@ -31,23 +31,23 @@ local function ShowUsersTable()
 		Content = Content .. "<tr><td>None</td></tr>"
 	end
 	Content = Content .. "</table>"
-	
-	
+
+
 	return Content
 end
 
 local function ShowGroupsTable()
 	local Content = "<h4>Groups</h4>"
-	
+
 	local NumGroups = GroupsIni:GetNumKeys()
-	
+
 	Content = Content .. "<table>"
 	if( NumGroups > 0 ) then
 		Content = Content .. "<tr><th></th><th>Name</th><th>Permissions</th><th>Color</th></tr>"
-		
+
 		for i=0, NumGroups-1 do
 			local GroupName = GroupsIni:GetKeyName( i )
-		
+
 			Content = Content .. "<tr>"
 			Content = Content .. "<td style='width: 10px;'>" .. i .. ".</td>"
 			Content = Content .. "<td>" .. GroupName .. "</td>"
@@ -63,14 +63,14 @@ local function ShowGroupsTable()
 		Content = Content .. "<tr><td>None</td></tr>"
 	end
 	Content = Content .. "</table>"
-	
+
 	return Content
 end
 
 local function HTML_Select_Group( name, defaultValue )
 	Groups = ""
 	for I=0, GroupsIni:GetNumKeys() - 1 do
-		Groups = Groups .. 
+		Groups = Groups ..
 		HTML_Option(GroupsIni:KeyName(I), GroupsIni:KeyName(I),  defaultValue == GroupsIni:KeyName(I) )
 	end
 	return [[<select name="]] .. name .. [[">]] .. Groups .. [[</select>]]
@@ -90,7 +90,7 @@ local function AddPlayers( Request )
 				UsersIni:WriteFile()
 				local loopPlayers = function( Player )
 					if Player:GetName() == Request.PostParams["AddPlayer"] then
-						Player:SendMessage( cChatColor.Green .. "You were moved to group " .. Request.PostParams["AddGroup"] )
+						SendMessageSuccess( Player, "You were moved to group " .. Request.PostParams["AddGroup"] )
 						Player:LoadPermissionsFromDisk()
 					end
 				end
@@ -110,7 +110,7 @@ local function AddPlayers( Request )
 	<td>]] .. HTML_Select_Group("AddGroup", GroupsIni:KeyName(0) ) .. [[</td></tr>
 	</table>
 	<input type="submit" value="Add Player" name="AddPlayerToGroup">]]
-	
+
 	return Content
 end
 
@@ -123,12 +123,12 @@ function HandleRequest_Permissions( Request )
 	if( UsersIni:ReadFile() == false ) then
 		return "Could not read users.ini!"
 	end
-	
+
 	local Content = ""
-	
+
 	Content = Content .. AddPlayers( Request )
 	Content = Content .. ShowGroupsTable()
 	Content = Content .. ShowUsersTable()
-	
+
 	return Content
-end
\ No newline at end of file
+end