diff --git a/Essentials/src/messages.properties b/Essentials/src/messages.properties
index a618c8535..cc2ecde4b 100644
--- a/Essentials/src/messages.properties
+++ b/Essentials/src/messages.properties
@@ -111,9 +111,7 @@ gctotal=\u00a76Allocated memory:\u00a7c {0} MB
 geoIpUrlEmpty=GeoIP download url is empty.
 geoIpUrlInvalid=GeoIP download url is invalid.
 geoipJoinFormat=Player {0} comes from {1}
-godDisabledFor=\u00a74disabled\u00a76 for\u00a7c {0}
-godEnabledFor=\u00a7aenabled\u00a76 for\u00a7c {0}
-godMode=\u00a76God mode\u00a7c {0}\u00a76.
+godMode=\u00a76Set god mode\u00a7c {0} \u00a76for {1}\u00a76.
 hatArmor=\u00a74Error, you cannot use this item as a hat!
 hatEmpty=\u00a74You are not wearing a hat.
 hatFail=\u00a74You must have something to wear in your hand.
@@ -358,7 +356,7 @@ teleportRequest=\u00a7c{0}\u00a76 has requested to teleport to you.
 teleportRequestTimeoutInfo=\u00a76This request will timeout after\u00a7c {0} seconds\u00a76.
 teleportTop=\u00a76Teleporting to top.
 teleportationCommencing=\u00a76Teleportation commencing...
-teleportMode=\u00a76Teleportation\u00a7c {0}\u00a76.
+teleportMode=\u00a76Teleportation\u00a7c {0} \u00a76for {1}\u00a76.
 teleporting=\u00a76Teleporting...
 teleportingPortal=\u00a76Teleporting via portal.
 tempBanned=Temporarily banned from server for {0}
@@ -405,6 +403,7 @@ userdataMoveBackError=Failed to move userdata/{0}.tmp to userdata/{1}
 userdataMoveError=Failed to move userdata/{0} to userdata/{1}.tmp
 usingTempFolderForTesting=Using temp folder for testing:
 vanished=\u00a76You have now been vanished.
+vansihMode=\u00a76Set vanish\u00a7c {0} \u00a76for {1}\u00a76.
 versionMismatch=\u00a74Version mismatch! Please update {0} to the same version.
 versionMismatchAll=\u00a74Version mismatch! Please update all Essentials jars to the same version.
 voiceSilenced=\u00a76Your voice has been silenced.
diff --git a/Essentials/src/net/ess3/commands/Commandfly.java b/Essentials/src/net/ess3/commands/Commandfly.java
index d15b44d19..c609a2a5d 100644
--- a/Essentials/src/net/ess3/commands/Commandfly.java
+++ b/Essentials/src/net/ess3/commands/Commandfly.java
@@ -29,6 +29,7 @@ public class Commandfly extends EssentialsSettingsCommand
 			sender.sendMessage( _("flyMode", _(getValue(player) ? "enabled" : "disabled"), player.getPlayer().getDisplayName()));
 		}
 		else {
+			//TODO: TL this
 			sender.sendMessage("Can't change fly mode for player " + player.getName());
 		}
 	}
diff --git a/Essentials/src/net/ess3/commands/Commandgod.java b/Essentials/src/net/ess3/commands/Commandgod.java
index 32df31bf7..6282fad46 100644
--- a/Essentials/src/net/ess3/commands/Commandgod.java
+++ b/Essentials/src/net/ess3/commands/Commandgod.java
@@ -23,6 +23,7 @@ public class Commandgod extends EssentialsSettingsCommand
 			sender.sendMessage( _("godMode", _(getValue(player) ? "enabled" : "disabled"), player.getPlayer().getDisplayName()));
 		}
 		else {
+			//TODO: TL this
 			sender.sendMessage("Can't change god mode for player " + player.getName());
 		}
 	}
diff --git a/Essentials/src/net/ess3/commands/Commandtptoggle.java b/Essentials/src/net/ess3/commands/Commandtptoggle.java
index 73c05e6a9..f34d667f4 100644
--- a/Essentials/src/net/ess3/commands/Commandtptoggle.java
+++ b/Essentials/src/net/ess3/commands/Commandtptoggle.java
@@ -25,6 +25,7 @@ public class Commandtptoggle extends EssentialsSettingsCommand
 			sender.sendMessage( _("teleportMode", _(getValue(player) ? "enabled" : "disabled"), player.getPlayer().getDisplayName()));
 		}
 		else {
+			//TODO: TL this
 			sender.sendMessage("Can't change teleport toggle for player " + player.getName());
 		}
 	}
diff --git a/Essentials/src/net/ess3/commands/Commandvanish.java b/Essentials/src/net/ess3/commands/Commandvanish.java
index cc57b1203..34b63842f 100644
--- a/Essentials/src/net/ess3/commands/Commandvanish.java
+++ b/Essentials/src/net/ess3/commands/Commandvanish.java
@@ -24,6 +24,7 @@ public class Commandvanish extends EssentialsSettingsCommand
 			sender.sendMessage( _("vanishMode", _(getValue(player) ? "enabled" : "disabled"), player.getPlayer().getDisplayName()));
 		}
 		else {
+			//TODO: TL this
 			sender.sendMessage("Can't change vanish mode for player " + player.getName());
 		}
 	}