diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/ConfirmCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/ConfirmCommand.java
index 85943ed6..19c0001f 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/commands/ConfirmCommand.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/commands/ConfirmCommand.java
@@ -13,7 +13,7 @@ public class ConfirmCommand extends MultiverseCommand {
         super(plugin);
         // Any command that is dangerous should require op
         this.setName("Confirms a command that could destroy life, the universe and everything.");
-        this.setCommandUsage("/mvconfirm");
+        this.setCommandUsage("/mv confirm");
         this.setArgRange(0, 0);
         this.addKey("mvconfirm");
         this.setPermission("multiverse.core.confirm", "If you have not been prompted to use this, it will not do anything.", PermissionDefault.OP);
diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/CoordCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/CoordCommand.java
index 63984b85..6a62a297 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/commands/CoordCommand.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/commands/CoordCommand.java
@@ -18,7 +18,7 @@ public class CoordCommand extends MultiverseCommand {
     public CoordCommand(MultiverseCore plugin) {
         super(plugin);
         this.setName("Coordinates");
-        this.setCommandUsage("/mvcoord");
+        this.setCommandUsage("/mv coord");
         this.setArgRange(0, 0);
         this.addKey("mv coord");
         this.addKey("mvcoord");
diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/CreateCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/CreateCommand.java
index ccecac27..6c10b2b0 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/commands/CreateCommand.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/commands/CreateCommand.java
@@ -16,7 +16,7 @@ public class CreateCommand extends MultiverseCommand {
     public CreateCommand(MultiverseCore plugin) {
         super(plugin);
         this.setName("Create World");
-        this.setCommandUsage("/mvcreate" + ChatColor.GREEN + " {NAME} {ENV}" + ChatColor.GOLD + " -s [SEED] -g [GENERATOR[:ID]]");
+        this.setCommandUsage("/mv create" + ChatColor.GREEN + " {NAME} {ENV}" + ChatColor.GOLD + " -s [SEED] -g [GENERATOR[:ID]]");
         this.setArgRange(2, 6);
         this.addKey("mvcreate");
         this.addKey("mvc");
diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/DeleteCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/DeleteCommand.java
index fcffdc09..6e4f7219 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/commands/DeleteCommand.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/commands/DeleteCommand.java
@@ -13,7 +13,7 @@ public class DeleteCommand extends MultiverseCommand {
     public DeleteCommand(MultiverseCore plugin) {
         super(plugin);
         this.setName("Delete World");
-        this.setCommandUsage("/mvdelete" + ChatColor.GREEN + " {WORLD}");
+        this.setCommandUsage("/mv delete" + ChatColor.GREEN + " {WORLD}");
         this.setArgRange(1, 1);
         this.addKey("mvdelete");
         this.addKey("mv delete");
diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/EnvironmentCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/EnvironmentCommand.java
index 05dc003d..5e2ee652 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/commands/EnvironmentCommand.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/commands/EnvironmentCommand.java
@@ -14,7 +14,7 @@ public class EnvironmentCommand extends MultiverseCommand {
     public EnvironmentCommand(MultiverseCore plugin) {
         super(plugin);
         this.setName("List Environments");
-        this.setCommandUsage("/mvenv");
+        this.setCommandUsage("/mv env");
         this.setArgRange(0, 0);
         this.addKey("mvenv");
         this.addKey("mv env");
diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/ImportCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/ImportCommand.java
index 2f283477..1b1f5742 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/commands/ImportCommand.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/commands/ImportCommand.java
@@ -15,7 +15,7 @@ public class ImportCommand extends MultiverseCommand {
     public ImportCommand(MultiverseCore plugin) {
         super(plugin);
         this.setName("Import World");
-        this.setCommandUsage("/mvimport" + ChatColor.GREEN + " {NAME} {ENV} " + ChatColor.GOLD + "[GENERATOR[:ID]]");
+        this.setCommandUsage("/mv import" + ChatColor.GREEN + " {NAME} {ENV} " + ChatColor.GOLD + "[GENERATOR[:ID]]");
         this.setArgRange(2, 3);
         this.addKey("mvimport");
         this.addKey("mvi");
diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/InfoCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/InfoCommand.java
index 6843cc88..80f62424 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/commands/InfoCommand.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/commands/InfoCommand.java
@@ -16,7 +16,7 @@ public class InfoCommand extends MultiverseCommand {
     public InfoCommand(MultiverseCore plugin) {
         super(plugin);
         this.setName("World Information");
-        this.setCommandUsage("/mvinfo" + ChatColor.GOLD + " [WORLD]");
+        this.setCommandUsage("/mv info" + ChatColor.GOLD + " [WORLD]");
         this.setArgRange(0, 1);
         this.addKey("mvinfo");
         this.addKey("mvi");
diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/ListCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/ListCommand.java
index 6543af55..c5916f0d 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/commands/ListCommand.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/commands/ListCommand.java
@@ -16,7 +16,7 @@ public class ListCommand extends MultiverseCommand {
     public ListCommand(MultiverseCore plugin) {
         super(plugin);
         this.setName("World Listing");
-        this.setCommandUsage("/mvlist");
+        this.setCommandUsage("/mv list");
         this.setArgRange(0, 0);
         this.addKey("mvlist");
         this.addKey("mvl");
diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/ModifyAddCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/ModifyAddCommand.java
index de8382e2..344cf1a8 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/commands/ModifyAddCommand.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/commands/ModifyAddCommand.java
@@ -18,7 +18,7 @@ public class ModifyAddCommand extends MultiverseCommand {
     public ModifyAddCommand(MultiverseCore plugin) {
         super(plugin);
         this.setName("Modify a World (Add a value)");
-        this.setCommandUsage("/mvmodify " + ChatColor.GREEN + "ADD {VALUE} {PROPERTY}" + ChatColor.GOLD + " [WORLD] ");
+        this.setCommandUsage("/mv modify " + ChatColor.GREEN + "ADD {VALUE} {PROPERTY}" + ChatColor.GOLD + " [WORLD] ");
         this.setArgRange(2, 3);
         this.addKey("mvm add");
         this.addKey("mvmadd");
diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/ModifyClearCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/ModifyClearCommand.java
index 8ebcffed..df88bdea 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/commands/ModifyClearCommand.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/commands/ModifyClearCommand.java
@@ -15,7 +15,7 @@ public class ModifyClearCommand extends MultiverseCommand {
     public ModifyClearCommand(MultiverseCore plugin) {
         super(plugin);
         this.setName("Modify a World (Clear a property)");
-        this.setCommandUsage("/mvmodify" + ChatColor.GREEN + " clear {PROPERTY}" + ChatColor.GOLD + " [WORLD]");
+        this.setCommandUsage("/mv modify" + ChatColor.GREEN + " clear {PROPERTY}" + ChatColor.GOLD + " [WORLD]");
         this.setArgRange(1, 2);
         this.addKey("mvm clear");
         this.addKey("mvmclear");
diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/ModifyCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/ModifyCommand.java
index e2521d8d..db961cf2 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/commands/ModifyCommand.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/commands/ModifyCommand.java
@@ -29,7 +29,7 @@ public class ModifyCommand extends MultiverseCommand {
     public ModifyCommand(MultiverseCore plugin) {
         super(plugin);
         this.setName("Modify a World");
-        this.setCommandUsage("/mvmodify" + ChatColor.GREEN + " {set|add|remove|clear} ...");
+        this.setCommandUsage("/mv modify" + ChatColor.GREEN + " {set|add|remove|clear} ...");
         this.setArgRange(2, 3);
         this.addKey("mvm");
         this.addKey("mvmodify");
diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/ModifyRemoveCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/ModifyRemoveCommand.java
index 8c13e0c4..a8eb700f 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/commands/ModifyRemoveCommand.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/commands/ModifyRemoveCommand.java
@@ -15,7 +15,7 @@ public class ModifyRemoveCommand extends MultiverseCommand {
     public ModifyRemoveCommand(MultiverseCore plugin) {
         super(plugin);
         this.setName("Modify a World (Remove a value)");
-        this.setCommandUsage("/mvmodify" + ChatColor.GREEN + "REMOVE {PROPERTY} {VALUE}" + ChatColor.GOLD + " [WORLD]");
+        this.setCommandUsage("/mv modify" + ChatColor.GREEN + "REMOVE {PROPERTY} {VALUE}" + ChatColor.GOLD + " [WORLD]");
         this.setArgRange(2, 3);
         this.addKey("mvm remove");
         this.addKey("mvmremove");
diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/ModifySetCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/ModifySetCommand.java
index a579592a..da5f5b38 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/commands/ModifySetCommand.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/commands/ModifySetCommand.java
@@ -15,7 +15,7 @@ public class ModifySetCommand extends MultiverseCommand {
     public ModifySetCommand(MultiverseCore plugin) {
         super(plugin);
         this.setName("Modify a World (Set a value)");
-        this.setCommandUsage("/mvmodify" + ChatColor.GREEN + " set {PROPERTY} {VALUE}" + ChatColor.GOLD + " [WORLD]");
+        this.setCommandUsage("/mv modify" + ChatColor.GREEN + " set {PROPERTY} {VALUE}" + ChatColor.GOLD + " [WORLD]");
         this.setArgRange(2, 3);
         this.addKey("mvm set");
         this.addKey("mvmset");
diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/PurgeCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/PurgeCommand.java
index 9358fc78..398ad9c4 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/commands/PurgeCommand.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/commands/PurgeCommand.java
@@ -18,7 +18,7 @@ public class PurgeCommand extends MultiverseCommand {
     public PurgeCommand(MultiverseCore plugin) {
         super(plugin);
         this.setName("Purge World of Creatures");
-        this.setCommandUsage("/mvpurge" + ChatColor.GOLD + " [WORLD|all] " + ChatColor.GREEN + "{all|animals|monsters|MOBNAME}");
+        this.setCommandUsage("/mv purge" + ChatColor.GOLD + " [WORLD|all] " + ChatColor.GREEN + "{all|animals|monsters|MOBNAME}");
         this.setArgRange(1, 2);
         this.addKey("mvpurge");
         this.addKey("mv purge");
diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/ReloadCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/ReloadCommand.java
index e3617178..7738a494 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/commands/ReloadCommand.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/commands/ReloadCommand.java
@@ -15,7 +15,7 @@ public class ReloadCommand extends MultiverseCommand {
     public ReloadCommand(MultiverseCore plugin) {
         super(plugin);
         this.setName("Reload Configs");
-        this.setCommandUsage("/mvreload");
+        this.setCommandUsage("/mv reload");
         this.setArgRange(0, 0);
         this.addKey("mvreload");
         this.addKey("mv reload");
diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/RemoveCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/RemoveCommand.java
index 9666a1e4..cae002fc 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/commands/RemoveCommand.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/commands/RemoveCommand.java
@@ -13,7 +13,7 @@ public class RemoveCommand extends MultiverseCommand {
     public RemoveCommand(MultiverseCore plugin) {
         super(plugin);
         this.setName("Remove World");
-        this.setCommandUsage("/mvremove " + ChatColor.GREEN + " {WORLD}");
+        this.setCommandUsage("/mv remove " + ChatColor.GREEN + " {WORLD}");
         this.setArgRange(1, 1);
         this.addKey("mvremove");
         this.setPermission("multiverse.core.remove", "Unloads a world from Multiverse and removes it from worlds.yml, this does NOT remove the world folder.", PermissionDefault.OP);
diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/SetSpawnCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/SetSpawnCommand.java
index 2b3fc00a..a71e2b40 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/commands/SetSpawnCommand.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/commands/SetSpawnCommand.java
@@ -15,7 +15,7 @@ public class SetSpawnCommand extends MultiverseCommand {
     public SetSpawnCommand(MultiverseCore plugin) {
         super(plugin);
         this.setName("Set World Spawn");
-        this.setCommandUsage("/mvsetspawn");
+        this.setCommandUsage("/mv setspawn");
         this.setArgRange(0, 0);
         this.addKey("mvsetspawn");
         this.addKey("mvss");
diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/SpawnCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/SpawnCommand.java
index 553567ff..2666b24c 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/commands/SpawnCommand.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/commands/SpawnCommand.java
@@ -16,7 +16,7 @@ public class SpawnCommand extends MultiverseCommand {
         super(plugin);
         Permission otherPerm = new Permission("multiverse.core.spawn.other", "Teleports another player to the spawn of the world they are in.", PermissionDefault.OP);
         this.setName("Spawn");
-        this.setCommandUsage("/mvspawn" + ChatColor.GOLD + " [PLAYER]");
+        this.setCommandUsage("/mv spawn" + ChatColor.GOLD + " [PLAYER]");
         this.setArgRange(0, 1);
         this.addKey("mvspawn");
         this.addKey("mv spawn");
diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/TeleportCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/TeleportCommand.java
index 9cb45a65..4f1bcd63 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/commands/TeleportCommand.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/commands/TeleportCommand.java
@@ -30,7 +30,7 @@ public class TeleportCommand extends MultiverseCommand {
         Permission tp = new Permission("multiverse.core.tp", "Allows teleportation to other worlds.", PermissionDefault.OP, children);
 
         this.setName("Teleport");
-        this.setCommandUsage("/mvtp " + ChatColor.GOLD + "[PLAYER]" + ChatColor.GREEN + " {WORLD}");
+        this.setCommandUsage("/mv tp " + ChatColor.GOLD + "[PLAYER]" + ChatColor.GREEN + " {WORLD}");
         this.setArgRange(1, 2);
         this.addKey("mvtp");
         this.addKey("mv tp");
@@ -106,6 +106,8 @@ public class TeleportCommand extends MultiverseCommand {
             teleporter.sendMessage("Sorry Boss, I tried everything, but just couldn't teleport ya there!");
             return;
         }
-        this.playerTeleporter.safelyTeleport(teleportee, l);
+        if(this.playerTeleporter.safelyTeleport(teleportee, l)) {
+            
+        }
     }
 }
diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/UnloadCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/UnloadCommand.java
index 737da752..35af8c73 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/commands/UnloadCommand.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/commands/UnloadCommand.java
@@ -13,7 +13,7 @@ public class UnloadCommand extends MultiverseCommand {
     public UnloadCommand(MultiverseCore plugin) {
         super(plugin);
         this.setName("Unload World");
-        this.setCommandUsage("/mvunload" + ChatColor.GREEN + " {WORLD}");
+        this.setCommandUsage("/mv unload" + ChatColor.GREEN + " {WORLD}");
         this.setArgRange(1, 1);
         this.addKey("mvunload");
         this.addKey("mv unload");
diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/VersionCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/VersionCommand.java
index 0492f4f3..19bf9944 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/commands/VersionCommand.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/commands/VersionCommand.java
@@ -41,6 +41,7 @@ public class VersionCommand extends MultiverseCommand {
         this.plugin.log(Level.INFO, "opfallback: " + this.plugin.getConfig().getString("opfallback", "NOT SET"));
         this.plugin.log(Level.INFO, "disableautoheal: " + this.plugin.getConfig().getString("disableautoheal", "NOT SET"));
         this.plugin.log(Level.INFO, "fakepvp: " + this.plugin.getConfig().getString("fakepvp", "NOT SET"));
+        this.plugin.log(Level.INFO, "fakepvp: " + this.plugin.getConfig().getString("fakepvp", "NOT SET"));
         this.plugin.log(Level.INFO, "Special Code: FRN001");
     }
 }
diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/WhoCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/WhoCommand.java
index b99e71ef..ddd0f2c6 100644
--- a/src/main/java/com/onarandombox/MultiverseCore/commands/WhoCommand.java
+++ b/src/main/java/com/onarandombox/MultiverseCore/commands/WhoCommand.java
@@ -16,7 +16,7 @@ public class WhoCommand extends MultiverseCommand {
     public WhoCommand(MultiverseCore plugin) {
         super(plugin);
         this.setName("Who?");
-        this.setCommandUsage("/mvwho" + ChatColor.GOLD + " [WORLD]");
+        this.setCommandUsage("/mv   who" + ChatColor.GOLD + " [WORLD]");
         this.setArgRange(0, 1);
         this.addKey("mv who");
         this.addKey("mvw");