diff --git a/appinfo.properties b/appinfo.properties
index d29b336a..189d3b97 100644
--- a/appinfo.properties
+++ b/appinfo.properties
@@ -1,5 +1,5 @@
-#Tue, 19 Mar 2013 11:50:18 +0100
+#Tue, 19 Mar 2013 18:03:45 -0400
 
 program.VERSION=2.11
-program.BUILDNUM=95
-program.BUILDDATE=03/19/2013 11\:50 AM
+program.BUILDNUM=96
+program.BUILDDATE=03/19/2013 06\:03 PM
diff --git a/buildnumber.properties b/buildnumber.properties
index f4bb9e0f..cebf671b 100644
--- a/buildnumber.properties
+++ b/buildnumber.properties
@@ -1,3 +1,3 @@
 #Build Number for ANT. Do not edit!
-#Tue Mar 19 11:50:18 CET 2013
-build.number=95
+#Tue Mar 19 18:03:45 EDT 2013
+build.number=97
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/CommandPermissions.java b/src/me/StevenLawson/TotalFreedomMod/Commands/CommandPermissions.java
index f36fba92..df50fea9 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/CommandPermissions.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/CommandPermissions.java
@@ -11,7 +11,4 @@ public @interface CommandPermissions
     SourceType source();
 
     boolean block_host_console() default false;
-
-    boolean ignore_permissions() default false; // O_o
-
 }
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_adminmode.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_adminmode.java
index c79704c2..aee25a97 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_adminmode.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_adminmode.java
@@ -7,7 +7,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.ONLY_CONSOLE, block_host_console = true, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.ONLY_CONSOLE, block_host_console = true)
 public class Command_adminmode extends TFM_Command
 {
     @Override
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_blockcmd.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_blockcmd.java
index b25ac317..f43f50e6 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_blockcmd.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_blockcmd.java
@@ -7,7 +7,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
 public class Command_blockcmd extends TFM_Command
 {
     @Override
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_blockcommand.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_blockcommand.java
index e4826039..0fe03408 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_blockcommand.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_blockcommand.java
@@ -6,7 +6,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
 public class Command_blockcommand extends TFM_Command
 {
     @Override
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_cage.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_cage.java
index 046787d5..73967377 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_cage.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_cage.java
@@ -9,7 +9,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
 public class Command_cage extends TFM_Command
 {
     @Override
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_cake.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_cake.java
index 1a18c4a3..a33ffea8 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_cake.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_cake.java
@@ -10,7 +10,7 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
-@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
 public class Command_cake extends TFM_Command
 {
     @Override
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_cartsit.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_cartsit.java
index ed69c6c9..5e6e8bfc 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_cartsit.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_cartsit.java
@@ -6,7 +6,7 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Minecart;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.ALL, source = SourceType.BOTH, ignore_permissions = true)
+@CommandPermissions(level = AdminLevel.ALL, source = SourceType.BOTH)
 public class Command_cartsit extends TFM_Command
 {
     @Override
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_clearall.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_clearall.java
index 42f76740..a65d7b84 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_clearall.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_clearall.java
@@ -4,7 +4,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
 public class Command_clearall extends TFM_Command
 {
     @Override
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_cmdlist.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_cmdlist.java
index c1e2113d..5fc42df8 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_cmdlist.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_cmdlist.java
@@ -12,14 +12,14 @@ import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.PluginDescriptionFile;
 
-@CommandPermissions(level = AdminLevel.ALL, source = SourceType.BOTH, ignore_permissions = true)
+@CommandPermissions(level = AdminLevel.ALL, source = SourceType.BOTH)
 public class Command_cmdlist extends TFM_Command
 {
     @Override
     public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
     {
         List<String> commands = new ArrayList<String>();
-        
+
         for (Plugin p : server.getPluginManager().getPlugins())
         {
             try
@@ -40,9 +40,9 @@ public class Command_cmdlist extends TFM_Command
             {
             }
         }
-        
+
         Collections.sort(commands);
-        
+
         sender.sendMessage(StringUtils.join(commands, ","));
 
         return true;
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_cmdspy.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_cmdspy.java
index 0a993049..ae74eba4 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_cmdspy.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_cmdspy.java
@@ -5,8 +5,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-
-@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.ONLY_IN_GAME, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.ONLY_IN_GAME)
 public class Command_cmdspy extends TFM_Command
 {
     @Override
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_cookie.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_cookie.java
index 259c9d58..57d1460a 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_cookie.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_cookie.java
@@ -10,7 +10,7 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
-@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
 public class Command_cookie extends TFM_Command
 {
     @Override
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_creative.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_creative.java
index 56866eec..df4fc0c8 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_creative.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_creative.java
@@ -6,7 +6,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.OP, source = SourceType.BOTH, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.OP, source = SourceType.BOTH)
 public class Command_creative extends TFM_Command
 {
     @Override
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_csay.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_csay.java
index a95f64c9..c9f0d478 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_csay.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_csay.java
@@ -6,7 +6,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.ONLY_CONSOLE, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.ONLY_CONSOLE)
 public class Command_csay extends TFM_Command
 {
     @Override
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_deafen.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_deafen.java
index 0ded5983..8d54982a 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_deafen.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_deafen.java
@@ -7,7 +7,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.BOTH, block_host_console = true, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.BOTH, block_host_console = true)
 public class Command_deafen extends TFM_Command
 {
     private static final Random random = new Random();
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_deop.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_deop.java
index b070f53f..c7a740c1 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_deop.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_deop.java
@@ -6,7 +6,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
 public class Command_deop extends TFM_Command
 {
     @Override
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_deopall.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_deopall.java
index fa20623c..cd957a02 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_deopall.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_deopall.java
@@ -6,7 +6,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
 public class Command_deopall extends TFM_Command
 {
     @Override
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_dispfill.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_dispfill.java
index e5a0e194..b92add1d 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_dispfill.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_dispfill.java
@@ -14,7 +14,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
 
-@CommandPermissions(level = AdminLevel.OP, source = SourceType.ONLY_IN_GAME, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.OP, source = SourceType.ONLY_IN_GAME)
 public class Command_dispfill extends TFM_Command
 {
     @Override
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_doom.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_doom.java
index 8ae001d8..16124a51 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_doom.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_doom.java
@@ -9,7 +9,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE)
 public class Command_doom extends TFM_Command
 {
     @Override
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_enchant.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_enchant.java
index 9a165519..6b4d83df 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_enchant.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_enchant.java
@@ -6,7 +6,7 @@ import org.bukkit.enchantments.Enchantment;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
-@CommandPermissions(level = AdminLevel.OP, source = SourceType.ONLY_IN_GAME, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.OP, source = SourceType.ONLY_IN_GAME)
 public class Command_enchant extends TFM_Command
 {
     @Override
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_ender.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_ender.java
index 8bdda743..ec128c08 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_ender.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_ender.java
@@ -5,7 +5,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.ALL, source = SourceType.BOTH, ignore_permissions = true)
+@CommandPermissions(level = AdminLevel.ALL, source = SourceType.BOTH)
 public class Command_ender extends TFM_Command
 {
     @Override
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_expel.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_expel.java
index b588b4c1..a692ac9f 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_expel.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_expel.java
@@ -5,7 +5,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.ONLY_IN_GAME, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.ONLY_IN_GAME)
 public class Command_expel extends TFM_Command
 {
     @Override
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_explosives.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_explosives.java
index 0636e088..bf04d1ee 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_explosives.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_explosives.java
@@ -6,7 +6,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
 public class Command_explosives extends TFM_Command
 {
     @Override
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_fireplace.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_fireplace.java
index cd22e003..9ec7a7c6 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_fireplace.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_fireplace.java
@@ -5,7 +5,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
 public class Command_fireplace extends TFM_Command
 {
     @Override
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_firespread.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_firespread.java
index de5529c9..15485e7e 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_firespread.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_firespread.java
@@ -5,7 +5,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
 public class Command_firespread extends TFM_Command
 {
     @Override
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_flatlands.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_flatlands.java
index 18ec9875..2c193954 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_flatlands.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_flatlands.java
@@ -6,7 +6,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.ALL, source = SourceType.BOTH, ignore_permissions = true)
+@CommandPermissions(level = AdminLevel.ALL, source = SourceType.BOTH)
 public class Command_flatlands extends TFM_Command
 {
     @Override
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_fluidspread.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_fluidspread.java
index 13e125e5..2d362a44 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_fluidspread.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_fluidspread.java
@@ -5,7 +5,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
 public class Command_fluidspread extends TFM_Command
 {
     @Override
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_fr.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_fr.java
index 7bf0ac31..c173cf2b 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_fr.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_fr.java
@@ -9,7 +9,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
 public class Command_fr extends TFM_Command
 {
     @Override
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_fuckoff.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_fuckoff.java
index acd2997b..b8f077eb 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_fuckoff.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_fuckoff.java
@@ -5,7 +5,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_IN_GAME, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_IN_GAME)
 public class Command_fuckoff extends TFM_Command
 {
     @Override
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_gadmin.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_gadmin.java
index ec8c7e88..184c1be2 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_gadmin.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_gadmin.java
@@ -9,7 +9,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
 public class Command_gadmin extends TFM_Command
 {
     @Override
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_gcmd.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_gcmd.java
index a9a5aa5c..fd030e72 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_gcmd.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_gcmd.java
@@ -5,7 +5,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
 public class Command_gcmd extends TFM_Command
 {
     @Override
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_glist.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_glist.java
index 6e676a39..1d5fa3b4 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_glist.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_glist.java
@@ -12,7 +12,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
 public class Command_glist extends TFM_Command
 {
     @Override
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_gtfo.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_gtfo.java
index 914f6de8..d05da387 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_gtfo.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_gtfo.java
@@ -9,7 +9,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
 public class Command_gtfo extends TFM_Command
 {
     @Override
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_halt.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_halt.java
index d294faab..e64d6ba7 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_halt.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_halt.java
@@ -9,7 +9,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
 public class Command_halt extends TFM_Command
 {
     @Override
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_health.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_health.java
index e747fb9a..5249106d 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_health.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_health.java
@@ -9,8 +9,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-
-@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
 public class Command_health extends TFM_Command
 {
     @Override
@@ -36,14 +35,14 @@ public class Command_health extends TFM_Command
                     float usedMem = runtime.totalMemory() - runtime.freeMemory();
 
                     playerMsg("Reserved Memory: " + runtime.totalMemory() / mb + "mb");
-                    playerMsg("Used Memory: " + new DecimalFormat("#").format(usedMem / mb)  + "mb (" + new DecimalFormat("#").format(usedMem/runtime.totalMemory()*100) + "%)");
+                    playerMsg("Used Memory: " + new DecimalFormat("#").format(usedMem / mb) + "mb (" + new DecimalFormat("#").format(usedMem / runtime.totalMemory() * 100) + "%)");
                     playerMsg("Max Memory: " + runtime.maxMemory() / mb + "mb");
                     playerMsg("Ticks per second: " + (meter.getTicks() == 20 ? ChatColor.GREEN : ChatColor.RED) + meter.getTicks());
                 }
                 catch (Exception iex)
                 {
-                   TFM_Log.warning("Exception in TFM_TickMeter: Thread was interupted in sleeping process.");
-                   TFM_Log.warning(ExceptionUtils.getStackTrace(iex));
+                    TFM_Log.warning("Exception in TFM_TickMeter: Thread was interupted in sleeping process.");
+                    TFM_Log.warning(ExceptionUtils.getStackTrace(iex));
                 }
             }
         };
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_kicknoob.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_kicknoob.java
index 2b622ee1..9d362186 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_kicknoob.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_kicknoob.java
@@ -7,7 +7,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.BOTH, block_host_console = true, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.BOTH, block_host_console = true)
 public class Command_kicknoob extends TFM_Command
 {
     @Override
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_landmine.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_landmine.java
index 044437b9..f7eb966c 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_landmine.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_landmine.java
@@ -10,7 +10,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.OP, source = SourceType.ONLY_IN_GAME, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.OP, source = SourceType.ONLY_IN_GAME)
 public class Command_landmine extends TFM_Command
 {
     @Override
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_lastcmd.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_lastcmd.java
index ba21a62a..3f551011 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_lastcmd.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_lastcmd.java
@@ -7,7 +7,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
 public class Command_lastcmd extends TFM_Command
 {
     @Override
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_lavadmg.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_lavadmg.java
index 0933745a..0e030205 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_lavadmg.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_lavadmg.java
@@ -5,7 +5,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
 public class Command_lavadmg extends TFM_Command
 {
     @Override
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_lavaplace.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_lavaplace.java
index e7f03f6f..1dc67658 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_lavaplace.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_lavaplace.java
@@ -5,7 +5,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
 public class Command_lavaplace extends TFM_Command
 {
     @Override
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_list.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_list.java
index 92a9c673..7190f21d 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_list.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_list.java
@@ -10,7 +10,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.ALL, source = SourceType.BOTH, ignore_permissions = true)
+@CommandPermissions(level = AdminLevel.ALL, source = SourceType.BOTH)
 public class Command_list extends TFM_Command
 {
     @Override
@@ -52,7 +52,7 @@ public class Command_list extends TFM_Command
 
                 if (p.getName().equalsIgnoreCase("madgeek1450") || p.getName().equalsIgnoreCase("darthsalamon"))
                 {
-                    prefix = (ChatColor.DARK_PURPLE+ "[Dev]");
+                    prefix = (ChatColor.DARK_PURPLE + "[Dev]");
                 }
             }
             else
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_listsync.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_listsync.java
index 61fa31f7..fd0fbc46 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_listsync.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_listsync.java
@@ -8,7 +8,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE, block_host_console = true, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE, block_host_console = true)
 public class Command_listsync extends TFM_Command
 {
     @Override
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_lockup.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_lockup.java
index 29462d1c..d177618b 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_lockup.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_lockup.java
@@ -9,7 +9,7 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitTask;
 
-@CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE, block_host_console = true, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE, block_host_console = true)
 public class Command_lockup extends TFM_Command
 {
     @Override
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_moblimiter.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_moblimiter.java
index b8a5751b..86d1f789 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_moblimiter.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_moblimiter.java
@@ -5,7 +5,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.ONLY_CONSOLE, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.ONLY_CONSOLE)
 public class Command_moblimiter extends TFM_Command
 {
     @Override
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_mp.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_mp.java
index 620e2650..426ec627 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_mp.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_mp.java
@@ -6,7 +6,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.*;
 
-@CommandPermissions(level = AdminLevel.OP, source = SourceType.BOTH, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.OP, source = SourceType.BOTH)
 public class Command_mp extends TFM_Command
 {
     @Override
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_mp44.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_mp44.java
index afe03bcb..5fbb91c5 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_mp44.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_mp44.java
@@ -9,7 +9,7 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
-@CommandPermissions(level = AdminLevel.OP, source = SourceType.ONLY_IN_GAME, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.OP, source = SourceType.ONLY_IN_GAME)
 public class Command_mp44 extends TFM_Command
 {
     @Override
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_nether.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_nether.java
index c888c8a6..9be4aea6 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_nether.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_nether.java
@@ -5,7 +5,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.ALL, source = SourceType.BOTH, ignore_permissions = true)
+@CommandPermissions(level = AdminLevel.ALL, source = SourceType.BOTH)
 public class Command_nether extends TFM_Command
 {
     @Override
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_nonuke.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_nonuke.java
index affa24c3..28fe1101 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_nonuke.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_nonuke.java
@@ -5,7 +5,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE, block_host_console = true, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE, block_host_console = true)
 public class Command_nonuke extends TFM_Command
 {
     @Override
@@ -41,7 +41,7 @@ public class Command_nonuke extends TFM_Command
         if (args[0].equalsIgnoreCase("on"))
         {
             TotalFreedomMod.nukeMonitor = true;
-            playerMsg( "Nuke monitor is enabled.");
+            playerMsg("Nuke monitor is enabled.");
             playerMsg("Anti-freecam range is set to " + TotalFreedomMod.nukeMonitorRange + " blocks.");
             playerMsg("Block throttle rate is set to " + TotalFreedomMod.nukeMonitorCountBreak + " blocks destroyed per 5 seconds.");
         }
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_o.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_o.java
index 937a9cf5..9fa750be 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_o.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_o.java
@@ -7,7 +7,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
 public class Command_o extends TFM_Command
 {
     @Override
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_onlinemode.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_onlinemode.java
index de107ba1..0324cde9 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_onlinemode.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_onlinemode.java
@@ -8,7 +8,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE, block_host_console = true, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE, block_host_console = true)
 public class Command_onlinemode extends TFM_Command
 {
     @Override
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_op.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_op.java
index 2fd23860..203d9a7d 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_op.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_op.java
@@ -8,7 +8,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.OP, source = SourceType.BOTH, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.OP, source = SourceType.BOTH)
 public class Command_op extends TFM_Command
 {
     @Override
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_opall.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_opall.java
index 8aab1445..e102c3dd 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_opall.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_opall.java
@@ -7,7 +7,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
 public class Command_opall extends TFM_Command
 {
     @Override
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_opme.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_opme.java
index 6359f3a4..e1e3b3a0 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_opme.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_opme.java
@@ -6,7 +6,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.ONLY_IN_GAME, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.ONLY_IN_GAME)
 public class Command_opme extends TFM_Command
 {
     @Override
@@ -15,7 +15,7 @@ public class Command_opme extends TFM_Command
         TFM_Util.adminAction(sender.getName(), "Opping " + sender.getName(), false);
         sender.setOp(true);
         sender.sendMessage(TotalFreedomMod.YOU_ARE_OP);
-        
+
         return true;
     }
 }
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_ops.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_ops.java
index 365bee1d..45f6b452 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_ops.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_ops.java
@@ -7,7 +7,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.OP, source = SourceType.BOTH, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.OP, source = SourceType.BOTH)
 public class Command_ops extends TFM_Command
 {
     @Override
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_orbit.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_orbit.java
index 9d2f8d18..0d048173 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_orbit.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_orbit.java
@@ -9,7 +9,7 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.util.Vector;
 
-@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
 public class Command_orbit extends TFM_Command
 {
     @Override
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_permban.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_permban.java
index 4b52ebb0..6751d8a4 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_permban.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_permban.java
@@ -7,8 +7,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-
-@CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE, block_host_console = true, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE, block_host_console = true)
 public class Command_permban extends TFM_Command
 {
     @Override
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_potion.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_potion.java
index b17133ec..0397bbad 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_potion.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_potion.java
@@ -13,7 +13,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;
 
-@CommandPermissions(level = AdminLevel.OP, source = SourceType.BOTH, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.OP, source = SourceType.BOTH)
 public class Command_potion extends TFM_Command
 {
     @Override
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_prelog.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_prelog.java
index 03084cfe..0cce4a4e 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_prelog.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_prelog.java
@@ -5,7 +5,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE, block_host_console = true, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE, block_host_console = true)
 public class Command_prelog extends TFM_Command
 {
     @Override
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_protectarea.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_protectarea.java
index 5e7de720..29ffe726 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_protectarea.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_protectarea.java
@@ -7,7 +7,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
 public class Command_protectarea extends TFM_Command
 {
     @Override
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_qdeop.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_qdeop.java
index 785a1766..06b738bb 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_qdeop.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_qdeop.java
@@ -6,7 +6,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
 public class Command_qdeop extends TFM_Command
 {
     @Override
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_qop.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_qop.java
index b2dc05af..5b38f4a9 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_qop.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_qop.java
@@ -6,7 +6,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
 public class Command_qop extends TFM_Command
 {
     @Override
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_radar.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_radar.java
index 056966b8..f3a8ac20 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_radar.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_radar.java
@@ -10,7 +10,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.ALL, source = SourceType.ONLY_IN_GAME, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.ALL, source = SourceType.ONLY_IN_GAME)
 public class Command_radar extends TFM_Command
 {
     @Override
@@ -33,7 +33,7 @@ public class Command_radar extends TFM_Command
                 }
             }
         }
-        
+
         if (radar_data.isEmpty())
         {
             playerMsg("You are the only player in this world. (" + ChatColor.GREEN + "Forever alone..." + ChatColor.YELLOW + ")", ChatColor.YELLOW); //lol
@@ -55,14 +55,13 @@ public class Command_radar extends TFM_Command
             {
             }
         }
-        
+
         for (TFM_RadarData i : radar_data)
         {
             playerMsg(String.format("%s - %d",
                     i.player.getName(),
-                    Math.round(i.distance)
-                    ), ChatColor.YELLOW);
-            
+                    Math.round(i.distance)), ChatColor.YELLOW);
+
             if (--countmax <= 0)
             {
                 break;
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_rank.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_rank.java
index 7626a101..07333a06 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_rank.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_rank.java
@@ -6,7 +6,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.ALL, source = SourceType.BOTH, ignore_permissions = true)
+@CommandPermissions(level = AdminLevel.ALL, source = SourceType.BOTH)
 public class Command_rank extends TFM_Command
 {
     @Override
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_rawsay.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_rawsay.java
index bf52aa33..0b461fcd 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_rawsay.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_rawsay.java
@@ -6,7 +6,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE, block_host_console = true, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE, block_host_console = true)
 public class Command_rawsay extends TFM_Command
 {
     @Override
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_rd.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_rd.java
index 99448698..d553e8e2 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_rd.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_rd.java
@@ -5,7 +5,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
 public class Command_rd extends TFM_Command
 {
     @Override
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_ro.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_ro.java
index b621858c..1039e704 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_ro.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_ro.java
@@ -7,7 +7,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, block_host_console = false, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, block_host_console = false)
 public class Command_ro extends TFM_Command
 {
     @Override
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_saconfig.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_saconfig.java
index 82dcc672..f08f0d1e 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_saconfig.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_saconfig.java
@@ -11,7 +11,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.OP, source = SourceType.BOTH, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.OP, source = SourceType.BOTH)
 public class Command_saconfig extends TFM_Command
 {
     @Override
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_say.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_say.java
index a39ec115..25e14df9 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_say.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_say.java
@@ -7,7 +7,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
 public class Command_say extends TFM_Command
 {
     @Override
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_setlevel.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_setlevel.java
index bb7fe7ea..17ee895b 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_setlevel.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_setlevel.java
@@ -5,7 +5,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.OP, source = SourceType.ONLY_IN_GAME, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.OP, source = SourceType.ONLY_IN_GAME)
 public class Command_setlevel extends TFM_Command
 {
     @Override
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_setspawnworld.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_setspawnworld.java
index 2c1930d0..728e0da2 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_setspawnworld.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_setspawnworld.java
@@ -8,7 +8,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.ONLY_IN_GAME, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.ONLY_IN_GAME)
 public class Command_setspawnworld extends TFM_Command
 {
     @Override
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_smite.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_smite.java
index 587bb2e4..8c006cf9 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_smite.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_smite.java
@@ -9,7 +9,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
 public class Command_smite extends TFM_Command
 {
     @Override
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_status.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_status.java
index 5869c274..ff94117e 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_status.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_status.java
@@ -21,7 +21,7 @@ import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
 import org.json.simple.JSONValue;
 
-@CommandPermissions(level = AdminLevel.ALL, source = SourceType.BOTH, ignore_permissions = true)
+@CommandPermissions(level = AdminLevel.ALL, source = SourceType.BOTH)
 public class Command_status extends TFM_Command
 {
     public static final Map<String, String> SERVICE_MAP = new HashMap<String, String>();
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_stfu.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_stfu.java
index 1254af3d..3c7cae92 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_stfu.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_stfu.java
@@ -9,7 +9,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
 public class Command_stfu extends TFM_Command
 {
     @Override
@@ -92,7 +92,7 @@ public class Command_stfu extends TFM_Command
                     {
                         TFM_PlayerData.getPlayerData(p).setMuted(false);
                     }
-                    
+
                     TotalFreedomMod.mutePurgeEventId = 0;
                 }
             }, 6000L); // five minutes in ticks: 20*60*5
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_stop.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_stop.java
index 98557245..ef57f7f2 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_stop.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_stop.java
@@ -6,7 +6,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
 public class Command_stop extends TFM_Command
 {
     @Override
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_survival.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_survival.java
index a5dfb35b..a0190c6a 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_survival.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_survival.java
@@ -7,7 +7,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.OP, source = SourceType.BOTH, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.OP, source = SourceType.BOTH)
 public class Command_survival extends TFM_Command
 {
     @Override
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tempban.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tempban.java
index a5043bb1..5714474d 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tempban.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tempban.java
@@ -11,7 +11,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
 public class Command_tempban extends TFM_Command
 {
     private static final SimpleDateFormat date_format = new SimpleDateFormat("yyyy-MM-dd \'at\' HH:mm:ss z");
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_terminal.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_terminal.java
index 080aedb4..ec6dd0c6 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_terminal.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_terminal.java
@@ -5,7 +5,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE, block_host_console = true, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE, block_host_console = true)
 public class Command_terminal extends TFM_Command
 {
     @Override
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tfbanlist.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tfbanlist.java
index fdffd4ca..5b393454 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tfbanlist.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tfbanlist.java
@@ -10,7 +10,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.OP, source = SourceType.BOTH, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.OP, source = SourceType.BOTH)
 public class Command_tfbanlist extends TFM_Command
 {
     @Override
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tfipbanlist.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tfipbanlist.java
index 5241ff7a..810fa807 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tfipbanlist.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tfipbanlist.java
@@ -11,7 +11,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.OP, source = SourceType.BOTH, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.OP, source = SourceType.BOTH)
 public class Command_tfipbanlist extends TFM_Command
 {
     @Override
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tfupdate.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tfupdate.java
index bd353dc0..1e9edf43 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tfupdate.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tfupdate.java
@@ -8,7 +8,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE, block_host_console = true, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE, block_host_console = true)
 public class Command_tfupdate extends TFM_Command
 {
     public static final String[] FILES =
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tossmob.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tossmob.java
index 6da8ddce..f9156263 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tossmob.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tossmob.java
@@ -12,7 +12,7 @@ import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
-@CommandPermissions(level = AdminLevel.OP, source = SourceType.ONLY_IN_GAME, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.OP, source = SourceType.ONLY_IN_GAME)
 public class Command_tossmob extends TFM_Command
 {
     @Override
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_twitter.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_twitter.java
index 8c1e0875..d580bd04 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_twitter.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_twitter.java
@@ -8,8 +8,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-
-@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.ONLY_IN_GAME, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.ONLY_IN_GAME)
 public class Command_twitter extends TFM_Command
 {
     @Override
@@ -30,11 +29,12 @@ public class Command_twitter extends TFM_Command
 
         if ("set".equals(args[0]))
         {
-            if (args.length != 2) {
+            if (args.length != 2)
+            {
                 return false;
             }
 
-            if(args[1].startsWith("@"))
+            if (args[1].startsWith("@"))
             {
                 TFM_Util.playerMsg(sender, "Please do not prefix your twitter username with '@'");
                 return true;
@@ -81,8 +81,9 @@ public class Command_twitter extends TFM_Command
             TFM_Util.playerMsg(sender, "-- Twitter Information --", ChatColor.BLUE);
             TFM_Util.playerMsg(sender, "Using this feature, you can re-super yourself using twitter.");
             TFM_Util.playerMsg(sender, "You can set your twitter handle using " + ChatColor.AQUA + "/twitter set [twittername]");
-            TFM_Util.playerMsg (sender, "Then, you can verify yourself by tweeting " + ChatColor.AQUA + "@TFUpdates #superme");
-            if ("notfound".equals(reply)) {
+            TFM_Util.playerMsg(sender, "Then, you can verify yourself by tweeting " + ChatColor.AQUA + "@TFUpdates #superme");
+            if ("notfound".equals(reply))
+            {
                 TFM_Util.playerMsg(sender, "You currently have " + ChatColor.RED + "no" + ChatColor.BLUE + " Twitter handle set.", ChatColor.BLUE);
             }
             else if ("disabled".equals(reply))
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_uall.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_uall.java
index e1d43239..de5476c4 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_uall.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_uall.java
@@ -6,7 +6,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
 public class Command_uall extends TFM_Command
 {
     @Override
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_waterplace.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_waterplace.java
index 2cb40369..64fb82d2 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_waterplace.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_waterplace.java
@@ -5,7 +5,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
 public class Command_waterplace extends TFM_Command
 {
     @Override
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_whitelist.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_whitelist.java
index ac39fd20..7b9177dd 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_whitelist.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_whitelist.java
@@ -9,7 +9,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.OP, source = SourceType.BOTH, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.OP, source = SourceType.BOTH)
 public class Command_whitelist extends TFM_Command
 {
     @Override
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_wildcard.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_wildcard.java
index 69c220ae..ecc5fcf6 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_wildcard.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_wildcard.java
@@ -6,7 +6,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
 public class Command_wildcard extends TFM_Command
 {
     @Override
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_wipeflatlands.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_wipeflatlands.java
index 9202949b..7b1dc9e8 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_wipeflatlands.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_wipeflatlands.java
@@ -6,7 +6,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE, block_host_console = true, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE, block_host_console = true)
 public class Command_wipeflatlands extends TFM_Command
 {
     @Override
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_ziptool.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_ziptool.java
index 6904b5bd..491f04fb 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_ziptool.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_ziptool.java
@@ -8,7 +8,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE, block_host_console = true, ignore_permissions = false)
+@CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE, block_host_console = true)
 public class Command_ziptool extends TFM_Command
 {
     @Override
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/TFM_Command.java b/src/me/StevenLawson/TotalFreedomMod/Commands/TFM_Command.java
index 1cb6283a..92b154ee 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/TFM_Command.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/TFM_Command.java
@@ -65,81 +65,74 @@ public class TFM_Command
         CommandPermissions permissions = cmd_class.getAnnotation(CommandPermissions.class);
         if (permissions != null)
         {
-            if (permissions.ignore_permissions())
+            boolean is_super = TFM_SuperadminList.isUserSuperadmin(sender);
+            boolean is_senior = false;
+            if (is_super)
             {
-                return true;
+                is_senior = TFM_SuperadminList.isSeniorAdmin(sender);
+            }
+
+            AdminLevel level = permissions.level();
+            SourceType source = permissions.source();
+            boolean block_host_console = permissions.block_host_console();
+
+            Player sender_p = null;
+            if (sender instanceof Player)
+            {
+                sender_p = (Player) sender;
+            }
+
+            if (sender_p == null)
+            {
+                if (source == SourceType.ONLY_IN_GAME)
+                {
+                    return false;
+                }
+                else if (level == AdminLevel.SENIOR && !is_senior)
+                {
+                    return false;
+                }
+                else if (block_host_console && TFM_Util.isFromHostConsole(sender.getName()))
+                {
+                    return false;
+                }
             }
             else
             {
-                boolean is_super = TFM_SuperadminList.isUserSuperadmin(sender);
-                boolean is_senior = false;
-                if (is_super)
+                if (source == SourceType.ONLY_CONSOLE)
                 {
-                    is_senior = TFM_SuperadminList.isSeniorAdmin(sender);
+                    return false;
                 }
-
-                AdminLevel level = permissions.level();
-                SourceType source = permissions.source();
-                boolean block_host_console = permissions.block_host_console();
-
-                Player sender_p = null;
-                if (sender instanceof Player)
+                else if (level == AdminLevel.SENIOR)
                 {
-                    sender_p = (Player) sender;
-                }
+                    if (is_senior)
+                    {
+                        TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(sender_p);
+                        Boolean superadminIdVerified = playerdata.isSuperadminIdVerified();
 
-                if (sender_p == null)
-                {
-                    if (source == SourceType.ONLY_IN_GAME)
-                    {
-                        return false;
-                    }
-                    else if (level == AdminLevel.SENIOR && !is_senior)
-                    {
-                        return false;
-                    }
-                    else if (block_host_console && TFM_Util.isFromHostConsole(sender.getName()))
-                    {
-                        return false;
-                    }
-                }
-                else
-                {
-                    if (source == SourceType.ONLY_CONSOLE)
-                    {
-                        return false;
-                    }
-                    else if (level == AdminLevel.SENIOR)
-                    {
-                        if (is_senior)
+                        if (superadminIdVerified != null)
                         {
-                            TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(sender_p);
-                            Boolean superadminIdVerified = playerdata.isSuperadminIdVerified();
-
-                            if (superadminIdVerified != null)
+                            if (!superadminIdVerified.booleanValue())
                             {
-                                if (!superadminIdVerified.booleanValue())
-                                {
-                                    return false;
-                                }
+                                return false;
                             }
                         }
-                        else
-                        {
-                            return false;
-                        }
                     }
-                    else if (level == AdminLevel.SUPER && !is_super)
-                    {
-                        return false;
-                    }
-                    else if (level == AdminLevel.OP && !sender_p.isOp())
+                    else
                     {
                         return false;
                     }
                 }
-                return true;
+                else if (level == AdminLevel.SUPER && !is_super)
+                {
+                    return false;
+                }
+                else if (level == AdminLevel.OP && !sender_p.isOp())
+                {
+                    return false;
+                }
             }
+            return true;
         }
         return true;
     }
diff --git a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_BlockListener.java b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_BlockListener.java
index 0bb06566..02f11ecb 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_BlockListener.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_BlockListener.java
@@ -1,9 +1,9 @@
 package me.StevenLawson.TotalFreedomMod.Listener;
 
 import me.StevenLawson.TotalFreedomMod.TFM_Log;
+import me.StevenLawson.TotalFreedomMod.TFM_PlayerData;
 import me.StevenLawson.TotalFreedomMod.TFM_ProtectedArea;
 import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
-import me.StevenLawson.TotalFreedomMod.TFM_PlayerData;
 import me.StevenLawson.TotalFreedomMod.TFM_Util;
 import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
 import org.bukkit.ChatColor;
@@ -250,7 +250,6 @@ public class TFM_BlockListener implements Listener
             event.setCancelled(true);
         }
     }
-    
 //    @EventHandler(priority = EventPriority.NORMAL)
 //    public void onCommandBlockChangeEvent(CommandBlockChangeEvent event)
 //    {
diff --git a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java
index 453d66d8..7ede8a6e 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java
@@ -58,7 +58,6 @@ public class TFM_PlayerListener implements Listener
                     }
                     case POTION:
                     {
-
                     }
                 }
                 break;
@@ -588,7 +587,7 @@ public class TFM_PlayerListener implements Listener
             }
             return;
         }
-        
+
         if (!TFM_SuperadminList.isUserSuperadmin(p))
         {
             for (Player pl : Bukkit.getOnlinePlayers())
diff --git a/src/me/StevenLawson/TotalFreedomMod/SerializableLocation.java b/src/me/StevenLawson/TotalFreedomMod/SerializableLocation.java
index f127b7c5..ac3f90ab 100644
--- a/src/me/StevenLawson/TotalFreedomMod/SerializableLocation.java
+++ b/src/me/StevenLawson/TotalFreedomMod/SerializableLocation.java
@@ -10,7 +10,6 @@ import org.bukkit.World;
 
 // From: http://forums.bukkit.org/threads/location-serialized.105851/
 // By: gcflames5
-
 public final class SerializableLocation implements Serializable
 {
     private static final long serialVersionUID = 7498864812883577904L;
diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_LandmineData.java b/src/me/StevenLawson/TotalFreedomMod/TFM_LandmineData.java
index c443b498..240ce618 100644
--- a/src/me/StevenLawson/TotalFreedomMod/TFM_LandmineData.java
+++ b/src/me/StevenLawson/TotalFreedomMod/TFM_LandmineData.java
@@ -8,7 +8,7 @@ import org.bukkit.entity.Player;
 public class TFM_LandmineData
 {
     public static List<TFM_LandmineData> landmines = new ArrayList<TFM_LandmineData>();
-    
+
     public Location landmine_pos;
     public Player player;
     public double radius;
diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_PlayerData.java b/src/me/StevenLawson/TotalFreedomMod/TFM_PlayerData.java
index 1cb51caf..c3da4f6d 100644
--- a/src/me/StevenLawson/TotalFreedomMod/TFM_PlayerData.java
+++ b/src/me/StevenLawson/TotalFreedomMod/TFM_PlayerData.java
@@ -475,5 +475,4 @@ public class TFM_PlayerData
     {
         return cmdspy_enabled;
     }
-
 }
diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_TickMeter.java b/src/me/StevenLawson/TotalFreedomMod/TFM_TickMeter.java
index c5c23135..1d28cad1 100644
--- a/src/me/StevenLawson/TotalFreedomMod/TFM_TickMeter.java
+++ b/src/me/StevenLawson/TotalFreedomMod/TFM_TickMeter.java
@@ -2,7 +2,6 @@ package me.StevenLawson.TotalFreedomMod;
 
 public class TFM_TickMeter
 {
-
     int ticks;
     int taskId;
     final TotalFreedomMod plugin;
@@ -36,5 +35,4 @@ public class TFM_TickMeter
     {
         return ticks;
     }
-
 }
diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_TwitterHandler.java b/src/me/StevenLawson/TotalFreedomMod/TFM_TwitterHandler.java
index b5f5f26f..6a8656b0 100644
--- a/src/me/StevenLawson/TotalFreedomMod/TFM_TwitterHandler.java
+++ b/src/me/StevenLawson/TotalFreedomMod/TFM_TwitterHandler.java
@@ -6,9 +6,8 @@ import java.net.URL;
 import java.net.URLConnection;
 import org.apache.commons.lang.exception.ExceptionUtils;
 
-
-public class TFM_TwitterHandler {
-
+public class TFM_TwitterHandler
+{
     private TotalFreedomMod plugin;
 
     private TFM_TwitterHandler(TotalFreedomMod plugin)
@@ -30,19 +29,23 @@ public class TFM_TwitterHandler {
         return request("action=settwitter&player=" + player + "&twitter=" + twitter);
     }
 
-    public String delTwitter(String player) {
+    public String delTwitter(String player)
+    {
         return request("action=deltwitter&player=" + player);
     }
 
-    public String isEnabled() {
+    public String isEnabled()
+    {
         return request("action=getstatus");
     }
 
-    public String setEnabled(String status) {
+    public String setEnabled(String status)
+    {
         return request("action=setstatus&status=" + status);
     }
 
-    private String request(String queryString) {
+    private String request(String queryString)
+    {
         String line = "failed";
         try
         {
@@ -60,8 +63,8 @@ public class TFM_TwitterHandler {
         return line;
     }
 
-    public static TFM_TwitterHandler getInstance(TotalFreedomMod plugin) {
+    public static TFM_TwitterHandler getInstance(TotalFreedomMod plugin)
+    {
         return new TFM_TwitterHandler(plugin);
     }
-
 }
diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_UserList.java b/src/me/StevenLawson/TotalFreedomMod/TFM_UserList.java
index 1e551330..ec177fda 100644
--- a/src/me/StevenLawson/TotalFreedomMod/TFM_UserList.java
+++ b/src/me/StevenLawson/TotalFreedomMod/TFM_UserList.java
@@ -90,7 +90,7 @@ public class TFM_UserList
     public void addUser(String username, String ip_address)
     {
         username = username.toLowerCase();
-        
+
         TFM_UserListEntry entry = _userlist.get(username);
         if (entry == null)
         {
@@ -123,7 +123,7 @@ public class TFM_UserList
         {
             addUser(p);
         }
-        
+
         exportList();
     }
 
@@ -132,15 +132,15 @@ public class TFM_UserList
         private String _username;
         private List<String> _ip_addresses = new ArrayList<String>();
 
-        public TFM_UserListEntry(String username, List<String>ip_addresses)
+        public TFM_UserListEntry(String username, List<String> ip_addresses)
         {
-           _username = username;
-           _ip_addresses = ip_addresses;
+            _username = username;
+            _ip_addresses = ip_addresses;
         }
 
         public TFM_UserListEntry(String username)
         {
-           _username = username;
+            _username = username;
         }
 
         public List<String> getIpAddresses()
diff --git a/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java b/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java
index 50946725..c998d34c 100644
--- a/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java
+++ b/src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java
@@ -298,7 +298,7 @@ public class TotalFreedomMod extends JavaPlugin
             TFM_Log.severe("Error loading superadmin list: " + ex.getMessage());
         }
     }
-
+    
     public static List<String> permbanned_players = new ArrayList<String>();
     public static List<String> permbanned_ips = new ArrayList<String>();