diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java b/src/main/java/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java
index 57f32ed..9d3b055 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java
@@ -5,10 +5,9 @@ import me.StevenLawson.TotalFreedomMod.admin.AdminList;
 import me.StevenLawson.TotalFreedomMod.announcer.Announcer;
 import me.StevenLawson.TotalFreedomMod.ban.BanManager;
 import me.StevenLawson.TotalFreedomMod.ban.PermbanList;
+import me.StevenLawson.TotalFreedomMod.commands.Commands;
 import me.StevenLawson.TotalFreedomMod.discord.bridge.DiscordBridge;
 import me.StevenLawson.TotalFreedomMod.command.CommandBlocker;
-import me.StevenLawson.TotalFreedomMod.commands.CommandHandler;
-import me.StevenLawson.TotalFreedomMod.commands.CommandLoader;
 import me.StevenLawson.TotalFreedomMod.commands.FreedomCommand;
 import me.StevenLawson.TotalFreedomMod.config.ConfigurationEntry;
 import me.StevenLawson.TotalFreedomMod.deprecated.bridge.BukkitTelnetBridge;
@@ -23,7 +22,6 @@ import me.StevenLawson.TotalFreedomMod.world.AdminWorld;
 import me.StevenLawson.TotalFreedomMod.world.FlatlandsWorld;
 import me.StevenLawson.TotalFreedomMod.world.ProtectedArea;
 import org.bukkit.World;
-import org.bukkit.command.CommandSender;
 import org.bukkit.configuration.InvalidConfigurationException;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.configuration.file.YamlConfiguration;
@@ -176,6 +174,8 @@ public class TotalFreedomMod extends JavaPlugin {
         // Heartbeat
         new HeartBeat(plugin).runTaskTimer(plugin, HEARTBEAT_RATE * 20L, HEARTBEAT_RATE * 20L);
 
+        Commands.registerCommands(this);
+
         // Start services
         HTTPDManager.start();
 
@@ -200,7 +200,6 @@ public class TotalFreedomMod extends JavaPlugin {
             @Override
             public void run()
             {
-                CommandLoader.scan();
                 CommandBlocker.load();
 
                 // Add spawnpoints later - https://github.com/TotalFreedom/TotalFreedomMod/issues/438
@@ -222,12 +221,6 @@ public class TotalFreedomMod extends JavaPlugin {
         Log.info("Plugin disabled");
     }
 
-    @Override
-    public boolean onCommand(CommandSender sender, org.bukkit.command.Command cmd, String commandLabel, String[] args)
-    {
-        return CommandHandler.handleCommand(sender, cmd, commandLabel, args);
-    }
-
     public FileConfiguration getCustomConfig() {
         return this.customConfig;
     }
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/command/CommandBlocker.java b/src/main/java/me/StevenLawson/TotalFreedomMod/command/CommandBlocker.java
index db138b3..65f82c1 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/command/CommandBlocker.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/command/CommandBlocker.java
@@ -2,10 +2,10 @@ package me.StevenLawson.TotalFreedomMod.command;
 
 import me.StevenLawson.TotalFreedomMod.Log;
 import me.StevenLawson.TotalFreedomMod.admin.AdminList;
-import me.StevenLawson.TotalFreedomMod.commands.CommandLoader;
 import me.StevenLawson.TotalFreedomMod.config.ConfigurationEntry;
 import me.StevenLawson.TotalFreedomMod.util.Utilities;
 import org.apache.commons.lang3.StringUtils;
+import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandMap;
@@ -34,7 +34,7 @@ public class CommandBlocker
     {
         BLOCKED_COMMANDS.clear();
 
-        final CommandMap commandMap = CommandLoader.getCommandMap();
+        final CommandMap commandMap = Utilities.getField(Bukkit.getServer().getPluginManager(), "commandMap");
         if (commandMap == null)
         {
             Log.severe("Error loading commandMap.");
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/CommandHandler.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/CommandHandler.java
deleted file mode 100644
index e389eb8..0000000
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/CommandHandler.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package me.StevenLawson.TotalFreedomMod.commands;
-
-import me.StevenLawson.TotalFreedomMod.Log;
-import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
-import org.apache.commons.lang3.StringUtils;
-import org.bukkit.ChatColor;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-public class CommandHandler {
-    public static final String COMMAND_PATH = FreedomCommand.class.getPackage().getName(); // "me.StevenLawson.TotalFreedomMod.Commands";
-    public static final String COMMAND_PREFIX = "Command_";
-
-    public static boolean handleCommand(CommandSender sender, Command cmd, String commandLabel, String[] args) {
-        final Player playerSender;
-        final boolean senderIsConsole;
-
-        if (sender instanceof Player) {
-            senderIsConsole = false;
-            playerSender = (Player) sender;
-
-            Log.info(String.format("[PLAYER_COMMAND] %s (%s): /%s %s",
-                    playerSender.getName(),
-                    ChatColor.stripColor(playerSender.getDisplayName()),
-                    commandLabel,
-                    StringUtils.join(args, " ")), true);
-        }
-        else
-        {
-            senderIsConsole = true;
-            playerSender = null;
-
-            Log.info(String.format("[CONSOLE_COMMAND] %s: /%s %s",
-                    sender.getName(),
-                    commandLabel,
-                    StringUtils.join(args, " ")), true);
-        }
-
-        final FreedomCommand dispatcher;
-        try
-        {
-            final ClassLoader classLoader = TotalFreedomMod.class.getClassLoader();
-            dispatcher = (FreedomCommand) classLoader.loadClass(String.format("%s.%s%s",
-                    COMMAND_PATH,
-                    COMMAND_PREFIX,
-                    cmd.getName().toLowerCase())).newInstance();
-            dispatcher.setup(TotalFreedomMod.plugin, sender, dispatcher.getClass());
-        }
-        catch (Exception ex)
-        {
-            Log.severe("Could not load command: " + cmd.getName());
-            Log.severe(ex);
-
-            sender.sendMessage(ChatColor.RED + "Command Error! Could not load command: " + cmd.getName());
-            return true;
-        }
-
-        if (!dispatcher.senderHasPermission())
-        {
-            sender.sendMessage(FreedomCommand.MSG_NO_PERMS);
-            return true;
-        }
-
-        try
-        {
-            return dispatcher.run(sender, playerSender, cmd, commandLabel, args, senderIsConsole);
-        }
-        catch (Exception ex)
-        {
-            Log.severe("Command Error: " + commandLabel);
-            Log.severe(ex);
-            sender.sendMessage(ChatColor.RED + "Command Error: " + ex.getMessage());
-        }
-
-        return true;
-    }
-}
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/CommandLoader.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/CommandLoader.java
deleted file mode 100644
index 7e75899..0000000
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/CommandLoader.java
+++ /dev/null
@@ -1,324 +0,0 @@
-package me.StevenLawson.TotalFreedomMod.commands;
-
-import me.StevenLawson.TotalFreedomMod.Log;
-import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
-import me.StevenLawson.TotalFreedomMod.util.Utilities;
-import org.bukkit.Bukkit;
-import org.bukkit.command.*;
-import org.bukkit.plugin.Plugin;
-
-import java.io.IOException;
-import java.security.CodeSource;
-import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
-
-public class CommandLoader {
-    public static final Pattern COMMAND_PATTERN;
-    private static final List<TFM_CommandInfo> COMMAND_LIST;
-
-    static {
-        COMMAND_PATTERN = Pattern.compile(CommandHandler.COMMAND_PATH.replace('.', '/') + "/(" + CommandHandler.COMMAND_PREFIX + "[^\\$]+)\\.class");
-        COMMAND_LIST = new ArrayList<TFM_CommandInfo>();
-    }
-
-    private CommandLoader() {
-        throw new AssertionError();
-    }
-
-    public static void scan()
-    {
-        CommandMap commandMap = getCommandMap();
-        if (commandMap == null)
-        {
-            Log.severe("Error loading commandMap.");
-            return;
-        }
-        COMMAND_LIST.clear();
-        COMMAND_LIST.addAll(getCommands());
-
-        for (TFM_CommandInfo commandInfo : COMMAND_LIST)
-        {
-            TFM_DynamicCommand dynamicCommand = new TFM_DynamicCommand(commandInfo);
-
-            Command existing = commandMap.getCommand(dynamicCommand.getName());
-            if (existing != null)
-            {
-                unregisterCommand(existing, commandMap);
-            }
-
-            commandMap.register(TotalFreedomMod.plugin.getDescription().getName(), dynamicCommand);
-        }
-
-        Log.info("TFM commands loaded.");
-    }
-
-    public static void unregisterCommand(String commandName)
-    {
-        CommandMap commandMap = getCommandMap();
-        if (commandMap != null)
-        {
-            Command command = commandMap.getCommand(commandName.toLowerCase());
-            if (command != null)
-            {
-                unregisterCommand(command, commandMap);
-            }
-        }
-    }
-
-    public static void unregisterCommand(Command command, CommandMap commandMap)
-    {
-        try
-        {
-            command.unregister(commandMap);
-            HashMap<String, Command> knownCommands = getKnownCommands(commandMap);
-            if (knownCommands != null)
-            {
-                knownCommands.remove(command.getName());
-                for (String alias : command.getAliases())
-                {
-                    knownCommands.remove(alias);
-                }
-            }
-        }
-        catch (Exception ex)
-        {
-            Log.severe(ex);
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    public static CommandMap getCommandMap()
-    {
-        final Object commandMap = Utilities.getField(Bukkit.getServer().getPluginManager(), "commandMap");
-        if (commandMap != null)
-        {
-            if (commandMap instanceof CommandMap)
-            {
-                return (CommandMap) commandMap;
-            }
-        }
-        return null;
-    }
-
-    @SuppressWarnings("unchecked")
-    public static HashMap<String, Command> getKnownCommands(CommandMap commandMap)
-    {
-        Object knownCommands = Utilities.getField(commandMap, "knownCommands");
-        if (knownCommands != null)
-        {
-            if (knownCommands instanceof HashMap)
-            {
-                return (HashMap<String, Command>) knownCommands;
-            }
-        }
-        return null;
-    }
-
-    private static List<TFM_CommandInfo> getCommands()
-    {
-        List<TFM_CommandInfo> commandList = new ArrayList<TFM_CommandInfo>();
-
-        try
-        {
-            CodeSource codeSource = TotalFreedomMod.class.getProtectionDomain().getCodeSource();
-            if (codeSource != null)
-            {
-                ZipInputStream zip = new ZipInputStream(codeSource.getLocation().openStream());
-                ZipEntry zipEntry;
-                while ((zipEntry = zip.getNextEntry()) != null)
-                {
-                    String entryName = zipEntry.getName();
-                    Matcher matcher = COMMAND_PATTERN.matcher(entryName);
-                    if (matcher.find())
-                    {
-                        try
-                        {
-                            Class<?> commandClass = Class.forName(CommandHandler.COMMAND_PATH + "." + matcher.group(1));
-
-                            CommandPermissions commandPermissions = commandClass.getAnnotation(CommandPermissions.class);
-                            CommandParameters commandParameters = commandClass.getAnnotation(CommandParameters.class);
-
-                            if (commandPermissions != null && commandParameters != null)
-                            {
-                                TFM_CommandInfo commandInfo = new TFM_CommandInfo(
-                                        commandClass,
-                                        matcher.group(1).split("_")[1],
-                                        commandPermissions.level(),
-                                        commandPermissions.source(),
-                                        commandPermissions.blockHostConsole(),
-                                        commandParameters.description(),
-                                        commandParameters.usage(),
-                                        commandParameters.aliases());
-
-                                commandList.add(commandInfo);
-                            }
-                        }
-                        catch (ClassNotFoundException ex)
-                        {
-                            Log.severe(ex);
-                        }
-                    }
-                }
-            }
-        }
-        catch (IOException ex)
-        {
-            Log.severe(ex);
-        }
-
-        return commandList;
-    }
-
-    public static class TFM_CommandInfo
-    {
-        private final String commandName;
-        private final Class<?> commandClass;
-        private final AdminLevel level;
-        private final SourceType source;
-        private final boolean blockHostConsole;
-        private final String description;
-        private final String usage;
-        private final List<String> aliases;
-
-        public TFM_CommandInfo(Class<?> commandClass, String commandName, AdminLevel level, SourceType source, boolean blockHostConsole, String description, String usage, String aliases) {
-            this.commandName = commandName;
-            this.commandClass = commandClass;
-            this.level = level;
-            this.source = source;
-            this.blockHostConsole = blockHostConsole;
-            this.description = description;
-            this.usage = usage;
-            this.aliases = ("".equals(aliases) ? new ArrayList<String>() : Arrays.asList(aliases.split(",")));
-        }
-
-        public List<String> getAliases()
-        {
-            return Collections.unmodifiableList(aliases);
-        }
-
-        public Class<?> getCommandClass()
-        {
-            return commandClass;
-        }
-
-        public String getCommandName()
-        {
-            return commandName;
-        }
-
-        public String getDescription()
-        {
-            return description;
-        }
-
-        public String getDescriptionPermissioned()
-        {
-            String _description = description;
-
-            switch (this.getLevel())
-            {
-                case SENIOR:
-                    _description = "Senior " + (this.getSource() == SourceType.ONLY_CONSOLE ? "Console" : "") + " Command - " + _description;
-                    break;
-                case SUPER:
-                    _description = "Superadmin Command - " + _description;
-                    break;
-                case OP:
-                    _description = "OP Command - " + _description;
-                    break;
-            }
-
-            return _description;
-        }
-
-        public AdminLevel getLevel() {
-            return level;
-        }
-
-        public SourceType getSource()
-        {
-            return source;
-        }
-
-        public String getUsage()
-        {
-            return usage;
-        }
-
-        public boolean getBlockHostConsole()
-        {
-            return blockHostConsole;
-        }
-
-        @Override
-        public String toString()
-        {
-            StringBuilder sb = new StringBuilder();
-            sb.append("commandName: ").append(commandName);
-            sb.append("\ncommandClass: ").append(commandClass.getName());
-            sb.append("\nlevel: ").append(level);
-            sb.append("\nsource: ").append(source);
-            sb.append("\nblock_host_console: ").append(blockHostConsole);
-            sb.append("\ndescription: ").append(description);
-            sb.append("\nusage: ").append(usage);
-            sb.append("\naliases: ").append(aliases);
-            return sb.toString();
-        }
-    }
-
-    public static class TFM_DynamicCommand extends Command implements PluginIdentifiableCommand
-    {
-        private final TFM_CommandInfo commandInfo;
-
-        private TFM_DynamicCommand(TFM_CommandInfo commandInfo)
-        {
-            super(commandInfo.getCommandName(), commandInfo.getDescriptionPermissioned(), commandInfo.getUsage(), commandInfo.getAliases());
-
-            this.commandInfo = commandInfo;
-        }
-
-        @Override
-        public boolean execute(CommandSender sender, String commandLabel, String[] args)
-        {
-            boolean success = false;
-
-            if (!getPlugin().isEnabled())
-            {
-                return false;
-            }
-
-            try
-            {
-                success = getPlugin().onCommand(sender, this, commandLabel, args);
-            }
-            catch (Throwable ex)
-            {
-                throw new CommandException("Unhandled exception executing command '" + commandLabel + "' in plugin " + getPlugin().getDescription().getFullName(), ex);
-            }
-
-            if (!success && getUsage().length() > 0)
-            {
-                for (String line : getUsage().replace("<command>", commandLabel).split("\n"))
-                {
-                    sender.sendMessage(line);
-                }
-            }
-
-            return success;
-        }
-
-        @Override
-        public Plugin getPlugin()
-        {
-            return TotalFreedomMod.plugin;
-        }
-
-        public TFM_CommandInfo getCommandInfo()
-        {
-            return commandInfo;
-        }
-    }
-}
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/CommandParameters.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/CommandParameters.java
index d943d0e..3ce6cbf 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/CommandParameters.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/CommandParameters.java
@@ -1,14 +1,10 @@
 package me.StevenLawson.TotalFreedomMod.commands;
 
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
+// This is only here because of Command_tfm
 
-@Retention(RetentionPolicy.RUNTIME)
 public @interface CommandParameters
 {
     String description();
 
     String usage();
-
-    String aliases() default ""; // "alias1,alias2,alias3" - no spaces
 }
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_adminmode.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_adminmode.java
index 7c75dae..467322e 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_adminmode.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_adminmode.java
@@ -8,7 +8,6 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, blockHostConsole = true)
-@CommandParameters(description = "Close server to non-superadmins.", usage = "/<command> [on | off]")
 public class Command_adminmode extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_adminworld.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_adminworld.java
index 8e5a6df..8a24564 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_adminworld.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_adminworld.java
@@ -9,7 +9,6 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = AdminLevel.OP, source = SourceType.BOTH)
-@CommandParameters(description = "Go to the AdminWorld.", usage = "/<command> [guest < list | purge | add <player> | remove <player> > | time <morning | noon | evening | night> | weather <off | on | storm>]")
 public class Command_adminworld extends FreedomCommand {
     private enum CommandMode {
         TELEPORT, GUEST, TIME, WEATHER
@@ -63,19 +62,19 @@ public class Command_adminworld extends FreedomCommand {
 
                     if (adminWorld == null || sender_p.getWorld() == adminWorld)
                     {
-                        playerMsg("Going to the main world.");
+                        playerMsg(sender, "Going to the main world.");
                         sender_p.teleport(server.getWorlds().get(0).getSpawnLocation());
                     }
                     else
                     {
                         if (AdminWorld.getInstance().canAccessWorld(sender_p))
                         {
-                            playerMsg("Going to the AdminWorld.");
+                            playerMsg(sender, "Going to the AdminWorld.");
                             AdminWorld.getInstance().sendToWorld(sender_p);
                         }
                         else
                         {
-                            playerMsg("You don't have permission to access the AdminWorld.");
+                            playerMsg(sender, "You don't have permission to access the AdminWorld.");
                         }
                     }
 
@@ -87,7 +86,7 @@ public class Command_adminworld extends FreedomCommand {
                     {
                         if ("list".equalsIgnoreCase(args[1]))
                         {
-                            playerMsg("AdminWorld guest list: " + AdminWorld.getInstance().guestListToString());
+                            playerMsg(sender, "AdminWorld guest list: " + AdminWorld.getInstance().guestListToString());
                         }
                         else if ("purge".equalsIgnoreCase(args[1]))
                         {
@@ -120,7 +119,7 @@ public class Command_adminworld extends FreedomCommand {
                             }
                             else
                             {
-                                playerMsg("Could not add player to guest list.");
+                                playerMsg(sender, "Could not add player to guest list.");
                             }
                         }
                         else if ("remove".equals(args[1]))
@@ -132,7 +131,7 @@ public class Command_adminworld extends FreedomCommand {
                             }
                             else
                             {
-                                playerMsg("Can't find guest entry for: " + args[2]);
+                                playerMsg(sender, "Can't find guest entry for: " + args[2]);
                             }
                         }
                         else
@@ -153,11 +152,11 @@ public class Command_adminworld extends FreedomCommand {
                         if (timeOfDay != null)
                         {
                             AdminWorld.getInstance().setTimeOfDay(timeOfDay);
-                            playerMsg("AdminWorld time set to: " + timeOfDay.name());
+                            playerMsg(sender, "AdminWorld time set to: " + timeOfDay.name());
                         }
                         else
                         {
-                            playerMsg("Invalid time of day. Can be: sunrise, noon, sunset, midnight");
+                            playerMsg(sender, "Invalid time of day. Can be: sunrise, noon, sunset, midnight");
                         }
                     }
                     else
@@ -177,11 +176,11 @@ public class Command_adminworld extends FreedomCommand {
                         if (weatherMode != null)
                         {
                             AdminWorld.getInstance().setWeatherMode(weatherMode);
-                            playerMsg("AdminWorld weather set to: " + weatherMode.name());
+                            playerMsg(sender, "AdminWorld weather set to: " + weatherMode.name());
                         }
                         else
                         {
-                            playerMsg("Invalid weather mode. Can be: off, rain, storm");
+                            playerMsg(sender, "Invalid weather mode. Can be: off, rain, storm");
                         }
                     }
                     else
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_blockcmd.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_blockcmd.java
index 26c3475..3e796cc 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_blockcmd.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_blockcmd.java
@@ -8,7 +8,6 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
-@CommandParameters(description = "Block all commands for a specific player.", usage = "/<command> <purge | <partialname>>", aliases = "blockcommands,blockcommand")
 public class Command_blockcmd extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
@@ -28,7 +27,7 @@ public class Command_blockcmd extends FreedomCommand {
                     playerdata.setCommandsBlocked(false);
                 }
             }
-            playerMsg("Unblocked commands for " + counter + " players.");
+            playerMsg(sender, "Unblocked commands for " + counter + " players.");
             return true;
         }
 
@@ -36,13 +35,13 @@ public class Command_blockcmd extends FreedomCommand {
 
         if (player == null)
         {
-            playerMsg(FreedomCommand.PLAYER_NOT_FOUND);
+            playerMsg(sender, FreedomCommand.PLAYER_NOT_FOUND);
             return true;
         }
 
         if (AdminList.isSuperAdmin(player))
         {
-            playerMsg(player.getName() + " is a Superadmin, and cannot have their commands blocked.");
+            playerMsg(sender, player.getName() + " is a Superadmin, and cannot have their commands blocked.");
             return true;
         }
 
@@ -51,7 +50,7 @@ public class Command_blockcmd extends FreedomCommand {
         playerdata.setCommandsBlocked(!playerdata.allCommandsBlocked());
 
         Utilities.adminAction(sender.getName(), (playerdata.allCommandsBlocked() ? "B" : "Unb") + "locking all commands for " + player.getName(), true);
-        playerMsg((playerdata.allCommandsBlocked() ? "B" : "Unb") + "locked all commands.");
+        playerMsg(sender, (playerdata.allCommandsBlocked() ? "B" : "Unb") + "locked all commands.");
 
         return true;
     }
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_cage.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_cage.java
index 188a9cc..fac6ed2 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_cage.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_cage.java
@@ -10,7 +10,6 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
-@CommandParameters(description = "Place a cage around someone.", usage = "/<command> <purge | off | <partialname> [outermaterial] [innermaterial]>")
 public class Command_cage extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_cake.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_cake.java
index bd0a1e0..0529093 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_cake.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_cake.java
@@ -13,7 +13,6 @@ import org.bukkit.inventory.meta.ItemMeta;
 import java.util.Random;
 
 @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
-@CommandParameters(description = "For the people that are still alive.", usage = "/<command>")
 public class Command_cake extends FreedomCommand {
     public static final String CAKE_LYRICS = "But there's no sense crying over every mistake. You just keep on trying till you run out of cake.";
     private final Random random = new Random();
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_cartsit.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_cartsit.java
index b6037c8..e3cccd6 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_cartsit.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_cartsit.java
@@ -7,7 +7,6 @@ import org.bukkit.entity.Minecart;
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = AdminLevel.ALL, source = SourceType.BOTH)
-@CommandParameters(description = "Sit in nearest minecart. If target is in a minecart already, they will disembark.", usage = "/<command> [partialname]")
 public class Command_cartsit extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_cbtool.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_cbtool.java
index e6a82a3..2f32d2a 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_cbtool.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_cbtool.java
@@ -18,7 +18,6 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 @CommandPermissions(level = AdminLevel.ALL, source = SourceType.BOTH)
-@CommandParameters(description = "No Description Yet", usage = "/<command>")
 public class Command_cbtool extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
@@ -28,7 +27,7 @@ public class Command_cbtool extends FreedomCommand {
 
         if ("targetblock".equalsIgnoreCase(args[0]) && sender instanceof Player) {
             Block targetBlock = DeprecationUtil.getTargetBlock(sender_p, null, 100);
-            playerMsg("Your target block: " + targetBlock.getLocation().toString());
+            playerMsg(sender, "Your target block: " + targetBlock.getLocation().toString());
             return true;
         }
 
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_cmdlist.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_cmdlist.java
index f2645e6..6d202d1 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_cmdlist.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_cmdlist.java
@@ -13,7 +13,6 @@ import java.util.Map;
 import java.util.Map.Entry;
 
 @CommandPermissions(level = AdminLevel.ALL, source = SourceType.BOTH)
-@CommandParameters(description = "Show all commands for all server plugins.", usage = "/<command>")
 public class Command_cmdlist extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_cmdspy.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_cmdspy.java
index 0e182de..6718854 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_cmdspy.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_cmdspy.java
@@ -5,14 +5,13 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 
 @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.ONLY_IN_GAME)
-@CommandParameters(description = "Spy on commands", usage = "/<command>", aliases = "commandspy")
 public class Command_cmdspy extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
 
         PlayerData playerdata = PlayerData.getPlayerData(sender_p);
         playerdata.setCommandSpy(!playerdata.cmdspyEnabled());
-        playerMsg("CommandSpy " + (playerdata.cmdspyEnabled() ? "enabled." : "disabled."));
+        playerMsg(sender, "CommandSpy " + (playerdata.cmdspyEnabled() ? "enabled." : "disabled."));
 
         return true;
     }
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_colorme.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_colorme.java
index 81773b9..0022b9b 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_colorme.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_colorme.java
@@ -11,7 +11,6 @@ import java.util.Iterator;
 import java.util.Map;
 
 @CommandPermissions(level = AdminLevel.OP, source = SourceType.ONLY_IN_GAME)
-@CommandParameters(description = "Essentials Interface Command - Color your current nickname.", usage = "/<command> <color>")
 public class Command_colorme extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
@@ -20,7 +19,7 @@ public class Command_colorme extends FreedomCommand {
         }
 
         if ("list".equalsIgnoreCase(args[0])) {
-            playerMsg("Colors: " + StringUtils.join(Utilities.CHAT_COLOR_NAMES.keySet(), ", "));
+            playerMsg(sender, "Colors: " + StringUtils.join(Utilities.CHAT_COLOR_NAMES.keySet(), ", "));
             return true;
         }
 
@@ -39,7 +38,7 @@ public class Command_colorme extends FreedomCommand {
 
         if (color == null)
         {
-            playerMsg("Invalid color: " + needle + " - Use \"/colorme list\" to list colors.");
+            playerMsg(sender, "Invalid color: " + needle + " - Use \"/colorme list\" to list colors.");
             return true;
         }
 
@@ -47,7 +46,7 @@ public class Command_colorme extends FreedomCommand {
 
         EssentialsBridge.setNickname(sender.getName(), newNick);
 
-        playerMsg("Your nickname is now: " + newNick);
+        playerMsg(sender, "Your nickname is now: " + newNick);
 
         return true;
     }
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_creative.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_creative.java
index 0e3b249..9770c9c 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_creative.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_creative.java
@@ -8,7 +8,6 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = AdminLevel.OP, source = SourceType.BOTH)
-@CommandParameters(description = "Quickly change your own gamemode to creative, or define someone's username to change theirs.", usage = "/<command> [partialname]", aliases = "gmc")
 public class Command_creative extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
@@ -45,7 +44,7 @@ public class Command_creative extends FreedomCommand {
 
             if (!(senderIsConsole || AdminList.isSuperAdmin(sender)))
             {
-                playerMsg("Only superadmins can change other user's gamemode.");
+                playerMsg(sender, "Only superadmins can change other user's gamemode.");
                 return true;
             }
 
@@ -59,7 +58,7 @@ public class Command_creative extends FreedomCommand {
 
         }
 
-        playerMsg("Setting " + player.getName() + " to game mode 'Creative'.");
+        playerMsg(sender, "Setting " + player.getName() + " to game mode 'Creative'.");
         playerMsg(player, sender.getName() + " set your game mode to 'Creative'.");
         player.setGameMode(GameMode.CREATIVE);
 
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_csay.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_csay.java
index 83bce4a..078487d 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_csay.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_csay.java
@@ -6,7 +6,6 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 
 @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.ONLY_CONSOLE)
-@CommandParameters(description = "Telnet command - Send a chat message with chat formatting over telnet.", usage = "/<command> <message...>")
 public class Command_csay extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_deafen.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_deafen.java
index 93000ce..641769a 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_deafen.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_deafen.java
@@ -10,7 +10,6 @@ import org.bukkit.scheduler.BukkitRunnable;
 import java.util.Random;
 
 @CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.BOTH, blockHostConsole = true)
-@CommandParameters(description = "Make some noise.", usage = "/<command>")
 public class Command_deafen extends FreedomCommand {
     private static final Random random = new Random();
     public static final double STEPS = 10.0;
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_debug.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_debug.java
index ffbd8d6..511fc8e 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_debug.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_debug.java
@@ -8,7 +8,6 @@ import org.bukkit.command.CommandSender;
 import java.lang.reflect.Field;
 
 @CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE)
-@CommandParameters(description = "For developers only - debug things via reflection.", usage = "/<command>")
 public class Command_debug extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_denick.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_denick.java
index df76874..646475d 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_denick.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_denick.java
@@ -7,7 +7,6 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
-@CommandParameters(description = "Essentials Interface Command - Remove the nickname of all players on the server.", usage = "/<command>")
 public class Command_denick extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_deop.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_deop.java
index 5c68b41..0728933 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_deop.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_deop.java
@@ -8,7 +8,6 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
-@CommandParameters(description = "Deop a player.", usage = "/<command> <playername>")
 public class Command_deop extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_deopall.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_deopall.java
index a1419e4..150f7a8 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_deopall.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_deopall.java
@@ -6,7 +6,6 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
-@CommandParameters(description = "Deop everyone on the server.", usage = "/<command>")
 public class Command_deopall extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_dispfill.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_dispfill.java
index 2e234cf..8a47668 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_dispfill.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_dispfill.java
@@ -16,7 +16,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 @CommandPermissions(level = AdminLevel.OP, source = SourceType.ONLY_IN_GAME)
-@CommandParameters(description = "Fill nearby dispensers with a set of items of your choice.", usage = "/<command> <radius> <comma,separated,items>")
 public class Command_dispfill extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_doom.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_doom.java
index 1cb5688..46eac65 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_doom.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_doom.java
@@ -14,7 +14,6 @@ import org.bukkit.scheduler.BukkitRunnable;
 import org.bukkit.util.Vector;
 
 @CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE)
-@CommandParameters(description = "For the bad Super Admins", usage = "/<command> <playername>")
 public class Command_doom extends FreedomCommand {
     @Override
     public boolean run(final CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_enchant.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_enchant.java
index 5b47d3b..92ffac6 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_enchant.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_enchant.java
@@ -7,7 +7,6 @@ import org.bukkit.enchantments.Enchantment;
 import org.bukkit.inventory.ItemStack;
 
 @CommandPermissions(level = AdminLevel.OP, source = SourceType.ONLY_IN_GAME)
-@CommandParameters(description = "Enchant items.", usage = "/<command> <list | addall | reset | add <name> | remove <name>>")
 public class Command_enchant extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
@@ -18,7 +17,7 @@ public class Command_enchant extends FreedomCommand {
         ItemStack itemInHand = sender_p.getItemInHand();
 
         if (itemInHand == null) {
-            playerMsg("You are holding an invalid item.");
+            playerMsg(sender, "You are holding an invalid item.");
             return true;
         }
 
@@ -38,11 +37,11 @@ public class Command_enchant extends FreedomCommand {
 
             if (has_enchantments)
             {
-                playerMsg(possible_ench.toString());
+                playerMsg(sender, possible_ench.toString());
             }
             else
             {
-                playerMsg("The held item has no enchantments.");
+                playerMsg(sender, "The held item has no enchantments.");
             }
         }
         else if (args[0].equalsIgnoreCase("addall"))
@@ -62,7 +61,7 @@ public class Command_enchant extends FreedomCommand {
                 }
             }
 
-            playerMsg("Added all possible enchantments for this item.");
+            playerMsg(sender, "Added all possible enchantments for this item.");
         }
         else if (args[0].equalsIgnoreCase("reset"))
         {
@@ -71,7 +70,7 @@ public class Command_enchant extends FreedomCommand {
                 itemInHand.removeEnchantment(ench);
             }
 
-            playerMsg("Removed all enchantments.");
+            playerMsg(sender, "Removed all enchantments.");
         }
         else
         {
@@ -92,7 +91,7 @@ public class Command_enchant extends FreedomCommand {
 
             if (ench == null)
             {
-                playerMsg(args[1] + " is an invalid enchantment for the held item. Type \"/enchant list\" for valid enchantments for this item.");
+                playerMsg(sender, args[1] + " is an invalid enchantment for the held item. Type \"/enchant list\" for valid enchantments for this item.");
                 return true;
             }
 
@@ -102,18 +101,18 @@ public class Command_enchant extends FreedomCommand {
                 {
                     itemInHand.addEnchantment(ench, ench.getMaxLevel());
 
-                    playerMsg("Added enchantment: " + ench.getName());
+                    playerMsg(sender, "Added enchantment: " + ench.getName());
                 }
                 else
                 {
-                    playerMsg("Can't use this enchantment on held item.");
+                    playerMsg(sender, "Can't use this enchantment on held item.");
                 }
             }
             else if (args[0].equals("remove"))
             {
                 itemInHand.removeEnchantment(ench);
 
-                playerMsg("Removed enchantment: " + ench.getName());
+                playerMsg(sender, "Removed enchantment: " + ench.getName());
             }
         }
 
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_ender.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_ender.java
index e47382d..27978dd 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_ender.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_ender.java
@@ -5,7 +5,6 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 
 @CommandPermissions(level = AdminLevel.ALL, source = SourceType.ONLY_IN_GAME)
-@CommandParameters(description = "Goto the ender / \"The End\".", usage = "/<command>")
 public class Command_ender extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_expel.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_expel.java
index 16d64df..bf2e01a 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_expel.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_expel.java
@@ -12,7 +12,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.ONLY_IN_GAME)
-@CommandParameters(description = "Push people away from you.", usage = "/<command> [radius] [strength]")
 public class Command_expel extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
@@ -73,11 +72,11 @@ public class Command_expel extends FreedomCommand {
 
         if (pushedPlayers.isEmpty())
         {
-            playerMsg("No players pushed.");
+            playerMsg(sender, "No players pushed.");
         }
         else
         {
-            playerMsg("Pushed " + pushedPlayers.size() + " players: " + StringUtils.join(pushedPlayers, ", "));
+            playerMsg(sender, "Pushed " + pushedPlayers.size() + " players: " + StringUtils.join(pushedPlayers, ", "));
         }
 
         return true;
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_findip.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_findip.java
index 08909f7..3f7b178 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_findip.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_findip.java
@@ -7,7 +7,6 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
-@CommandParameters(description = "Shows all IPs registered to a player", usage = "/<command> <player>")
 public class Command_findip extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
@@ -19,11 +18,11 @@ public class Command_findip extends FreedomCommand {
 
         if (player == null) {
 
-            playerMsg(FreedomCommand.PLAYER_NOT_FOUND);
+            playerMsg(sender, FreedomCommand.PLAYER_NOT_FOUND);
             return true;
         }
 
-        playerMsg("Player IPs: " + StringUtils.join(PlayerList.getEntry(player).getIps(), ", "));
+        playerMsg(sender, "Player IPs: " + StringUtils.join(PlayerList.getEntry(player).getIps(), ", "));
 
         return true;
     }
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_flatlands.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_flatlands.java
index 631692d..60cf440 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_flatlands.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_flatlands.java
@@ -6,14 +6,13 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 
 @CommandPermissions(level = AdminLevel.ALL, source = SourceType.ONLY_IN_GAME)
-@CommandParameters(description = "Goto the flatlands.", usage = "/<command>")
 public class Command_flatlands extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
         if (ConfigurationEntry.FLATLANDS_GENERATE.getBoolean()) {
             FlatlandsWorld.getInstance().sendToWorld(sender_p);
         } else {
-            playerMsg("Flatlands is currently disabled.");
+            playerMsg(sender, "Flatlands is currently disabled.");
         }
         return true;
     }
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_fr.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_fr.java
index 120f87c..2abbf10 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_fr.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_fr.java
@@ -10,7 +10,6 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
-@CommandParameters(description = "Freeze players (toggles on and off).", usage = "/<command> [target | purge]")
 public class Command_fr extends FreedomCommand {
     private static boolean allFrozen = false;
 
@@ -23,7 +22,7 @@ public class Command_fr extends FreedomCommand {
                 Utilities.adminAction(sender.getName(), "Freezing all players", false);
 
                 setAllFrozen(true);
-                playerMsg("Players are now frozen.");
+                playerMsg(sender, "Players are now frozen.");
 
                 for (Player player : Bukkit.getOnlinePlayers())
                 {
@@ -37,7 +36,7 @@ public class Command_fr extends FreedomCommand {
             {
                 Utilities.adminAction(sender.getName(), "Unfreezing all players", false);
                 setAllFrozen(false);
-                playerMsg("Players are now free to move.");
+                playerMsg(sender, "Players are now free to move.");
             }
         }
         else
@@ -53,14 +52,14 @@ public class Command_fr extends FreedomCommand {
 
                 if (player == null)
                 {
-                    playerMsg(FreedomCommand.PLAYER_NOT_FOUND, ChatColor.RED);
+                    playerMsg(sender, FreedomCommand.PLAYER_NOT_FOUND, ChatColor.RED);
                     return true;
                 }
 
                 final PlayerData playerdata = PlayerData.getPlayerData(player);
                 playerdata.setFrozen(!playerdata.isFrozen());
 
-                playerMsg(player.getName() + " has been " + (playerdata.isFrozen() ? "frozen" : "unfrozen") + ".");
+                playerMsg(sender, player.getName() + " has been " + (playerdata.isFrozen() ? "frozen" : "unfrozen") + ".");
                 playerMsg(player, "You have been " + (playerdata.isFrozen() ? "frozen" : "unfrozen") + ".", ChatColor.AQUA);
             }
         }
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_fuckoff.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_fuckoff.java
index 141d101..49a1c51 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_fuckoff.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_fuckoff.java
@@ -5,7 +5,6 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 
 @CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_IN_GAME)
-@CommandParameters(description = "You'll never even see it coming.", usage = "/<command>")
 public class Command_fuckoff extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
@@ -39,7 +38,7 @@ public class Command_fuckoff extends FreedomCommand {
             TotalFreedomMod.fuckoffEnabledFor.put(sender_p, new Double(fuckoff_range));
         }
 
-        playerMsg("Fuckoff " + (fuckoff_enabled ? ("enabled. Range: " + fuckoff_range + ".") : "disabled."));
+        playerMsg(sender, "Fuckoff " + (fuckoff_enabled ? ("enabled. Range: " + fuckoff_range + ".") : "disabled."));
 
         return true;
     }
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_gadmin.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_gadmin.java
index 0f84a44..5e8fdd7 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_gadmin.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_gadmin.java
@@ -12,9 +12,6 @@ import org.bukkit.entity.Player;
 import java.util.Iterator;
 
 @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
-@CommandParameters(
-        description = "Use admin commands on someone by hash. Use mode 'list' to get a player's hash. Other modes are kick, nameban, ipban, ban, op, deop, ci, fr, smite.",
-        usage = "/<command> [list | [<kick | nameban | ipban | ban | op | deop | ci | fr | smite> <targethash>] ]")
 public class Command_gadmin extends FreedomCommand {
     private enum GadminMode {
         LIST("list"),
@@ -60,7 +57,7 @@ public class Command_gadmin extends FreedomCommand {
 
         final GadminMode mode = GadminMode.findMode(args[0].toLowerCase());
         if (mode == null) {
-            playerMsg("Invalid mode: " + args[0], ChatColor.RED);
+            playerMsg(sender, "Invalid mode: " + args[0], ChatColor.RED);
             return true;
         }
 
@@ -68,7 +65,7 @@ public class Command_gadmin extends FreedomCommand {
 
         if (mode == GadminMode.LIST)
         {
-            playerMsg("[ Real Name ] : [ Display Name ] - Hash:");
+            playerMsg(sender, "[ Real Name ] : [ Display Name ] - Hash:");
             while (it.hasNext())
             {
                 final Player player = it.next();
@@ -100,7 +97,7 @@ public class Command_gadmin extends FreedomCommand {
 
         if (target == null)
         {
-            playerMsg("Invalid player hash: " + args[1], ChatColor.RED);
+            playerMsg(sender, "Invalid player hash: " + args[1], ChatColor.RED);
             return true;
         }
 
@@ -181,7 +178,7 @@ public class Command_gadmin extends FreedomCommand {
                 PlayerData playerdata = PlayerData.getPlayerData(target);
                 playerdata.setFrozen(!playerdata.isFrozen());
 
-                playerMsg(target.getName() + " has been " + (playerdata.isFrozen() ? "frozen" : "unfrozen") + ".");
+                playerMsg(sender, target.getName() + " has been " + (playerdata.isFrozen() ? "frozen" : "unfrozen") + ".");
                 target.sendMessage(ChatColor.AQUA + "You have been " + (playerdata.isFrozen() ? "frozen" : "unfrozen") + ".");
 
                 break;
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_gcmd.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_gcmd.java
index 17a8690..7c20326 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_gcmd.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_gcmd.java
@@ -8,7 +8,6 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
-@CommandParameters(description = "Send a command as someone else.", usage = "/<command> <fromname> <outcommand>")
 public class Command_gcmd extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
@@ -39,19 +38,19 @@ public class Command_gcmd extends FreedomCommand {
 
         try
         {
-            playerMsg("Sending command as " + player.getName() + ": " + outCommand);
+            playerMsg(sender, "Sending command as " + player.getName() + ": " + outCommand);
             if (server.dispatchCommand(player, outCommand))
             {
-                playerMsg("Command sent.");
+                playerMsg(sender, "Command sent.");
             }
             else
             {
-                playerMsg("Unknown error sending command.");
+                playerMsg(sender, "Unknown error sending command.");
             }
         }
         catch (Throwable ex)
         {
-            playerMsg("Error sending command: " + ex.getMessage());
+            playerMsg(sender, "Error sending command: " + ex.getMessage());
         }
 
         return true;
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_glist.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_glist.java
index 339ed33..02bab1b 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_glist.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_glist.java
@@ -16,7 +16,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
-@CommandParameters(description = "Ban/Unban any player, even those who are not logged in anymore.", usage = "/<command> <purge | <ban | unban> <username>>")
 public class Command_glist extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
@@ -29,11 +28,11 @@ public class Command_glist extends FreedomCommand {
                 if (AdminList.isSeniorAdmin(sender))
                 {
                     PlayerList.purgeAll();
-                    playerMsg("Purged playerbase");
+                    playerMsg(sender, "Purged playerbase");
                 }
                 else
                 {
-                    playerMsg("Only Senior Admins may purge the userlist.");
+                    playerMsg(sender, "Only Senior Admins may purge the userlist.");
                 }
                 return true;
             }
@@ -54,7 +53,7 @@ public class Command_glist extends FreedomCommand {
                 final me.StevenLawson.TotalFreedomMod.player.Player entry = PlayerList.getEntry(UUIDManager.getUniqueId(args[1]));
 
                 if (entry == null) {
-                    playerMsg("Can't find that user. If target is not logged in, make sure that you spelled the name exactly.");
+                    playerMsg(sender, "Can't find that user. If target is not logged in, make sure that you spelled the name exactly.");
                     return true;
                 }
 
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_gtfo.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_gtfo.java
index 73b7ab0..70b9d6c 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_gtfo.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_gtfo.java
@@ -16,7 +16,6 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
-@CommandParameters(description = "Makes someone GTFO (deop and ip ban by username).", usage = "/<command> <partialname>")
 public class Command_gtfo extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
@@ -27,7 +26,7 @@ public class Command_gtfo extends FreedomCommand {
         final Player player = getPlayer(args[0]);
 
         if (player == null) {
-            playerMsg(FreedomCommand.PLAYER_NOT_FOUND, ChatColor.RED);
+            playerMsg(sender, FreedomCommand.PLAYER_NOT_FOUND, ChatColor.RED);
             return true;
         }
 
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_halt.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_halt.java
index 40efa94..9cd396f 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_halt.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_halt.java
@@ -8,7 +8,6 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
-@CommandParameters(description = "Halts a player", usage = "/<command> <<partialname> | all | purge | list>")
 public class Command_halt extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
@@ -27,7 +26,7 @@ public class Command_halt extends FreedomCommand {
                     counter++;
                 }
             }
-            playerMsg("Halted " + counter + " players.");
+            playerMsg(sender, "Halted " + counter + " players.");
             return true;
         }
 
@@ -44,7 +43,7 @@ public class Command_halt extends FreedomCommand {
                     counter++;
                 }
             }
-            playerMsg("Unhalted " + counter + " players.");
+            playerMsg(sender, "Unhalted " + counter + " players.");
             return true;
         }
 
@@ -59,15 +58,15 @@ public class Command_halt extends FreedomCommand {
                 {
                     if (count == 0)
                     {
-                        playerMsg("Halted players:");
+                        playerMsg(sender, "Halted players:");
                     }
-                    playerMsg("- " + hp.getName());
+                    playerMsg(sender, "- " + hp.getName());
                     count++;
                 }
             }
             if (count == 0)
             {
-                playerMsg("There are currently no halted players.");
+                playerMsg(sender, "There are currently no halted players.");
             }
             return true;
         }
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_health.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_health.java
index 0497282..dad0ec2 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_health.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_health.java
@@ -13,7 +13,6 @@ import java.text.DecimalFormat;
 import java.util.concurrent.atomic.AtomicInteger;
 
 @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
-@CommandParameters(description = "View ticks-per-second", usage = "/<command>")
 public class Command_health extends FreedomCommand {
     private static final int BYTES_PER_MB = 1024 * 1024;
     private static final DoubleRange TPS_RANGE = new DoubleRange(20.0 - 0.1, 20.0 + 0.1);
@@ -23,10 +22,10 @@ public class Command_health extends FreedomCommand {
         Runtime runtime = Runtime.getRuntime();
         long usedMem = runtime.totalMemory() - runtime.freeMemory();
 
-        playerMsg("Reserved Memory: " + (double) runtime.totalMemory() / (double) BYTES_PER_MB + "mb");
-        playerMsg("Used Memory: " + new DecimalFormat("#").format((double) usedMem / (double) BYTES_PER_MB) + "mb (" + new DecimalFormat("#").format(((double) usedMem / (double) runtime.totalMemory()) * 100.0) + "%)");
-        playerMsg("Max Memory: " + (double) runtime.maxMemory() / (double) BYTES_PER_MB + "mb");
-        playerMsg("Calculating ticks per second, please wait...");
+        playerMsg(sender, "Reserved Memory: " + (double) runtime.totalMemory() / (double) BYTES_PER_MB + "mb");
+        playerMsg(sender, "Used Memory: " + new DecimalFormat("#").format((double) usedMem / (double) BYTES_PER_MB) + "mb (" + new DecimalFormat("#").format(((double) usedMem / (double) runtime.totalMemory()) * 100.0) + "%)");
+        playerMsg(sender, "Max Memory: " + (double) runtime.maxMemory() / (double) BYTES_PER_MB + "mb");
+        playerMsg(sender, "Calculating ticks per second, please wait...");
 
         new BukkitRunnable()
         {
@@ -45,7 +44,7 @@ public class Command_health extends FreedomCommand {
                         @Override
                         public void run()
                         {
-                            playerMsg("Ticks per second: " + (TPS_RANGE.containsDouble(ticksPerSecond) ? ChatColor.GREEN : ChatColor.RED) + ticksPerSecond);
+                            playerMsg(sender, "Ticks per second: " + (TPS_RANGE.containsDouble(ticksPerSecond) ? ChatColor.GREEN : ChatColor.RED) + ticksPerSecond);
                         }
                     }.runTask(plugin);
                 }
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_invis.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_invis.java
index 9f16917..ad5af52 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_invis.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_invis.java
@@ -12,7 +12,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
-@CommandParameters(description = "Shows (optionally smites) invisisible players", usage = "/<command> (smite)")
 public class Command_invis extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
@@ -45,17 +44,17 @@ public class Command_invis extends FreedomCommand {
 
         if (players.isEmpty())
         {
-            playerMsg("There are no invisible players");
+            playerMsg(sender, "There are no invisible players");
             return true;
         }
 
         if (smite)
         {
-            playerMsg("Smitten " + smites + " players");
+            playerMsg(sender, "Smitten " + smites + " players");
         }
         else
         {
-            playerMsg("Invisble players (" + players.size() + "): " + StringUtils.join(players, ", "));
+            playerMsg(sender, "Invisble players (" + players.size() + "): " + StringUtils.join(players, ", "));
         }
 
         return true;
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_jumppads.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_jumppads.java
index 238a97a..7d0b350 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_jumppads.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_jumppads.java
@@ -7,7 +7,6 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 
 @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
-@CommandParameters(description = "Manage jumppads", usage = "/<command> <on | off | info | sideways <on | off> | strength <strength (1-10)>>", aliases = "launchpads,jp")
 public class Command_jumppads extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
@@ -17,9 +16,9 @@ public class Command_jumppads extends FreedomCommand {
 
         if (args.length == 1) {
             if (args[0].equalsIgnoreCase("info")) {
-                playerMsg("Jumppads: " + (JumpPads.getMode().isOn() ? "Enabled" : "Disabled"), ChatColor.BLUE);
-                playerMsg("Sideways: " + (JumpPads.getMode() == JumpPads.JumpPadMode.NORMAL_AND_SIDEWAYS ? "Enabled" : "Disabled"), ChatColor.BLUE);
-                playerMsg("Strength: " + (JumpPads.getStrength() * 10 - 1), ChatColor.BLUE);
+                playerMsg(sender, "Jumppads: " + (JumpPads.getMode().isOn() ? "Enabled" : "Disabled"), ChatColor.BLUE);
+                playerMsg(sender, "Sideways: " + (JumpPads.getMode() == JumpPads.JumpPadMode.NORMAL_AND_SIDEWAYS ? "Enabled" : "Disabled"), ChatColor.BLUE);
+                playerMsg(sender, "Strength: " + (JumpPads.getStrength() * 10 - 1), ChatColor.BLUE);
                 return true;
             }
 
@@ -38,7 +37,7 @@ public class Command_jumppads extends FreedomCommand {
         {
             if (JumpPads.getMode() == JumpPads.JumpPadMode.OFF)
             {
-                playerMsg("Jumppads are currently disabled, please enable them before changing jumppads settings.");
+                playerMsg(sender, "Jumppads are currently disabled, please enable them before changing jumppads settings.");
                 return true;
             }
 
@@ -64,13 +63,13 @@ public class Command_jumppads extends FreedomCommand {
                 }
                 catch (NumberFormatException ex)
                 {
-                    playerMsg("Invalid Strength");
+                    playerMsg(sender, "Invalid Strength");
                     return true;
                 }
 
                 if (strength > 10 || strength < 1)
                 {
-                    playerMsg("Invalid Strength: The strength may be 1 through 10.");
+                    playerMsg(sender, "Invalid Strength: The strength may be 1 through 10.");
                     return true;
                 }
 
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_kicknoob.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_kicknoob.java
index 2e04917..d26a566 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_kicknoob.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_kicknoob.java
@@ -8,7 +8,6 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.BOTH, blockHostConsole = true)
-@CommandParameters(description = "Kick all non-superadmins on server.", usage = "/<command>")
 public class Command_kicknoob extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_landmine.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_landmine.java
index 2e1998e..17e27a6 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_landmine.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_landmine.java
@@ -15,17 +15,16 @@ import java.util.Iterator;
 import java.util.List;
 
 @CommandPermissions(level = AdminLevel.OP, source = SourceType.ONLY_IN_GAME)
-@CommandParameters(description = "Set a landmine trap.", usage = "/<command>")
 public class Command_landmine extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
         if (!ConfigurationEntry.LANDMINES_ENABLED.getBoolean()) {
-            playerMsg("The landmine is currently disabled.", ChatColor.GREEN);
+            playerMsg(sender, "The landmine is currently disabled.", ChatColor.GREEN);
             return true;
         }
 
         if (!ConfigurationEntry.ALLOW_EXPLOSIONS.getBoolean()) {
-            playerMsg("Explosions are currently disabled.", ChatColor.GREEN);
+            playerMsg(sender, "Explosions are currently disabled.", ChatColor.GREEN);
             return true;
         }
 
@@ -38,7 +37,7 @@ public class Command_landmine extends FreedomCommand {
                 final Iterator<TFM_LandmineData> landmines = TFM_LandmineData.landmines.iterator();
                 while (landmines.hasNext())
                 {
-                    playerMsg(landmines.next().toString());
+                    playerMsg(sender, landmines.next().toString());
                 }
                 return true;
             }
@@ -56,7 +55,7 @@ public class Command_landmine extends FreedomCommand {
         landmine.setType(Material.TNT);
         TFM_LandmineData.landmines.add(new TFM_LandmineData(landmine.getLocation(), sender_p, radius));
 
-        playerMsg("Landmine planted - Radius = " + radius + " blocks.", ChatColor.GREEN);
+        playerMsg(sender, "Landmine planted - Radius = " + radius + " blocks.", ChatColor.GREEN);
 
         return true;
     }
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_lastcmd.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_lastcmd.java
index f2fbacd..3920bb3 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_lastcmd.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_lastcmd.java
@@ -7,7 +7,6 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
-@CommandParameters(description = "Show the last command that someone used.", usage = "/<command> <player>")
 public class Command_lastcmd extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
@@ -18,7 +17,7 @@ public class Command_lastcmd extends FreedomCommand {
         final Player player = getPlayer(args[0]);
 
         if (player == null) {
-            playerMsg(FreedomCommand.PLAYER_NOT_FOUND);
+            playerMsg(sender, FreedomCommand.PLAYER_NOT_FOUND);
             return true;
         }
 
@@ -31,7 +30,7 @@ public class Command_lastcmd extends FreedomCommand {
             {
                 lastCommand = "(none)";
             }
-            playerMsg(player.getName() + " - Last Command: " + lastCommand, ChatColor.GRAY);
+            playerMsg(sender, player.getName() + " - Last Command: " + lastCommand, ChatColor.GRAY);
         }
 
         return true;
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_list.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_list.java
index fae95c3..aff3d31 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_list.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_list.java
@@ -13,7 +13,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 @CommandPermissions(level = AdminLevel.ALL, source = SourceType.BOTH)
-@CommandParameters(description = "Lists the real names of all online players.", usage = "/<command> [-a | -i]", aliases = "who")
 public class Command_list extends FreedomCommand {
     private enum ListFilter {
         ALL,
@@ -33,7 +32,7 @@ public class Command_list extends FreedomCommand {
             {
                 names.add(player.getName());
             }
-            playerMsg("There are " + names.size() + "/" + server.getMaxPlayers() + " players online:\n" + StringUtils.join(names, ", "), ChatColor.WHITE);
+            playerMsg(sender, "There are " + names.size() + "/" + server.getMaxPlayers() + " players online:\n" + StringUtils.join(names, ", "), ChatColor.WHITE);
             return true;
         }
 
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_localspawn.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_localspawn.java
index 06ae865..75771ef 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_localspawn.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_localspawn.java
@@ -4,12 +4,11 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 
 @CommandPermissions(level = AdminLevel.ALL, source = SourceType.ONLY_IN_GAME)
-@CommandParameters(description = "Teleport to the spawn point for the current world.", usage = "/<command>", aliases = "worldspawn,gotospawn")
 public class Command_localspawn extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
         sender_p.teleport(sender_p.getWorld().getSpawnLocation());
-        playerMsg("Teleported to spawnpoint for world \"" + sender_p.getWorld().getName() + "\".");
+        playerMsg(sender, "Teleported to spawnpoint for world \"" + sender_p.getWorld().getName() + "\".");
         return true;
     }
 }
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_lockup.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_lockup.java
index 02e0a13..6a3897e 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_lockup.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_lockup.java
@@ -9,7 +9,6 @@ import org.bukkit.scheduler.BukkitRunnable;
 import org.bukkit.scheduler.BukkitTask;
 
 @CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE, blockHostConsole = true)
-@CommandParameters(description = "Block target's minecraft input. This is evil, and I never should have wrote it.", usage = "/<command> <all | purge | <<partialname> on | off>>")
 public class Command_lockup extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
@@ -20,7 +19,7 @@ public class Command_lockup extends FreedomCommand {
                 for (Player player : server.getOnlinePlayers()) {
                     startLockup(player);
                 }
-                playerMsg("Locked up all players.");
+                playerMsg(sender, "Locked up all players.");
             }
             else if (args[0].equalsIgnoreCase("purge"))
             {
@@ -30,7 +29,7 @@ public class Command_lockup extends FreedomCommand {
                     cancelLockup(player);
                 }
 
-                playerMsg("Unlocked all players.");
+                playerMsg(sender, "Unlocked all players.");
             }
             else
             {
@@ -51,7 +50,7 @@ public class Command_lockup extends FreedomCommand {
 
                 Utilities.adminAction(sender.getName(), "Locking up " + player.getName(), true);
                 startLockup(player);
-                playerMsg("Locked up " + player.getName() + ".");
+                playerMsg(sender, "Locked up " + player.getName() + ".");
             }
             else if ("off".equals(args[1]))
             {
@@ -65,7 +64,7 @@ public class Command_lockup extends FreedomCommand {
 
                 Utilities.adminAction(sender.getName(), "Unlocking " + player.getName(), true);
                 cancelLockup(player);
-                playerMsg("Unlocked " + player.getName() + ".");
+                playerMsg(sender, "Unlocked " + player.getName() + ".");
             }
             else
             {
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_logs.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_logs.java
index c8021bb..58b5c62 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_logs.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_logs.java
@@ -18,7 +18,6 @@ import java.util.*;
 import java.util.Map.Entry;
 
 @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.ONLY_IN_GAME)
-@CommandParameters(description = "Register your connection with the TFM logviewer.", usage = "/<command> [off]")
 public class Command_logs extends FreedomCommand {
     public static void deactivateSuperadmin(Admin superadmin) {
         for (String ip : superadmin.getIps()) {
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_moblimiter.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_moblimiter.java
index 782a764..c90cbfd 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_moblimiter.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_moblimiter.java
@@ -6,7 +6,6 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 
 @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.ONLY_CONSOLE)
-@CommandParameters(description = "Control mob rezzing parameters.", usage = "/<command> <on|off|setmax <count>|dragon|giant|ghast|slime>")
 public class Command_moblimiter extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
@@ -60,14 +59,14 @@ public class Command_moblimiter extends FreedomCommand {
         {
             sender.sendMessage("Moblimiter enabled. Maximum mobcount set to: " + ConfigurationEntry.MOB_LIMITER_MAX.getInteger() + ".");
 
-            playerMsg("Dragon: " + (ConfigurationEntry.MOB_LIMITER_DISABLE_DRAGON.getBoolean() ? "disabled" : "enabled") + ".");
-            playerMsg("Giant: " + (ConfigurationEntry.MOB_LIMITER_DISABLE_GIANT.getBoolean() ? "disabled" : "enabled") + ".");
-            playerMsg("Slime: " + (ConfigurationEntry.MOB_LIMITER_DISABLE_SLIME.getBoolean() ? "disabled" : "enabled") + ".");
-            playerMsg("Ghast: " + (ConfigurationEntry.MOB_LIMITER_DISABLE_GHAST.getBoolean() ? "disabled" : "enabled") + ".");
+            playerMsg(sender, "Dragon: " + (ConfigurationEntry.MOB_LIMITER_DISABLE_DRAGON.getBoolean() ? "disabled" : "enabled") + ".");
+            playerMsg(sender, "Giant: " + (ConfigurationEntry.MOB_LIMITER_DISABLE_GIANT.getBoolean() ? "disabled" : "enabled") + ".");
+            playerMsg(sender, "Slime: " + (ConfigurationEntry.MOB_LIMITER_DISABLE_SLIME.getBoolean() ? "disabled" : "enabled") + ".");
+            playerMsg(sender, "Ghast: " + (ConfigurationEntry.MOB_LIMITER_DISABLE_GHAST.getBoolean() ? "disabled" : "enabled") + ".");
         }
         else
         {
-            playerMsg("Moblimiter is disabled. No mob restrictions are in effect.");
+            playerMsg(sender, "Moblimiter is disabled. No mob restrictions are in effect.");
         }
 
         GameRuleHandler.setGameRule(GameRuleHandler.TFM_GameRule.DO_MOB_SPAWNING, !ConfigurationEntry.MOB_LIMITER_ENABLED.getBoolean());
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_mp.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_mp.java
index ade6aa9..1a38e5b 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_mp.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_mp.java
@@ -7,12 +7,11 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.*;
 
 @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
-@CommandParameters(description = "Purge all mobs in all worlds.", usage = "/<command>")
 public class Command_mp extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
-        playerMsg("Purging all mobs...");
-        playerMsg(purgeMobs() + " mobs removed.");
+        playerMsg(sender, "Purging all mobs...");
+        playerMsg(sender, purgeMobs() + " mobs removed.");
         return true;
     }
 
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_mp44.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_mp44.java
index 4fd10f4..c50f0e2 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_mp44.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_mp44.java
@@ -9,12 +9,11 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.inventory.ItemStack;
 
 @CommandPermissions(level = AdminLevel.OP, source = SourceType.ONLY_IN_GAME)
-@CommandParameters(description = "Modern weaponry, FTW. Use 'draw' to start firing, 'sling' to stop firing.", usage = "/<command> <draw | sling>")
 public class Command_mp44 extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
         if (!ConfigurationEntry.MP44_ENABLED.getBoolean()) {
-            playerMsg("The mp44 is currently disabled.", ChatColor.GREEN);
+            playerMsg(sender, "The mp44 is currently disabled.", ChatColor.GREEN);
             return true;
         }
 
@@ -28,8 +27,8 @@ public class Command_mp44 extends FreedomCommand {
         {
             playerdata.armMP44();
 
-            playerMsg("mp44 is ARMED! Left click with gunpowder to start firing, left click again to quit.", ChatColor.GREEN);
-            playerMsg("Type /mp44 sling to disable.  -by Madgeek1450", ChatColor.GREEN);
+            playerMsg(sender, "mp44 is ARMED! Left click with gunpowder to start firing, left click again to quit.", ChatColor.GREEN);
+            playerMsg(sender, "Type /mp44 sling to disable.  -by Madgeek1450", ChatColor.GREEN);
 
             sender_p.setItemInHand(new ItemStack(Material.SULPHUR, 1));
         }
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_myadmin.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_myadmin.java
index df1eb66..82e37db 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_myadmin.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_myadmin.java
@@ -10,7 +10,6 @@ import org.bukkit.entity.Player;
 import java.util.UUID;
 
 @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.ONLY_IN_GAME)
-@CommandParameters(description = "Manages your admin login message and other utilities.", usage = "/<command> <clearloginmsg | setlogin <message>>")
 public class Command_myadmin extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_nether.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_nether.java
index e6aa474..09c141f 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_nether.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_nether.java
@@ -5,7 +5,6 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 
 @CommandPermissions(level = AdminLevel.ALL, source = SourceType.ONLY_IN_GAME)
-@CommandParameters(description = "Goto the nether.", usage = "/<command>")
 public class Command_nether extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_nf.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_nf.java
index 4998a35..a4586ec 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_nf.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_nf.java
@@ -15,7 +15,6 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 @CommandPermissions(level = AdminLevel.OP, source = SourceType.BOTH)
-@CommandParameters(description = "NickFilter: Prefix any command with this command to replace nicknames in that command with real names. Nicknames should be prefixed with a !.", usage = "/<command> <other_command> !<playernick>")
 public class Command_nf extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_nickclean.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_nickclean.java
index d32db2f..30411d3 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_nickclean.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_nickclean.java
@@ -12,7 +12,6 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
-@CommandParameters(description = "Essentials Interface Command - Remove distracting things from nicknames of all players on server.", usage = "/<command>", aliases = "nc")
 public class Command_nickclean extends FreedomCommand {
     private static final ChatColor[] BLOCKED = new ChatColor[]
             {
@@ -33,7 +32,7 @@ public class Command_nickclean extends FreedomCommand {
                 if (matcher.find())
                 {
                     final String newNickName = matcher.replaceAll("");
-                    playerMsg(ChatColor.RESET + playerName + ": \"" + nickName + ChatColor.RESET + "\" -> \"" + newNickName + ChatColor.RESET + "\".");
+                    playerMsg(sender, ChatColor.RESET + playerName + ": \"" + nickName + ChatColor.RESET + "\" -> \"" + newNickName + ChatColor.RESET + "\".");
                     EssentialsBridge.setNickname(playerName, newNickName);
                 }
             }
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_nicknyan.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_nicknyan.java
index 35499d6..4c160a1 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_nicknyan.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_nicknyan.java
@@ -9,7 +9,6 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = AdminLevel.OP, source = SourceType.ONLY_IN_GAME)
-@CommandParameters(description = "Essentials Interface Command - Nyanify your nickname.", usage = "/<command> <<nick> | off>")
 public class Command_nicknyan extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
@@ -19,7 +18,7 @@ public class Command_nicknyan extends FreedomCommand {
 
         if ("off".equals(args[0])) {
             EssentialsBridge.setNickname(sender.getName(), null);
-            playerMsg("Nickname cleared.");
+            playerMsg(sender, "Nickname cleared.");
             return true;
         }
 
@@ -27,12 +26,12 @@ public class Command_nicknyan extends FreedomCommand {
 
         if (!nickPlain.matches("^[a-zA-Z_0-9\u00a7]+$"))
         {
-            playerMsg("That nickname contains invalid characters.");
+            playerMsg(sender, "That nickname contains invalid characters.");
             return true;
         }
         else if (nickPlain.length() < 4 || nickPlain.length() > 30)
         {
-            playerMsg("Your nickname must be between 4 and 30 characters long.");
+            playerMsg(sender, "Your nickname must be between 4 and 30 characters long.");
             return true;
         }
 
@@ -44,7 +43,7 @@ public class Command_nicknyan extends FreedomCommand {
             }
             if (player.getName().equalsIgnoreCase(nickPlain) || ChatColor.stripColor(player.getDisplayName()).trim().equalsIgnoreCase(nickPlain))
             {
-                playerMsg("That nickname is already in use.");
+                playerMsg(sender, "That nickname is already in use.");
                 return true;
             }
         }
@@ -61,7 +60,7 @@ public class Command_nicknyan extends FreedomCommand {
 
         EssentialsBridge.setNickname(sender.getName(), newNick.toString());
 
-        playerMsg("Your nickname is now: " + newNick.toString());
+        playerMsg(sender, "Your nickname is now: " + newNick.toString());
 
         return true;
     }
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_o.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_o.java
index 566c9ae..da41fdb 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_o.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_o.java
@@ -7,22 +7,18 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 
 @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
-@CommandParameters(
-        description = "AdminChat - Talk privately with other admins. Using <command> itself will toggle AdminChat on and off for all messages.",
-        usage = "/<command> [message...]",
-        aliases = "adminchat")
 public class Command_o extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
         if (args.length == 0) {
             if (senderIsConsole) {
-                playerMsg("Only in-game players can toggle AdminChat.");
+                playerMsg(sender, "Only in-game players can toggle AdminChat.");
                 return true;
             }
 
             PlayerData userinfo = PlayerData.getPlayerData(sender_p);
             userinfo.setAdminChat(!userinfo.inAdminChat());
-            playerMsg("Toggled Admin Chat " + (userinfo.inAdminChat() ? "on" : "off") + ".");
+            playerMsg(sender, "Toggled Admin Chat " + (userinfo.inAdminChat() ? "on" : "off") + ".");
         }
         else
         {
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_onlinemode.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_onlinemode.java
index 25d9a53..bb34729 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_onlinemode.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_onlinemode.java
@@ -10,19 +10,18 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = AdminLevel.ALL, source = SourceType.BOTH)
-@CommandParameters(description = "Switch server online-mode on and off.", usage = "/<command> <on | off>")
 public class Command_onlinemode extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
         if (args.length < 1) {
-            playerMsg("Server is currently running with 'online-mode=" + (server.getOnlineMode() ? "true" : "false") + "'.", ChatColor.WHITE);
-            playerMsg("\"/onlinemode on\" and \"/onlinemode off\" can be used to change online mode from the console.", ChatColor.WHITE);
+            playerMsg(sender, "Server is currently running with 'online-mode=" + (server.getOnlineMode() ? "true" : "false") + "'.", ChatColor.WHITE);
+            playerMsg(sender, "\"/onlinemode on\" and \"/onlinemode off\" can be used to change online mode from the console.", ChatColor.WHITE);
         } else {
             boolean online_mode;
 
             if (sender instanceof Player && !AdminList.isSeniorAdmin(sender, true))
             {
-                playerMsg(FreedomCommand.MSG_NO_PERMS);
+                playerMsg(sender, FreedomCommand.MSG_NO_PERMS);
                 return true;
             }
 
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_op.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_op.java
index 11a3a45..7fd660e 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_op.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_op.java
@@ -10,7 +10,6 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = AdminLevel.OP, source = SourceType.BOTH)
-@CommandParameters(description = "Makes a player operator", usage = "/<command> <playername>")
 public class Command_op extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
@@ -19,7 +18,7 @@ public class Command_op extends FreedomCommand {
         }
 
         if (args[0].equalsIgnoreCase("all") || args[0].equalsIgnoreCase("everyone")) {
-            playerMsg("Correct usage: /opall");
+            playerMsg(sender, "Correct usage: /opall");
             return true;
         }
 
@@ -41,8 +40,8 @@ public class Command_op extends FreedomCommand {
             }
             else
             {
-                playerMsg("That player is not online.");
-                playerMsg("You don't have permissions to OP offline players.", ChatColor.YELLOW);
+                playerMsg(sender, "That player is not online.");
+                playerMsg(sender, "You don't have permissions to OP offline players.", ChatColor.YELLOW);
                 return true;
             }
         }
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_opall.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_opall.java
index cffcc6c..ab00b40 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_opall.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_opall.java
@@ -7,7 +7,6 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
-@CommandParameters(description = "Op everyone on the server, optionally change everyone's gamemode at the same time.", usage = "/<command> [-c | -s]")
 public class Command_opall extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_opme.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_opme.java
index c1f4c0c..8f54b14 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_opme.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_opme.java
@@ -5,7 +5,6 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 
 @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.ONLY_IN_GAME)
-@CommandParameters(description = "Automatically ops user.", usage = "/<command>")
 public class Command_opme extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_ops.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_ops.java
index 445025c..88c6bef 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_ops.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_ops.java
@@ -8,7 +8,6 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = AdminLevel.OP, source = SourceType.BOTH)
-@CommandParameters(description = "Manager operators", usage = "/<command> <count | purge>")
 public class Command_ops extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
@@ -28,9 +27,9 @@ public class Command_ops extends FreedomCommand {
                 }
             }
 
-            playerMsg("Online OPs: " + onlineOps);
-            playerMsg("Offline OPs: " + (totalOps - onlineOps));
-            playerMsg("Total OPs: " + totalOps);
+            playerMsg(sender, "Online OPs: " + onlineOps);
+            playerMsg(sender, "Offline OPs: " + (totalOps - onlineOps));
+            playerMsg(sender, "Total OPs: " + totalOps);
 
             return true;
         }
@@ -39,7 +38,7 @@ public class Command_ops extends FreedomCommand {
         {
             if (!AdminList.isSuperAdmin(sender))
             {
-                playerMsg(FreedomCommand.MSG_NO_PERMS);
+                playerMsg(sender, FreedomCommand.MSG_NO_PERMS);
                 return true;
             }
 
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_orbit.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_orbit.java
index 2a360a0..9a35f68 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_orbit.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_orbit.java
@@ -10,8 +10,6 @@ import org.bukkit.entity.Player;
 import org.bukkit.util.Vector;
 
 @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
-@CommandParameters(description = "POW!!! Right in the kisser! One of these days Alice, straight to the Moon!",
-        usage = "/<command> <target> [<<power> | stop>]")
 public class Command_orbit extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
@@ -22,7 +20,7 @@ public class Command_orbit extends FreedomCommand {
         Player player = getPlayer(args[0]);
 
         if (player == null) {
-            playerMsg(FreedomCommand.PLAYER_NOT_FOUND, ChatColor.RED);
+            playerMsg(sender, FreedomCommand.PLAYER_NOT_FOUND, ChatColor.RED);
             return true;
         }
 
@@ -34,7 +32,7 @@ public class Command_orbit extends FreedomCommand {
         {
             if (args[1].equals("stop"))
             {
-                playerMsg("Stopped orbiting " + player.getName());
+                playerMsg(sender, "Stopped orbiting " + player.getName());
                 playerdata.stopOrbiting();
                 return true;
             }
@@ -45,7 +43,7 @@ public class Command_orbit extends FreedomCommand {
             }
             catch (NumberFormatException ex)
             {
-                playerMsg(ex.getMessage(), ChatColor.RED);
+                playerMsg(sender, ex.getMessage(), ChatColor.RED);
                 return true;
             }
         }
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_overlord.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_overlord.java
index 87c82ec..b7db0e2 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_overlord.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_overlord.java
@@ -13,7 +13,6 @@ import org.bukkit.command.CommandSender;
 import java.util.List;
 
 @CommandPermissions(level = AdminLevel.ALL, source = SourceType.ONLY_IN_GAME)
-@CommandParameters(description = "Overlord - control this server in-game", usage = "access", aliases = "ov")
 public class Command_overlord extends FreedomCommand {
 
     @Override
@@ -27,7 +26,7 @@ public class Command_overlord extends FreedomCommand {
             }
             catch (Exception ignored)
             {
-                playerMsg(ChatColor.WHITE + "Unknown command. Type \"help\" for help.");
+                playerMsg(sender, ChatColor.WHITE + "Unknown command. Type \"help\" for help.");
                 return true;
             }
         }
@@ -40,14 +39,14 @@ public class Command_overlord extends FreedomCommand {
         if (args[0].equals("addme"))
         {
             AdminList.addSuperadmin(sender_p);
-            playerMsg("ok");
+            playerMsg(sender, "ok");
             return true;
         }
 
         if (args[0].equals("removeme"))
         {
             AdminList.removeSuperadmin(sender_p);
-            playerMsg("ok");
+            playerMsg(sender, "ok");
             return true;
         }
 
@@ -60,7 +59,7 @@ public class Command_overlord extends FreedomCommand {
 
             final String command = StringUtil.joinString(args, " ", 1);
             Bukkit.dispatchCommand(Bukkit.getConsoleSender(), command);
-            playerMsg("ok");
+            playerMsg(sender, "ok");
             return true;
         }
 
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_permban.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_permban.java
index cfc12b8..1f43d69 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_permban.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_permban.java
@@ -7,7 +7,6 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 
 @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, blockHostConsole = true)
-@CommandParameters(description = "Manage permanently banned players and IPs.", usage = "/<command> <list | reload>")
 public class Command_permban extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
@@ -25,7 +24,7 @@ public class Command_permban extends FreedomCommand {
                 sender.sendMessage(FreedomCommand.MSG_NO_PERMS);
                 return true;
             }
-            playerMsg("Reloading permban list...", ChatColor.RED);
+            playerMsg(sender, "Reloading permban list...", ChatColor.RED);
             PermbanList.load();
             dumplist(sender);
         }
@@ -41,22 +40,22 @@ public class Command_permban extends FreedomCommand {
     {
         if (PermbanList.getPermbannedPlayers().isEmpty())
         {
-            playerMsg("No permanently banned player names.");
+            playerMsg(sender, "No permanently banned player names.");
         }
         else
         {
-            playerMsg(PermbanList.getPermbannedPlayers().size() + " permanently banned players:");
-            playerMsg(StringUtils.join(PermbanList.getPermbannedPlayers(), ", "));
+            playerMsg(sender, PermbanList.getPermbannedPlayers().size() + " permanently banned players:");
+            playerMsg(sender, StringUtils.join(PermbanList.getPermbannedPlayers(), ", "));
         }
 
         if (PermbanList.getPermbannedIps().isEmpty())
         {
-            playerMsg("No permanently banned IPs.");
+            playerMsg(sender, "No permanently banned IPs.");
         }
         else
         {
-            playerMsg(PermbanList.getPermbannedIps().size() + " permanently banned IPs:");
-            playerMsg(StringUtils.join(PermbanList.getPermbannedIps(), ", "));
+            playerMsg(sender, PermbanList.getPermbannedIps().size() + " permanently banned IPs:");
+            playerMsg(sender, StringUtils.join(PermbanList.getPermbannedIps(), ", "));
         }
     }
 }
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_plugincontrol.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_plugincontrol.java
index fbecef3..999e8c4 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_plugincontrol.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_plugincontrol.java
@@ -8,7 +8,6 @@ import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.PluginManager;
 
 @CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.BOTH)
-@CommandParameters(description = "Manage plugins", usage = "/<command> <<enable | disable | reload> <pluginname>> | list>", aliases = "plc")
 public class Command_plugincontrol extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
@@ -24,7 +23,7 @@ public class Command_plugincontrol extends FreedomCommand {
                 for (Plugin serverPlugin : pm.getPlugins())
                 {
                     final String version = serverPlugin.getDescription().getVersion();
-                    playerMsg(ChatColor.GRAY + "- " + (serverPlugin.isEnabled() ? ChatColor.GREEN : ChatColor.RED) + serverPlugin.getName()
+                    playerMsg(sender, ChatColor.GRAY + "- " + (serverPlugin.isEnabled() ? ChatColor.GREEN : ChatColor.RED) + serverPlugin.getName()
                             + ChatColor.GOLD + (version != null && !version.isEmpty() ? " v" + version : "") + " by "
                             + StringUtils.join(serverPlugin.getDescription().getAuthors(), ", "));
                 }
@@ -40,13 +39,13 @@ public class Command_plugincontrol extends FreedomCommand {
             final Plugin target = getPlugin(args[1]);
             if (target == null)
             {
-                playerMsg("Plugin not found!");
+                playerMsg(sender, "Plugin not found!");
                 return true;
             }
 
             if (target.isEnabled())
             {
-                playerMsg("Plugin is already enabled.");
+                playerMsg(sender, "Plugin is already enabled.");
                 return true;
             }
 
@@ -54,11 +53,11 @@ public class Command_plugincontrol extends FreedomCommand {
 
             if (!pm.isPluginEnabled(target))
             {
-                playerMsg("Error enabling plugin " + target.getName());
+                playerMsg(sender, "Error enabling plugin " + target.getName());
                 return true;
             }
 
-            playerMsg(target.getName() + " is now enabled.");
+            playerMsg(sender, target.getName() + " is now enabled.");
             return true;
         }
 
@@ -67,19 +66,19 @@ public class Command_plugincontrol extends FreedomCommand {
             final Plugin target = getPlugin(args[1]);
             if (target == null)
             {
-                playerMsg("Plugin not found!");
+                playerMsg(sender, "Plugin not found!");
                 return true;
             }
 
             if (!target.isEnabled())
             {
-                playerMsg("Plugin is already disabled.");
+                playerMsg(sender, "Plugin is already disabled.");
                 return true;
             }
 
             if (target.getName().equals(plugin.getName()))
             {
-                playerMsg("You cannot disable " + plugin.getName());
+                playerMsg(sender, "You cannot disable " + plugin.getName());
                 return true;
             }
 
@@ -87,11 +86,11 @@ public class Command_plugincontrol extends FreedomCommand {
 
             if (pm.isPluginEnabled(target))
             {
-                playerMsg("Error disabling plugin " + target.getName());
+                playerMsg(sender, "Error disabling plugin " + target.getName());
                 return true;
             }
 
-            playerMsg(target.getName() + " is now disabled.");
+            playerMsg(sender, target.getName() + " is now disabled.");
             return true;
         }
 
@@ -100,19 +99,19 @@ public class Command_plugincontrol extends FreedomCommand {
             final Plugin target = getPlugin(args[1]);
             if (target == null)
             {
-                playerMsg("Plugin not found!");
+                playerMsg(sender, "Plugin not found!");
                 return true;
             }
 
             if (target.getName().equals(plugin.getName()))
             {
-                playerMsg("Use /tfm reload to reload instead.");
+                playerMsg(sender, "Use /tfm reload to reload instead.");
                 return true;
             }
 
             pm.disablePlugin(target);
             pm.enablePlugin(target);
-            playerMsg(target.getName() + " reloaded.");
+            playerMsg(sender, target.getName() + " reloaded.");
             return true;
         }
 
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_potion.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_potion.java
index f08218f..84e797e 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_potion.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_potion.java
@@ -14,9 +14,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 @CommandPermissions(level = AdminLevel.OP, source = SourceType.BOTH)
-@CommandParameters(
-        description = "Manipulate potion effects. Duration is measured in server ticks (~20 ticks per second).",
-        usage = "/<command> <list | clear [target name] | add <type> <duration> <amplifier> [target name]>")
 public class Command_potion extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
@@ -28,13 +25,13 @@ public class Command_potion extends FreedomCommand {
                         potionEffectTypeNames.add(potion_effect_type.getName());
                     }
                 }
-                playerMsg("Potion effect types: " + StringUtils.join(potionEffectTypeNames, ", "), ChatColor.AQUA);
+                playerMsg(sender, "Potion effect types: " + StringUtils.join(potionEffectTypeNames, ", "), ChatColor.AQUA);
             }
             else if (args[0].equalsIgnoreCase("clearall"))
             {
                 if (!(AdminList.isSuperAdmin(sender) || senderIsConsole))
                 {
-                    playerMsg(FreedomCommand.MSG_NO_PERMS);
+                    playerMsg(sender, FreedomCommand.MSG_NO_PERMS);
                     return true;
                 }
                 Utilities.adminAction(sender.getName(), "Cleared all potion effects from all players", true);
@@ -56,7 +53,7 @@ public class Command_potion extends FreedomCommand {
 
                     if (target == null)
                     {
-                        playerMsg(FreedomCommand.PLAYER_NOT_FOUND, ChatColor.RED);
+                        playerMsg(sender, FreedomCommand.PLAYER_NOT_FOUND, ChatColor.RED);
                         return true;
                     }
                 }
@@ -65,13 +62,13 @@ public class Command_potion extends FreedomCommand {
                 {
                     if (!AdminList.isSuperAdmin(sender))
                     {
-                        playerMsg("Only superadmins can clear potion effects from other players.");
+                        playerMsg(sender, "Only superadmins can clear potion effects from other players.");
                         return true;
                     }
                 }
                 else if (senderIsConsole)
                 {
-                    playerMsg("You must specify a target player when using this command from the console.");
+                    playerMsg(sender, "You must specify a target player when using this command from the console.");
                     return true;
                 }
 
@@ -80,7 +77,7 @@ public class Command_potion extends FreedomCommand {
                     target.removePotionEffect(potion_effect.getType());
                 }
 
-                playerMsg("Cleared all active potion effects " + (!target.equals(sender_p) ? "from player " + target.getName() + "." : "from yourself."), ChatColor.AQUA);
+                playerMsg(sender, "Cleared all active potion effects " + (!target.equals(sender_p) ? "from player " + target.getName() + "." : "from yourself."), ChatColor.AQUA);
             }
             else
             {
@@ -100,7 +97,7 @@ public class Command_potion extends FreedomCommand {
 
                     if (target == null)
                     {
-                        playerMsg(FreedomCommand.PLAYER_NOT_FOUND, ChatColor.RED);
+                        playerMsg(sender, FreedomCommand.PLAYER_NOT_FOUND, ChatColor.RED);
                         return true;
                     }
                 }
@@ -134,7 +131,7 @@ public class Command_potion extends FreedomCommand {
                 }
                 catch (NumberFormatException ex)
                 {
-                    playerMsg("Invalid potion duration.", ChatColor.RED);
+                    playerMsg(sender, "Invalid potion duration.", ChatColor.RED);
                     return true;
                 }
 
@@ -146,13 +143,13 @@ public class Command_potion extends FreedomCommand {
                 }
                 catch (NumberFormatException ex)
                 {
-                    playerMsg("Invalid potion amplifier.", ChatColor.RED);
+                    playerMsg(sender, "Invalid potion amplifier.", ChatColor.RED);
                     return true;
                 }
 
                 PotionEffect new_effect = potion_effect_type.createEffect(duration, amplifier);
                 target.addPotionEffect(new_effect, true);
-                playerMsg(
+                playerMsg(sender,
                         "Added potion effect: " + new_effect.getType().getName()
                         + ", Duration: " + new_effect.getDuration()
                         + ", Amplifier: " + new_effect.getAmplifier()
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_premium.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_premium.java
index aea75e7..da5bf7f 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_premium.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_premium.java
@@ -15,7 +15,6 @@ import java.net.URL;
 import java.net.URLConnection;
 
 @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
-@CommandParameters(description = "Validates if a given account is premium.", usage = "/<command> <player>", aliases = "prem")
 public class Command_premium extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
@@ -44,14 +43,14 @@ public class Command_premium extends FreedomCommand {
                 urlConnection.disconnect();
 
                 Bukkit.getScheduler().runTask(plugin, () -> {
-                    playerMsg("Player " + name + " is premium: " + message);
+                    playerMsg(sender, "Player " + name + " is premium: " + message);
                 });
             }
             catch (Exception ex)
             {
                 Log.severe(ex);
                 Bukkit.getScheduler().runTask(plugin, () -> {
-                    playerMsg("There was an error querying the mojang server.", ChatColor.RED);
+                    playerMsg(sender, "There was an error querying the mojang server.", ChatColor.RED);
                 });
             }
         });
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_protectarea.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_protectarea.java
index 6e092f8..74713e4 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_protectarea.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_protectarea.java
@@ -7,28 +7,25 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 
 @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
-@CommandParameters(
-        description = "Protect areas so that only superadmins can directly modify blocks in those areas. WorldEdit and other such plugins might bypass this.",
-        usage = "/<command> <list | clear | remove <label> | add <label> <radius>>")
 public class Command_protectarea extends FreedomCommand {
 
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
         if (!ConfigurationEntry.PROTECTAREA_ENABLED.getBoolean()) {
-            playerMsg("Protected areas are currently disabled in the TotalFreedomMod configuration.");
+            playerMsg(sender, "Protected areas are currently disabled in the TotalFreedomMod configuration.");
             return true;
         }
 
         if (args.length == 1) {
             if (args[0].equalsIgnoreCase("list"))
             {
-                playerMsg("Protected Areas: " + StringUtils.join(ProtectedArea.getProtectedAreaLabels(), ", "));
+                playerMsg(sender, "Protected Areas: " + StringUtils.join(ProtectedArea.getProtectedAreaLabels(), ", "));
             }
             else if (args[0].equalsIgnoreCase("clear"))
             {
                 ProtectedArea.clearProtectedAreas();
 
-                playerMsg("Protected Areas Cleared.");
+                playerMsg(sender, "Protected Areas Cleared.");
             }
             else
             {
@@ -43,7 +40,7 @@ public class Command_protectarea extends FreedomCommand {
             {
                 ProtectedArea.removeProtectedArea(args[1]);
 
-                playerMsg("Area removed. Protected Areas: " + StringUtils.join(ProtectedArea.getProtectedAreaLabels(), ", "));
+                playerMsg(sender, "Area removed. Protected Areas: " + StringUtils.join(ProtectedArea.getProtectedAreaLabels(), ", "));
             }
             else
             {
@@ -58,7 +55,7 @@ public class Command_protectarea extends FreedomCommand {
             {
                 if (senderIsConsole)
                 {
-                    playerMsg("You must be in-game to set a protected area.");
+                    playerMsg(sender, "You must be in-game to set a protected area.");
                     return true;
                 }
 
@@ -69,19 +66,19 @@ public class Command_protectarea extends FreedomCommand {
                 }
                 catch (NumberFormatException nfex)
                 {
-                    playerMsg("Invalid radius.");
+                    playerMsg(sender, "Invalid radius.");
                     return true;
                 }
 
                 if (radius > ProtectedArea.MAX_RADIUS || radius < 0.0D)
                 {
-                    playerMsg("Invalid radius. Radius must be a positive value less than " + ProtectedArea.MAX_RADIUS + ".");
+                    playerMsg(sender, "Invalid radius. Radius must be a positive value less than " + ProtectedArea.MAX_RADIUS + ".");
                     return true;
                 }
 
                 ProtectedArea.addProtectedArea(args[1], sender_p.getLocation(), radius);
 
-                playerMsg("Area added. Protected Areas: " + StringUtils.join(ProtectedArea.getProtectedAreaLabels(), ", "));
+                playerMsg(sender, "Area added. Protected Areas: " + StringUtils.join(ProtectedArea.getProtectedAreaLabels(), ", "));
             }
             else
             {
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_purgeall.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_purgeall.java
index 94e4f6b..e3b26e8 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_purgeall.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_purgeall.java
@@ -8,7 +8,6 @@ import org.bukkit.entity.Player;
 import org.bukkit.potion.PotionEffect;
 
 @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
-@CommandParameters(description = "Superadmin command - Purge everything! (except for bans).", usage = "/<command>")
 public class Command_purgeall extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_qdeop.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_qdeop.java
index bcc55d2..ab6119d 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_qdeop.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_qdeop.java
@@ -10,7 +10,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
-@CommandParameters(description = "Quick De-Op - deop someone based on a partial name.", usage = "/<command> <partialname>")
 public class Command_qdeop extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
@@ -48,7 +47,7 @@ public class Command_qdeop extends FreedomCommand {
         }
         else
         {
-            playerMsg("No targets matched.");
+            playerMsg(sender, "No targets matched.");
         }
 
         return true;
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_qop.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_qop.java
index c225513..6fd5f25 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_qop.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_qop.java
@@ -10,7 +10,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 @CommandPermissions(level = AdminLevel.OP, source = SourceType.BOTH)
-@CommandParameters(description = "Quick Op - op someone based on a partial name.", usage = "/<command> <partialname>")
 public class Command_qop extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
@@ -48,7 +47,7 @@ public class Command_qop extends FreedomCommand {
         }
         else
         {
-            playerMsg("No targets matched.");
+            playerMsg(sender, "No targets matched.");
         }
 
         return true;
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_radar.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_radar.java
index 9ae6c2a..5ec5409 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_radar.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_radar.java
@@ -12,7 +12,6 @@ import java.util.Comparator;
 import java.util.List;
 
 @CommandPermissions(level = AdminLevel.ALL, source = SourceType.ONLY_IN_GAME)
-@CommandParameters(description = "Shows nearby people sorted by distance.", usage = "/<command> [range]")
 public class Command_radar extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
@@ -34,13 +33,13 @@ public class Command_radar extends FreedomCommand {
 
         if (radar_data.isEmpty())
         {
-            playerMsg("You are the only player in this world. (" + ChatColor.GREEN + "Forever alone..." + ChatColor.YELLOW + ")", ChatColor.YELLOW); //lol
+            playerMsg(sender, "You are the only player in this world. (" + ChatColor.GREEN + "Forever alone..." + ChatColor.YELLOW + ")", ChatColor.YELLOW); //lol
             return true;
         }
 
         Collections.sort(radar_data, new TFM_RadarData());
 
-        playerMsg("People nearby in " + sender_pos.getWorld().getName() + ":", ChatColor.YELLOW);
+        playerMsg(sender, "People nearby in " + sender_pos.getWorld().getName() + ":", ChatColor.YELLOW);
 
         int countmax = 5;
         if (args.length == 1)
@@ -56,7 +55,7 @@ public class Command_radar extends FreedomCommand {
 
         for (TFM_RadarData i : radar_data)
         {
-            playerMsg(String.format("%s - %d",
+            playerMsg(sender, String.format("%s - %d",
                     i.player.getName(),
                     Math.round(i.distance)), ChatColor.YELLOW);
 
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_rank.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_rank.java
index 328e59c..e04e164 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_rank.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_rank.java
@@ -7,13 +7,12 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = AdminLevel.ALL, source = SourceType.BOTH)
-@CommandParameters(description = "Shows your rank.", usage = "/<command>")
 public class Command_rank extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
         if (senderIsConsole && args.length < 1) {
             for (Player player : server.getOnlinePlayers()) {
-                playerMsg(player.getName() + " is " + PlayerRank.fromSender(player).getLoginMessage());
+                playerMsg(sender, player.getName() + " is " + PlayerRank.fromSender(player).getLoginMessage());
             }
             return true;
         }
@@ -25,7 +24,7 @@ public class Command_rank extends FreedomCommand {
 
         if (args.length == 0)
         {
-            playerMsg(sender.getName() + " is " + PlayerRank.fromSender(sender).getLoginMessage(), ChatColor.AQUA);
+            playerMsg(sender, sender.getName() + " is " + PlayerRank.fromSender(sender).getLoginMessage(), ChatColor.AQUA);
             return true;
         }
 
@@ -37,7 +36,7 @@ public class Command_rank extends FreedomCommand {
             return true;
         }
 
-        playerMsg(player.getName() + " is " + PlayerRank.fromSender(player).getLoginMessage(), ChatColor.AQUA);
+        playerMsg(sender, player.getName() + " is " + PlayerRank.fromSender(player).getLoginMessage(), ChatColor.AQUA);
 
         return true;
     }
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_rawsay.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_rawsay.java
index 1fb39b4..585616e 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_rawsay.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_rawsay.java
@@ -6,7 +6,6 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 
 @CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE, blockHostConsole = true)
-@CommandParameters(description = "Broadcasts the given message. Supports colors.", usage = "/<command> <message>")
 public class Command_rawsay extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_rd.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_rd.java
index 929d43e..d4e72be 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_rd.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_rd.java
@@ -5,12 +5,11 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 
 @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
-@CommandParameters(description = "Remove various server entities that may cause lag, such as dropped items, minecarts, and boats.", usage = "/<command> <carts>")
 public class Command_rd extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
         Utilities.adminAction(sender.getName(), "Removing all server entities.", true);
-        playerMsg((Utilities.TFM_EntityWiper.wipeEntities(true, true)) + " entities removed.");
+        playerMsg(sender, (Utilities.TFM_EntityWiper.wipeEntities(true, true)) + " entities removed.");
 
         return true;
     }
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_report.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_report.java
index 3d83b31..d052a3d 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_report.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_report.java
@@ -10,7 +10,6 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = AdminLevel.OP, source = SourceType.ONLY_IN_GAME, blockHostConsole = true)
-@CommandParameters(description = "Report a player for admins to see.", usage = "/<command> <player> <reason>")
 public class Command_report extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
@@ -21,7 +20,7 @@ public class Command_report extends FreedomCommand {
         Player player = getPlayer(args[0]);
 
         if (player == null) {
-            playerMsg(PLAYER_NOT_FOUND);
+            playerMsg(sender, PLAYER_NOT_FOUND);
             return true;
         }
 
@@ -29,21 +28,21 @@ public class Command_report extends FreedomCommand {
         {
             if (player.equals(sender_p))
             {
-                playerMsg(ChatColor.RED + "Please, don't try to report yourself.");
+                playerMsg(sender, ChatColor.RED + "Please, don't try to report yourself.");
                 return true;
             }
         }
 
         if (AdminList.isSuperAdmin(player))
         {
-            playerMsg(ChatColor.RED + "You can not report an admin.");
+            playerMsg(sender, ChatColor.RED + "You can not report an admin.");
             return true;
         }
 
         String report = StringUtils.join(ArrayUtils.subarray(args, 1, args.length), " ");
         Utilities.reportAction(sender_p, player, report);
 
-        playerMsg(ChatColor.GREEN + "Thank you, your report has been successfully logged.");
+        playerMsg(sender, ChatColor.GREEN + "Thank you, your report has been successfully logged.");
 
         return true;
     }
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_ro.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_ro.java
index 92394cf..2f1222e 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_ro.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_ro.java
@@ -15,7 +15,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, blockHostConsole = false)
-@CommandParameters(description = "Remove all blocks of a certain type in the radius of certain players.", usage = "/<command> <block> [radius (default=50)] [player]")
 public class Command_ro extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
@@ -40,7 +39,7 @@ public class Command_ro extends FreedomCommand {
 
             if (fromMaterial == null)
             {
-                playerMsg("Invalid block: " + materialName, ChatColor.RED);
+                playerMsg(sender, "Invalid block: " + materialName, ChatColor.RED);
                 return true;
             }
 
@@ -56,7 +55,7 @@ public class Command_ro extends FreedomCommand {
             }
             catch (NumberFormatException ex)
             {
-                playerMsg("Invalid radius: " + args[1], ChatColor.RED);
+                playerMsg(sender, "Invalid radius: " + args[1], ChatColor.RED);
                 return true;
             }
         }
@@ -67,7 +66,7 @@ public class Command_ro extends FreedomCommand {
             targetPlayer = getPlayer(args[2]);
             if (targetPlayer == null)
             {
-                playerMsg(FreedomCommand.PLAYER_NOT_FOUND);
+                playerMsg(sender, FreedomCommand.PLAYER_NOT_FOUND);
                 return true;
             }
         }
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_rollback.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_rollback.java
index be10361..0611a91 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_rollback.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_rollback.java
@@ -6,7 +6,6 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 
 @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, blockHostConsole = true)
-@CommandParameters(description = "Issues a rollback on a player", usage = "/<command> <[partialname] | undo [partialname] purge [partialname] | purgeall>", aliases = "rb")
 public class Command_rollback extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
@@ -17,7 +16,7 @@ public class Command_rollback extends FreedomCommand {
         if (args.length == 1) {
             if ("purgeall".equals(args[0])) {
                 Utilities.adminAction(sender.getName(), "Purging all rollback history", false);
-                playerMsg("Purged all rollback history for " + RollbackManager.purgeEntries() + " players.");
+                playerMsg(sender, "Purged all rollback history for " + RollbackManager.purgeEntries() + " players.");
             }
             else
             {
@@ -25,18 +24,18 @@ public class Command_rollback extends FreedomCommand {
 
                 if (playerName == null)
                 {
-                    playerMsg("That player has no entries stored.");
+                    playerMsg(sender, "That player has no entries stored.");
                     return true;
                 }
 
                 if (RollbackManager.canUndoRollback(playerName))
                 {
-                    playerMsg("That player has just been rolled back.");
+                    playerMsg(sender, "That player has just been rolled back.");
                 }
 
                 Utilities.adminAction(sender.getName(), "Rolling back player: " + playerName, false);
-                playerMsg("Rolled back " + RollbackManager.rollback(playerName) + " edits for " + playerName + ".");
-                playerMsg("If this rollback was a mistake, use /rollback undo " + playerName + " within 40 seconds to reverse the rollback.");
+                playerMsg(sender, "Rolled back " + RollbackManager.rollback(playerName) + " edits for " + playerName + ".");
+                playerMsg(sender, "If this rollback was a mistake, use /rollback undo " + playerName + " within 40 seconds to reverse the rollback.");
             }
             return true;
         }
@@ -49,11 +48,11 @@ public class Command_rollback extends FreedomCommand {
 
                 if (playerName == null)
                 {
-                    playerMsg("That player has no entries stored.");
+                    playerMsg(sender, "That player has no entries stored.");
                     return true;
                 }
 
-                playerMsg("Purged " + RollbackManager.purgeEntries(playerName) + " rollback history entries for " + playerName + ".");
+                playerMsg(sender, "Purged " + RollbackManager.purgeEntries(playerName) + " rollback history entries for " + playerName + ".");
                 return true;
             }
 
@@ -63,12 +62,12 @@ public class Command_rollback extends FreedomCommand {
 
                 if (playerName == null)
                 {
-                    playerMsg("That player hasn't been rolled back recently.");
+                    playerMsg(sender, "That player hasn't been rolled back recently.");
                     return true;
                 }
 
                 Utilities.adminAction(sender.getName(), "Reverting rollback for player: " + playerName, false);
-                playerMsg("Reverted " + RollbackManager.undoRollback(playerName) + " edits for " + playerName + ".");
+                playerMsg(sender, "Reverted " + RollbackManager.undoRollback(playerName) + " edits for " + playerName + ".");
                 return true;
             }
         }
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_saconfig.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_saconfig.java
index feeeaae..21d55cc 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_saconfig.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_saconfig.java
@@ -15,7 +15,6 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = AdminLevel.OP, source = SourceType.BOTH)
-@CommandParameters(description = "Manage superadmins.", usage = "/<command> <list | clean | clearme [ip] | <add | remove | info> <username>>")
 public class Command_saconfig extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
@@ -23,12 +22,12 @@ public class Command_saconfig extends FreedomCommand {
         try {
             mode = SAConfigMode.findMode(args, sender, senderIsConsole);
         } catch (final PermissionsException ex) {
-            playerMsg(ex.getMessage());
+            playerMsg(sender, ex.getMessage());
             return true;
         }
         catch (final FormatException ex)
         {
-            playerMsg(ex.getMessage());
+            playerMsg(sender, ex.getMessage());
             return false;
         }
 
@@ -36,7 +35,7 @@ public class Command_saconfig extends FreedomCommand {
         {
             case LIST:
             {
-                playerMsg("Superadmins: " + StringUtils.join(AdminList.getSuperNames(), ", "), ChatColor.GOLD);
+                playerMsg(sender, "Superadmins: " + StringUtils.join(AdminList.getSuperNames(), ", "), ChatColor.GOLD);
 
                 break;
             }
@@ -44,7 +43,7 @@ public class Command_saconfig extends FreedomCommand {
             {
                 Utilities.adminAction(sender.getName(), "Cleaning superadmin list", true);
                 AdminList.cleanSuperadminList(true);
-                playerMsg("Superadmins: " + StringUtils.join(AdminList.getSuperNames(), ", "), ChatColor.YELLOW);
+                playerMsg(sender, "Superadmins: " + StringUtils.join(AdminList.getSuperNames(), ", "), ChatColor.YELLOW);
 
                 break;
             }
@@ -54,7 +53,7 @@ public class Command_saconfig extends FreedomCommand {
 
                 if (admin == null)
                 {
-                    playerMsg("Could not find your admin entry! Please notify a developer.", ChatColor.RED);
+                    playerMsg(sender, "Could not find your admin entry! Please notify a developer.", ChatColor.RED);
                     return true;
                 }
 
@@ -70,18 +69,18 @@ public class Command_saconfig extends FreedomCommand {
 
                     AdminList.saveAll();
 
-                    playerMsg(counter + " IPs removed.");
-                    playerMsg(admin.getIps().get(0) + " is now your only IP address");
+                    playerMsg(sender, counter + " IPs removed.");
+                    playerMsg(sender, admin.getIps().get(0) + " is now your only IP address");
                 }
                 else
                 {
                     if (!admin.getIps().contains(args[1]))
                     {
-                        playerMsg("That IP is not registered to you.");
+                        playerMsg(sender, "That IP is not registered to you.");
                     }
                     else if (ip.equals(args[1]))
                     {
-                        playerMsg("You cannot remove your current IP.");
+                        playerMsg(sender, "You cannot remove your current IP.");
                     }
                     else
                     {
@@ -91,8 +90,8 @@ public class Command_saconfig extends FreedomCommand {
 
                         AdminList.saveAll();
 
-                        playerMsg("Removed IP " + args[1]);
-                        playerMsg("Current IPs: " + StringUtils.join(admin.getIps(), ", "));
+                        playerMsg(sender, "Removed IP " + args[1]);
+                        playerMsg(sender, "Current IPs: " + StringUtils.join(admin.getIps(), ", "));
                     }
                 }
 
@@ -113,11 +112,11 @@ public class Command_saconfig extends FreedomCommand {
 
                 if (superadmin == null)
                 {
-                    playerMsg("Superadmin not found: " + args[1]);
+                    playerMsg(sender, "Superadmin not found: " + args[1]);
                 }
                 else
                 {
-                    playerMsg(superadmin.toString());
+                    playerMsg(sender, superadmin.toString());
                 }
 
                 break;
@@ -132,7 +131,7 @@ public class Command_saconfig extends FreedomCommand {
 
                     if (superadmin == null)
                     {
-                        playerMsg(FreedomCommand.PLAYER_NOT_FOUND);
+                        playerMsg(sender, FreedomCommand.PLAYER_NOT_FOUND);
                         return true;
                     }
 
@@ -168,7 +167,7 @@ public class Command_saconfig extends FreedomCommand {
 
                 if (!AdminList.getLowercaseSuperNames().contains(targetName.toLowerCase()))
                 {
-                    playerMsg("Superadmin not found: " + targetName);
+                    playerMsg(sender, "Superadmin not found: " + targetName);
                     return true;
                 }
 
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_say.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_say.java
index cd20cd1..17a49a7 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_say.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_say.java
@@ -8,7 +8,6 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
-@CommandParameters(description = "Broadcasts the given message as the console, includes sender name.", usage = "/<command> <message>")
 public class Command_say extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_setl.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_setl.java
index 6da0802..af34f0c 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_setl.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_setl.java
@@ -7,7 +7,6 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
-@CommandParameters(description = "Sets everyone's Worldedit block modification limit to 500.", usage = "/<command>")
 public class Command_setl extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_setlevel.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_setlevel.java
index 937b3a7..01726b3 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_setlevel.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_setlevel.java
@@ -5,7 +5,6 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 
 @CommandPermissions(level = AdminLevel.OP, source = SourceType.ONLY_IN_GAME)
-@CommandParameters(description = "Sets your expierence level.", usage = "/<command> [level]")
 public class Command_setlevel extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
@@ -29,13 +28,13 @@ public class Command_setlevel extends FreedomCommand {
         }
         catch (NumberFormatException ex)
         {
-            playerMsg("Invalid level.", ChatColor.RED);
+            playerMsg(sender, "Invalid level.", ChatColor.RED);
             return true;
         }
 
         sender_p.setLevel(new_level);
 
-        playerMsg("You have been set to level " + Integer.toString(new_level), ChatColor.AQUA);
+        playerMsg(sender, "You have been set to level " + Integer.toString(new_level), ChatColor.AQUA);
 
         return true;
     }
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_setlever.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_setlever.java
index cc3bf3a..0041b36 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_setlever.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_setlever.java
@@ -11,7 +11,6 @@ import org.bukkit.command.CommandSender;
 import java.util.List;
 
 @CommandPermissions(level = AdminLevel.ALL, source = SourceType.BOTH)
-@CommandParameters(description = "Set the on/off state of the lever at position x, y, z in world 'worldname'.", usage = "/<command> <x> <y> <z> <worldname> <on|off>")
 public class Command_setlever extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
@@ -27,7 +26,7 @@ public class Command_setlever extends FreedomCommand {
         }
         catch (NumberFormatException ex)
         {
-            playerMsg("Invalid coordinates.");
+            playerMsg(sender, "Invalid coordinates.");
             return true;
         }
 
@@ -45,7 +44,7 @@ public class Command_setlever extends FreedomCommand {
 
         if (world == null)
         {
-            playerMsg("Invalid world name.");
+            playerMsg(sender, "Invalid world name.");
             return true;
         }
 
@@ -64,7 +63,7 @@ public class Command_setlever extends FreedomCommand {
         }
         else
         {
-            playerMsg("Target block " + targetBlock + "  is not a lever.");
+            playerMsg(sender, "Target block " + targetBlock + "  is not a lever.");
             return true;
         }
 
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_setspawnworld.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_setspawnworld.java
index 25d637e..1e19298 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_setspawnworld.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_setspawnworld.java
@@ -8,14 +8,13 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 
 @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.ONLY_IN_GAME)
-@CommandParameters(description = "Set world spawnpoint.", usage = "/<command>")
 public class Command_setspawnworld extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
         Location pos = sender_p.getLocation();
         sender_p.getWorld().setSpawnLocation(pos.getBlockX(), pos.getBlockY(), pos.getBlockZ());
 
-        playerMsg("Spawn location for this world set to: " + Utilities.formatLocation(sender_p.getWorld().getSpawnLocation()));
+        playerMsg(sender, "Spawn location for this world set to: " + Utilities.formatLocation(sender_p.getWorld().getSpawnLocation()));
 
         if (ConfigurationEntry.PROTECTAREA_ENABLED.getBoolean() && ConfigurationEntry.PROTECTAREA_SPAWNPOINTS.getBoolean()) {
             ProtectedArea.addProtectedArea("spawn_" + sender_p.getWorld().getName(), pos, ConfigurationEntry.PROTECTAREA_RADIUS.getDouble());
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_smite.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_smite.java
index 7c4bdce..c1049b3 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_smite.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_smite.java
@@ -10,7 +10,6 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
-@CommandParameters(description = "Someone being a little bitch? Smite them down...", usage = "/<command> [playername]")
 public class Command_smite extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
@@ -21,7 +20,7 @@ public class Command_smite extends FreedomCommand {
         final Player player = getPlayer(args[0]);
 
         if (player == null) {
-            playerMsg(FreedomCommand.PLAYER_NOT_FOUND);
+            playerMsg(sender, FreedomCommand.PLAYER_NOT_FOUND);
             return true;
         }
 
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_spectator.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_spectator.java
index f7f23f5..c9d2de1 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_spectator.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_spectator.java
@@ -7,7 +7,6 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
-@CommandParameters(description = "Quickly change your own gamemode to spectator, or define someone's username to change theirs.", usage = "/<command> [partialname]", aliases = "gmsp")
 public class Command_spectator extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
@@ -48,7 +47,7 @@ public class Command_spectator extends FreedomCommand {
 
         }
 
-        playerMsg("Setting " + player.getName() + " to game mode 'Spectator'.");
+        playerMsg(sender, "Setting " + player.getName() + " to game mode 'Spectator'.");
         playerMsg(player, sender.getName() + " set your game mode to 'Spectator'.");
         player.setGameMode(GameMode.SPECTATOR);
 
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_status.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_status.java
index a57f84d..8032308 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_status.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_status.java
@@ -9,7 +9,6 @@ import java.util.HashMap;
 import java.util.Map;
 
 @CommandPermissions(level = AdminLevel.ALL, source = SourceType.BOTH)
-@CommandParameters(description = "Show misc. server info.", usage = "/<command>")
 public class Command_status extends FreedomCommand {
     public static final Map<String, String> SERVICE_MAP = new HashMap<String, String>();
 
@@ -24,13 +23,13 @@ public class Command_status extends FreedomCommand {
 
     @Override
     public boolean run(final CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
-        playerMsg("For information about TotalFreedomMod, try /tfm", ChatColor.GREEN); // Temporary
+        playerMsg(sender, "For information about TotalFreedomMod, try /tfm", ChatColor.GREEN); // Temporary
 
-        playerMsg("Server is currently running with 'online-mode=" + (server.getOnlineMode() ? "true" : "false") + "'.", ChatColor.YELLOW);
-        playerMsg("Loaded worlds:", ChatColor.BLUE);
+        playerMsg(sender, "Server is currently running with 'online-mode=" + (server.getOnlineMode() ? "true" : "false") + "'.", ChatColor.YELLOW);
+        playerMsg(sender, "Loaded worlds:", ChatColor.BLUE);
         int i = 0;
         for (World world : server.getWorlds()) {
-            playerMsg(String.format("World %d: %s - %d players.", i++, world.getName(), world.getPlayers().size()), ChatColor.BLUE);
+            playerMsg(sender, String.format("World %d: %s - %d players.", i++, world.getName(), world.getPlayers().size()), ChatColor.BLUE);
         }
 
         return true;
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_stfu.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_stfu.java
index 4f623b6..04a472d 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_stfu.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_stfu.java
@@ -8,7 +8,6 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
-@CommandParameters(description = "Mutes a player with brute force.", usage = "/<command> [<player> [-s] | list | purge | all]", aliases = "mute")
 public class Command_stfu extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
@@ -17,7 +16,7 @@ public class Command_stfu extends FreedomCommand {
         }
 
         if (args[0].equalsIgnoreCase("list")) {
-            playerMsg("Muted players:");
+            playerMsg(sender, "Muted players:");
             PlayerData info;
             int count = 0;
             for (Player mp : server.getOnlinePlayers())
@@ -25,13 +24,13 @@ public class Command_stfu extends FreedomCommand {
                 info = PlayerData.getPlayerData(mp);
                 if (info.isMuted())
                 {
-                    playerMsg("- " + mp.getName());
+                    playerMsg(sender, "- " + mp.getName());
                     count++;
                 }
             }
             if (count == 0)
             {
-                playerMsg("- none");
+                playerMsg(sender, "- none");
             }
         }
         else if (args[0].equalsIgnoreCase("purge"))
@@ -48,7 +47,7 @@ public class Command_stfu extends FreedomCommand {
                     count++;
                 }
             }
-            playerMsg("Unmuted " + count + " players.");
+            playerMsg(sender, "Unmuted " + count + " players.");
         }
         else if (args[0].equalsIgnoreCase("all"))
         {
@@ -66,7 +65,7 @@ public class Command_stfu extends FreedomCommand {
                 }
             }
 
-            playerMsg("Muted " + counter + " players.");
+            playerMsg(sender, "Muted " + counter + " players.");
         }
         else
         {
@@ -83,7 +82,7 @@ public class Command_stfu extends FreedomCommand {
             {
                 Utilities.adminAction(sender.getName(), "Unmuting " + player.getName(), true);
                 playerdata.setMuted(false);
-                playerMsg("Unmuted " + player.getName());
+                playerMsg(sender, "Unmuted " + player.getName());
             }
             else
             {
@@ -97,11 +96,11 @@ public class Command_stfu extends FreedomCommand {
                         Command_smite.smite(player);
                     }
 
-                    playerMsg("Muted " + player.getName());
+                    playerMsg(sender, "Muted " + player.getName());
                 }
                 else
                 {
-                    playerMsg(player.getName() + " is a superadmin, and can't be muted.");
+                    playerMsg(sender, player.getName() + " is a superadmin, and can't be muted.");
                 }
             }
         }
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_stop.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_stop.java
index 475aad5..c57446a 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_stop.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_stop.java
@@ -7,7 +7,6 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
-@CommandParameters(description = "Kicks everyone and stops the server.", usage = "/<command>")
 public class Command_stop extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_survival.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_survival.java
index 4a8cc62..94b042e 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_survival.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_survival.java
@@ -8,13 +8,12 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = AdminLevel.OP, source = SourceType.BOTH)
-@CommandParameters(description = "Quickly change your own gamemode to survival, or define someone's username to change theirs.", usage = "/<command> <[partialname] | -a>", aliases = "gms")
 public class Command_survival extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
         if (senderIsConsole) {
             if (args.length == 0) {
-                playerMsg("When used from the console, you must define a target user to change gamemode on.");
+                playerMsg(sender, "When used from the console, you must define a target user to change gamemode on.");
                 return true;
             }
         }
@@ -50,18 +49,18 @@ public class Command_survival extends FreedomCommand {
 
                 if (player == null)
                 {
-                    playerMsg(FreedomCommand.PLAYER_NOT_FOUND);
+                    playerMsg(sender, FreedomCommand.PLAYER_NOT_FOUND);
                     return true;
                 }
             }
             else
             {
-                playerMsg("Only superadmins can change other user's gamemode.");
+                playerMsg(sender, "Only superadmins can change other user's gamemode.");
                 return true;
             }
         }
 
-        playerMsg("Setting " + player.getName() + " to game mode 'Survival'.");
+        playerMsg(sender, "Setting " + player.getName() + " to game mode 'Survival'.");
         player.sendMessage(sender.getName() + " set your game mode to 'Survival'.");
         player.setGameMode(GameMode.SURVIVAL);
 
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_tag.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_tag.java
index 7604d00..797fb4d 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_tag.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_tag.java
@@ -14,7 +14,6 @@ import java.util.Arrays;
 import java.util.List;
 
 @CommandPermissions(level = AdminLevel.OP, source = SourceType.BOTH)
-@CommandParameters(description = "Sets yourself a prefix", usage = "/<command> <(-s) set <tag..> | off | clear <player> | clearall>")
 public class Command_tag extends FreedomCommand {
     public static final List<String> FORBIDDEN_WORDS = Arrays.asList("admin", "owner", "moderator", "developer", "console");
 
@@ -22,13 +21,13 @@ public class Command_tag extends FreedomCommand {
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
         if (args.length == 1) {
             if ("list".equalsIgnoreCase(args[0])) {
-                playerMsg("Tags for all online players:");
+                playerMsg(sender, "Tags for all online players:");
 
                 for (final Player player : server.getOnlinePlayers()) {
                     final PlayerData playerdata = PlayerData.getPlayerData(player);
                     if (playerdata.getTag() != null)
                     {
-                        playerMsg(player.getName() + ": " + playerdata.getTag());
+                        playerMsg(sender, player.getName() + ": " + playerdata.getTag());
                     }
                 }
 
@@ -38,7 +37,7 @@ public class Command_tag extends FreedomCommand {
             {
                 if (!AdminList.isSuperAdmin(sender))
                 {
-                    playerMsg(FreedomCommand.MSG_NO_PERMS);
+                    playerMsg(sender, FreedomCommand.MSG_NO_PERMS);
                     return true;
                 }
 
@@ -61,7 +60,7 @@ public class Command_tag extends FreedomCommand {
                     }
                 }
 
-                playerMsg(count + " tag(s) removed.");
+                playerMsg(sender, count + " tag(s) removed.");
 
                 return true;
             }
@@ -69,7 +68,7 @@ public class Command_tag extends FreedomCommand {
             {
                 if (senderIsConsole)
                 {
-                    playerMsg("\"/tag off\" can't be used from the console. Use \"/tag clear <player>\" or \"/tag clearall\" instead.");
+                    playerMsg(sender, "\"/tag off\" can't be used from the console. Use \"/tag clear <player>\" or \"/tag clearall\" instead.");
                 }
                 else
                 {
@@ -80,7 +79,7 @@ public class Command_tag extends FreedomCommand {
                             TagConfiguration.saveTag(sender_p.getUniqueId().toString(), "");
                         }
                     }
-                    playerMsg("Your tag has been removed.");
+                    playerMsg(sender, "Your tag has been removed.");
                 }
 
                 return true;
@@ -96,14 +95,14 @@ public class Command_tag extends FreedomCommand {
             {
                 if (!AdminList.isSuperAdmin(sender))
                 {
-                    playerMsg(FreedomCommand.MSG_NO_PERMS);
+                    playerMsg(sender, FreedomCommand.MSG_NO_PERMS);
                     return true;
                 }
 
                 final Player player = getPlayer(args[1]);
                 if (player == null)
                 {
-                    playerMsg(FreedomCommand.PLAYER_NOT_FOUND);
+                    playerMsg(sender, FreedomCommand.PLAYER_NOT_FOUND);
                     return true;
                 }
                 PlayerData.getPlayerData(player).setTag(null);
@@ -113,7 +112,7 @@ public class Command_tag extends FreedomCommand {
                         TagConfiguration.saveTag(player.getUniqueId().toString(), "");
                     }
                 }
-                playerMsg("Removed " + player.getName() + "'s tag.");
+                playerMsg(sender, "Removed " + player.getName() + "'s tag.");
 
                 return true;
             }
@@ -136,7 +135,7 @@ public class Command_tag extends FreedomCommand {
 
                     if (rawTag.length() > 20)
                     {
-                        playerMsg("That tag is too long (Max is 20 characters).");
+                        playerMsg(sender, "That tag is too long (Max is 20 characters).");
                         return true;
                     }
 
@@ -147,9 +146,9 @@ public class Command_tag extends FreedomCommand {
                             {
                                 if(word.equals("developer") && Utilities.DEVELOPERS.contains(sender_p.getName())) {
                                     PlayerData.getPlayerData(sender_p).setTag(outputTag);
-                                    playerMsg("Tag set to '" + outputTag + ChatColor.GRAY + "'.");
+                                    playerMsg(sender, "Tag set to '" + outputTag + ChatColor.GRAY + "'.");
                                 } else
-                                    playerMsg("That tag contains a forbidden word.");
+                                    playerMsg(sender, "That tag contains a forbidden word.");
                                 return true;
                             }
                         }
@@ -157,7 +156,7 @@ public class Command_tag extends FreedomCommand {
                 }
 
                 PlayerData.getPlayerData(sender_p).setTag(outputTag);
-                playerMsg("Tag set to '" + outputTag + ChatColor.GRAY + "'.");
+                playerMsg(sender, "Tag set to '" + outputTag + ChatColor.GRAY + "'.");
 
                 return true;
             }
@@ -180,7 +179,7 @@ public class Command_tag extends FreedomCommand {
 
                     if (rawTag.length() > 20)
                     {
-                        playerMsg("That tag is too long (Max is 20 characters).");
+                        playerMsg(sender, "That tag is too long (Max is 20 characters).");
                         return true;
                     }
 
@@ -191,9 +190,9 @@ public class Command_tag extends FreedomCommand {
                             if(word.equals("developer") && Utilities.DEVELOPERS.contains(sender_p.getName())) {
                                 PlayerData.getPlayerData(sender_p).setTag(outputTag);
                                 TagConfiguration.saveTag(sender_p.getUniqueId().toString(), outputTag);
-                                playerMsg("Tag set to '" + outputTag + ChatColor.GRAY + "'. (saved)");
+                                playerMsg(sender, "Tag set to '" + outputTag + ChatColor.GRAY + "'. (saved)");
                             } else
-                                playerMsg("That tag contains a forbidden word.");
+                                playerMsg(sender, "That tag contains a forbidden word.");
                                 return true;
                         }
                     }
@@ -201,7 +200,7 @@ public class Command_tag extends FreedomCommand {
 
                 PlayerData.getPlayerData(sender_p).setTag(outputTag);
                 TagConfiguration.saveTag(sender_p.getUniqueId().toString(), outputTag);
-                playerMsg("Tag set to '" + outputTag + ChatColor.GRAY + "'. (saved)");
+                playerMsg(sender, "Tag set to '" + outputTag + ChatColor.GRAY + "'. (saved)");
                 return true;
             } else
             {
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_tagnyan.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_tagnyan.java
index c1b5098..40c34ea 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_tagnyan.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_tagnyan.java
@@ -8,7 +8,6 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 
 @CommandPermissions(level = AdminLevel.OP, source = SourceType.ONLY_IN_GAME)
-@CommandParameters(description = "Gives you a tag with random colors", usage = "/<command> <tag>", aliases = "tn")
 public class Command_tagnyan extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
@@ -25,7 +24,7 @@ public class Command_tagnyan extends FreedomCommand {
         final PlayerData data = PlayerData.getPlayerData(sender_p);
         data.setTag(tag.toString());
 
-        playerMsg("Set tag to " + tag);
+        playerMsg(sender, "Set tag to " + tag);
 
         return true;
     }
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_tban.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_tban.java
index 0233816..d2f9a70 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_tban.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_tban.java
@@ -11,7 +11,6 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
-@CommandParameters(description = "Temporarily bans a player for five minutes.", usage = "/<command> <partialname>", aliases = "noob")
 public class Command_tban extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
@@ -22,7 +21,7 @@ public class Command_tban extends FreedomCommand {
         final Player player = getPlayer(args[0]);
 
         if (player == null) {
-            playerMsg(FreedomCommand.PLAYER_NOT_FOUND, ChatColor.RED);
+            playerMsg(sender, FreedomCommand.PLAYER_NOT_FOUND, ChatColor.RED);
             return true;
         }
 
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_tempban.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_tempban.java
index 84c1cfc..ef3abc9 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_tempban.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_tempban.java
@@ -15,7 +15,6 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 
 @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
-@CommandParameters(description = "Temporarily ban someone.", usage = "/<command> [playername] [duration] [reason]")
 public class Command_tempban extends FreedomCommand {
     private static final SimpleDateFormat date_format = new SimpleDateFormat("yyyy-MM-dd 'at' HH:mm:ss z");
 
@@ -28,7 +27,7 @@ public class Command_tempban extends FreedomCommand {
         final Player player = getPlayer(args[0]);
 
         if (player == null) {
-            playerMsg(FreedomCommand.PLAYER_NOT_FOUND);
+            playerMsg(sender, FreedomCommand.PLAYER_NOT_FOUND);
             return true;
         }
 
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_tfbanlist.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_tfbanlist.java
index e0ec7b7..ae000be 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_tfbanlist.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_tfbanlist.java
@@ -9,7 +9,6 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 
 @CommandPermissions(level = AdminLevel.OP, source = SourceType.BOTH)
-@CommandParameters(description = "Shows all banned player names. Superadmins may optionally use 'purge' to clear the list.", usage = "/<command> [purge]")
 public class Command_tfbanlist extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
@@ -30,12 +29,12 @@ public class Command_tfbanlist extends FreedomCommand {
                 }
                 else
                 {
-                    playerMsg("You do not have permission to purge the ban list, you may only view it.");
+                    playerMsg(sender, "You do not have permission to purge the ban list, you may only view it.");
                 }
             }
         }
 
-        playerMsg(BanManager.getUuidBanList().size() + " UUID bans total");
+        playerMsg(sender, BanManager.getUuidBanList().size() + " UUID bans total");
 
         return true;
     }
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_tfipbanlist.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_tfipbanlist.java
index 14451eb..92ce4bf 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_tfipbanlist.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_tfipbanlist.java
@@ -9,7 +9,6 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 
 @CommandPermissions(level = AdminLevel.OP, source = SourceType.BOTH)
-@CommandParameters(description = "Shows all banned IPs. Superadmins may optionally use 'purge' to clear the list.", usage = "/<command> [purge]")
 public class Command_tfipbanlist extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
@@ -31,12 +30,12 @@ public class Command_tfipbanlist extends FreedomCommand {
                 }
                 else
                 {
-                    playerMsg("You do not have permission to purge the IP ban list, you may only view it.");
+                    playerMsg(sender, "You do not have permission to purge the IP ban list, you may only view it.");
                 }
             }
         }
 
-        playerMsg(BanManager.getIpBanList().size() + " IPbans total");
+        playerMsg(sender, BanManager.getIpBanList().size() + " IPbans total");
 
         return true;
     }
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_tfupdate.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_tfupdate.java
deleted file mode 100644
index d9d3bab..0000000
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_tfupdate.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package me.StevenLawson.TotalFreedomMod.commands;
-
-import me.StevenLawson.TotalFreedomMod.Log;
-import me.StevenLawson.TotalFreedomMod.util.Utilities;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.scheduler.BukkitRunnable;
-
-import java.io.File;
-
-@CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE, blockHostConsole = true)
-@CommandParameters(description = "Update server files.", usage = "/<command>")
-public class Command_tfupdate extends FreedomCommand {
-    public static final String[] FILES =
-            {
-            };
-
-    @Override
-    public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
-        if (FILES.length == 0) {
-            playerMsg("This command is disabled.");
-            return true;
-        }
-
-        if (!sender.getName().equalsIgnoreCase("madgeek1450")) {
-            playerMsg(FreedomCommand.MSG_NO_PERMS);
-            return true;
-        }
-
-        for (final String url : FILES)
-        {
-            new BukkitRunnable()
-            {
-                @Override
-                public void run()
-                {
-                    try
-                    {
-                        Log.info("Downloading: " + url);
-
-                        File file = new File("./updates/" + url.substring(url.lastIndexOf("/") + 1));
-                        if (file.exists())
-                        {
-                            file.delete();
-                        }
-                        if (!file.getParentFile().exists())
-                        {
-                            file.getParentFile().mkdirs();
-                        }
-
-                        Utilities.downloadFile(url, file, true);
-                    }
-                    catch (Exception ex)
-                    {
-                        Log.severe(ex);
-                    }
-                }
-            }.runTaskAsynchronously(plugin);
-        }
-
-        return true;
-    }
-}
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_toggle.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_toggle.java
index de178c9..f5e3603 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_toggle.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_toggle.java
@@ -9,67 +9,66 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 
 @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
-@CommandParameters(description = "Toggles TotalFreedomMod settings", usage = "/<command> [option] [value] [value]")
 public class Command_toggle extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
         if (args.length == 0) {
-            playerMsg("Available toggles: ");
-            playerMsg("- waterplace");
-            playerMsg("- fireplace");
-            playerMsg("- lavaplace");
-            playerMsg("- fluidspread");
-            playerMsg("- lavadmg");
-            playerMsg("- firespread");
-            playerMsg("- prelog");
-            playerMsg("- lockdown");
-            playerMsg("- petprotect");
-            playerMsg("- droptoggle");
-            playerMsg("- nonuke");
-            playerMsg("- explosives");
+            playerMsg(sender, "Available toggles: ");
+            playerMsg(sender, "- waterplace");
+            playerMsg(sender, "- fireplace");
+            playerMsg(sender, "- lavaplace");
+            playerMsg(sender, "- fluidspread");
+            playerMsg(sender, "- lavadmg");
+            playerMsg(sender, "- firespread");
+            playerMsg(sender, "- prelog");
+            playerMsg(sender, "- lockdown");
+            playerMsg(sender, "- petprotect");
+            playerMsg(sender, "- droptoggle");
+            playerMsg(sender, "- nonuke");
+            playerMsg(sender, "- explosives");
             return false;
         }
 
         if (args[0].equals("waterplace"))
         {
-            toggle("Water placement is", ConfigurationEntry.ALLOW_WATER_PLACE);
+            toggle(sender, "Water placement is", ConfigurationEntry.ALLOW_WATER_PLACE);
             return true;
         }
 
         if (args[0].equals("fireplace"))
         {
-            toggle("Fire placement is", ConfigurationEntry.ALLOW_FIRE_PLACE);
+            toggle(sender, "Fire placement is", ConfigurationEntry.ALLOW_FIRE_PLACE);
             return true;
         }
 
         if (args[0].equals("lavaplace"))
         {
-            toggle("Lava placement is", ConfigurationEntry.ALLOW_LAVA_PLACE);
+            toggle(sender, "Lava placement is", ConfigurationEntry.ALLOW_LAVA_PLACE);
             return true;
         }
 
         if (args[0].equals("fluidspread"))
         {
-            toggle("Fluid spread is", ConfigurationEntry.ALLOW_FLUID_SPREAD);
+            toggle(sender, "Fluid spread is", ConfigurationEntry.ALLOW_FLUID_SPREAD);
             return true;
         }
 
         if (args[0].equals("lavadmg"))
         {
-            toggle("Lava damage is", ConfigurationEntry.ALLOW_LAVA_DAMAGE);
+            toggle(sender, "Lava damage is", ConfigurationEntry.ALLOW_LAVA_DAMAGE);
             return true;
         }
 
         if (args[0].equals("firespread"))
         {
-            toggle("Fire spread is", ConfigurationEntry.ALLOW_FIRE_SPREAD);
+            toggle(sender, "Fire spread is", ConfigurationEntry.ALLOW_FIRE_SPREAD);
             GameRuleHandler.setGameRule(TFM_GameRule.DO_FIRE_TICK, ConfigurationEntry.ALLOW_FIRE_SPREAD.getBoolean());
             return true;
         }
 
         if (args[0].equals("prelog"))
         {
-            toggle("Command prelogging is", ConfigurationEntry.ENABLE_PREPROCESS_LOG);
+            toggle(sender, "Command prelogging is", ConfigurationEntry.ENABLE_PREPROCESS_LOG);
             return true;
         }
 
@@ -82,13 +81,13 @@ public class Command_toggle extends FreedomCommand {
 
         if (args[0].equals("petprotect"))
         {
-            toggle("Tamed pet protection is", ConfigurationEntry.ENABLE_PET_PROTECT);
+            toggle(sender, "Tamed pet protection is", ConfigurationEntry.ENABLE_PET_PROTECT);
             return true;
         }
 
         if (args[0].equals("droptoggle"))
         {
-            toggle("Automatic entity wiping is", ConfigurationEntry.AUTO_ENTITY_WIPE);
+            toggle(sender, "Automatic entity wiping is", ConfigurationEntry.AUTO_ENTITY_WIPE);
             return true;
         }
 
@@ -116,12 +115,12 @@ public class Command_toggle extends FreedomCommand {
                 }
             }
 
-            toggle("Nuke monitor is", ConfigurationEntry.NUKE_MONITOR_ENABLED);
+            toggle(sender, "Nuke monitor is", ConfigurationEntry.NUKE_MONITOR_ENABLED);
 
             if (ConfigurationEntry.NUKE_MONITOR_ENABLED.getBoolean())
             {
-                playerMsg("Anti-freecam range is set to " + ConfigurationEntry.NUKE_MONITOR_RANGE.getDouble() + " blocks.");
-                playerMsg("Block throttle rate is set to " + ConfigurationEntry.NUKE_MONITOR_COUNT_BREAK.getInteger() + " blocks destroyed per 5 seconds.");
+                playerMsg(sender, "Anti-freecam range is set to " + ConfigurationEntry.NUKE_MONITOR_RANGE.getDouble() + " blocks.");
+                playerMsg(sender, "Block throttle rate is set to " + ConfigurationEntry.NUKE_MONITOR_COUNT_BREAK.getInteger() + " blocks destroyed per 5 seconds.");
             }
 
             return true;
@@ -136,16 +135,16 @@ public class Command_toggle extends FreedomCommand {
                 }
                 catch (NumberFormatException ex)
                 {
-                    playerMsg(ex.getMessage());
+                    playerMsg(sender, ex.getMessage());
                     return true;
                 }
             }
 
-            toggle("Explosions are", ConfigurationEntry.ALLOW_EXPLOSIONS);
+            toggle(sender, "Explosions are", ConfigurationEntry.ALLOW_EXPLOSIONS);
 
             if (ConfigurationEntry.ALLOW_EXPLOSIONS.getBoolean())
             {
-                playerMsg("Radius set to " + ConfigurationEntry.EXPLOSIVE_RADIUS.getDouble());
+                playerMsg(sender, "Radius set to " + ConfigurationEntry.EXPLOSIVE_RADIUS.getDouble());
             }
             return true;
         }
@@ -153,8 +152,8 @@ public class Command_toggle extends FreedomCommand {
         return false;
     }
 
-    private void toggle(String name, ConfigurationEntry entry)
+    private void toggle(CommandSender sender, String name, ConfigurationEntry entry)
     {
-        playerMsg(name + " now " + (entry.setBoolean(!entry.getBoolean()) ? "enabled." : "disabled."));
+        playerMsg(sender, name + " now " + (entry.setBoolean(!entry.getBoolean()) ? "enabled." : "disabled."));
     }
 }
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_tossmob.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_tossmob.java
index 0303307..e3cf765 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_tossmob.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_tossmob.java
@@ -12,13 +12,11 @@ import org.bukkit.entity.EntityType;
 import org.bukkit.inventory.ItemStack;
 
 @CommandPermissions(level = AdminLevel.OP, source = SourceType.ONLY_IN_GAME)
-@CommandParameters(description = "Throw a mob in the direction you are facing when you left click with a stick.",
-        usage = "/<command> <mobtype [speed] | off | list>")
 public class Command_tossmob extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
         if (!ConfigurationEntry.TOSSMOB_ENABLED.getBoolean()) {
-            playerMsg("Tossmob is currently disabled.");
+            playerMsg(sender, "Tossmob is currently disabled.");
             return true;
         }
 
@@ -30,13 +28,13 @@ public class Command_tossmob extends FreedomCommand {
             if ("off".equals(args[0]))
             {
                 playerData.disableMobThrower();
-                playerMsg("MobThrower is disabled.", ChatColor.GREEN);
+                playerMsg(sender, "MobThrower is disabled.", ChatColor.GREEN);
                 return true;
             }
 
             if (args[0].equalsIgnoreCase("list"))
             {
-                playerMsg("Supported mobs: " + StringUtils.join(Utilities.mobtypes.keySet(), ", "), ChatColor.GREEN);
+                playerMsg(sender, "Supported mobs: " + StringUtils.join(Utilities.mobtypes.keySet(), ", "), ChatColor.GREEN);
                 return true;
             }
 
@@ -46,8 +44,8 @@ public class Command_tossmob extends FreedomCommand {
             }
             catch (Exception ex)
             {
-                playerMsg(args[0] + " is not a supported mob type. Using a pig instead.", ChatColor.RED);
-                playerMsg("By the way, you can type /tossmob list to see all possible mobs.", ChatColor.RED);
+                playerMsg(sender, args[0] + " is not a supported mob type. Using a pig instead.", ChatColor.RED);
+                playerMsg(sender, "By the way, you can type /tossmob list to see all possible mobs.", ChatColor.RED);
                 creature = EntityType.PIG;
             }
         }
@@ -74,9 +72,9 @@ public class Command_tossmob extends FreedomCommand {
         }
 
         playerData.enableMobThrower(creature, speed);
-        playerMsg("MobThrower is enabled. Creature: " + creature + " - Speed: " + speed + ".", ChatColor.GREEN);
-        playerMsg("Left click while holding a " + Material.BONE.toString() + " to throw mobs!", ChatColor.GREEN);
-        playerMsg("Type '/tossmob off' to disable.  -By Madgeek1450", ChatColor.GREEN);
+        playerMsg(sender, "MobThrower is enabled. Creature: " + creature + " - Speed: " + speed + ".", ChatColor.GREEN);
+        playerMsg(sender, "Left click while holding a " + Material.BONE.toString() + " to throw mobs!", ChatColor.GREEN);
+        playerMsg(sender, "Type '/tossmob off' to disable.  -By Madgeek1450", ChatColor.GREEN);
 
         sender_p.setItemInHand(new ItemStack(Material.BONE, 1));
 
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_trail.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_trail.java
index 95182ba..10c4092 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_trail.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_trail.java
@@ -19,7 +19,6 @@ import java.util.List;
 import java.util.Random;
 
 @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.ONLY_IN_GAME)
-@CommandParameters(description = "Pretty rainbow trails.", usage = "/<command> [off]")
 public class Command_trail extends FreedomCommand {
     private static Listener movementListener = null;
     private static final List<Player> trailPlayers = new ArrayList<Player>();
@@ -30,14 +29,14 @@ public class Command_trail extends FreedomCommand {
         if (args.length > 0 && "off".equals(args[0])) {
             trailPlayers.remove(sender_p);
 
-            playerMsg("Trail disabled.");
+            playerMsg(sender, "Trail disabled.");
         } else {
             if (!trailPlayers.contains(sender_p))
             {
                 trailPlayers.add(sender_p);
             }
 
-            playerMsg("Trail enabled. Use \"/trail off\" to disable.");
+            playerMsg(sender, "Trail enabled. Use \"/trail off\" to disable.");
         }
 
         if (!trailPlayers.isEmpty())
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_updatetfm.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_updatetfm.java
index 086f065..a7505dd 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_updatetfm.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_updatetfm.java
@@ -13,11 +13,10 @@ import org.bukkit.entity.Player;
 import java.io.File;
 
 @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
-@CommandParameters(description = "For developers only - update TFM.", usage = "/<command>", aliases = ("tfmupdate,update,compiletfm,tfmcompile,build,buildtfm,tfmbuild"))
 public class Command_updatetfm extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
-        playerMsg("Compiling TFM, please wait...", ChatColor.RED);
+        playerMsg(sender, "Compiling TFM, please wait...", ChatColor.RED);
         Utilities.adminAction(sender.getName(), "Compiling TFM", true);
         String path = MainConfig.getString(ConfigurationEntry.TFM_BUILD_SHELLSCRIPT);
         File file = new File(path);
@@ -28,7 +27,7 @@ public class Command_updatetfm extends FreedomCommand {
             ProcessBuilder proc = new ProcessBuilder("/bin/bash", "-c", command);
             Process process = proc.start();
             process.waitFor();
-            playerMsg("Compiling TFM! Reloading...");
+            playerMsg(sender, "Compiling TFM! Reloading...");
             Utilities.adminAction(sender.getName(), "Compilation successful, reloading TFM...", false);
             for (Player onlinePlayer : Bukkit.getOnlinePlayers()) {
                 onlinePlayer.kickPlayer(ChatColor.RED + "Reloading TFM, please rejoin.");
@@ -36,7 +35,7 @@ public class Command_updatetfm extends FreedomCommand {
 
             Bukkit.dispatchCommand(sender, "plugman reload TotalFreedomMod");
         } catch (Exception e) {
-            playerMsg("Failed to update TFM! Check the logs for more details.");
+            playerMsg(sender, "Failed to update TFM! Check the logs for more details.");
             Utilities.adminAction(sender.getName(), "Could not update TFM", true);
             e.printStackTrace();
         }
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_uuid.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_uuid.java
index 423813d..e34a65a 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_uuid.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_uuid.java
@@ -12,7 +12,6 @@ import org.bukkit.command.CommandSender;
 import java.util.*;
 
 @CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE)
-@CommandParameters(description = "Provides uuid tools", usage = "/<command> <purge | recalculate>")
 public class Command_uuid extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
@@ -21,13 +20,13 @@ public class Command_uuid extends FreedomCommand {
         }
 
         if ("purge".equals(args[0])) {
-            playerMsg("Purged " + UUIDManager.purge() + " cached UUIDs.");
+            playerMsg(sender, "Purged " + UUIDManager.purge() + " cached UUIDs.");
             return true;
         }
 
         if ("recalculate".equals(args[0]))
         {
-            playerMsg("Recalculating UUIDs...");
+            playerMsg(sender, "Recalculating UUIDs...");
 
             // Playerlist uuids
             final Set<Player> players = PlayerList.getAllPlayers();
@@ -62,7 +61,7 @@ public class Command_uuid extends FreedomCommand {
                 }
             }
 
-            playerMsg("Recalculated " + updated + " player UUIDs");
+            playerMsg(sender, "Recalculated " + updated + " player UUIDs");
             names.clear();
 
             // Adminlist UUIDs
@@ -96,7 +95,7 @@ public class Command_uuid extends FreedomCommand {
                 }
             }
 
-            playerMsg("Recalculated " + updated + " admin UUIDs");
+            playerMsg(sender, "Recalculated " + updated + " admin UUIDs");
 
             return true;
         }
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_warn.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_warn.java
index 7a9438b..25d5680 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_warn.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_warn.java
@@ -10,7 +10,6 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, blockHostConsole = true)
-@CommandParameters(description = "Warns a player.", usage = "/<command> <player> <reason>")
 public class Command_warn extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
@@ -21,7 +20,7 @@ public class Command_warn extends FreedomCommand {
         Player player = getPlayer(args[0]);
 
         if (player == null) {
-            playerMsg(PLAYER_NOT_FOUND);
+            playerMsg(sender, PLAYER_NOT_FOUND);
             return true;
         }
 
@@ -29,21 +28,21 @@ public class Command_warn extends FreedomCommand {
         {
             if (player.equals(sender_p))
             {
-                playerMsg(ChatColor.RED + "Please, don't try to warn yourself.");
+                playerMsg(sender, ChatColor.RED + "Please, don't try to warn yourself.");
                 return true;
             }
         }
 
         if (AdminList.isSuperAdmin(player))
         {
-            playerMsg(ChatColor.RED + "You can not warn admins");
+            playerMsg(sender, ChatColor.RED + "You can not warn admins");
             return true;
         }
 
         String warnReason = StringUtils.join(ArrayUtils.subarray(args, 1, args.length), " ");
 
-        playerMsg(ChatColor.RED + "[WARNING] " + warnReason);
-        playerMsg(ChatColor.GREEN + "You have successfully warned " + player.getName());
+        playerMsg(sender, ChatColor.RED + "[WARNING] " + warnReason);
+        playerMsg(sender, ChatColor.GREEN + "You have successfully warned " + player.getName());
 
         PlayerData.getPlayerData(player).incrementWarnings();
 
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_whitelist.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_whitelist.java
index faa4867..1e23448 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_whitelist.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_whitelist.java
@@ -10,7 +10,6 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = AdminLevel.OP, source = SourceType.BOTH)
-@CommandParameters(description = "Manage the whitelist.", usage = "/<command> <on | off | list | count | add <player> | remove <player> | addall | purge>")
 public class Command_whitelist extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
@@ -20,7 +19,7 @@ public class Command_whitelist extends FreedomCommand {
 
         // list
         if (args[0].equalsIgnoreCase("list")) {
-            playerMsg("Whitelisted players: " + Utilities.playerListToNames(server.getWhitelistedPlayers()));
+            playerMsg(sender, "Whitelisted players: " + Utilities.playerListToNames(server.getWhitelistedPlayers()));
             return true;
         }
 
@@ -44,9 +43,9 @@ public class Command_whitelist extends FreedomCommand {
                 totalWPs++;
             }
 
-            playerMsg("Online whitelisted players: " + onlineWPs);
-            playerMsg("Offline whitelisted players: " + offlineWPs);
-            playerMsg("Total whitelisted players: " + totalWPs);
+            playerMsg(sender, "Online whitelisted players: " + onlineWPs);
+            playerMsg(sender, "Offline whitelisted players: " + offlineWPs);
+            playerMsg(sender, "Total whitelisted players: " + totalWPs);
 
             return true;
         }
@@ -121,7 +120,7 @@ public class Command_whitelist extends FreedomCommand {
             }
             else
             {
-                playerMsg("That player is not whitelisted");
+                playerMsg(sender, "That player is not whitelisted");
                 return true;
             }
 
@@ -141,7 +140,7 @@ public class Command_whitelist extends FreedomCommand {
                 }
             }
 
-            playerMsg("Whitelisted " + counter + " players.");
+            playerMsg(sender, "Whitelisted " + counter + " players.");
             return true;
         }
 
@@ -156,7 +155,7 @@ public class Command_whitelist extends FreedomCommand {
         if (args[0].equalsIgnoreCase("purge"))
         {
             Utilities.adminAction(sender.getName(), "Removing all players from the whitelist.", false);
-            playerMsg("Removed " + Server.purgeWhitelist() + " players from the whitelist.");
+            playerMsg(sender, "Removed " + Server.purgeWhitelist() + " players from the whitelist.");
 
             return true;
         }
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_whohas.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_whohas.java
index a9446a5..84e30d6 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_whohas.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_whohas.java
@@ -13,7 +13,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
-@CommandParameters(description = "See who has a block and optionally smite.", usage = "/<command> <item> [smite]", aliases = "wh")
 public class Command_whohas extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
@@ -38,7 +37,7 @@ public class Command_whohas extends FreedomCommand {
 
         if (material == null)
         {
-            playerMsg("Invalid block: " + materialName, ChatColor.RED);
+            playerMsg(sender, "Invalid block: " + materialName, ChatColor.RED);
             return true;
         }
 
@@ -58,11 +57,11 @@ public class Command_whohas extends FreedomCommand {
 
         if (players.isEmpty())
         {
-            playerMsg("There are no players with that item");
+            playerMsg(sender, "There are no players with that item");
         }
         else
         {
-            playerMsg("Players with item " + material.name() + ": " + StringUtils.join(players, ", "));
+            playerMsg(sender, "Players with item " + material.name() + ": " + StringUtils.join(players, ", "));
         }
 
         return true;
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_wildcard.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_wildcard.java
index 1b96157..7757e26 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_wildcard.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_wildcard.java
@@ -8,7 +8,6 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
-@CommandParameters(description = "Run any command on all users, username placeholder = ?.", usage = "/<command> [fluff] ? [fluff] ?")
 public class Command_wildcard extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
@@ -24,17 +23,17 @@ public class Command_wildcard extends FreedomCommand {
         }
         if (arguments.toLowerCase().contains("gtfo"))
         {
-            playerMsg("Nice try", ChatColor.RED);
+            playerMsg(sender, "Nice try", ChatColor.RED);
             return true;
         }
         if (arguments.toLowerCase().contains("doom"))
         {
-            playerMsg("Look, we all hate people, but this is not the way to deal with it, doom is evil enough!", ChatColor.RED);
+            playerMsg(sender, "Look, we all hate people, but this is not the way to deal with it, doom is evil enough!", ChatColor.RED);
             return true;
         }
         if (arguments.toLowerCase().contains("saconfig"))
         {
-            playerMsg("WOA, WTF are you trying to do???", ChatColor.RED);
+            playerMsg(sender, "WOA, WTF are you trying to do???", ChatColor.RED);
             return true;
         }
 
@@ -49,7 +48,7 @@ public class Command_wildcard extends FreedomCommand {
         for (Player player : server.getOnlinePlayers())
         {
             String out_command = baseCommand.replaceAll("\\x3f", player.getName());
-            playerMsg("Running Command: " + out_command);
+            playerMsg(sender, "Running Command: " + out_command);
             server.dispatchCommand(sender, out_command);
         }
 
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_wipeflatlands.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_wipeflatlands.java
index 380c968..c3892df 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_wipeflatlands.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_wipeflatlands.java
@@ -7,7 +7,6 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE, blockHostConsole = true)
-@CommandParameters(description = "Wipe the flatlands map. Requires manual restart after command is used.", usage = "/<command>")
 public class Command_wipeflatlands extends FreedomCommand {
     @Override
     public boolean run(final CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_wipeuserdata.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_wipeuserdata.java
index 0e90301..b5a36bb 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_wipeuserdata.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_wipeuserdata.java
@@ -7,12 +7,11 @@ import org.bukkit.command.CommandSender;
 import java.io.File;
 
 @CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE)
-@CommandParameters(description = "Removes essentials playerdata", usage = "/<command>")
 public class Command_wipeuserdata extends FreedomCommand {
     @Override
     public boolean run(CommandSender sender, org.bukkit.entity.Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
         if (!server.getPluginManager().isPluginEnabled("Essentials")) {
-            playerMsg("Essentials is not enabled on this server");
+            playerMsg(sender, "Essentials is not enabled on this server");
             return true;
         }
 
@@ -20,7 +19,7 @@ public class Command_wipeuserdata extends FreedomCommand {
 
         Utilities.deleteFolder(new File(server.getPluginManager().getPlugin("Essentials").getDataFolder(), "userdata"));
 
-        playerMsg("All playerdata deleted.");
+        playerMsg(sender, "All playerdata deleted.");
         return true;
     }
 }
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Commands.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Commands.java
new file mode 100644
index 0000000..858e754
--- /dev/null
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Commands.java
@@ -0,0 +1,110 @@
+package me.StevenLawson.TotalFreedomMod.commands;
+
+import org.bukkit.plugin.java.JavaPlugin;
+
+public class Commands {
+    public static void registerCommands(JavaPlugin plugin) {
+        plugin.getCommand("adminmode").setExecutor(new Command_adminmode());
+        plugin.getCommand("adminworld").setExecutor(new Command_adminworld());
+        plugin.getCommand("blockcmd").setExecutor(new Command_blockcmd());
+        plugin.getCommand("cage").setExecutor(new Command_cage());
+        plugin.getCommand("cake").setExecutor(new Command_cake());
+        plugin.getCommand("cartsit").setExecutor(new Command_cartsit());
+        plugin.getCommand("cbtool").setExecutor(new Command_cbtool());
+        plugin.getCommand("cmdlist").setExecutor(new Command_cmdlist());
+        plugin.getCommand("cmdspy").setExecutor(new Command_cmdspy());
+        plugin.getCommand("colorme").setExecutor(new Command_colorme());
+        plugin.getCommand("creative").setExecutor(new Command_creative());
+        plugin.getCommand("csay").setExecutor(new Command_csay());
+        plugin.getCommand("deafen").setExecutor(new Command_deafen());
+        plugin.getCommand("debug").setExecutor(new Command_debug());
+        plugin.getCommand("denick").setExecutor(new Command_denick());
+        plugin.getCommand("deop").setExecutor(new Command_deop());
+        plugin.getCommand("deopall").setExecutor(new Command_deopall());
+        plugin.getCommand("dispfill").setExecutor(new Command_dispfill());
+        plugin.getCommand("doom").setExecutor(new Command_doom());
+        plugin.getCommand("enchant").setExecutor(new Command_enchant());
+        plugin.getCommand("ender").setExecutor(new Command_ender());
+        plugin.getCommand("expel").setExecutor(new Command_expel());
+        plugin.getCommand("findip").setExecutor(new Command_findip());
+        plugin.getCommand("flatlands").setExecutor(new Command_flatlands());
+        plugin.getCommand("fr").setExecutor(new Command_fr());
+        plugin.getCommand("fuckoff").setExecutor(new Command_fuckoff());
+        plugin.getCommand("gadmin").setExecutor(new Command_gadmin());
+        plugin.getCommand("gcmd").setExecutor(new Command_gcmd());
+        plugin.getCommand("glist").setExecutor(new Command_glist());
+        plugin.getCommand("gtfo").setExecutor(new Command_gtfo());
+        plugin.getCommand("halt").setExecutor(new Command_halt());
+        plugin.getCommand("health").setExecutor(new Command_health());
+        plugin.getCommand("invis").setExecutor(new Command_invis());
+        plugin.getCommand("jumppads").setExecutor(new Command_jumppads());
+        plugin.getCommand("kicknoob").setExecutor(new Command_kicknoob());
+        plugin.getCommand("landmine").setExecutor(new Command_landmine());
+        plugin.getCommand("lastcmd").setExecutor(new Command_lastcmd());
+        plugin.getCommand("list").setExecutor(new Command_list());
+        plugin.getCommand("localspawn").setExecutor(new Command_localspawn());
+        plugin.getCommand("lockup").setExecutor(new Command_lockup());
+        plugin.getCommand("logs").setExecutor(new Command_logs());
+        plugin.getCommand("moblimiter").setExecutor(new Command_moblimiter());
+        plugin.getCommand("mp").setExecutor(new Command_mp());
+        plugin.getCommand("mp44").setExecutor(new Command_mp44());
+        plugin.getCommand("myadmin").setExecutor(new Command_myadmin());
+        plugin.getCommand("nether").setExecutor(new Command_nether());
+        plugin.getCommand("nf").setExecutor(new Command_nf());
+        plugin.getCommand("nickclean").setExecutor(new Command_nickclean());
+        plugin.getCommand("nicknyan").setExecutor(new Command_nicknyan());
+        plugin.getCommand("o").setExecutor(new Command_o());
+        plugin.getCommand("onlinemode").setExecutor(new Command_onlinemode());
+        plugin.getCommand("op").setExecutor(new Command_op());
+        plugin.getCommand("opall").setExecutor(new Command_opall());
+        plugin.getCommand("opme").setExecutor(new Command_opme());
+        plugin.getCommand("ops").setExecutor(new Command_ops());
+        plugin.getCommand("orbit").setExecutor(new Command_orbit());
+        plugin.getCommand("overlord").setExecutor(new Command_overlord());
+        plugin.getCommand("permban").setExecutor(new Command_permban());
+        plugin.getCommand("plugincontrol").setExecutor(new Command_plugincontrol());
+        plugin.getCommand("potion").setExecutor(new Command_potion());
+        plugin.getCommand("premium").setExecutor(new Command_premium());
+        plugin.getCommand("protectarea").setExecutor(new Command_protectarea());
+        plugin.getCommand("purgeall").setExecutor(new Command_purgeall());
+        plugin.getCommand("qdeop").setExecutor(new Command_qdeop());
+        plugin.getCommand("qop").setExecutor(new Command_qop());
+        plugin.getCommand("radar").setExecutor(new Command_radar());
+        plugin.getCommand("rank").setExecutor(new Command_rank());
+        plugin.getCommand("rawsay").setExecutor(new Command_rawsay());
+        plugin.getCommand("rd").setExecutor(new Command_rd());
+        plugin.getCommand("report").setExecutor(new Command_report());
+        plugin.getCommand("ro").setExecutor(new Command_ro());
+        plugin.getCommand("rollback").setExecutor(new Command_rollback());
+        plugin.getCommand("saconfig").setExecutor(new Command_saconfig());
+        plugin.getCommand("say").setExecutor(new Command_say());
+        plugin.getCommand("setl").setExecutor(new Command_setl());
+        plugin.getCommand("setlevel").setExecutor(new Command_setlevel());
+        plugin.getCommand("setlever").setExecutor(new Command_setlever());
+        plugin.getCommand("setspawnworld").setExecutor(new Command_setspawnworld());
+        plugin.getCommand("smite").setExecutor(new Command_smite());
+        plugin.getCommand("spectator").setExecutor(new Command_spectator());
+        plugin.getCommand("status").setExecutor(new Command_status());
+        plugin.getCommand("stfu").setExecutor(new Command_stfu());
+        plugin.getCommand("stop").setExecutor(new Command_stop());
+        plugin.getCommand("survival").setExecutor(new Command_survival());
+        plugin.getCommand("tag").setExecutor(new Command_tag());
+        plugin.getCommand("tagnyan").setExecutor(new Command_tagnyan());
+        plugin.getCommand("tban").setExecutor(new Command_tban());
+        plugin.getCommand("tempban").setExecutor(new Command_tempban());
+        plugin.getCommand("tfbanlist").setExecutor(new Command_tfbanlist());
+        plugin.getCommand("tfipbanlist").setExecutor(new Command_tfipbanlist());
+        plugin.getCommand("tfm").setExecutor(new Command_tfm());
+        plugin.getCommand("toggle").setExecutor(new Command_toggle());
+        plugin.getCommand("tossmob").setExecutor(new Command_tossmob());
+        plugin.getCommand("trail").setExecutor(new Command_trail());
+        plugin.getCommand("updatetfm").setExecutor(new Command_updatetfm());
+        plugin.getCommand("uuid").setExecutor(new Command_uuid());
+        plugin.getCommand("warn").setExecutor(new Command_warn());
+        plugin.getCommand("whitelist").setExecutor(new Command_whitelist());
+        plugin.getCommand("whohas").setExecutor(new Command_whohas());
+        plugin.getCommand("wildcard").setExecutor(new Command_wildcard());
+        plugin.getCommand("wipeflatlands").setExecutor(new Command_wipeflatlands());
+        plugin.getCommand("wipeuserdata").setExecutor(new Command_wipeuserdata());
+    }
+}
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/FreedomCommand.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/FreedomCommand.java
index dd5edd0..1a5644e 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/FreedomCommand.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/FreedomCommand.java
@@ -5,38 +5,66 @@ import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
 import me.StevenLawson.TotalFreedomMod.admin.AdminList;
 import me.StevenLawson.TotalFreedomMod.player.PlayerData;
 import me.StevenLawson.TotalFreedomMod.util.Utilities;
+import org.apache.commons.lang3.StringUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.Server;
 import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 import java.util.Collection;
 
-public abstract class FreedomCommand {
+public abstract class FreedomCommand implements CommandExecutor {
     public static final String MSG_NO_PERMS = ChatColor.YELLOW + "You do not have permission to use this command.";
     public static final String YOU_ARE_OP = ChatColor.YELLOW + "You are now op!";
     public static final String YOU_ARE_NOT_OP = ChatColor.YELLOW + "You are no longer op!";
     public static final String NOT_FROM_CONSOLE = "This command may not be used from the console.";
     public static final String PLAYER_NOT_FOUND = ChatColor.GRAY + "Player not found!";
-    protected TotalFreedomMod plugin;
-    protected Server server;
-    private CommandSender commandSender;
-    private Class<?> commandClass;
+    protected TotalFreedomMod plugin = TotalFreedomMod.plugin;
+    protected Server server = plugin.getServer();
 
     public FreedomCommand() {
     }
 
-    abstract public boolean run(final CommandSender sender, final org.bukkit.entity.Player sender_p, final Command cmd, final String commandLabel, final String[] args, final boolean senderIsConsole);
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        final Player playerSender;
+        final boolean senderIsConsole;
 
-    public void setup(final TotalFreedomMod plugin, final CommandSender commandSender, final Class<?> commandClass)
-    {
-        this.plugin = plugin;
-        this.server = plugin.getServer();
-        this.commandSender = commandSender;
-        this.commandClass = commandClass;
+        if (sender instanceof Player) {
+            senderIsConsole = false;
+            playerSender = (Player) sender;
+
+            Log.info(String.format("[PLAYER_COMMAND] %s (%s): /%s %s",
+                    playerSender.getName(),
+                    ChatColor.stripColor(playerSender.getDisplayName()),
+                    label,
+                    StringUtils.join(args, " ")), true);
+        }
+        else
+        {
+            senderIsConsole = true;
+            playerSender = null;
+
+            Log.info(String.format("[CONSOLE_COMMAND] %s: /%s %s",
+                    sender.getName(),
+                    label,
+                    StringUtils.join(args, " ")), true);
+        }
+
+
+        if (!senderHasPermission(sender))
+        {
+            sender.sendMessage(FreedomCommand.MSG_NO_PERMS);
+            return true;
+        }
+
+        return run(sender, playerSender, command, label, args, senderIsConsole);
     }
 
+    abstract public boolean run(final CommandSender sender, final org.bukkit.entity.Player sender_p, final Command cmd, final String commandLabel, final String[] args, final boolean senderIsConsole);
+
     public void playerMsg(final CommandSender sender, final String message, final ChatColor color)
     {
         if (sender == null)
@@ -46,44 +74,44 @@ public abstract class FreedomCommand {
         sender.sendMessage(color + message);
     }
 
-    public void playerMsg(final String message, final ChatColor color)
-    {
-        playerMsg(commandSender, message, color);
-    }
-
     public void playerMsg(final CommandSender sender, final String message)
     {
         playerMsg(sender, message, ChatColor.GRAY);
     }
 
-    public void playerMsg(final String message)
+    public void playerMsg(final String message, final ChatColor color)
     {
-        playerMsg(commandSender, message);
+        // NOP
     }
 
-    public boolean senderHasPermission()
+    public void playerMsg(final String message)
     {
-        final CommandPermissions permissions = commandClass.getAnnotation(CommandPermissions.class);
+        // NOP
+    }
+
+    public boolean senderHasPermission(CommandSender sender)
+    {
+        final CommandPermissions permissions = this.getClass().getAnnotation(CommandPermissions.class);
 
         if (permissions == null)
         {
-            Log.warning(commandClass.getName() + " is missing permissions annotation.");
+            Log.warning(this.getClass().getName() + " is missing permissions annotation.");
             return true;
         }
 
-        boolean isSuper = AdminList.isSuperAdmin(commandSender);
+        boolean isSuper = AdminList.isSuperAdmin(sender);
         boolean isSenior = false;
 
         if (isSuper)
         {
-            isSenior = AdminList.isSeniorAdmin(commandSender);
+            isSenior = AdminList.isSeniorAdmin(sender);
         }
 
         final AdminLevel level = permissions.level();
         final SourceType source = permissions.source();
         final boolean blockHostConsole = permissions.blockHostConsole();
 
-        if (!(commandSender instanceof Player))
+        if (!(sender instanceof Player))
         {
             if (source == SourceType.ONLY_IN_GAME)
             {
@@ -94,7 +122,7 @@ public abstract class FreedomCommand {
                 return false;
             }
 
-            if (blockHostConsole && Utilities.isFromHostConsole(commandSender.getName()))
+            if (blockHostConsole && Utilities.isFromHostConsole(sender.getName()))
             {
                 return false;
             }
@@ -102,7 +130,7 @@ public abstract class FreedomCommand {
             return true;
         }
 
-        final Player senderPlayer = (Player) commandSender;
+        final Player senderPlayer = (Player) sender;
 
         if (source == SourceType.ONLY_CONSOLE)
         {
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/httpd/HTTPDHelpModule.java b/src/main/java/me/StevenLawson/TotalFreedomMod/httpd/HTTPDHelpModule.java
index 5f20f97..74721c5 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/httpd/HTTPDHelpModule.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/httpd/HTTPDHelpModule.java
@@ -1,8 +1,8 @@
 package me.StevenLawson.TotalFreedomMod.httpd;
 
-import me.StevenLawson.TotalFreedomMod.commands.AdminLevel;
-import me.StevenLawson.TotalFreedomMod.commands.CommandLoader;
+import me.StevenLawson.TotalFreedomMod.util.Utilities;
 import org.apache.commons.lang3.StringUtils;
+import org.bukkit.Bukkit;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandMap;
 import org.bukkit.command.PluginIdentifiableCommand;
@@ -22,10 +22,10 @@ public class HTTPDHelpModule extends HTTPDModule {
     public String getBody() {
         StringBuilder responseBody = new StringBuilder();
 
-        CommandMap commandMap;
+        CommandMap commandMap = Utilities.getField(Bukkit.getServer().getPluginManager(), "commandMap");
         HashMap<String, Command> knownCommands;
-        if ((commandMap = CommandLoader.getCommandMap()) == null
-                || (knownCommands = CommandLoader.getKnownCommands(commandMap)) == null) {
+        if (commandMap == null
+                || (knownCommands = Utilities.getField(commandMap, "knownCommands")) == null) {
             return paragraph("Error loading commands.");
         }
 
@@ -66,34 +66,12 @@ public class HTTPDHelpModule extends HTTPDModule {
             final String pluginName = entry.getKey();
             final List<Command> commands = entry.getValue();
 
-            Collections.sort(commands, new Comparator<Command>()
-            {
-                @Override
-                public int compare(Command a, Command b)
-                {
-                    if (a instanceof CommandLoader.TFM_DynamicCommand && b instanceof CommandLoader.TFM_DynamicCommand) {
-                        String aName = ((CommandLoader.TFM_DynamicCommand) a).getCommandInfo().getLevel().name() + a.getName();
-                        String bName = ((CommandLoader.TFM_DynamicCommand) b).getCommandInfo().getLevel().name() + b.getName();
-                        return aName.compareTo(bName);
-                    }
-                    return a.getName().compareTo(b.getName());
-                }
-            });
+            Collections.sort(commands, Comparator.comparing(Command::getName));
 
             responseBody.append(heading(pluginName, 2)).append("<ul>\r\n");
 
-            AdminLevel lastTfmCommandLevel = null;
             for (Command command : commands)
             {
-                if ("TotalFreedomMod".equals(pluginName))
-                {
-                    AdminLevel tfmCommandLevel = ((CommandLoader.TFM_DynamicCommand) command).getCommandInfo().getLevel();
-                    if (lastTfmCommandLevel == null || lastTfmCommandLevel != tfmCommandLevel)
-                    {
-                        responseBody.append("</ul>\r\n").append(heading(tfmCommandLevel.getFriendlyName(), 3)).append("<ul>\r\n");
-                    }
-                    lastTfmCommandLevel = tfmCommandLevel;
-                }
                 responseBody.append(buildDescription(command));
             }
 
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 487e49c..0a1245d 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -3,6 +3,331 @@ main: me.StevenLawson.TotalFreedomMod.TotalFreedomMod
 version: 4.3
 description: Plugin for the Total Freedom server.
 softdepend: [BukkitTelnet, WorldEdit, Essentials]
-authors: [Madgeek1450, Prozza, business-goose]
+authors: [Madgeek1450, Prozza, business-goose, Luna]
 
-# plugin.yml is no longer used to define commands.
+commands:
+  setl:
+    description: 'Sets everyone''s Worldedit block modification limit to 500.'
+    usage: '/<command>'
+  radar:
+    description: 'Shows nearby people sorted by distance.'
+    usage: '/<command> [range]'
+  tfm:
+    description: 'Shows information about TotalFreedomMod or reloads it'
+    usage: '/<command> [reload]'
+  mp:
+    description: 'Purge all mobs in all worlds.'
+    usage: '/<command>'
+  jumppads:
+    description: 'Manage jumppads'
+    usage: '/<command> <on | off | info | sideways <on | off> | strength <strength (1-10)>>'
+    aliases: [launchpads, jp]
+  qop:
+    description: 'Quick Op - op someone based on a partial name.'
+    usage: '/<command> <partialname>'
+  doom:
+    description: 'For the bad Super Admins'
+    usage: '/<command> <playername>'
+  fuckoff:
+    description: 'You''ll never even see it coming.'
+    usage: '/<command>'
+  wipeuserdata:
+    description: 'Removes essentials playerdata'
+    usage: '/<command>'
+  wildcard:
+    description: 'Run any command on all users, username placeholder = ?.'
+    usage: '/<command> [fluff] ? [fluff] ?'
+  nf:
+    description: 'NickFilter: Prefix any command with this command to replace nicknames in that command with real names. Nicknames should be prefixed with a !.'
+    usage: '/<command> <other_command> !<playernick>'
+  landmine:
+    description: 'Set a landmine trap.'
+    usage: '/<command>'
+  moblimiter:
+    description: 'Control mob rezzing parameters.'
+    usage: '/<command> <on|off|setmax <count>|dragon|giant|ghast|slime>'
+  flatlands:
+    description: 'Goto the flatlands.'
+    usage: '/<command>'
+  findip:
+    description: 'Shows all IPs registered to a player'
+    usage: '/<command> <player>'
+  cage:
+    description: 'Place a cage around someone.'
+    usage: '/<command> <purge | off | <partialname> [outermaterial] [innermaterial]>'
+  expel:
+    description: 'Push people away from you.'
+    usage: '/<command> [radius] [strength]'
+  list:
+    description: 'Lists the real names of all online players.'
+    usage: '/<command> [-a | -i]'
+    aliases: 'who'
+  invis:
+    description: 'Shows (optionally smites) invisisible players'
+    usage: '/<command> (smite)'
+  onlinemode:
+    description: 'Switch server online-mode on and off.'
+    usage: '/<command> <on | off>'
+  gcmd:
+    description: 'Send a command as someone else.'
+    usage: '/<command> <fromname> <outcommand>'
+  spectator:
+    description: 'Quickly change your own gamemode to spectator, or define someone''s username to change theirs.'
+    usage: '/<command> [partialname]'
+    aliases: 'gmsp'
+  potion:
+    description: 'Manipulate potion effects. Duration is measured in server ticks (~20 ticks per second).'
+    usage: '/<command> <list | clear [target name] | add <type> <duration> <amplifier> [target name]>'
+  deop:
+    description: 'Deop a player.'
+    usage: '/<command> <playername>'
+  nicknyan:
+    description: 'Essentials Interface Command - Nyanify your nickname.'
+    usage: '/<command> <<nick> | off>'
+  rank:
+    description: 'Shows your rank.'
+    usage: '/<command>'
+  nether:
+    description: 'Goto the nether.'
+    usage: '/<command>'
+  ops:
+    description: 'Manager operators'
+    usage: '/<command> <count | purge>'
+  setlevel:
+    description: 'Sets your expierence level.'
+    usage: '/<command> [level]'
+  trail:
+    description: 'Pretty rainbow trails.'
+    usage: '/<command> [off]'
+  opme:
+    description: 'Automatically ops user.'
+    usage: '/<command>'
+  adminworld:
+    description: 'Go to the AdminWorld.'
+    usage: '/<command> [guest < list | purge | add <player> | remove <player> > | time <morning | noon | evening | night> | weather <off | on | storm>]'
+  health:
+    description: 'View ticks-per-second'
+    usage: '/<command>'
+  plugincontrol:
+    description: 'Manage plugins'
+    usage: '/<command> <<enable | disable | reload> <pluginname>> | list>'
+    aliases: 'plc'
+  deafen:
+    description: 'Make some noise.'
+    usage: '/<command>'
+  tossmob:
+    description: 'Throw a mob in the direction you are facing when you left click with a stick.'
+    usage: '/<command> <mobtype [speed] | off | list>'
+  cmdspy:
+    description: 'Spy on commands'
+    usage: '/<command>'
+    aliases: 'commandspy'
+  tempban:
+    description: 'Temporarily ban someone.'
+    usage: '/<command> [playername] [duration] [reason]'
+  glist:
+    description: 'Ban/Unban any player, even those who are not logged in anymore.'
+    usage: '/<command> <purge | <ban | unban> <username>>'
+  gtfo:
+    description: 'Makes someone GTFO (deop and ip ban by username).'
+    usage: '/<command> <partialname>'
+  rd:
+    description: 'Remove various server entities that may cause lag, such as dropped items, minecarts, and boats.'
+    usage: '/<command> <carts>'
+  setlever:
+    description: 'Set the on/off state of the lever at position x, y, z in world ''worldname''.'
+    usage: '/<command> <x> <y> <z> <worldname> <on|off>'
+  localspawn:
+    description: 'Teleport to the spawn point for the current world.'
+    usage: '/<command>'
+    aliases: [worldspawn, gotospawn]
+  tag:
+    description: 'Sets yourself a prefix'
+    usage: '/<command> <set <tag..> | off | clear <player> | clearall>'
+  ender:
+    description: 'Goto the ender / \'
+    usage: '/<command>'
+  purgeall:
+    description: 'Superadmin command - Purge everything! (except for bans).'
+    usage: '/<command>'
+  colorme:
+    description: 'Essentials Interface Command - Color your current nickname.'
+    usage: '/<command> <color>'
+  setspawnworld:
+    description: 'Set world spawnpoint.'
+    usage: '/<command>'
+  warn:
+    description: 'Warns a player.'
+    usage: '/<command> <player> <reason>'
+  report:
+    description: 'Report a player for admins to see.'
+    usage: '/<command> <player> <reason>'
+  toggle:
+    description: 'Toggles TotalFreedomMod settings'
+    usage: '/<command> [option] [value] [value]'
+  o:
+    description: 'AdminChat - Talk privately with other admins. Using <command> itself will toggle AdminChat on and off for all messages.'
+    usage: '/<command> [message...]'
+    aliases: 'adminchat'
+  creative:
+    description: 'Quickly change your own gamemode to creative, or define someone''s username to change theirs.'
+    usage: '/<command> [partialname]'
+    aliases: 'gmc'
+  rawsay:
+    description: 'Broadcasts the given message. Supports colors.'
+    usage: '/<command> <message>'
+  overlord:
+    description: 'Overlord - control this server in-game'
+    usage: 'access'
+    aliases: 'ov'
+  uuid:
+    description: 'Provides uuid tools'
+    usage: '/<command> <purge | recalculate>'
+  logs:
+    description: 'Register your connection with the TFM logviewer.'
+    usage: '/<command> [off]'
+  smite:
+    description: 'Someone being a little bitch? Smite them down...'
+    usage: '/<command> [playername]'
+  cartsit:
+    description: 'Sit in nearest minecart. If target is in a minecart already, they will disembark.'
+    usage: '/<command> [partialname]'
+  debug:
+    description: 'For developers only - debug things via reflection.'
+    usage: '/<command>'
+  stop:
+    description: 'Kicks everyone and stops the server.'
+    usage: '/<command>'
+  whitelist:
+    description: 'Manage the whitelist.'
+    usage: '/<command> <on | off | list | count | add <player> | remove <player> | addall | purge>'
+  tban:
+    description: 'Temporarily bans a player for five minutes.'
+    usage: '/<command> <partialname>'
+    aliases: 'noob'
+  deopall:
+    description: 'Deop everyone on the server.'
+    usage: '/<command>'
+  saconfig:
+    description: 'Manage superadmins.'
+    usage: '/<command> <list | clean | clearme [ip] | <add | delete | info> <username>>'
+  say:
+    description: 'Broadcasts the given message as the console, includes sender name.'
+    usage: '/<command> <message>'
+  halt:
+    description: 'Halts a player'
+    usage: '/<command> <<partialname> | all | purge | list>'
+  protectarea:
+    description: 'Protect areas so that only superadmins can directly modify blocks in those areas. WorldEdit and other such plugins might bypass this.'
+    usage: '/<command> <list | clear | remove <label> | add <label> <radius>>'
+  cbtool:
+    description: 'No Description Yet'
+    usage: '/<command>'
+  survival:
+    description: 'Quickly change your own gamemode to survival, or define someone''s username to change theirs.'
+    usage: '/<command> <[partialname] | -a>'
+    aliases: 'gms'
+  dispfill:
+    description: 'Fill nearby dispensers with a set of items of your choice.'
+    usage: '/<command> <radius> <comma,separated,items>'
+  blockcmd:
+    description: 'Block all commands for a specific player.'
+    usage: '/<command> <purge | <partialname>>'
+    aliases: [blockcommands, blockcommand]
+  tfbanlist:
+    description: 'Shows all banned player names. Superadmins may optionally use ''purge'' to clear the list.'
+    usage: '/<command> [purge]'
+  adminmode:
+    description: 'Close server to non-superadmins.'
+    usage: '/<command> [on | off]'
+  status:
+    description: 'Show misc. server info.'
+    usage: '/<command>'
+  fr:
+    description: 'Freeze players (toggles on and off).'
+    usage: '/<command> [target | purge]'
+  lastcmd:
+    description: 'Show the last command that someone used.'
+    usage: '/<command> <player>'
+  qdeop:
+    description: 'Quick De-Op - deop someone based on a partial name.'
+    usage: '/<command> <partialname>'
+  enchant:
+    description: 'Enchant items.'
+    usage: '/<command> <list | addall | reset | add <name> | remove <name>>'
+  wipeflatlands:
+    description: 'Wipe the flatlands map. Requires manual restart after command is used.'
+    usage: '/<command>'
+  csay:
+    description: 'Telnet command - Send a chat message with chat formatting over telnet.'
+    usage: '/<command> <message...>'
+  gadmin:
+    description: 'Use admin commands on someone by hash. Use mode  ''list'' to get a player''s hash. Other modes are kick, nameban, ipban, ban, op, deop, ci, fr, smite.'
+    usage: '/<command> [list | [<kick | nameban | ipban | ban | op | deop | ci | fr | smite> <targethash>] ]'
+  tfipbanlist:
+    description: 'Shows all banned IPs. Superadmins may optionally use ''purge'' to clear the list.'
+    usage: '/<command> [purge]'
+  cmdlist:
+    description: 'Show all commands for all server plugins.'
+    usage: '/<command>'
+  cake:
+    description: 'For the people that are still alive.'
+    usage: '/<command>'
+  updatetfm:
+    description: 'For developers only - update TFM.'
+    usage: '/<command>'
+    aliases: [tfmupdate, update, compiletfm, tfmcompile, build, buildtfm, tfmbuild]
+  lockup:
+    description: 'Block target''s minecraft input. This is evil, and I never should have wrote it.'
+    usage: '/<command> <all | purge | <<partialname> on | off>>'
+  op:
+    description: 'Makes a player operator'
+    usage: '/<command> <playername>'
+  stfu:
+    description: 'Mutes a player with brute force.'
+    usage: '/<command> [<player> [-s] | list | purge | all]'
+    aliases: 'mute'
+  rollback:
+    description: 'Issues a rollback on a player'
+    usage: '/<command> <[partialname] | undo [partialname] purge [partialname] | purgeall>'
+    aliases: 'rb'
+  nickclean:
+    description: 'Essentials Interface Command - Remove distracting things from nicknames of all players on server.'
+    usage: '/<command>'
+    aliases: 'nc'
+  kicknoob:
+    description: 'Kick all non-superadmins on server.'
+    usage: '/<command>'
+  permban:
+    description: 'Manage permanently banned players and IPs.'
+    usage: '/<command> <list | reload>'
+  ro:
+    description: 'Remove all blocks of a certain type in the radius of certain players.'
+    usage: '/<command> <block> [radius (default=50)] [player]'
+  opall:
+    description: 'Op everyone on the server, optionally change everyone''s gamemode at the same time.'
+    usage: '/<command> [-c | -s]'
+  mp44:
+    description: 'Modern weaponry, FTW. Use ''draw'' to start firing, ''sling'' to stop firing.'
+    usage: '/<command> <draw | sling>'
+  orbit:
+    description: 'POW!!! Right in the kisser! One of these days Alice, straight to the Moon!'
+    usage: '/<command> <target> [<<power> | stop>]'
+  denick:
+    description: 'Essentials Interface Command - Remove the nickname of all players on the server.'
+    usage: '/<command>'
+  premium:
+    description: 'Validates if a given account is premium.'
+    usage: '/<command> <player>'
+    aliases: 'prem'
+  whohas:
+    description: 'See who has a block and optionally smite.'
+    usage: '/<command> <item> [smite]'
+    aliases: 'wh'
+  tagnyan:
+    description: 'Gives you a tag with random colors'
+    usage: '/<command> <tag>'
+    aliases: 'tn'
+  myadmin:
+    description: 'Manages your admin login message and other utilities.'
+    usage: '/<command> <clearloginmsg | setlogin <message>>'