diff --git a/.gitignore b/.gitignore
index 90dc65d43..1e4e21fc2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,5 @@
 /target/PlotSquared-Uber.jar
 /target/maven-archiver
 *.project
-*.classpath
\ No newline at end of file
+*.classpath
+/target/
diff --git a/src/main/java/com/intellectualcrafters/configuration/Configuration.java b/src/main/java/com/intellectualcrafters/configuration/Configuration.java
index a912b5323..58e826d78 100644
--- a/src/main/java/com/intellectualcrafters/configuration/Configuration.java
+++ b/src/main/java/com/intellectualcrafters/configuration/Configuration.java
@@ -5,7 +5,8 @@ import java.util.Map;
 /**
  * Represents a source of configurable options and settings
  */
-public interface Configuration extends ConfigurationSection {
+public interface Configuration extends ConfigurationSection
+{
     /**
      * Sets the default value of the given path as provided.
      * <p>
@@ -20,7 +21,8 @@ public interface Configuration extends ConfigurationSection {
      * @param value Value to set the default to.
      * @throws IllegalArgumentException Thrown if path is null.
      */
-    public void addDefault(String path, Object value);
+    @Override
+    public void addDefault(final String path, final Object value);
 
     /**
      * Sets the default values of the given paths as provided.
@@ -32,7 +34,7 @@ public interface Configuration extends ConfigurationSection {
      * @param defaults A map of Path->Values to add to defaults.
      * @throws IllegalArgumentException Thrown if defaults is null.
      */
-    public void addDefaults(Map<String, Object> defaults);
+    public void addDefaults(final Map<String, Object> defaults);
 
     /**
      * Sets the default values of the given paths as provided.
@@ -49,7 +51,7 @@ public interface Configuration extends ConfigurationSection {
      * @param defaults A configuration holding a list of defaults to copy.
      * @throws IllegalArgumentException Thrown if defaults is null or this.
      */
-    public void addDefaults(Configuration defaults);
+    public void addDefaults(final Configuration defaults);
 
     /**
      * Sets the source of all default values for this {@link Configuration}.
@@ -60,7 +62,7 @@ public interface Configuration extends ConfigurationSection {
      * @param defaults New source of default values for this configuration.
      * @throws IllegalArgumentException Thrown if defaults is null or this.
      */
-    public void setDefaults(Configuration defaults);
+    public void setDefaults(final Configuration defaults);
 
     /**
      * Gets the source {@link Configuration} for this configuration.
diff --git a/src/main/java/com/intellectualcrafters/configuration/ConfigurationOptions.java b/src/main/java/com/intellectualcrafters/configuration/ConfigurationOptions.java
index 4f32c6545..3768af587 100644
--- a/src/main/java/com/intellectualcrafters/configuration/ConfigurationOptions.java
+++ b/src/main/java/com/intellectualcrafters/configuration/ConfigurationOptions.java
@@ -4,12 +4,14 @@ package com.intellectualcrafters.configuration;
  * Various settings for controlling the input and output of a {@link
  * Configuration}
  */
-public class ConfigurationOptions {
+public class ConfigurationOptions
+{
     private char pathSeparator = '.';
     private boolean copyDefaults = false;
     private final Configuration configuration;
 
-    protected ConfigurationOptions(Configuration configuration) {
+    protected ConfigurationOptions(final Configuration configuration)
+    {
         this.configuration = configuration;
     }
 
@@ -18,7 +20,8 @@ public class ConfigurationOptions {
      *
      * @return Parent configuration
      */
-    public Configuration configuration() {
+    public Configuration configuration()
+    {
         return configuration;
     }
 
@@ -31,7 +34,8 @@ public class ConfigurationOptions {
      *
      * @return Path separator
      */
-    public char pathSeparator() {
+    public char pathSeparator()
+    {
         return pathSeparator;
     }
 
@@ -45,8 +49,9 @@ public class ConfigurationOptions {
      * @param value Path separator
      * @return This object, for chaining
      */
-    public ConfigurationOptions pathSeparator(char value) {
-        this.pathSeparator = value;
+    public ConfigurationOptions pathSeparator(final char value)
+    {
+        pathSeparator = value;
         return this;
     }
 
@@ -64,7 +69,8 @@ public class ConfigurationOptions {
      *
      * @return Whether or not defaults are directly copied
      */
-    public boolean copyDefaults() {
+    public boolean copyDefaults()
+    {
         return copyDefaults;
     }
 
@@ -83,8 +89,9 @@ public class ConfigurationOptions {
      * @param value Whether or not defaults are directly copied
      * @return This object, for chaining
      */
-    public ConfigurationOptions copyDefaults(boolean value) {
-        this.copyDefaults = value;
+    public ConfigurationOptions copyDefaults(final boolean value)
+    {
+        copyDefaults = value;
         return this;
     }
 }
diff --git a/src/main/java/com/intellectualcrafters/configuration/ConfigurationSection.java b/src/main/java/com/intellectualcrafters/configuration/ConfigurationSection.java
index 9e368b566..d2f3dbd1b 100644
--- a/src/main/java/com/intellectualcrafters/configuration/ConfigurationSection.java
+++ b/src/main/java/com/intellectualcrafters/configuration/ConfigurationSection.java
@@ -7,7 +7,8 @@ import java.util.Set;
 /**
  * Represents a section of a {@link Configuration}
  */
-public interface ConfigurationSection {
+public interface ConfigurationSection
+{
     /**
      * Gets a set containing all keys in this section.
      * <p>
@@ -22,7 +23,7 @@ public interface ConfigurationSection {
      *     list.
      * @return Set of keys contained within this ConfigurationSection.
      */
-    public Set<String> getKeys(boolean deep);
+    public Set<String> getKeys(final boolean deep);
 
     /**
      * Gets a Map containing all keys and their values for this section.
@@ -38,7 +39,7 @@ public interface ConfigurationSection {
      *     list.
      * @return Map of keys and values of this section.
      */
-    public Map<String, Object> getValues(boolean deep);
+    public Map<String, Object> getValues(final boolean deep);
 
     /**
      * Checks if this {@link ConfigurationSection} contains the given path.
@@ -51,7 +52,7 @@ public interface ConfigurationSection {
      *     default or being set.
      * @throws IllegalArgumentException Thrown when path is null.
      */
-    public boolean contains(String path);
+    public boolean contains(final String path);
 
     /**
      * Checks if this {@link ConfigurationSection} has a value set for the
@@ -65,7 +66,7 @@ public interface ConfigurationSection {
      *     having a default.
      * @throws IllegalArgumentException Thrown when path is null.
      */
-    public boolean isSet(String path);
+    public boolean isSet(final String path);
 
     /**
      * Gets the path of this {@link ConfigurationSection} from its root {@link
@@ -132,7 +133,7 @@ public interface ConfigurationSection {
      * @param path Path of the Object to get.
      * @return Requested Object.
      */
-    public Object get(String path);
+    public Object get(final String path);
 
     /**
      * Gets the requested Object by path, returning a default value if not
@@ -146,7 +147,7 @@ public interface ConfigurationSection {
      * @param def The default value to return if the path is not found.
      * @return Requested Object.
      */
-    public Object get(String path, Object def);
+    public Object get(final String path, final Object def);
 
     /**
      * Sets the specified path to the given value.
@@ -162,7 +163,7 @@ public interface ConfigurationSection {
      * @param path Path of the object to set.
      * @param value New value to set the path to.
      */
-    public void set(String path, Object value);
+    public void set(final String path, final Object value);
 
     /**
      * Creates an empty {@link ConfigurationSection} at the specified path.
@@ -174,7 +175,7 @@ public interface ConfigurationSection {
      * @param path Path to create the section at.
      * @return Newly created section
      */
-    public ConfigurationSection createSection(String path);
+    public ConfigurationSection createSection(final String path);
 
     /**
      * Creates a {@link ConfigurationSection} at the specified path, with
@@ -188,7 +189,7 @@ public interface ConfigurationSection {
      * @param map The values to used.
      * @return Newly created section
      */
-    public ConfigurationSection createSection(String path, Map<?, ?> map);
+    public ConfigurationSection createSection(final String path, final Map<?, ?> map);
 
     // Primitives
     /**
@@ -201,7 +202,7 @@ public interface ConfigurationSection {
      * @param path Path of the String to get.
      * @return Requested String.
      */
-    public String getString(String path);
+    public String getString(final String path);
 
     /**
      * Gets the requested String by path, returning a default value if not
@@ -216,7 +217,7 @@ public interface ConfigurationSection {
      *     not a String.
      * @return Requested String.
      */
-    public String getString(String path, String def);
+    public String getString(final String path, final String def);
 
     /**
      * Checks if the specified path is a String.
@@ -229,7 +230,7 @@ public interface ConfigurationSection {
      * @param path Path of the String to check.
      * @return Whether or not the specified path is a String.
      */
-    public boolean isString(String path);
+    public boolean isString(final String path);
 
     /**
      * Gets the requested int by path.
@@ -241,7 +242,7 @@ public interface ConfigurationSection {
      * @param path Path of the int to get.
      * @return Requested int.
      */
-    public int getInt(String path);
+    public int getInt(final String path);
 
     /**
      * Gets the requested int by path, returning a default value if not found.
@@ -255,7 +256,7 @@ public interface ConfigurationSection {
      *     not an int.
      * @return Requested int.
      */
-    public int getInt(String path, int def);
+    public int getInt(final String path, final int def);
 
     /**
      * Checks if the specified path is an int.
@@ -268,7 +269,7 @@ public interface ConfigurationSection {
      * @param path Path of the int to check.
      * @return Whether or not the specified path is an int.
      */
-    public boolean isInt(String path);
+    public boolean isInt(final String path);
 
     /**
      * Gets the requested boolean by path.
@@ -280,7 +281,7 @@ public interface ConfigurationSection {
      * @param path Path of the boolean to get.
      * @return Requested boolean.
      */
-    public boolean getBoolean(String path);
+    public boolean getBoolean(final String path);
 
     /**
      * Gets the requested boolean by path, returning a default value if not
@@ -295,7 +296,7 @@ public interface ConfigurationSection {
      *     not a boolean.
      * @return Requested boolean.
      */
-    public boolean getBoolean(String path, boolean def);
+    public boolean getBoolean(final String path, final boolean def);
 
     /**
      * Checks if the specified path is a boolean.
@@ -308,7 +309,7 @@ public interface ConfigurationSection {
      * @param path Path of the boolean to check.
      * @return Whether or not the specified path is a boolean.
      */
-    public boolean isBoolean(String path);
+    public boolean isBoolean(final String path);
 
     /**
      * Gets the requested double by path.
@@ -320,7 +321,7 @@ public interface ConfigurationSection {
      * @param path Path of the double to get.
      * @return Requested double.
      */
-    public double getDouble(String path);
+    public double getDouble(final String path);
 
     /**
      * Gets the requested double by path, returning a default value if not
@@ -335,7 +336,7 @@ public interface ConfigurationSection {
      *     not a double.
      * @return Requested double.
      */
-    public double getDouble(String path, double def);
+    public double getDouble(final String path, final double def);
 
     /**
      * Checks if the specified path is a double.
@@ -348,7 +349,7 @@ public interface ConfigurationSection {
      * @param path Path of the double to check.
      * @return Whether or not the specified path is a double.
      */
-    public boolean isDouble(String path);
+    public boolean isDouble(final String path);
 
     /**
      * Gets the requested long by path.
@@ -360,7 +361,7 @@ public interface ConfigurationSection {
      * @param path Path of the long to get.
      * @return Requested long.
      */
-    public long getLong(String path);
+    public long getLong(final String path);
 
     /**
      * Gets the requested long by path, returning a default value if not
@@ -375,7 +376,7 @@ public interface ConfigurationSection {
      *     not a long.
      * @return Requested long.
      */
-    public long getLong(String path, long def);
+    public long getLong(final String path, final long def);
 
     /**
      * Checks if the specified path is a long.
@@ -388,7 +389,7 @@ public interface ConfigurationSection {
      * @param path Path of the long to check.
      * @return Whether or not the specified path is a long.
      */
-    public boolean isLong(String path);
+    public boolean isLong(final String path);
 
     // Java
     /**
@@ -401,7 +402,7 @@ public interface ConfigurationSection {
      * @param path Path of the List to get.
      * @return Requested List.
      */
-    public List<?> getList(String path);
+    public List<?> getList(final String path);
 
     /**
      * Gets the requested List by path, returning a default value if not
@@ -416,7 +417,7 @@ public interface ConfigurationSection {
      *     not a List.
      * @return Requested List.
      */
-    public List<?> getList(String path, List<?> def);
+    public List<?> getList(final String path, final List<?> def);
 
     /**
      * Checks if the specified path is a List.
@@ -429,7 +430,7 @@ public interface ConfigurationSection {
      * @param path Path of the List to check.
      * @return Whether or not the specified path is a List.
      */
-    public boolean isList(String path);
+    public boolean isList(final String path);
 
     /**
      * Gets the requested List of String by path.
@@ -444,7 +445,7 @@ public interface ConfigurationSection {
      * @param path Path of the List to get.
      * @return Requested List of String.
      */
-    public List<String> getStringList(String path);
+    public List<String> getStringList(final String path);
 
     /**
      * Gets the requested List of Integer by path.
@@ -459,7 +460,7 @@ public interface ConfigurationSection {
      * @param path Path of the List to get.
      * @return Requested List of Integer.
      */
-    public List<Integer> getIntegerList(String path);
+    public List<Integer> getIntegerList(final String path);
 
     /**
      * Gets the requested List of Boolean by path.
@@ -474,7 +475,7 @@ public interface ConfigurationSection {
      * @param path Path of the List to get.
      * @return Requested List of Boolean.
      */
-    public List<Boolean> getBooleanList(String path);
+    public List<Boolean> getBooleanList(final String path);
 
     /**
      * Gets the requested List of Double by path.
@@ -489,7 +490,7 @@ public interface ConfigurationSection {
      * @param path Path of the List to get.
      * @return Requested List of Double.
      */
-    public List<Double> getDoubleList(String path);
+    public List<Double> getDoubleList(final String path);
 
     /**
      * Gets the requested List of Float by path.
@@ -504,7 +505,7 @@ public interface ConfigurationSection {
      * @param path Path of the List to get.
      * @return Requested List of Float.
      */
-    public List<Float> getFloatList(String path);
+    public List<Float> getFloatList(final String path);
 
     /**
      * Gets the requested List of Long by path.
@@ -519,7 +520,7 @@ public interface ConfigurationSection {
      * @param path Path of the List to get.
      * @return Requested List of Long.
      */
-    public List<Long> getLongList(String path);
+    public List<Long> getLongList(final String path);
 
     /**
      * Gets the requested List of Byte by path.
@@ -534,7 +535,7 @@ public interface ConfigurationSection {
      * @param path Path of the List to get.
      * @return Requested List of Byte.
      */
-    public List<Byte> getByteList(String path);
+    public List<Byte> getByteList(final String path);
 
     /**
      * Gets the requested List of Character by path.
@@ -549,7 +550,7 @@ public interface ConfigurationSection {
      * @param path Path of the List to get.
      * @return Requested List of Character.
      */
-    public List<Character> getCharacterList(String path);
+    public List<Character> getCharacterList(final String path);
 
     /**
      * Gets the requested List of Short by path.
@@ -564,7 +565,7 @@ public interface ConfigurationSection {
      * @param path Path of the List to get.
      * @return Requested List of Short.
      */
-    public List<Short> getShortList(String path);
+    public List<Short> getShortList(final String path);
 
     /**
      * Gets the requested List of Maps by path.
@@ -579,7 +580,7 @@ public interface ConfigurationSection {
      * @param path Path of the List to get.
      * @return Requested List of Maps.
      */
-    public List<Map<?, ?>> getMapList(String path);
+    public List<Map<?, ?>> getMapList(final String path);
 
     /**
      * Gets the requested ConfigurationSection by path.
@@ -592,7 +593,7 @@ public interface ConfigurationSection {
      * @param path Path of the ConfigurationSection to get.
      * @return Requested ConfigurationSection.
      */
-    public ConfigurationSection getConfigurationSection(String path);
+    public ConfigurationSection getConfigurationSection(final String path);
 
     /**
      * Checks if the specified path is a ConfigurationSection.
@@ -606,7 +607,7 @@ public interface ConfigurationSection {
      * @param path Path of the ConfigurationSection to check.
      * @return Whether or not the specified path is a ConfigurationSection.
      */
-    public boolean isConfigurationSection(String path);
+    public boolean isConfigurationSection(final String path);
 
     /**
      * Gets the equivalent {@link ConfigurationSection} from the default
@@ -638,5 +639,5 @@ public interface ConfigurationSection {
      * @param value Value to set the default to.
      * @throws IllegalArgumentException Thrown if path is null.
      */
-    public void addDefault(String path, Object value);
+    public void addDefault(final String path, final Object value);
 }
diff --git a/src/main/java/com/intellectualcrafters/configuration/InvalidConfigurationException.java b/src/main/java/com/intellectualcrafters/configuration/InvalidConfigurationException.java
index 38e9b0cb3..c7769dd7d 100644
--- a/src/main/java/com/intellectualcrafters/configuration/InvalidConfigurationException.java
+++ b/src/main/java/com/intellectualcrafters/configuration/InvalidConfigurationException.java
@@ -4,13 +4,15 @@ package com.intellectualcrafters.configuration;
  * Exception thrown when attempting to load an invalid {@link Configuration}
  */
 @SuppressWarnings("serial")
-public class InvalidConfigurationException extends Exception {
+public class InvalidConfigurationException extends Exception
+{
 
     /**
      * Creates a new instance of InvalidConfigurationException without a
      * message or cause.
      */
-    public InvalidConfigurationException() {}
+    public InvalidConfigurationException()
+    {}
 
     /**
      * Constructs an instance of InvalidConfigurationException with the
@@ -18,7 +20,8 @@ public class InvalidConfigurationException extends Exception {
      *
      * @param msg The details of the exception.
      */
-    public InvalidConfigurationException(String msg) {
+    public InvalidConfigurationException(final String msg)
+    {
         super(msg);
     }
 
@@ -28,7 +31,8 @@ public class InvalidConfigurationException extends Exception {
      *
      * @param cause The cause of the exception.
      */
-    public InvalidConfigurationException(Throwable cause) {
+    public InvalidConfigurationException(final Throwable cause)
+    {
         super(cause);
     }
 
@@ -39,7 +43,8 @@ public class InvalidConfigurationException extends Exception {
      * @param cause The cause of the exception.
      * @param msg The details of the exception.
      */
-    public InvalidConfigurationException(String msg, Throwable cause) {
+    public InvalidConfigurationException(final String msg, final Throwable cause)
+    {
         super(msg, cause);
     }
 }
diff --git a/src/main/java/com/intellectualcrafters/configuration/MemoryConfiguration.java b/src/main/java/com/intellectualcrafters/configuration/MemoryConfiguration.java
index ad81ab8f8..5448f837a 100644
--- a/src/main/java/com/intellectualcrafters/configuration/MemoryConfiguration.java
+++ b/src/main/java/com/intellectualcrafters/configuration/MemoryConfiguration.java
@@ -7,14 +7,16 @@ import java.util.Map;
  * from any source, and stores all values in memory only.
  * This is useful for temporary Configurations for providing defaults.
  */
-public class MemoryConfiguration extends MemorySection implements Configuration {
+public class MemoryConfiguration extends MemorySection implements Configuration
+{
     protected Configuration defaults;
     protected MemoryConfigurationOptions options;
 
     /**
      * Creates an empty {@link MemoryConfiguration} with no default values.
      */
-    public MemoryConfiguration() {}
+    public MemoryConfiguration()
+    {}
 
     /**
      * Creates an empty {@link MemoryConfiguration} using the specified {@link
@@ -23,51 +25,67 @@ public class MemoryConfiguration extends MemorySection implements Configuration
      * @param defaults Default value provider
      * @throws IllegalArgumentException Thrown if defaults is null
      */
-    public MemoryConfiguration(Configuration defaults) {
+    public MemoryConfiguration(final Configuration defaults)
+    {
         this.defaults = defaults;
     }
 
     @Override
-    public void addDefault(String path, Object value) {
-        if (path == null) throw new NullPointerException("Path may not be null");
-        if (defaults == null) {
+    public void addDefault(final String path, final Object value)
+    {
+        if (path == null) { throw new NullPointerException("Path may not be null"); }
+        if (defaults == null)
+        {
             defaults = new MemoryConfiguration();
         }
 
         defaults.set(path, value);
     }
 
-    public void addDefaults(Map<String, Object> defaults) {
-        if (defaults == null) throw new NullPointerException("Defaults may not be null");
+    @Override
+    public void addDefaults(final Map<String, Object> defaults)
+    {
+        if (defaults == null) { throw new NullPointerException("Defaults may not be null"); }
 
-        for (Map.Entry<String, Object> entry : defaults.entrySet()) {
+        for (final Map.Entry<String, Object> entry : defaults.entrySet())
+        {
             addDefault(entry.getKey(), entry.getValue());
         }
     }
 
-    public void addDefaults(Configuration defaults) {
-        if (defaults == null) throw new NullPointerException("Defaults may not be null");
+    @Override
+    public void addDefaults(final Configuration defaults)
+    {
+        if (defaults == null) { throw new NullPointerException("Defaults may not be null"); }
 
         addDefaults(defaults.getValues(true));
     }
 
-    public void setDefaults(Configuration defaults) {
-        if (defaults == null) throw new NullPointerException("Defaults may not be null");
+    @Override
+    public void setDefaults(final Configuration defaults)
+    {
+        if (defaults == null) { throw new NullPointerException("Defaults may not be null"); }
 
         this.defaults = defaults;
     }
 
-    public Configuration getDefaults() {
+    @Override
+    public Configuration getDefaults()
+    {
         return defaults;
     }
 
     @Override
-    public ConfigurationSection getParent() {
+    public ConfigurationSection getParent()
+    {
         return null;
     }
 
-    public MemoryConfigurationOptions options() {
-        if (options == null) {
+    @Override
+    public MemoryConfigurationOptions options()
+    {
+        if (options == null)
+        {
             options = new MemoryConfigurationOptions(this);
         }
 
diff --git a/src/main/java/com/intellectualcrafters/configuration/MemoryConfigurationOptions.java b/src/main/java/com/intellectualcrafters/configuration/MemoryConfigurationOptions.java
index 1720118c6..4e6af36c2 100644
--- a/src/main/java/com/intellectualcrafters/configuration/MemoryConfigurationOptions.java
+++ b/src/main/java/com/intellectualcrafters/configuration/MemoryConfigurationOptions.java
@@ -4,24 +4,29 @@ package com.intellectualcrafters.configuration;
  * Various settings for controlling the input and output of a {@link
  * MemoryConfiguration}
  */
-public class MemoryConfigurationOptions extends ConfigurationOptions {
-    protected MemoryConfigurationOptions(MemoryConfiguration configuration) {
+public class MemoryConfigurationOptions extends ConfigurationOptions
+{
+    protected MemoryConfigurationOptions(final MemoryConfiguration configuration)
+    {
         super(configuration);
     }
 
     @Override
-    public MemoryConfiguration configuration() {
+    public MemoryConfiguration configuration()
+    {
         return (MemoryConfiguration) super.configuration();
     }
 
     @Override
-    public MemoryConfigurationOptions copyDefaults(boolean value) {
+    public MemoryConfigurationOptions copyDefaults(final boolean value)
+    {
         super.copyDefaults(value);
         return this;
     }
 
     @Override
-    public MemoryConfigurationOptions pathSeparator(char value) {
+    public MemoryConfigurationOptions pathSeparator(final char value)
+    {
         super.pathSeparator(value);
         return this;
     }
diff --git a/src/main/java/com/intellectualcrafters/configuration/MemorySection.java b/src/main/java/com/intellectualcrafters/configuration/MemorySection.java
index 2c3bc0f4c..042e9efe4 100644
--- a/src/main/java/com/intellectualcrafters/configuration/MemorySection.java
+++ b/src/main/java/com/intellectualcrafters/configuration/MemorySection.java
@@ -10,70 +10,74 @@ import java.util.Set;
 /**
  * A type of {@link ConfigurationSection} that is stored in memory.
  */
-public class MemorySection implements ConfigurationSection {
+public class MemorySection implements ConfigurationSection
+{
     protected final Map<String, Object> map = new LinkedHashMap<String, Object>();
     private final Configuration root;
     private final ConfigurationSection parent;
     private final String path;
     private final String fullPath;
 
-    public static double toDouble(Object obj, double def) {
-        if (obj instanceof Number) {
-            return ((Number) obj).doubleValue();
-        }
-        if (obj instanceof String) {
-            try {
+    public static double toDouble(final Object obj, final double def)
+    {
+        if (obj instanceof Number) { return ((Number) obj).doubleValue(); }
+        if (obj instanceof String)
+        {
+            try
+            {
                 return Double.parseDouble((String) obj);
             }
-            catch (Exception e) {}
+            catch (final Exception e)
+            {}
         }
-        else if (obj instanceof List) {
-            List<?> val = ((List<?>) obj);
-            if (val.size() > 0) {
-                return toDouble(val.get(0), def);
-            }
+        else if (obj instanceof List)
+        {
+            final List<?> val = ((List<?>) obj);
+            if (val.size() > 0) { return toDouble(val.get(0), def); }
         }
         return def;
     }
-    
-    public static int toInt(Object obj, int def) {
-        if (obj instanceof Number) {
-            return ((Number) obj).intValue();
-        }
-        if (obj instanceof String) {
-            try {
+
+    public static int toInt(final Object obj, final int def)
+    {
+        if (obj instanceof Number) { return ((Number) obj).intValue(); }
+        if (obj instanceof String)
+        {
+            try
+            {
                 return Integer.parseInt((String) obj);
             }
-            catch (Exception e) {}
+            catch (final Exception e)
+            {}
         }
-        else if (obj instanceof List) {
-            List<?> val = ((List<?>) obj);
-            if (val.size() > 0) {
-                return toInt(val.get(0), def);
-            }
+        else if (obj instanceof List)
+        {
+            final List<?> val = ((List<?>) obj);
+            if (val.size() > 0) { return toInt(val.get(0), def); }
         }
         return def;
     }
-    
-    public static long toLong(Object obj, long def) {
-        if (obj instanceof Number) {
-            return ((Number) obj).longValue();
-        }
-        if (obj instanceof String) {
-            try {
+
+    public static long toLong(final Object obj, final long def)
+    {
+        if (obj instanceof Number) { return ((Number) obj).longValue(); }
+        if (obj instanceof String)
+        {
+            try
+            {
                 return Long.parseLong((String) obj);
             }
-            catch (Exception e) {}
+            catch (final Exception e)
+            {}
         }
-        else if (obj instanceof List) {
-            List<?> val = ((List<?>) obj);
-            if (val.size() > 0) {
-                return toLong(val.get(0), def);
-            }
+        else if (obj instanceof List)
+        {
+            final List<?> val = ((List<?>) obj);
+            if (val.size() > 0) { return toLong(val.get(0), def); }
         }
         return def;
     }
-    
+
     /**
      * Creates an empty MemorySection for use as a root {@link Configuration}
      * section.
@@ -84,15 +88,14 @@ public class MemorySection implements ConfigurationSection {
      * @throws IllegalStateException Thrown if this is not a {@link
      *     Configuration} root.
      */
-    protected MemorySection() {
-        if (!(this instanceof Configuration)) {
-            throw new IllegalStateException("Cannot construct a root MemorySection when not a Configuration");
-        }
+    protected MemorySection()
+    {
+        if (!(this instanceof Configuration)) { throw new IllegalStateException("Cannot construct a root MemorySection when not a Configuration"); }
 
-        this.path = "";
-        this.fullPath = "";
-        this.parent = null;
-        this.root = (Configuration) this;
+        path = "";
+        fullPath = "";
+        parent = null;
+        root = (Configuration) this;
     }
 
     /**
@@ -104,27 +107,32 @@ public class MemorySection implements ConfigurationSection {
      * @throws IllegalArgumentException Thrown is parent or path is null, or
      *     if parent contains no root Configuration.
      */
-    protected MemorySection(ConfigurationSection parent, String path) {
-        if (parent == null) throw new NullPointerException("Parent may not be null");
-        if (path == null) throw new NullPointerException("Path may not be null");
+    protected MemorySection(final ConfigurationSection parent, final String path)
+    {
+        if (parent == null) { throw new NullPointerException("Parent may not be null"); }
+        if (path == null) { throw new NullPointerException("Path may not be null"); }
 
         this.path = path;
         this.parent = parent;
-        this.root = parent.getRoot();
+        root = parent.getRoot();
 
-        if (root == null) throw new NullPointerException("Path may not be orphaned");
+        if (root == null) { throw new NullPointerException("Path may not be orphaned"); }
 
-        this.fullPath = createPath(parent, path);
+        fullPath = createPath(parent, path);
     }
 
-    public Set<String> getKeys(boolean deep) {
-        Set<String> result = new LinkedHashSet<String>();
+    @Override
+    public Set<String> getKeys(final boolean deep)
+    {
+        final Set<String> result = new LinkedHashSet<String>();
 
-        Configuration root = getRoot();
-        if (root != null && root.options().copyDefaults()) {
-            ConfigurationSection defaults = getDefaultSection();
+        final Configuration root = getRoot();
+        if ((root != null) && root.options().copyDefaults())
+        {
+            final ConfigurationSection defaults = getDefaultSection();
 
-            if (defaults != null) {
+            if (defaults != null)
+            {
                 result.addAll(defaults.getKeys(deep));
             }
         }
@@ -134,14 +142,18 @@ public class MemorySection implements ConfigurationSection {
         return result;
     }
 
-    public Map<String, Object> getValues(boolean deep) {
-        Map<String, Object> result = new LinkedHashMap<String, Object>();
+    @Override
+    public Map<String, Object> getValues(final boolean deep)
+    {
+        final Map<String, Object> result = new LinkedHashMap<String, Object>();
 
-        Configuration root = getRoot();
-        if (root != null && root.options().copyDefaults()) {
-            ConfigurationSection defaults = getDefaultSection();
+        final Configuration root = getRoot();
+        if ((root != null) && root.options().copyDefaults())
+        {
+            final ConfigurationSection defaults = getDefaultSection();
 
-            if (defaults != null) {
+            if (defaults != null)
+            {
                 result.putAll(defaults.getValues(deep));
             }
         }
@@ -151,172 +163,200 @@ public class MemorySection implements ConfigurationSection {
         return result;
     }
 
-    public boolean contains(String path) {
+    @Override
+    public boolean contains(final String path)
+    {
         return get(path) != null;
     }
 
-    public boolean isSet(String path) {
-        Configuration root = getRoot();
-        if (root == null) {
-            return false;
-        }
-        if (root.options().copyDefaults()) {
-            return contains(path);
-        }
+    @Override
+    public boolean isSet(final String path)
+    {
+        final Configuration root = getRoot();
+        if (root == null) { return false; }
+        if (root.options().copyDefaults()) { return contains(path); }
         return get(path, null) != null;
     }
 
-    public String getCurrentPath() {
+    @Override
+    public String getCurrentPath()
+    {
         return fullPath;
     }
 
-    public String getName() {
+    @Override
+    public String getName()
+    {
         return path;
     }
 
-    public Configuration getRoot() {
+    @Override
+    public Configuration getRoot()
+    {
         return root;
     }
 
-    public ConfigurationSection getParent() {
+    @Override
+    public ConfigurationSection getParent()
+    {
         return parent;
     }
 
-    public void addDefault(String path, Object value) {
-        if (path == null) throw new NullPointerException("Path cannot be null");
+    @Override
+    public void addDefault(final String path, final Object value)
+    {
+        if (path == null) { throw new NullPointerException("Path cannot be null"); }
 
-        Configuration root = getRoot();
-        if (root == null) {
-            throw new IllegalStateException("Cannot add default without root");
-        }
-        if (root == this) {
-            throw new UnsupportedOperationException("Unsupported addDefault(String, Object) implementation");
-        }
+        final Configuration root = getRoot();
+        if (root == null) { throw new IllegalStateException("Cannot add default without root"); }
+        if (root == this) { throw new UnsupportedOperationException("Unsupported addDefault(String, Object) implementation"); }
         root.addDefault(createPath(this, path), value);
     }
 
-    public ConfigurationSection getDefaultSection() {
-        Configuration root = getRoot();
-        Configuration defaults = root == null ? null : root.getDefaults();
+    @Override
+    public ConfigurationSection getDefaultSection()
+    {
+        final Configuration root = getRoot();
+        final Configuration defaults = root == null ? null : root.getDefaults();
 
-        if (defaults != null) {
-            if (defaults.isConfigurationSection(getCurrentPath())) {
-                return defaults.getConfigurationSection(getCurrentPath());
-            }
+        if (defaults != null)
+        {
+            if (defaults.isConfigurationSection(getCurrentPath())) { return defaults.getConfigurationSection(getCurrentPath()); }
         }
 
         return null;
     }
 
-    public void set(String path, Object value) {
-        if (path == null) throw new NullPointerException("Cannot set to an empty path");
+    @Override
+    public void set(final String path, final Object value)
+    {
+        if (path == null) { throw new NullPointerException("Cannot set to an empty path"); }
 
-        Configuration root = getRoot();
-        if (root == null) {
-            throw new IllegalStateException("Cannot use section without a root");
-        }
+        final Configuration root = getRoot();
+        if (root == null) { throw new IllegalStateException("Cannot use section without a root"); }
 
         final char separator = root.options().pathSeparator();
         // i1 is the leading (higher) index
         // i2 is the trailing (lower) index
         int i1 = -1, i2;
         ConfigurationSection section = this;
-        while ((i1 = path.indexOf(separator, i2 = i1 + 1)) != -1) {
-            String node = path.substring(i2, i1);
-            ConfigurationSection subSection = section.getConfigurationSection(node);
-            if (subSection == null) {
+        while ((i1 = path.indexOf(separator, i2 = i1 + 1)) != -1)
+        {
+            final String node = path.substring(i2, i1);
+            final ConfigurationSection subSection = section.getConfigurationSection(node);
+            if (subSection == null)
+            {
                 section = section.createSection(node);
-            } else {
+            }
+            else
+            {
                 section = subSection;
             }
         }
 
-        String key = path.substring(i2);
-        if (section == this) {
-            if (value == null) {
+        final String key = path.substring(i2);
+        if (section == this)
+        {
+            if (value == null)
+            {
                 map.remove(key);
-            } else {
+            }
+            else
+            {
                 map.put(key, value);
             }
-        } else {
+        }
+        else
+        {
             section.set(key, value);
         }
     }
 
-    public Object get(String path) {
+    @Override
+    public Object get(final String path)
+    {
         return get(path, getDefault(path));
     }
 
-    public Object get(String path, Object def) {
-        if (path == null) throw new NullPointerException("Path cannot be null");
+    @Override
+    public Object get(final String path, final Object def)
+    {
+        if (path == null) { throw new NullPointerException("Path cannot be null"); }
 
-        if (path.length() == 0) {
-            return this;
-        }
+        if (path.length() == 0) { return this; }
 
-        Configuration root = getRoot();
-        if (root == null) {
-            throw new IllegalStateException("Cannot access section without a root");
-        }
+        final Configuration root = getRoot();
+        if (root == null) { throw new IllegalStateException("Cannot access section without a root"); }
 
         final char separator = root.options().pathSeparator();
         // i1 is the leading (higher) index
         // i2 is the trailing (lower) index
         int i1 = -1, i2;
         ConfigurationSection section = this;
-        while ((i1 = path.indexOf(separator, i2 = i1 + 1)) != -1) {
+        while ((i1 = path.indexOf(separator, i2 = i1 + 1)) != -1)
+        {
             section = section.getConfigurationSection(path.substring(i2, i1));
-            if (section == null) {
-                return def;
-            }
+            if (section == null) { return def; }
         }
 
-        String key = path.substring(i2);
-        if (section == this) {
-            Object result = map.get(key);
+        final String key = path.substring(i2);
+        if (section == this)
+        {
+            final Object result = map.get(key);
             return (result == null) ? def : result;
         }
         return section.get(key, def);
     }
 
-    public ConfigurationSection createSection(String path) {
-        if (path == null) throw new NullPointerException("Cannot create section at empty path");
-        Configuration root = getRoot();
-        if (root == null) {
-            throw new IllegalStateException("Cannot create section without a root");
-        }
+    @Override
+    public ConfigurationSection createSection(final String path)
+    {
+        if (path == null) { throw new NullPointerException("Cannot create section at empty path"); }
+        final Configuration root = getRoot();
+        if (root == null) { throw new IllegalStateException("Cannot create section without a root"); }
 
         final char separator = root.options().pathSeparator();
         // i1 is the leading (higher) index
         // i2 is the trailing (lower) index
         int i1 = -1, i2;
         ConfigurationSection section = this;
-        while ((i1 = path.indexOf(separator, i2 = i1 + 1)) != -1) {
-            String node = path.substring(i2, i1);
-            ConfigurationSection subSection = section.getConfigurationSection(node);
-            if (subSection == null) {
+        while ((i1 = path.indexOf(separator, i2 = i1 + 1)) != -1)
+        {
+            final String node = path.substring(i2, i1);
+            final ConfigurationSection subSection = section.getConfigurationSection(node);
+            if (subSection == null)
+            {
                 section = section.createSection(node);
-            } else {
+            }
+            else
+            {
                 section = subSection;
             }
         }
 
-        String key = path.substring(i2);
-        if (section == this) {
-            ConfigurationSection result = new MemorySection(this, key);
+        final String key = path.substring(i2);
+        if (section == this)
+        {
+            final ConfigurationSection result = new MemorySection(this, key);
             map.put(key, result);
             return result;
         }
         return section.createSection(key);
     }
 
-    public ConfigurationSection createSection(String path, Map<?, ?> map) {
-        ConfigurationSection section = createSection(path);
+    @Override
+    public ConfigurationSection createSection(final String path, final Map<?, ?> map)
+    {
+        final ConfigurationSection section = createSection(path);
 
-        for (Map.Entry<?, ?> entry : map.entrySet()) {
-            if (entry.getValue() instanceof Map) {
+        for (final Map.Entry<?, ?> entry : map.entrySet())
+        {
+            if (entry.getValue() instanceof Map)
+            {
                 section.createSection(entry.getKey().toString(), (Map<?, ?>) entry.getValue());
-            } else {
+            }
+            else
+            {
                 section.set(entry.getKey().toString(), entry.getValue());
             }
         }
@@ -325,108 +365,146 @@ public class MemorySection implements ConfigurationSection {
     }
 
     // Primitives
-    public String getString(String path) {
-        Object def = getDefault(path);
+    @Override
+    public String getString(final String path)
+    {
+        final Object def = getDefault(path);
         return getString(path, def != null ? def.toString() : null);
     }
 
-    public String getString(String path, String def) {
-        Object val = get(path, def);
+    @Override
+    public String getString(final String path, final String def)
+    {
+        final Object val = get(path, def);
         return (val != null) ? val.toString() : def;
     }
 
-    public boolean isString(String path) {
-        Object val = get(path);
+    @Override
+    public boolean isString(final String path)
+    {
+        final Object val = get(path);
         return val instanceof String;
     }
 
-    public int getInt(String path) {
-        Object def = getDefault(path);
+    @Override
+    public int getInt(final String path)
+    {
+        final Object def = getDefault(path);
         return getInt(path, toInt(def, 0));
     }
 
-    public int getInt(String path, int def) {
-        Object val = get(path, def);
+    @Override
+    public int getInt(final String path, final int def)
+    {
+        final Object val = get(path, def);
         return toInt(val, def);
     }
 
-    public boolean isInt(String path) {
-        Object val = get(path);
+    @Override
+    public boolean isInt(final String path)
+    {
+        final Object val = get(path);
         return val instanceof Integer;
     }
 
-    public boolean getBoolean(String path) {
-        Object def = getDefault(path);
+    @Override
+    public boolean getBoolean(final String path)
+    {
+        final Object def = getDefault(path);
         return getBoolean(path, (def instanceof Boolean) ? (Boolean) def : false);
     }
 
-    public boolean getBoolean(String path, boolean def) {
-        Object val = get(path, def);
+    @Override
+    public boolean getBoolean(final String path, final boolean def)
+    {
+        final Object val = get(path, def);
         return (val instanceof Boolean) ? (Boolean) val : def;
     }
 
-    public boolean isBoolean(String path) {
-        Object val = get(path);
+    @Override
+    public boolean isBoolean(final String path)
+    {
+        final Object val = get(path);
         return val instanceof Boolean;
     }
 
-    public double getDouble(String path) {
-        Object def = getDefault(path);
+    @Override
+    public double getDouble(final String path)
+    {
+        final Object def = getDefault(path);
         return getDouble(path, toDouble(def, 0));
     }
 
-    public double getDouble(String path, double def) {
-        Object val = get(path, def);
+    @Override
+    public double getDouble(final String path, final double def)
+    {
+        final Object val = get(path, def);
         return toDouble(val, def);
     }
 
-    public boolean isDouble(String path) {
-        Object val = get(path);
+    @Override
+    public boolean isDouble(final String path)
+    {
+        final Object val = get(path);
         return val instanceof Double;
     }
 
-    public long getLong(String path) {
-        Object def = getDefault(path);
+    @Override
+    public long getLong(final String path)
+    {
+        final Object def = getDefault(path);
         return getLong(path, toLong(def, 0));
     }
 
-    public long getLong(String path, long def) {
-        Object val = get(path, def);
+    @Override
+    public long getLong(final String path, final long def)
+    {
+        final Object val = get(path, def);
         return toLong(val, def);
     }
 
-    public boolean isLong(String path) {
-        Object val = get(path);
+    @Override
+    public boolean isLong(final String path)
+    {
+        final Object val = get(path);
         return val instanceof Long;
     }
 
     // Java
-    public List<?> getList(String path) {
-        Object def = getDefault(path);
+    @Override
+    public List<?> getList(final String path)
+    {
+        final Object def = getDefault(path);
         return getList(path, (def instanceof List) ? (List<?>) def : null);
     }
 
-    public List<?> getList(String path, List<?> def) {
-        Object val = get(path, def);
+    @Override
+    public List<?> getList(final String path, final List<?> def)
+    {
+        final Object val = get(path, def);
         return (List<?>) ((val instanceof List) ? val : def);
     }
 
-    public boolean isList(String path) {
-        Object val = get(path);
+    @Override
+    public boolean isList(final String path)
+    {
+        final Object val = get(path);
         return val instanceof List;
     }
 
-    public List<String> getStringList(String path) {
-        List<?> list = getList(path);
+    @Override
+    public List<String> getStringList(final String path)
+    {
+        final List<?> list = getList(path);
 
-        if (list == null) {
-            return new ArrayList<String>(0);
-        }
+        if (list == null) { return new ArrayList<String>(0); }
 
-        List<String> result = new ArrayList<String>();
+        final List<String> result = new ArrayList<String>();
 
-        for (Object object : list) {
-            if ((object instanceof String) || (isPrimitiveWrapper(object))) {
+        for (final Object object : list)
+        {
+            if ((object instanceof String) || (isPrimitiveWrapper(object)))
+            {
                 result.add(String.valueOf(object));
             }
         }
@@ -434,26 +512,36 @@ public class MemorySection implements ConfigurationSection {
         return result;
     }
 
-    public List<Integer> getIntegerList(String path) {
-        List<?> list = getList(path);
+    @Override
+    public List<Integer> getIntegerList(final String path)
+    {
+        final List<?> list = getList(path);
 
-        if (list == null) {
-            return new ArrayList<Integer>(0);
-        }
+        if (list == null) { return new ArrayList<Integer>(0); }
 
-        List<Integer> result = new ArrayList<Integer>();
+        final List<Integer> result = new ArrayList<Integer>();
 
-        for (Object object : list) {
-            if (object instanceof Integer) {
+        for (final Object object : list)
+        {
+            if (object instanceof Integer)
+            {
                 result.add((Integer) object);
-            } else if (object instanceof String) {
-                try {
+            }
+            else if (object instanceof String)
+            {
+                try
+                {
                     result.add(Integer.valueOf((String) object));
-                } catch (Exception ex) {
                 }
-            } else if (object instanceof Character) {
+                catch (final Exception ex)
+                {}
+            }
+            else if (object instanceof Character)
+            {
                 result.add((int) ((Character) object).charValue());
-            } else if (object instanceof Number) {
+            }
+            else if (object instanceof Number)
+            {
                 result.add(((Number) object).intValue());
             }
         }
@@ -461,22 +549,29 @@ public class MemorySection implements ConfigurationSection {
         return result;
     }
 
-    public List<Boolean> getBooleanList(String path) {
-        List<?> list = getList(path);
+    @Override
+    public List<Boolean> getBooleanList(final String path)
+    {
+        final List<?> list = getList(path);
 
-        if (list == null) {
-            return new ArrayList<Boolean>(0);
-        }
+        if (list == null) { return new ArrayList<Boolean>(0); }
 
-        List<Boolean> result = new ArrayList<Boolean>();
+        final List<Boolean> result = new ArrayList<Boolean>();
 
-        for (Object object : list) {
-            if (object instanceof Boolean) {
+        for (final Object object : list)
+        {
+            if (object instanceof Boolean)
+            {
                 result.add((Boolean) object);
-            } else if (object instanceof String) {
-                if (Boolean.TRUE.toString().equals(object)) {
+            }
+            else if (object instanceof String)
+            {
+                if (Boolean.TRUE.toString().equals(object))
+                {
                     result.add(true);
-                } else if (Boolean.FALSE.toString().equals(object)) {
+                }
+                else if (Boolean.FALSE.toString().equals(object))
+                {
                     result.add(false);
                 }
             }
@@ -485,26 +580,36 @@ public class MemorySection implements ConfigurationSection {
         return result;
     }
 
-    public List<Double> getDoubleList(String path) {
-        List<?> list = getList(path);
+    @Override
+    public List<Double> getDoubleList(final String path)
+    {
+        final List<?> list = getList(path);
 
-        if (list == null) {
-            return new ArrayList<Double>(0);
-        }
+        if (list == null) { return new ArrayList<Double>(0); }
 
-        List<Double> result = new ArrayList<Double>();
+        final List<Double> result = new ArrayList<Double>();
 
-        for (Object object : list) {
-            if (object instanceof Double) {
+        for (final Object object : list)
+        {
+            if (object instanceof Double)
+            {
                 result.add((Double) object);
-            } else if (object instanceof String) {
-                try {
+            }
+            else if (object instanceof String)
+            {
+                try
+                {
                     result.add(Double.valueOf((String) object));
-                } catch (Exception ex) {
                 }
-            } else if (object instanceof Character) {
+                catch (final Exception ex)
+                {}
+            }
+            else if (object instanceof Character)
+            {
                 result.add((double) ((Character) object).charValue());
-            } else if (object instanceof Number) {
+            }
+            else if (object instanceof Number)
+            {
                 result.add(((Number) object).doubleValue());
             }
         }
@@ -512,26 +617,36 @@ public class MemorySection implements ConfigurationSection {
         return result;
     }
 
-    public List<Float> getFloatList(String path) {
-        List<?> list = getList(path);
+    @Override
+    public List<Float> getFloatList(final String path)
+    {
+        final List<?> list = getList(path);
 
-        if (list == null) {
-            return new ArrayList<Float>(0);
-        }
+        if (list == null) { return new ArrayList<Float>(0); }
 
-        List<Float> result = new ArrayList<Float>();
+        final List<Float> result = new ArrayList<Float>();
 
-        for (Object object : list) {
-            if (object instanceof Float) {
+        for (final Object object : list)
+        {
+            if (object instanceof Float)
+            {
                 result.add((Float) object);
-            } else if (object instanceof String) {
-                try {
+            }
+            else if (object instanceof String)
+            {
+                try
+                {
                     result.add(Float.valueOf((String) object));
-                } catch (Exception ex) {
                 }
-            } else if (object instanceof Character) {
+                catch (final Exception ex)
+                {}
+            }
+            else if (object instanceof Character)
+            {
                 result.add((float) ((Character) object).charValue());
-            } else if (object instanceof Number) {
+            }
+            else if (object instanceof Number)
+            {
                 result.add(((Number) object).floatValue());
             }
         }
@@ -539,26 +654,36 @@ public class MemorySection implements ConfigurationSection {
         return result;
     }
 
-    public List<Long> getLongList(String path) {
-        List<?> list = getList(path);
+    @Override
+    public List<Long> getLongList(final String path)
+    {
+        final List<?> list = getList(path);
 
-        if (list == null) {
-            return new ArrayList<Long>(0);
-        }
+        if (list == null) { return new ArrayList<Long>(0); }
 
-        List<Long> result = new ArrayList<Long>();
+        final List<Long> result = new ArrayList<Long>();
 
-        for (Object object : list) {
-            if (object instanceof Long) {
+        for (final Object object : list)
+        {
+            if (object instanceof Long)
+            {
                 result.add((Long) object);
-            } else if (object instanceof String) {
-                try {
+            }
+            else if (object instanceof String)
+            {
+                try
+                {
                     result.add(Long.valueOf((String) object));
-                } catch (Exception ex) {
                 }
-            } else if (object instanceof Character) {
+                catch (final Exception ex)
+                {}
+            }
+            else if (object instanceof Character)
+            {
                 result.add((long) ((Character) object).charValue());
-            } else if (object instanceof Number) {
+            }
+            else if (object instanceof Number)
+            {
                 result.add(((Number) object).longValue());
             }
         }
@@ -566,26 +691,36 @@ public class MemorySection implements ConfigurationSection {
         return result;
     }
 
-    public List<Byte> getByteList(String path) {
-        List<?> list = getList(path);
+    @Override
+    public List<Byte> getByteList(final String path)
+    {
+        final List<?> list = getList(path);
 
-        if (list == null) {
-            return new ArrayList<Byte>(0);
-        }
+        if (list == null) { return new ArrayList<Byte>(0); }
 
-        List<Byte> result = new ArrayList<Byte>();
+        final List<Byte> result = new ArrayList<Byte>();
 
-        for (Object object : list) {
-            if (object instanceof Byte) {
+        for (final Object object : list)
+        {
+            if (object instanceof Byte)
+            {
                 result.add((Byte) object);
-            } else if (object instanceof String) {
-                try {
+            }
+            else if (object instanceof String)
+            {
+                try
+                {
                     result.add(Byte.valueOf((String) object));
-                } catch (Exception ex) {
                 }
-            } else if (object instanceof Character) {
+                catch (final Exception ex)
+                {}
+            }
+            else if (object instanceof Character)
+            {
                 result.add((byte) ((Character) object).charValue());
-            } else if (object instanceof Number) {
+            }
+            else if (object instanceof Number)
+            {
                 result.add(((Number) object).byteValue());
             }
         }
@@ -593,25 +728,32 @@ public class MemorySection implements ConfigurationSection {
         return result;
     }
 
-    public List<Character> getCharacterList(String path) {
-        List<?> list = getList(path);
+    @Override
+    public List<Character> getCharacterList(final String path)
+    {
+        final List<?> list = getList(path);
 
-        if (list == null) {
-            return new ArrayList<Character>(0);
-        }
+        if (list == null) { return new ArrayList<Character>(0); }
 
-        List<Character> result = new ArrayList<Character>();
+        final List<Character> result = new ArrayList<Character>();
 
-        for (Object object : list) {
-            if (object instanceof Character) {
+        for (final Object object : list)
+        {
+            if (object instanceof Character)
+            {
                 result.add((Character) object);
-            } else if (object instanceof String) {
-                String str = (String) object;
+            }
+            else if (object instanceof String)
+            {
+                final String str = (String) object;
 
-                if (str.length() == 1) {
+                if (str.length() == 1)
+                {
                     result.add(str.charAt(0));
                 }
-            } else if (object instanceof Number) {
+            }
+            else if (object instanceof Number)
+            {
                 result.add((char) ((Number) object).intValue());
             }
         }
@@ -619,26 +761,36 @@ public class MemorySection implements ConfigurationSection {
         return result;
     }
 
-    public List<Short> getShortList(String path) {
-        List<?> list = getList(path);
+    @Override
+    public List<Short> getShortList(final String path)
+    {
+        final List<?> list = getList(path);
 
-        if (list == null) {
-            return new ArrayList<Short>(0);
-        }
+        if (list == null) { return new ArrayList<Short>(0); }
 
-        List<Short> result = new ArrayList<Short>();
+        final List<Short> result = new ArrayList<Short>();
 
-        for (Object object : list) {
-            if (object instanceof Short) {
+        for (final Object object : list)
+        {
+            if (object instanceof Short)
+            {
                 result.add((Short) object);
-            } else if (object instanceof String) {
-                try {
+            }
+            else if (object instanceof String)
+            {
+                try
+                {
                     result.add(Short.valueOf((String) object));
-                } catch (Exception ex) {
                 }
-            } else if (object instanceof Character) {
+                catch (final Exception ex)
+                {}
+            }
+            else if (object instanceof Character)
+            {
                 result.add((short) ((Character) object).charValue());
-            } else if (object instanceof Number) {
+            }
+            else if (object instanceof Number)
+            {
                 result.add(((Number) object).shortValue());
             }
         }
@@ -646,16 +798,18 @@ public class MemorySection implements ConfigurationSection {
         return result;
     }
 
-    public List<Map<?, ?>> getMapList(String path) {
-        List<?> list = getList(path);
-        List<Map<?, ?>> result = new ArrayList<Map<?, ?>>();
+    @Override
+    public List<Map<?, ?>> getMapList(final String path)
+    {
+        final List<?> list = getList(path);
+        final List<Map<?, ?>> result = new ArrayList<Map<?, ?>>();
 
-        if (list == null) {
-            return result;
-        }
+        if (list == null) { return result; }
 
-        for (Object object : list) {
-            if (object instanceof Map) {
+        for (final Object object : list)
+        {
+            if (object instanceof Map)
+            {
                 result.add((Map<?, ?>) object);
             }
         }
@@ -663,74 +817,93 @@ public class MemorySection implements ConfigurationSection {
         return result;
     }
 
-    public ConfigurationSection getConfigurationSection(String path) {
+    @Override
+    public ConfigurationSection getConfigurationSection(final String path)
+    {
         Object val = get(path, null);
-        if (val != null) {
-            return (val instanceof ConfigurationSection) ? (ConfigurationSection) val : null;
-        }
+        if (val != null) { return (val instanceof ConfigurationSection) ? (ConfigurationSection) val : null; }
 
         val = get(path, getDefault(path));
         return (val instanceof ConfigurationSection) ? createSection(path) : null;
     }
 
-    public boolean isConfigurationSection(String path) {
-        Object val = get(path);
+    @Override
+    public boolean isConfigurationSection(final String path)
+    {
+        final Object val = get(path);
         return val instanceof ConfigurationSection;
     }
 
-    protected boolean isPrimitiveWrapper(Object input) {
-        return input instanceof Integer || input instanceof Boolean ||
-                input instanceof Character || input instanceof Byte ||
-                input instanceof Short || input instanceof Double ||
-                input instanceof Long || input instanceof Float;
+    protected boolean isPrimitiveWrapper(final Object input)
+    {
+        return (input instanceof Integer) || (input instanceof Boolean) ||
+        (input instanceof Character) || (input instanceof Byte) ||
+        (input instanceof Short) || (input instanceof Double) ||
+        (input instanceof Long) || (input instanceof Float);
     }
 
-    protected Object getDefault(String path) {
-        if (path == null) throw new NullPointerException("Path may not be null");
+    protected Object getDefault(final String path)
+    {
+        if (path == null) { throw new NullPointerException("Path may not be null"); }
 
-        Configuration root = getRoot();
-        Configuration defaults = root == null ? null : root.getDefaults();
+        final Configuration root = getRoot();
+        final Configuration defaults = root == null ? null : root.getDefaults();
         return (defaults == null) ? null : defaults.get(createPath(this, path));
     }
 
-    protected void mapChildrenKeys(Set<String> output, ConfigurationSection section, boolean deep) {
-        if (section instanceof MemorySection) {
-            MemorySection sec = (MemorySection) section;
+    protected void mapChildrenKeys(final Set<String> output, final ConfigurationSection section, final boolean deep)
+    {
+        if (section instanceof MemorySection)
+        {
+            final MemorySection sec = (MemorySection) section;
 
-            for (Map.Entry<String, Object> entry : sec.map.entrySet()) {
+            for (final Map.Entry<String, Object> entry : sec.map.entrySet())
+            {
                 output.add(createPath(section, entry.getKey(), this));
 
-                if ((deep) && (entry.getValue() instanceof ConfigurationSection)) {
-                    ConfigurationSection subsection = (ConfigurationSection) entry.getValue();
+                if ((deep) && (entry.getValue() instanceof ConfigurationSection))
+                {
+                    final ConfigurationSection subsection = (ConfigurationSection) entry.getValue();
                     mapChildrenKeys(output, subsection, deep);
                 }
             }
-        } else {
-            Set<String> keys = section.getKeys(deep);
+        }
+        else
+        {
+            final Set<String> keys = section.getKeys(deep);
 
-            for (String key : keys) {
+            for (final String key : keys)
+            {
                 output.add(createPath(section, key, this));
             }
         }
     }
 
-    protected void mapChildrenValues(Map<String, Object> output, ConfigurationSection section, boolean deep) {
-        if (section instanceof MemorySection) {
-            MemorySection sec = (MemorySection) section;
+    protected void mapChildrenValues(final Map<String, Object> output, final ConfigurationSection section, final boolean deep)
+    {
+        if (section instanceof MemorySection)
+        {
+            final MemorySection sec = (MemorySection) section;
 
-            for (Map.Entry<String, Object> entry : sec.map.entrySet()) {
+            for (final Map.Entry<String, Object> entry : sec.map.entrySet())
+            {
                 output.put(createPath(section, entry.getKey(), this), entry.getValue());
 
-                if (entry.getValue() instanceof ConfigurationSection) {
-                    if (deep) {
+                if (entry.getValue() instanceof ConfigurationSection)
+                {
+                    if (deep)
+                    {
                         mapChildrenValues(output, (ConfigurationSection) entry.getValue(), deep);
                     }
                 }
             }
-        } else {
-            Map<String, Object> values = section.getValues(deep);
+        }
+        else
+        {
+            final Map<String, Object> values = section.getValues(deep);
 
-            for (Map.Entry<String, Object> entry : values.entrySet()) {
+            for (final Map.Entry<String, Object> entry : values.entrySet())
+            {
                 output.put(createPath(section, entry.getKey(), this), entry.getValue());
             }
         }
@@ -747,7 +920,8 @@ public class MemorySection implements ConfigurationSection {
      * @param key Name of the specified section.
      * @return Full path of the section from its root.
      */
-    public static String createPath(ConfigurationSection section, String key) {
+    public static String createPath(final ConfigurationSection section, final String key)
+    {
         return createPath(section, key, (section == null) ? null : section.getRoot());
     }
 
@@ -763,18 +937,20 @@ public class MemorySection implements ConfigurationSection {
      * @param relativeTo Section to create the path relative to.
      * @return Full path of the section from its root.
      */
-    public static String createPath(ConfigurationSection section, String key, ConfigurationSection relativeTo) {
-        if (section == null) throw new NullPointerException("Cannot create path without a section");
-        Configuration root = section.getRoot();
-        if (root == null) {
-            throw new IllegalStateException("Cannot create path without a root");
-        }
-        char separator = root.options().pathSeparator();
+    public static String createPath(final ConfigurationSection section, final String key, final ConfigurationSection relativeTo)
+    {
+        if (section == null) { throw new NullPointerException("Cannot create path without a section"); }
+        final Configuration root = section.getRoot();
+        if (root == null) { throw new IllegalStateException("Cannot create path without a root"); }
+        final char separator = root.options().pathSeparator();
 
-        StringBuilder builder = new StringBuilder();
-        if (section != null) {
-            for (ConfigurationSection parent = section; (parent != null) && (parent != relativeTo); parent = parent.getParent()) {
-                if (builder.length() > 0) {
+        final StringBuilder builder = new StringBuilder();
+        if (section != null)
+        {
+            for (ConfigurationSection parent = section; (parent != null) && (parent != relativeTo); parent = parent.getParent())
+            {
+                if (builder.length() > 0)
+                {
                     builder.insert(0, separator);
                 }
 
@@ -782,8 +958,10 @@ public class MemorySection implements ConfigurationSection {
             }
         }
 
-        if ((key != null) && (key.length() > 0)) {
-            if (builder.length() > 0) {
+        if ((key != null) && (key.length() > 0))
+        {
+            if (builder.length() > 0)
+            {
                 builder.append(separator);
             }
 
@@ -794,15 +972,16 @@ public class MemorySection implements ConfigurationSection {
     }
 
     @Override
-    public String toString() {
-        Configuration root = getRoot();
+    public String toString()
+    {
+        final Configuration root = getRoot();
         return new StringBuilder()
-            .append(getClass().getSimpleName())
-            .append("[path='")
-            .append(getCurrentPath())
-            .append("', root='")
-            .append(root == null ? null : root.getClass().getSimpleName())
-            .append("']")
-            .toString();
+        .append(getClass().getSimpleName())
+        .append("[path='")
+        .append(getCurrentPath())
+        .append("', root='")
+        .append(root == null ? null : root.getClass().getSimpleName())
+        .append("']")
+        .toString();
     }
 }
diff --git a/src/main/java/com/intellectualcrafters/configuration/file/FileConfiguration.java b/src/main/java/com/intellectualcrafters/configuration/file/FileConfiguration.java
index 171374deb..5cec0073b 100644
--- a/src/main/java/com/intellectualcrafters/configuration/file/FileConfiguration.java
+++ b/src/main/java/com/intellectualcrafters/configuration/file/FileConfiguration.java
@@ -24,7 +24,8 @@ import com.intellectualcrafters.configuration.MemoryConfiguration;
  * This is a base class for all File based implementations of {@link
  * Configuration}
  */
-public abstract class FileConfiguration extends MemoryConfiguration {
+public abstract class FileConfiguration extends MemoryConfiguration
+{
     /**
      * This value specified that the system default encoding should be
      * completely ignored, as it cannot handle the ASCII character set, or it
@@ -49,7 +50,8 @@ public abstract class FileConfiguration extends MemoryConfiguration {
      */
     @Deprecated
     public static final boolean SYSTEM_UTF;
-    static {
+    static
+    {
         final byte[] testBytes = Base64Coder.decode("ICEiIyQlJicoKSorLC0uLzAxMjM0NTY3ODk6Ozw9Pj9AQUJDREVGR0hJSktMTU5PUFFSU1RVVldYWVpbXF1eX2BhYmNkZWZnaGlqa2xtbm9wcXJzdHV2d3h5ent8fX4NCg==");
         final String testString = " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\r\n";
         final Charset defaultCharset = Charset.defaultCharset();
@@ -63,7 +65,8 @@ public abstract class FileConfiguration extends MemoryConfiguration {
     /**
      * Creates an empty {@link FileConfiguration} with no default values.
      */
-    public FileConfiguration() {
+    public FileConfiguration()
+    {
         super();
     }
 
@@ -73,7 +76,8 @@ public abstract class FileConfiguration extends MemoryConfiguration {
      *
      * @param defaults Default value provider
      */
-    public FileConfiguration(Configuration defaults) {
+    public FileConfiguration(final Configuration defaults)
+    {
         super(defaults);
     }
 
@@ -92,17 +96,21 @@ public abstract class FileConfiguration extends MemoryConfiguration {
      *     any reason.
      * @throws IllegalArgumentException Thrown when file is null.
      */
-    public void save(File file) throws IOException {
-        if (file == null) throw new NullPointerException("File cannot be null");
+    public void save(final File file) throws IOException
+    {
+        if (file == null) { throw new NullPointerException("File cannot be null"); }
         file.getParentFile().mkdirs();
 
-        String data = saveToString();
+        final String data = saveToString();
 
-        Writer writer = new OutputStreamWriter(new FileOutputStream(file), UTF8_OVERRIDE && !UTF_BIG ? StandardCharsets.UTF_8 : Charset.defaultCharset());
+        final Writer writer = new OutputStreamWriter(new FileOutputStream(file), UTF8_OVERRIDE && !UTF_BIG ? StandardCharsets.UTF_8 : Charset.defaultCharset());
 
-        try {
+        try
+        {
             writer.write(data);
-        } finally {
+        }
+        finally
+        {
             writer.close();
         }
     }
@@ -122,8 +130,9 @@ public abstract class FileConfiguration extends MemoryConfiguration {
      *     any reason.
      * @throws IllegalArgumentException Thrown when file is null.
      */
-    public void save(String file) throws IOException {
-        if (file == null) throw new NullPointerException("File cannot be null");
+    public void save(final String file) throws IOException
+    {
+        if (file == null) { throw new NullPointerException("File cannot be null"); }
 
         save(new File(file));
     }
@@ -157,8 +166,9 @@ public abstract class FileConfiguration extends MemoryConfiguration {
      *     a valid Configuration.
      * @throws IllegalArgumentException Thrown when file is null.
      */
-    public void load(File file) throws IOException, InvalidConfigurationException {
-        if (file == null) throw new NullPointerException("File cannot be null");
+    public void load(final File file) throws IOException, InvalidConfigurationException
+    {
+        if (file == null) { throw new NullPointerException("File cannot be null"); }
 
         final FileInputStream stream = new FileInputStream(file);
 
@@ -184,8 +194,9 @@ public abstract class FileConfiguration extends MemoryConfiguration {
      * @see #load(Reader)
      */
     @Deprecated
-    public void load(InputStream stream) throws IOException, InvalidConfigurationException {
-        if (stream == null) throw new NullPointerException("Stream cannot be null");
+    public void load(final InputStream stream) throws IOException, InvalidConfigurationException
+    {
+        if (stream == null) { throw new NullPointerException("Stream cannot be null"); }
 
         load(new InputStreamReader(stream, UTF8_OVERRIDE ? StandardCharsets.UTF_8 : Charset.defaultCharset()));
     }
@@ -203,19 +214,24 @@ public abstract class FileConfiguration extends MemoryConfiguration {
      *      represent a valid Configuration
      * @throws IllegalArgumentException thrown when reader is null
      */
-    public void load(Reader reader) throws IOException, InvalidConfigurationException {
-        BufferedReader input = reader instanceof BufferedReader ? (BufferedReader) reader : new BufferedReader(reader);
+    public void load(final Reader reader) throws IOException, InvalidConfigurationException
+    {
+        final BufferedReader input = reader instanceof BufferedReader ? (BufferedReader) reader : new BufferedReader(reader);
 
-        StringBuilder builder = new StringBuilder();
+        final StringBuilder builder = new StringBuilder();
 
-        try {
+        try
+        {
             String line;
 
-            while ((line = input.readLine()) != null) {
+            while ((line = input.readLine()) != null)
+            {
                 builder.append(line);
                 builder.append('\n');
             }
-        } finally {
+        }
+        finally
+        {
             input.close();
         }
 
@@ -240,8 +256,9 @@ public abstract class FileConfiguration extends MemoryConfiguration {
      *     a valid Configuration.
      * @throws IllegalArgumentException Thrown when file is null.
      */
-    public void load(String file) throws IOException, InvalidConfigurationException {
-        if (file == null) throw new NullPointerException("File cannot be null");
+    public void load(final String file) throws IOException, InvalidConfigurationException
+    {
+        if (file == null) { throw new NullPointerException("File cannot be null"); }
 
         load(new File(file));
     }
@@ -261,7 +278,7 @@ public abstract class FileConfiguration extends MemoryConfiguration {
      *     invalid.
      * @throws IllegalArgumentException Thrown if contents is null.
      */
-    public abstract void loadFromString(String contents) throws InvalidConfigurationException;
+    public abstract void loadFromString(final String contents) throws InvalidConfigurationException;
 
     /**
      * Compiles the header for this {@link FileConfiguration} and returns the
@@ -276,11 +293,13 @@ public abstract class FileConfiguration extends MemoryConfiguration {
     protected abstract String buildHeader();
 
     @Override
-    public FileConfigurationOptions options() {
-        if (options == null) {
+    public FileConfigurationOptions options()
+    {
+        if (options == null)
+        {
             options = new FileConfigurationOptions(this);
         }
 
         return (FileConfigurationOptions) options;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/intellectualcrafters/configuration/file/FileConfigurationOptions.java b/src/main/java/com/intellectualcrafters/configuration/file/FileConfigurationOptions.java
index 72936c667..9b26be71c 100644
--- a/src/main/java/com/intellectualcrafters/configuration/file/FileConfigurationOptions.java
+++ b/src/main/java/com/intellectualcrafters/configuration/file/FileConfigurationOptions.java
@@ -7,27 +7,32 @@ import com.intellectualcrafters.configuration.MemoryConfigurationOptions;
  * Various settings for controlling the input and output of a {@link
  * FileConfiguration}
  */
-public class FileConfigurationOptions extends MemoryConfigurationOptions {
+public class FileConfigurationOptions extends MemoryConfigurationOptions
+{
     private String header = null;
     private boolean copyHeader = true;
 
-    protected FileConfigurationOptions(MemoryConfiguration configuration) {
+    protected FileConfigurationOptions(final MemoryConfiguration configuration)
+    {
         super(configuration);
     }
 
     @Override
-    public FileConfiguration configuration() {
+    public FileConfiguration configuration()
+    {
         return (FileConfiguration) super.configuration();
     }
 
     @Override
-    public FileConfigurationOptions copyDefaults(boolean value) {
+    public FileConfigurationOptions copyDefaults(final boolean value)
+    {
         super.copyDefaults(value);
         return this;
     }
 
     @Override
-    public FileConfigurationOptions pathSeparator(char value) {
+    public FileConfigurationOptions pathSeparator(final char value)
+    {
         super.pathSeparator(value);
         return this;
     }
@@ -46,7 +51,8 @@ public class FileConfigurationOptions extends MemoryConfigurationOptions {
      *
      * @return Header
      */
-    public String header() {
+    public String header()
+    {
         return header;
     }
 
@@ -65,8 +71,9 @@ public class FileConfigurationOptions extends MemoryConfigurationOptions {
      * @param value New header
      * @return This object, for chaining
      */
-    public FileConfigurationOptions header(String value) {
-        this.header = value;
+    public FileConfigurationOptions header(final String value)
+    {
+        header = value;
         return this;
     }
 
@@ -88,7 +95,8 @@ public class FileConfigurationOptions extends MemoryConfigurationOptions {
      *
      * @return Whether or not to copy the header
      */
-    public boolean copyHeader() {
+    public boolean copyHeader()
+    {
         return copyHeader;
     }
 
@@ -111,7 +119,8 @@ public class FileConfigurationOptions extends MemoryConfigurationOptions {
      * @param value Whether or not to copy the header
      * @return This object, for chaining
      */
-    public FileConfigurationOptions copyHeader(boolean value) {
+    public FileConfigurationOptions copyHeader(final boolean value)
+    {
         copyHeader = value;
 
         return this;
diff --git a/src/main/java/com/intellectualcrafters/configuration/file/YamlConfiguration.java b/src/main/java/com/intellectualcrafters/configuration/file/YamlConfiguration.java
index d1277be62..2a3a5fc20 100644
--- a/src/main/java/com/intellectualcrafters/configuration/file/YamlConfiguration.java
+++ b/src/main/java/com/intellectualcrafters/configuration/file/YamlConfiguration.java
@@ -22,7 +22,8 @@ import com.intellectualcrafters.plot.PS;
  * An implementation of {@link Configuration} which saves all files in Yaml.
  * Note that this implementation is not synchronized.
  */
-public class YamlConfiguration extends FileConfiguration {
+public class YamlConfiguration extends FileConfiguration
+{
     protected static final String COMMENT_PREFIX = "# ";
     protected static final String BLANK_CONFIG = "{}\n";
     private final DumperOptions yamlOptions = new DumperOptions();
@@ -30,16 +31,18 @@ public class YamlConfiguration extends FileConfiguration {
     private final Yaml yaml = new Yaml(new YamlConstructor(), yamlRepresenter, yamlOptions);
 
     @Override
-    public String saveToString() {
+    public String saveToString()
+    {
         yamlOptions.setIndent(options().indent());
         yamlOptions.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
         yamlOptions.setAllowUnicode(SYSTEM_UTF);
         yamlRepresenter.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
 
-        String header = buildHeader();
+        final String header = buildHeader();
         String dump = yaml.dump(getValues(false));
 
-        if (dump.equals(BLANK_CONFIG)) {
+        if (dump.equals(BLANK_CONFIG))
+        {
             dump = "";
         }
 
@@ -47,63 +50,85 @@ public class YamlConfiguration extends FileConfiguration {
     }
 
     @Override
-    public void loadFromString(String contents) throws InvalidConfigurationException {
-        if (contents == null) throw new NullPointerException("Contents cannot be null");
+    public void loadFromString(final String contents) throws InvalidConfigurationException
+    {
+        if (contents == null) { throw new NullPointerException("Contents cannot be null"); }
 
         Map<?, ?> input;
-        try {
+        try
+        {
             input = (Map<?, ?>) yaml.load(contents);
-        } catch (YAMLException e) {
+        }
+        catch (final YAMLException e)
+        {
             throw new InvalidConfigurationException(e);
-        } catch (ClassCastException e) {
+        }
+        catch (final ClassCastException e)
+        {
             throw new InvalidConfigurationException("Top level is not a Map.");
         }
 
-        String header = parseHeader(contents);
-        if (header.length() > 0) {
+        final String header = parseHeader(contents);
+        if (header.length() > 0)
+        {
             options().header(header);
         }
 
-        if (input != null) {
+        if (input != null)
+        {
             convertMapsToSections(input, this);
         }
     }
 
-    protected void convertMapsToSections(Map<?, ?> input, ConfigurationSection section) {
-        for (Map.Entry<?, ?> entry : input.entrySet()) {
-            String key = entry.getKey().toString();
-            Object value = entry.getValue();
+    protected void convertMapsToSections(final Map<?, ?> input, final ConfigurationSection section)
+    {
+        for (final Map.Entry<?, ?> entry : input.entrySet())
+        {
+            final String key = entry.getKey().toString();
+            final Object value = entry.getValue();
 
-            if (value instanceof Map) {
+            if (value instanceof Map)
+            {
                 convertMapsToSections((Map<?, ?>) value, section.createSection(key));
-            } else {
+            }
+            else
+            {
                 section.set(key, value);
             }
         }
     }
 
-    protected String parseHeader(String input) {
-        String[] lines = input.split("\r?\n", -1);
-        StringBuilder result = new StringBuilder();
+    protected String parseHeader(final String input)
+    {
+        final String[] lines = input.split("\r?\n", -1);
+        final StringBuilder result = new StringBuilder();
         boolean readingHeader = true;
         boolean foundHeader = false;
 
-        for (int i = 0; (i < lines.length) && (readingHeader); i++) {
-            String line = lines[i];
+        for (int i = 0; (i < lines.length) && (readingHeader); i++)
+        {
+            final String line = lines[i];
 
-            if (line.startsWith(COMMENT_PREFIX)) {
-                if (i > 0) {
+            if (line.startsWith(COMMENT_PREFIX))
+            {
+                if (i > 0)
+                {
                     result.append("\n");
                 }
 
-                if (line.length() > COMMENT_PREFIX.length()) {
+                if (line.length() > COMMENT_PREFIX.length())
+                {
                     result.append(line.substring(COMMENT_PREFIX.length()));
                 }
 
                 foundHeader = true;
-            } else if ((foundHeader) && (line.length() == 0)) {
+            }
+            else if ((foundHeader) && (line.length() == 0))
+            {
                 result.append("\n");
-            } else if (foundHeader) {
+            }
+            else if (foundHeader)
+            {
                 readingHeader = false;
             }
         }
@@ -112,34 +137,35 @@ public class YamlConfiguration extends FileConfiguration {
     }
 
     @Override
-    protected String buildHeader() {
-        String header = options().header();
+    protected String buildHeader()
+    {
+        final String header = options().header();
 
-        if (options().copyHeader()) {
-            Configuration def = getDefaults();
+        if (options().copyHeader())
+        {
+            final Configuration def = getDefaults();
 
-            if ((def != null) && (def instanceof FileConfiguration)) {
-                FileConfiguration filedefaults = (FileConfiguration) def;
-                String defaultsHeader = filedefaults.buildHeader();
+            if ((def != null) && (def instanceof FileConfiguration))
+            {
+                final FileConfiguration filedefaults = (FileConfiguration) def;
+                final String defaultsHeader = filedefaults.buildHeader();
 
-                if ((defaultsHeader != null) && (defaultsHeader.length() > 0)) {
-                    return defaultsHeader;
-                }
+                if ((defaultsHeader != null) && (defaultsHeader.length() > 0)) { return defaultsHeader; }
             }
         }
 
-        if (header == null) {
-            return "";
-        }
+        if (header == null) { return ""; }
 
-        StringBuilder builder = new StringBuilder();
-        String[] lines = header.split("\r?\n", -1);
+        final StringBuilder builder = new StringBuilder();
+        final String[] lines = header.split("\r?\n", -1);
         boolean startedHeader = false;
 
-        for (int i = lines.length - 1; i >= 0; i--) {
+        for (int i = lines.length - 1; i >= 0; i--)
+        {
             builder.insert(0, "\n");
 
-            if ((startedHeader) || (lines[i].length() != 0)) {
+            if ((startedHeader) || (lines[i].length() != 0))
+            {
                 builder.insert(0, lines[i]);
                 builder.insert(0, COMMENT_PREFIX);
                 startedHeader = true;
@@ -150,8 +176,10 @@ public class YamlConfiguration extends FileConfiguration {
     }
 
     @Override
-    public YamlConfigurationOptions options() {
-        if (options == null) {
+    public YamlConfigurationOptions options()
+    {
+        if (options == null)
+        {
             options = new YamlConfigurationOptions(this);
         }
 
@@ -171,28 +199,36 @@ public class YamlConfiguration extends FileConfiguration {
      * @return Resulting configuration
      * @throws IllegalArgumentException Thrown if file is null
      */
-    public static YamlConfiguration loadConfiguration(File file) {
-        if (file == null) throw new NullPointerException("File cannot be null");
+    public static YamlConfiguration loadConfiguration(final File file)
+    {
+        if (file == null) { throw new NullPointerException("File cannot be null"); }
 
-        YamlConfiguration config = new YamlConfiguration();
+        final YamlConfiguration config = new YamlConfiguration();
 
-        try {
+        try
+        {
             config.load(file);
-        } catch (Exception ex) {
-            try {
-                String path = file.getAbsolutePath() + "_broken";
+        }
+        catch (final Exception ex)
+        {
+            try
+            {
+                file.getAbsolutePath();
                 File dest = new File(file.getAbsolutePath() + "_broken");
                 int i = 0;
-                while (dest.exists()) {
+                while (dest.exists())
+                {
                     dest = new File(file.getAbsolutePath() + "_broken_" + i++);
                 }
-                Files.copy( file.toPath(), dest.toPath() , StandardCopyOption.REPLACE_EXISTING);
+                Files.copy(file.toPath(), dest.toPath(), StandardCopyOption.REPLACE_EXISTING);
                 PS.debug("&dCould not read: &7" + file);
                 PS.debug("&drenamed to: &7" + dest.getName());
                 PS.debug("&c============ Full stacktrace ============");
                 ex.printStackTrace();
                 PS.debug("&c=========================================");
-            } catch (IOException e) {
+            }
+            catch (final IOException e)
+            {
                 e.printStackTrace();
             }
         }
@@ -215,17 +251,23 @@ public class YamlConfiguration extends FileConfiguration {
      * @see #loadConfiguration(Reader)
      */
     @Deprecated
-    public static YamlConfiguration loadConfiguration(InputStream stream) {
-        if (stream == null) throw new NullPointerException("Stream cannot be null");
+    public static YamlConfiguration loadConfiguration(final InputStream stream)
+    {
+        if (stream == null) { throw new NullPointerException("Stream cannot be null"); }
 
-        YamlConfiguration config = new YamlConfiguration();
+        final YamlConfiguration config = new YamlConfiguration();
 
-        try {
+        try
+        {
             config.load(stream);
-        } catch (IOException ex) {
+        }
+        catch (final IOException ex)
+        {
             PS.debug("Cannot load configuration from stream");
             ex.printStackTrace();
-        } catch (InvalidConfigurationException ex) {
+        }
+        catch (final InvalidConfigurationException ex)
+        {
             ex.printStackTrace();
             PS.debug("Cannot load configuration from stream");
         }
@@ -233,7 +275,6 @@ public class YamlConfiguration extends FileConfiguration {
         return config;
     }
 
-
     /**
      * Creates a new {@link YamlConfiguration}, loading from the given reader.
      * <p>
@@ -245,17 +286,23 @@ public class YamlConfiguration extends FileConfiguration {
      * @return resulting configuration
      * @throws IllegalArgumentException Thrown if stream is null
      */
-    public static YamlConfiguration loadConfiguration(Reader reader) {
-        if (reader == null) throw new NullPointerException("Reader cannot be null");
+    public static YamlConfiguration loadConfiguration(final Reader reader)
+    {
+        if (reader == null) { throw new NullPointerException("Reader cannot be null"); }
 
-        YamlConfiguration config = new YamlConfiguration();
+        final YamlConfiguration config = new YamlConfiguration();
 
-        try {
+        try
+        {
             config.load(reader);
-        } catch (IOException ex) {
+        }
+        catch (final IOException ex)
+        {
             PS.debug("Cannot load configuration from stream");
             ex.printStackTrace();
-        } catch (InvalidConfigurationException ex) {
+        }
+        catch (final InvalidConfigurationException ex)
+        {
             PS.debug("Cannot load configuration from stream");
             ex.printStackTrace();
         }
diff --git a/src/main/java/com/intellectualcrafters/configuration/file/YamlConfigurationOptions.java b/src/main/java/com/intellectualcrafters/configuration/file/YamlConfigurationOptions.java
index 6783d5ce4..75eae9250 100644
--- a/src/main/java/com/intellectualcrafters/configuration/file/YamlConfigurationOptions.java
+++ b/src/main/java/com/intellectualcrafters/configuration/file/YamlConfigurationOptions.java
@@ -4,38 +4,45 @@ package com.intellectualcrafters.configuration.file;
  * Various settings for controlling the input and output of a {@link
  * YamlConfiguration}
  */
-public class YamlConfigurationOptions extends FileConfigurationOptions {
+public class YamlConfigurationOptions extends FileConfigurationOptions
+{
     private int indent = 2;
 
-    protected YamlConfigurationOptions(YamlConfiguration configuration) {
+    protected YamlConfigurationOptions(final YamlConfiguration configuration)
+    {
         super(configuration);
     }
 
     @Override
-    public YamlConfiguration configuration() {
+    public YamlConfiguration configuration()
+    {
         return (YamlConfiguration) super.configuration();
     }
 
     @Override
-    public YamlConfigurationOptions copyDefaults(boolean value) {
+    public YamlConfigurationOptions copyDefaults(final boolean value)
+    {
         super.copyDefaults(value);
         return this;
     }
 
     @Override
-    public YamlConfigurationOptions pathSeparator(char value) {
+    public YamlConfigurationOptions pathSeparator(final char value)
+    {
         super.pathSeparator(value);
         return this;
     }
 
     @Override
-    public YamlConfigurationOptions header(String value) {
+    public YamlConfigurationOptions header(final String value)
+    {
         super.header(value);
         return this;
     }
 
     @Override
-    public YamlConfigurationOptions copyHeader(boolean value) {
+    public YamlConfigurationOptions copyHeader(final boolean value)
+    {
         super.copyHeader(value);
         return this;
     }
@@ -47,7 +54,8 @@ public class YamlConfigurationOptions extends FileConfigurationOptions {
      *
      * @return How much to indent by
      */
-    public int indent() {
+    public int indent()
+    {
         return indent;
     }
 
@@ -59,11 +67,12 @@ public class YamlConfigurationOptions extends FileConfigurationOptions {
      * @param value New indent
      * @return This object, for chaining
      */
-    public YamlConfigurationOptions indent(int value) {
-        if (value < 2) throw new IllegalArgumentException("Indent must be at least 2 characters");
-        if (value > 9) throw new IllegalArgumentException("Indent cannot be greater than 9 characters");
+    public YamlConfigurationOptions indent(final int value)
+    {
+        if (value < 2) { throw new IllegalArgumentException("Indent must be at least 2 characters"); }
+        if (value > 9) { throw new IllegalArgumentException("Indent cannot be greater than 9 characters"); }
 
-        this.indent = value;
+        indent = value;
         return this;
     }
 }
diff --git a/src/main/java/com/intellectualcrafters/configuration/file/YamlConstructor.java b/src/main/java/com/intellectualcrafters/configuration/file/YamlConstructor.java
index 5a8b41732..688a53791 100644
--- a/src/main/java/com/intellectualcrafters/configuration/file/YamlConstructor.java
+++ b/src/main/java/com/intellectualcrafters/configuration/file/YamlConstructor.java
@@ -10,30 +10,37 @@ import org.yaml.snakeyaml.nodes.Tag;
 
 import com.intellectualcrafters.configuration.serialization.ConfigurationSerialization;
 
-public class YamlConstructor extends SafeConstructor {
+public class YamlConstructor extends SafeConstructor
+{
 
-    public YamlConstructor() {
-        this.yamlConstructors.put(Tag.MAP, new ConstructCustomObject());
+    public YamlConstructor()
+    {
+        yamlConstructors.put(Tag.MAP, new ConstructCustomObject());
     }
 
-    private class ConstructCustomObject extends ConstructYamlMap {
+    private class ConstructCustomObject extends ConstructYamlMap
+    {
         @Override
-        public Object construct(Node node) {
-            if (node.isTwoStepsConstruction()) {
-                throw new YAMLException("Unexpected referential mapping structure. Node: " + node);
-            }
+        public Object construct(final Node node)
+        {
+            if (node.isTwoStepsConstruction()) { throw new YAMLException("Unexpected referential mapping structure. Node: " + node); }
 
-            Map<?, ?> raw = (Map<?, ?>) super.construct(node);
+            final Map<?, ?> raw = (Map<?, ?>) super.construct(node);
 
-            if (raw.containsKey(ConfigurationSerialization.SERIALIZED_TYPE_KEY)) {
-                Map<String, Object> typed = new LinkedHashMap<String, Object>(raw.size());
-                for (Map.Entry<?, ?> entry : raw.entrySet()) {
+            if (raw.containsKey(ConfigurationSerialization.SERIALIZED_TYPE_KEY))
+            {
+                final Map<String, Object> typed = new LinkedHashMap<String, Object>(raw.size());
+                for (final Map.Entry<?, ?> entry : raw.entrySet())
+                {
                     typed.put(entry.getKey().toString(), entry.getValue());
                 }
 
-                try {
+                try
+                {
                     return ConfigurationSerialization.deserializeObject(typed);
-                } catch (IllegalArgumentException ex) {
+                }
+                catch (final IllegalArgumentException ex)
+                {
                     throw new YAMLException("Could not deserialize object", ex);
                 }
             }
@@ -42,7 +49,8 @@ public class YamlConstructor extends SafeConstructor {
         }
 
         @Override
-        public void construct2ndStep(Node node, Object object) {
+        public void construct2ndStep(final Node node, final Object object)
+        {
             throw new YAMLException("Unexpected referential mapping structure. Node: " + node);
         }
     }
diff --git a/src/main/java/com/intellectualcrafters/configuration/file/YamlRepresenter.java b/src/main/java/com/intellectualcrafters/configuration/file/YamlRepresenter.java
index d4ef6da29..f5bf748f2 100644
--- a/src/main/java/com/intellectualcrafters/configuration/file/YamlRepresenter.java
+++ b/src/main/java/com/intellectualcrafters/configuration/file/YamlRepresenter.java
@@ -10,25 +10,31 @@ import com.intellectualcrafters.configuration.ConfigurationSection;
 import com.intellectualcrafters.configuration.serialization.ConfigurationSerializable;
 import com.intellectualcrafters.configuration.serialization.ConfigurationSerialization;
 
-public class YamlRepresenter extends Representer {
+public class YamlRepresenter extends Representer
+{
 
-    public YamlRepresenter() {
-        this.multiRepresenters.put(ConfigurationSection.class, new RepresentConfigurationSection());
-        this.multiRepresenters.put(ConfigurationSerializable.class, new RepresentConfigurationSerializable());
+    public YamlRepresenter()
+    {
+        multiRepresenters.put(ConfigurationSection.class, new RepresentConfigurationSection());
+        multiRepresenters.put(ConfigurationSerializable.class, new RepresentConfigurationSerializable());
     }
 
-    private class RepresentConfigurationSection extends RepresentMap {
+    private class RepresentConfigurationSection extends RepresentMap
+    {
         @Override
-        public Node representData(Object data) {
+        public Node representData(final Object data)
+        {
             return super.representData(((ConfigurationSection) data).getValues(false));
         }
     }
 
-    private class RepresentConfigurationSerializable extends RepresentMap {
+    private class RepresentConfigurationSerializable extends RepresentMap
+    {
         @Override
-        public Node representData(Object data) {
-            ConfigurationSerializable serializable = (ConfigurationSerializable) data;
-            Map<String, Object> values = new LinkedHashMap<String, Object>();
+        public Node representData(final Object data)
+        {
+            final ConfigurationSerializable serializable = (ConfigurationSerializable) data;
+            final Map<String, Object> values = new LinkedHashMap<String, Object>();
             values.put(ConfigurationSerialization.SERIALIZED_TYPE_KEY, ConfigurationSerialization.getAlias(serializable.getClass()));
             values.putAll(serializable.serialize());
 
diff --git a/src/main/java/com/intellectualcrafters/configuration/serialization/ConfigurationSerializable.java b/src/main/java/com/intellectualcrafters/configuration/serialization/ConfigurationSerializable.java
index e403ebed9..0cca20083 100644
--- a/src/main/java/com/intellectualcrafters/configuration/serialization/ConfigurationSerializable.java
+++ b/src/main/java/com/intellectualcrafters/configuration/serialization/ConfigurationSerializable.java
@@ -21,7 +21,8 @@ import java.util.Map;
  * @see DelegateDeserialization
  * @see SerializableAs
  */
-public interface ConfigurationSerializable {
+public interface ConfigurationSerializable
+{
 
     /**
      * Creates a Map representation of this class.
diff --git a/src/main/java/com/intellectualcrafters/configuration/serialization/ConfigurationSerialization.java b/src/main/java/com/intellectualcrafters/configuration/serialization/ConfigurationSerialization.java
index db59bff3f..17eb82574 100644
--- a/src/main/java/com/intellectualcrafters/configuration/serialization/ConfigurationSerialization.java
+++ b/src/main/java/com/intellectualcrafters/configuration/serialization/ConfigurationSerialization.java
@@ -14,103 +14,130 @@ import com.intellectualcrafters.configuration.Configuration;
 /**
  * Utility class for storing and retrieving classes for {@link Configuration}.
  */
-public class ConfigurationSerialization {
+public class ConfigurationSerialization
+{
     public static final String SERIALIZED_TYPE_KEY = "==";
     private final Class<? extends ConfigurationSerializable> clazz;
     private static Map<String, Class<? extends ConfigurationSerializable>> aliases = new HashMap<String, Class<? extends ConfigurationSerializable>>();
 
-    protected ConfigurationSerialization(Class<? extends ConfigurationSerializable> clazz) {
+    protected ConfigurationSerialization(final Class<? extends ConfigurationSerializable> clazz)
+    {
         this.clazz = clazz;
     }
 
-    protected Method getMethod(String name, boolean isStatic) {
-        try {
-            Method method = clazz.getDeclaredMethod(name, Map.class);
+    protected Method getMethod(final String name, final boolean isStatic)
+    {
+        try
+        {
+            final Method method = clazz.getDeclaredMethod(name, Map.class);
 
-            if (!ConfigurationSerializable.class.isAssignableFrom(method.getReturnType())) {
-                return null;
-            }
-            if (Modifier.isStatic(method.getModifiers()) != isStatic) {
-                return null;
-            }
+            if (!ConfigurationSerializable.class.isAssignableFrom(method.getReturnType())) { return null; }
+            if (Modifier.isStatic(method.getModifiers()) != isStatic) { return null; }
 
             return method;
-        } catch (NoSuchMethodException ex) {
+        }
+        catch (final NoSuchMethodException ex)
+        {
             return null;
-        } catch (SecurityException ex) {
+        }
+        catch (final SecurityException ex)
+        {
             return null;
         }
     }
 
-    protected Constructor<? extends ConfigurationSerializable> getConstructor() {
-        try {
+    protected Constructor<? extends ConfigurationSerializable> getConstructor()
+    {
+        try
+        {
             return clazz.getConstructor(Map.class);
-        } catch (NoSuchMethodException ex) {
+        }
+        catch (final NoSuchMethodException ex)
+        {
             return null;
-        } catch (SecurityException ex) {
+        }
+        catch (final SecurityException ex)
+        {
             return null;
         }
     }
 
-    protected ConfigurationSerializable deserializeViaMethod(Method method, Map<String, ?> args) {
-        try {
-            ConfigurationSerializable result = (ConfigurationSerializable) method.invoke(null, args);
+    protected ConfigurationSerializable deserializeViaMethod(final Method method, final Map<String, ?> args)
+    {
+        try
+        {
+            final ConfigurationSerializable result = (ConfigurationSerializable) method.invoke(null, args);
 
-            if (result == null) {
-                Logger.getLogger(ConfigurationSerialization.class.getName()).log(Level.SEVERE, "Could not call method '" + method.toString() + "' of " + clazz + " for deserialization: method returned null");
-            } else {
+            if (result == null)
+            {
+                Logger.getLogger(ConfigurationSerialization.class.getName()).log(Level.SEVERE,
+                "Could not call method '" + method.toString() + "' of " + clazz + " for deserialization: method returned null");
+            }
+            else
+            {
                 return result;
             }
-        } catch (Throwable ex) {
+        }
+        catch (final Throwable ex)
+        {
             Logger.getLogger(ConfigurationSerialization.class.getName()).log(
-                    Level.SEVERE,
-                    "Could not call method '" + method.toString() + "' of " + clazz + " for deserialization",
-                    ex instanceof InvocationTargetException ? ex.getCause() : ex);
+            Level.SEVERE,
+            "Could not call method '" + method.toString() + "' of " + clazz + " for deserialization",
+            ex instanceof InvocationTargetException ? ex.getCause() : ex);
         }
 
         return null;
     }
 
-    protected ConfigurationSerializable deserializeViaCtor(Constructor<? extends ConfigurationSerializable> ctor, Map<String, ?> args) {
-        try {
+    protected ConfigurationSerializable deserializeViaCtor(final Constructor<? extends ConfigurationSerializable> ctor, final Map<String, ?> args)
+    {
+        try
+        {
             return ctor.newInstance(args);
-        } catch (Throwable ex) {
+        }
+        catch (final Throwable ex)
+        {
             Logger.getLogger(ConfigurationSerialization.class.getName()).log(
-                    Level.SEVERE,
-                    "Could not call constructor '" + ctor.toString() + "' of " + clazz + " for deserialization",
-                    ex instanceof InvocationTargetException ? ex.getCause() : ex);
+            Level.SEVERE,
+            "Could not call constructor '" + ctor.toString() + "' of " + clazz + " for deserialization",
+            ex instanceof InvocationTargetException ? ex.getCause() : ex);
         }
 
         return null;
     }
 
-    public ConfigurationSerializable deserialize(Map<String, ?> args) {
-        if (args == null) {
-            throw new NullPointerException("Args must not be null");
-        }
+    public ConfigurationSerializable deserialize(final Map<String, ?> args)
+    {
+        if (args == null) { throw new NullPointerException("Args must not be null"); }
         ConfigurationSerializable result = null;
         Method method = null;
 
-        if (result == null) {
+        if (result == null)
+        {
             method = getMethod("deserialize", true);
 
-            if (method != null) {
+            if (method != null)
+            {
                 result = deserializeViaMethod(method, args);
             }
         }
 
-        if (result == null) {
+        if (result == null)
+        {
             method = getMethod("valueOf", true);
 
-            if (method != null) {
+            if (method != null)
+            {
                 result = deserializeViaMethod(method, args);
             }
         }
 
-        if (result == null) {
-            Constructor<? extends ConfigurationSerializable> constructor = getConstructor();
+        if (result == null)
+        {
+            final Constructor<? extends ConfigurationSerializable> constructor = getConstructor();
 
-            if (constructor != null) {
+            if (constructor != null)
+            {
                 result = deserializeViaCtor(constructor, args);
             }
         }
@@ -133,7 +160,8 @@ public class ConfigurationSerialization {
      * @param clazz Class to deserialize into
      * @return New instance of the specified class
      */
-    public static ConfigurationSerializable deserializeObject(Map<String, ?> args, Class<? extends ConfigurationSerializable> clazz) {
+    public static ConfigurationSerializable deserializeObject(final Map<String, ?> args, final Class<? extends ConfigurationSerializable> clazz)
+    {
         return new ConfigurationSerialization(clazz).deserialize(args);
     }
 
@@ -151,25 +179,28 @@ public class ConfigurationSerialization {
      * @param args Arguments for deserialization
      * @return New instance of the specified class
      */
-    public static ConfigurationSerializable deserializeObject(Map<String, ?> args) {
+    public static ConfigurationSerializable deserializeObject(final Map<String, ?> args)
+    {
         Class<? extends ConfigurationSerializable> clazz = null;
 
-        if (args.containsKey(SERIALIZED_TYPE_KEY)) {
-            try {
-                String alias = (String) args.get(SERIALIZED_TYPE_KEY);
+        if (args.containsKey(SERIALIZED_TYPE_KEY))
+        {
+            try
+            {
+                final String alias = (String) args.get(SERIALIZED_TYPE_KEY);
 
-                if (alias == null) {
-                    throw new IllegalArgumentException("Cannot have null alias");
-                }
+                if (alias == null) { throw new IllegalArgumentException("Cannot have null alias"); }
                 clazz = getClassByAlias(alias);
-                if (clazz == null) {
-                    throw new IllegalArgumentException("Specified class does not exist ('" + alias + "')");
-                }
-            } catch (ClassCastException ex) {
+                if (clazz == null) { throw new IllegalArgumentException("Specified class does not exist ('" + alias + "')"); }
+            }
+            catch (final ClassCastException ex)
+            {
                 ex.fillInStackTrace();
                 throw ex;
             }
-        } else {
+        }
+        else
+        {
             throw new IllegalArgumentException("Args doesn't contain type key ('" + SERIALIZED_TYPE_KEY + "')");
         }
 
@@ -182,10 +213,12 @@ public class ConfigurationSerialization {
      *
      * @param clazz Class to register
      */
-    public static void registerClass(Class<? extends ConfigurationSerializable> clazz) {
-        DelegateDeserialization delegate = clazz.getAnnotation(DelegateDeserialization.class);
+    public static void registerClass(final Class<? extends ConfigurationSerializable> clazz)
+    {
+        final DelegateDeserialization delegate = clazz.getAnnotation(DelegateDeserialization.class);
 
-        if (delegate == null) {
+        if (delegate == null)
+        {
             registerClass(clazz, getAlias(clazz));
             registerClass(clazz, clazz.getName());
         }
@@ -199,7 +232,8 @@ public class ConfigurationSerialization {
      * @param alias Alias to register as
      * @see SerializableAs
      */
-    public static void registerClass(Class<? extends ConfigurationSerializable> clazz, String alias) {
+    public static void registerClass(final Class<? extends ConfigurationSerializable> clazz, final String alias)
+    {
         aliases.put(alias, clazz);
     }
 
@@ -208,7 +242,8 @@ public class ConfigurationSerialization {
      *
      * @param alias Alias to unregister
      */
-    public static void unregisterClass(String alias) {
+    public static void unregisterClass(final String alias)
+    {
         aliases.remove(alias);
     }
 
@@ -218,9 +253,10 @@ public class ConfigurationSerialization {
      *
      * @param clazz Class to unregister
      */
-    public static void unregisterClass(Class<? extends ConfigurationSerializable> clazz) {
-        while (aliases.values().remove(clazz)) {
-        }
+    public static void unregisterClass(final Class<? extends ConfigurationSerializable> clazz)
+    {
+        while (aliases.values().remove(clazz))
+        {}
     }
 
     /**
@@ -230,7 +266,8 @@ public class ConfigurationSerialization {
      * @param alias Alias of the serializable
      * @return Registered class, or null if not found
      */
-    public static Class<? extends ConfigurationSerializable> getClassByAlias(String alias) {
+    public static Class<? extends ConfigurationSerializable> getClassByAlias(final String alias)
+    {
         return aliases.get(alias);
     }
 
@@ -241,23 +278,27 @@ public class ConfigurationSerialization {
      * @param clazz Class to get alias for
      * @return Alias to use for the class
      */
-    public static String getAlias(Class<? extends ConfigurationSerializable> clazz) {
+    public static String getAlias(final Class<? extends ConfigurationSerializable> clazz)
+    {
         DelegateDeserialization delegate = clazz.getAnnotation(DelegateDeserialization.class);
 
-        if (delegate != null) {
-            if ((delegate.value() == null) || (delegate.value() == clazz)) {
+        if (delegate != null)
+        {
+            if ((delegate.value() == null) || (delegate.value() == clazz))
+            {
                 delegate = null;
-            } else {
+            }
+            else
+            {
                 return getAlias(delegate.value());
             }
         }
 
-        if (delegate == null) {
-            SerializableAs alias = clazz.getAnnotation(SerializableAs.class);
+        if (delegate == null)
+        {
+            final SerializableAs alias = clazz.getAnnotation(SerializableAs.class);
 
-            if ((alias != null) && (alias.value() != null)) {
-                return alias.value();
-            }
+            if ((alias != null) && (alias.value() != null)) { return alias.value(); }
         }
 
         return clazz.getName();
diff --git a/src/main/java/com/intellectualcrafters/configuration/serialization/DelegateDeserialization.java b/src/main/java/com/intellectualcrafters/configuration/serialization/DelegateDeserialization.java
index bc505ccf2..bb0e04d68 100644
--- a/src/main/java/com/intellectualcrafters/configuration/serialization/DelegateDeserialization.java
+++ b/src/main/java/com/intellectualcrafters/configuration/serialization/DelegateDeserialization.java
@@ -11,7 +11,8 @@ import java.lang.annotation.Target;
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
-public @interface DelegateDeserialization {
+public @interface DelegateDeserialization
+{
     /**
      * Which class should be used as a delegate for this classes
      * deserialization
diff --git a/src/main/java/com/intellectualcrafters/configuration/serialization/SerializableAs.java b/src/main/java/com/intellectualcrafters/configuration/serialization/SerializableAs.java
index 668da9ac9..fde872a1b 100644
--- a/src/main/java/com/intellectualcrafters/configuration/serialization/SerializableAs.java
+++ b/src/main/java/com/intellectualcrafters/configuration/serialization/SerializableAs.java
@@ -21,7 +21,8 @@ import java.lang.annotation.Target;
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
-public @interface SerializableAs {
+public @interface SerializableAs
+{
     /**
      * This is the name your class will be stored and retrieved as.
      * <p>
diff --git a/src/main/java/com/intellectualcrafters/jnbt/ByteArrayTag.java b/src/main/java/com/intellectualcrafters/jnbt/ByteArrayTag.java
index 67fc3d9b4..146f4e658 100644
--- a/src/main/java/com/intellectualcrafters/jnbt/ByteArrayTag.java
+++ b/src/main/java/com/intellectualcrafters/jnbt/ByteArrayTag.java
@@ -3,7 +3,8 @@ package com.intellectualcrafters.jnbt;
 /**
  * The {@code TAG_Byte_Array} tag.
  */
-public final class ByteArrayTag extends Tag {
+public final class ByteArrayTag extends Tag
+{
     private final byte[] value;
 
     /**
@@ -11,7 +12,8 @@ public final class ByteArrayTag extends Tag {
      *
      * @param value the value of the tag
      */
-    public ByteArrayTag(final byte[] value) {
+    public ByteArrayTag(final byte[] value)
+    {
         super();
         this.value = value;
     }
@@ -22,30 +24,36 @@ public final class ByteArrayTag extends Tag {
      * @param name  the name of the tag
      * @param value the value of the tag
      */
-    public ByteArrayTag(final String name, final byte[] value) {
+    public ByteArrayTag(final String name, final byte[] value)
+    {
         super(name);
         this.value = value;
     }
 
     @Override
-    public byte[] getValue() {
-        return this.value;
+    public byte[] getValue()
+    {
+        return value;
     }
 
     @Override
-    public String toString() {
+    public String toString()
+    {
         final StringBuilder hex = new StringBuilder();
-        for (final byte b : this.value) {
+        for (final byte b : value)
+        {
             final String hexDigits = Integer.toHexString(b).toUpperCase();
-            if (hexDigits.length() == 1) {
+            if (hexDigits.length() == 1)
+            {
                 hex.append("0");
             }
             hex.append(hexDigits).append(" ");
         }
         final String name = getName();
         String append = "";
-        if ((name != null) && !name.equals("")) {
-            append = "(\"" + this.getName() + "\")";
+        if ((name != null) && !name.equals(""))
+        {
+            append = "(\"" + getName() + "\")";
         }
         return "TAG_Byte_Array" + append + ": " + hex;
     }
diff --git a/src/main/java/com/intellectualcrafters/jnbt/ByteTag.java b/src/main/java/com/intellectualcrafters/jnbt/ByteTag.java
index 6ee42254c..fbdb1d30e 100644
--- a/src/main/java/com/intellectualcrafters/jnbt/ByteTag.java
+++ b/src/main/java/com/intellectualcrafters/jnbt/ByteTag.java
@@ -3,7 +3,8 @@ package com.intellectualcrafters.jnbt;
 /**
  * The {@code TAG_Byte} tag.
  */
-public final class ByteTag extends Tag {
+public final class ByteTag extends Tag
+{
     private final byte value;
 
     /**
@@ -11,7 +12,8 @@ public final class ByteTag extends Tag {
      *
      * @param value the value of the tag
      */
-    public ByteTag(final byte value) {
+    public ByteTag(final byte value)
+    {
         super();
         this.value = value;
     }
@@ -22,23 +24,27 @@ public final class ByteTag extends Tag {
      * @param name  the name of the tag
      * @param value the value of the tag
      */
-    public ByteTag(final String name, final byte value) {
+    public ByteTag(final String name, final byte value)
+    {
         super(name);
         this.value = value;
     }
 
     @Override
-    public Byte getValue() {
-        return this.value;
+    public Byte getValue()
+    {
+        return value;
     }
 
     @Override
-    public String toString() {
+    public String toString()
+    {
         final String name = getName();
         String append = "";
-        if ((name != null) && !name.equals("")) {
-            append = "(\"" + this.getName() + "\")";
+        if ((name != null) && !name.equals(""))
+        {
+            append = "(\"" + getName() + "\")";
         }
-        return "TAG_Byte" + append + ": " + this.value;
+        return "TAG_Byte" + append + ": " + value;
     }
 }
diff --git a/src/main/java/com/intellectualcrafters/jnbt/CompoundTag.java b/src/main/java/com/intellectualcrafters/jnbt/CompoundTag.java
index 842aba19b..6400f748f 100644
--- a/src/main/java/com/intellectualcrafters/jnbt/CompoundTag.java
+++ b/src/main/java/com/intellectualcrafters/jnbt/CompoundTag.java
@@ -8,7 +8,8 @@ import java.util.Map;
 /**
  * The {@code TAG_Compound} tag.
  */
-public final class CompoundTag extends Tag {
+public final class CompoundTag extends Tag
+{
     private final Map<String, Tag> value;
 
     /**
@@ -16,7 +17,8 @@ public final class CompoundTag extends Tag {
      *
      * @param value the value of the tag
      */
-    public CompoundTag(final Map<String, Tag> value) {
+    public CompoundTag(final Map<String, Tag> value)
+    {
         super();
         this.value = Collections.unmodifiableMap(value);
     }
@@ -27,7 +29,8 @@ public final class CompoundTag extends Tag {
      * @param name  the name of the tag
      * @param value the value of the tag
      */
-    public CompoundTag(final String name, final Map<String, Tag> value) {
+    public CompoundTag(final String name, final Map<String, Tag> value)
+    {
         super(name);
         this.value = Collections.unmodifiableMap(value);
     }
@@ -39,13 +42,15 @@ public final class CompoundTag extends Tag {
      *
      * @return true if the tag contains the given key
      */
-    public boolean containsKey(final String key) {
-        return this.value.containsKey(key);
+    public boolean containsKey(final String key)
+    {
+        return value.containsKey(key);
     }
 
     @Override
-    public Map<String, Tag> getValue() {
-        return this.value;
+    public Map<String, Tag> getValue()
+    {
+        return value;
     }
 
     /**
@@ -55,7 +60,8 @@ public final class CompoundTag extends Tag {
      *
      * @return the new compound tag
      */
-    public CompoundTag setValue(final Map<String, Tag> value) {
+    public CompoundTag setValue(final Map<String, Tag> value)
+    {
         return new CompoundTag(getName(), value);
     }
 
@@ -64,8 +70,9 @@ public final class CompoundTag extends Tag {
      *
      * @return the builder
      */
-    public CompoundTagBuilder createBuilder() {
-        return new CompoundTagBuilder(new HashMap<String, Tag>(this.value));
+    public CompoundTagBuilder createBuilder()
+    {
+        return new CompoundTagBuilder(new HashMap<String, Tag>(value));
     }
 
     /**
@@ -76,11 +83,15 @@ public final class CompoundTag extends Tag {
      *
      * @return a byte array
      */
-    public byte[] getByteArray(final String key) {
-        final Tag tag = this.value.get(key);
-        if (tag instanceof ByteArrayTag) {
+    public byte[] getByteArray(final String key)
+    {
+        final Tag tag = value.get(key);
+        if (tag instanceof ByteArrayTag)
+        {
             return ((ByteArrayTag) tag).getValue();
-        } else {
+        }
+        else
+        {
             return new byte[0];
         }
     }
@@ -93,11 +104,15 @@ public final class CompoundTag extends Tag {
      *
      * @return a byte
      */
-    public byte getByte(final String key) {
-        final Tag tag = this.value.get(key);
-        if (tag instanceof ByteTag) {
+    public byte getByte(final String key)
+    {
+        final Tag tag = value.get(key);
+        if (tag instanceof ByteTag)
+        {
             return ((ByteTag) tag).getValue();
-        } else {
+        }
+        else
+        {
             return (byte) 0;
         }
     }
@@ -110,11 +125,15 @@ public final class CompoundTag extends Tag {
      *
      * @return a double
      */
-    public double getDouble(final String key) {
-        final Tag tag = this.value.get(key);
-        if (tag instanceof DoubleTag) {
+    public double getDouble(final String key)
+    {
+        final Tag tag = value.get(key);
+        if (tag instanceof DoubleTag)
+        {
             return ((DoubleTag) tag).getValue();
-        } else {
+        }
+        else
+        {
             return 0;
         }
     }
@@ -127,21 +146,35 @@ public final class CompoundTag extends Tag {
      *
      * @return a double
      */
-    public double asDouble(final String key) {
-        final Tag tag = this.value.get(key);
-        if (tag instanceof ByteTag) {
+    public double asDouble(final String key)
+    {
+        final Tag tag = value.get(key);
+        if (tag instanceof ByteTag)
+        {
             return ((ByteTag) tag).getValue();
-        } else if (tag instanceof ShortTag) {
+        }
+        else if (tag instanceof ShortTag)
+        {
             return ((ShortTag) tag).getValue();
-        } else if (tag instanceof IntTag) {
+        }
+        else if (tag instanceof IntTag)
+        {
             return ((IntTag) tag).getValue();
-        } else if (tag instanceof LongTag) {
+        }
+        else if (tag instanceof LongTag)
+        {
             return ((LongTag) tag).getValue();
-        } else if (tag instanceof FloatTag) {
+        }
+        else if (tag instanceof FloatTag)
+        {
             return ((FloatTag) tag).getValue();
-        } else if (tag instanceof DoubleTag) {
+        }
+        else if (tag instanceof DoubleTag)
+        {
             return ((DoubleTag) tag).getValue();
-        } else {
+        }
+        else
+        {
             return 0;
         }
     }
@@ -154,11 +187,15 @@ public final class CompoundTag extends Tag {
      *
      * @return a float
      */
-    public float getFloat(final String key) {
-        final Tag tag = this.value.get(key);
-        if (tag instanceof FloatTag) {
+    public float getFloat(final String key)
+    {
+        final Tag tag = value.get(key);
+        if (tag instanceof FloatTag)
+        {
             return ((FloatTag) tag).getValue();
-        } else {
+        }
+        else
+        {
             return 0;
         }
     }
@@ -171,11 +208,15 @@ public final class CompoundTag extends Tag {
      *
      * @return an int array
      */
-    public int[] getIntArray(final String key) {
-        final Tag tag = this.value.get(key);
-        if (tag instanceof IntArrayTag) {
+    public int[] getIntArray(final String key)
+    {
+        final Tag tag = value.get(key);
+        if (tag instanceof IntArrayTag)
+        {
             return ((IntArrayTag) tag).getValue();
-        } else {
+        }
+        else
+        {
             return new int[0];
         }
     }
@@ -188,11 +229,15 @@ public final class CompoundTag extends Tag {
      *
      * @return an int
      */
-    public int getInt(final String key) {
-        final Tag tag = this.value.get(key);
-        if (tag instanceof IntTag) {
+    public int getInt(final String key)
+    {
+        final Tag tag = value.get(key);
+        if (tag instanceof IntTag)
+        {
             return ((IntTag) tag).getValue();
-        } else {
+        }
+        else
+        {
             return 0;
         }
     }
@@ -205,21 +250,35 @@ public final class CompoundTag extends Tag {
      *
      * @return an int
      */
-    public int asInt(final String key) {
-        final Tag tag = this.value.get(key);
-        if (tag instanceof ByteTag) {
+    public int asInt(final String key)
+    {
+        final Tag tag = value.get(key);
+        if (tag instanceof ByteTag)
+        {
             return ((ByteTag) tag).getValue();
-        } else if (tag instanceof ShortTag) {
+        }
+        else if (tag instanceof ShortTag)
+        {
             return ((ShortTag) tag).getValue();
-        } else if (tag instanceof IntTag) {
+        }
+        else if (tag instanceof IntTag)
+        {
             return ((IntTag) tag).getValue();
-        } else if (tag instanceof LongTag) {
+        }
+        else if (tag instanceof LongTag)
+        {
             return ((LongTag) tag).getValue().intValue();
-        } else if (tag instanceof FloatTag) {
+        }
+        else if (tag instanceof FloatTag)
+        {
             return ((FloatTag) tag).getValue().intValue();
-        } else if (tag instanceof DoubleTag) {
+        }
+        else if (tag instanceof DoubleTag)
+        {
             return ((DoubleTag) tag).getValue().intValue();
-        } else {
+        }
+        else
+        {
             return 0;
         }
     }
@@ -232,11 +291,15 @@ public final class CompoundTag extends Tag {
      *
      * @return a list of tags
      */
-    public List<Tag> getList(final String key) {
-        final Tag tag = this.value.get(key);
-        if (tag instanceof ListTag) {
+    public List<Tag> getList(final String key)
+    {
+        final Tag tag = value.get(key);
+        if (tag instanceof ListTag)
+        {
             return ((ListTag) tag).getValue();
-        } else {
+        }
+        else
+        {
             return Collections.emptyList();
         }
     }
@@ -249,11 +312,15 @@ public final class CompoundTag extends Tag {
      *
      * @return a tag list instance
      */
-    public ListTag getListTag(final String key) {
-        final Tag tag = this.value.get(key);
-        if (tag instanceof ListTag) {
+    public ListTag getListTag(final String key)
+    {
+        final Tag tag = value.get(key);
+        if (tag instanceof ListTag)
+        {
             return (ListTag) tag;
-        } else {
+        }
+        else
+        {
             return new ListTag(key, StringTag.class, Collections.<Tag> emptyList());
         }
     }
@@ -270,16 +337,23 @@ public final class CompoundTag extends Tag {
      * @return a list of tags
      */
     @SuppressWarnings("unchecked")
-    public <T extends Tag> List<T> getList(final String key, final Class<T> listType) {
-        final Tag tag = this.value.get(key);
-        if (tag instanceof ListTag) {
+    public <T extends Tag> List<T> getList(final String key, final Class<T> listType)
+    {
+        final Tag tag = value.get(key);
+        if (tag instanceof ListTag)
+        {
             final ListTag listTag = (ListTag) tag;
-            if (listTag.getType().equals(listType)) {
+            if (listTag.getType().equals(listType))
+            {
                 return (List<T>) listTag.getValue();
-            } else {
+            }
+            else
+            {
                 return Collections.emptyList();
             }
-        } else {
+        }
+        else
+        {
             return Collections.emptyList();
         }
     }
@@ -292,11 +366,15 @@ public final class CompoundTag extends Tag {
      *
      * @return a long
      */
-    public long getLong(final String key) {
-        final Tag tag = this.value.get(key);
-        if (tag instanceof LongTag) {
+    public long getLong(final String key)
+    {
+        final Tag tag = value.get(key);
+        if (tag instanceof LongTag)
+        {
             return ((LongTag) tag).getValue();
-        } else {
+        }
+        else
+        {
             return 0L;
         }
     }
@@ -309,21 +387,35 @@ public final class CompoundTag extends Tag {
      *
      * @return a long
      */
-    public long asLong(final String key) {
-        final Tag tag = this.value.get(key);
-        if (tag instanceof ByteTag) {
+    public long asLong(final String key)
+    {
+        final Tag tag = value.get(key);
+        if (tag instanceof ByteTag)
+        {
             return ((ByteTag) tag).getValue();
-        } else if (tag instanceof ShortTag) {
+        }
+        else if (tag instanceof ShortTag)
+        {
             return ((ShortTag) tag).getValue();
-        } else if (tag instanceof IntTag) {
+        }
+        else if (tag instanceof IntTag)
+        {
             return ((IntTag) tag).getValue();
-        } else if (tag instanceof LongTag) {
+        }
+        else if (tag instanceof LongTag)
+        {
             return ((LongTag) tag).getValue();
-        } else if (tag instanceof FloatTag) {
+        }
+        else if (tag instanceof FloatTag)
+        {
             return ((FloatTag) tag).getValue().longValue();
-        } else if (tag instanceof DoubleTag) {
+        }
+        else if (tag instanceof DoubleTag)
+        {
             return ((DoubleTag) tag).getValue().longValue();
-        } else {
+        }
+        else
+        {
             return 0L;
         }
     }
@@ -336,11 +428,15 @@ public final class CompoundTag extends Tag {
      *
      * @return a short
      */
-    public short getShort(final String key) {
-        final Tag tag = this.value.get(key);
-        if (tag instanceof ShortTag) {
+    public short getShort(final String key)
+    {
+        final Tag tag = value.get(key);
+        if (tag instanceof ShortTag)
+        {
             return ((ShortTag) tag).getValue();
-        } else {
+        }
+        else
+        {
             return 0;
         }
     }
@@ -353,25 +449,32 @@ public final class CompoundTag extends Tag {
      *
      * @return a string
      */
-    public String getString(final String key) {
-        final Tag tag = this.value.get(key);
-        if (tag instanceof StringTag) {
+    public String getString(final String key)
+    {
+        final Tag tag = value.get(key);
+        if (tag instanceof StringTag)
+        {
             return ((StringTag) tag).getValue();
-        } else {
+        }
+        else
+        {
             return "";
         }
     }
 
     @Override
-    public String toString() {
+    public String toString()
+    {
         final String name = getName();
         String append = "";
-        if ((name != null) && !name.equals("")) {
-            append = "(\"" + this.getName() + "\")";
+        if ((name != null) && !name.equals(""))
+        {
+            append = "(\"" + getName() + "\")";
         }
         final StringBuilder bldr = new StringBuilder();
-        bldr.append("TAG_Compound").append(append).append(": ").append(this.value.size()).append(" entries\r\n{\r\n");
-        for (final Map.Entry<String, Tag> entry : this.value.entrySet()) {
+        bldr.append("TAG_Compound").append(append).append(": ").append(value.size()).append(" entries\r\n{\r\n");
+        for (final Map.Entry<String, Tag> entry : value.entrySet())
+        {
             bldr.append("   ").append(entry.getValue().toString().replaceAll("\r\n", "\r\n   ")).append("\r\n");
         }
         bldr.append("}");
diff --git a/src/main/java/com/intellectualcrafters/jnbt/CompoundTagBuilder.java b/src/main/java/com/intellectualcrafters/jnbt/CompoundTagBuilder.java
index 3036481f2..69f4d7356 100644
--- a/src/main/java/com/intellectualcrafters/jnbt/CompoundTagBuilder.java
+++ b/src/main/java/com/intellectualcrafters/jnbt/CompoundTagBuilder.java
@@ -8,14 +8,16 @@ import java.util.Map;
 /**
  * Helps create compound tags.
  */
-public class CompoundTagBuilder {
+public class CompoundTagBuilder
+{
     private final Map<String, Tag> entries;
 
     /**
      * Create a new instance.
      */
-    CompoundTagBuilder() {
-        this.entries = new HashMap<String, Tag>();
+    CompoundTagBuilder()
+    {
+        entries = new HashMap<String, Tag>();
     }
 
     /**
@@ -23,9 +25,10 @@ public class CompoundTagBuilder {
      *
      * @param value the value
      */
-    CompoundTagBuilder(final Map<String, Tag> value) {
+    CompoundTagBuilder(final Map<String, Tag> value)
+    {
         checkNotNull(value);
-        this.entries = value;
+        entries = value;
     }
 
     /**
@@ -33,7 +36,8 @@ public class CompoundTagBuilder {
      *
      * @return a new builder
      */
-    public static CompoundTagBuilder create() {
+    public static CompoundTagBuilder create()
+    {
         return new CompoundTagBuilder();
     }
 
@@ -45,10 +49,11 @@ public class CompoundTagBuilder {
      *
      * @return this object
      */
-    public CompoundTagBuilder put(final String key, final Tag value) {
+    public CompoundTagBuilder put(final String key, final Tag value)
+    {
         checkNotNull(key);
         checkNotNull(value);
-        this.entries.put(key, value);
+        entries.put(key, value);
         return this;
     }
 
@@ -60,7 +65,8 @@ public class CompoundTagBuilder {
      *
      * @return this object
      */
-    public CompoundTagBuilder putByteArray(final String key, final byte[] value) {
+    public CompoundTagBuilder putByteArray(final String key, final byte[] value)
+    {
         return put(key, new ByteArrayTag(key, value));
     }
 
@@ -72,7 +78,8 @@ public class CompoundTagBuilder {
      *
      * @return this object
      */
-    public CompoundTagBuilder putByte(final String key, final byte value) {
+    public CompoundTagBuilder putByte(final String key, final byte value)
+    {
         return put(key, new ByteTag(key, value));
     }
 
@@ -84,7 +91,8 @@ public class CompoundTagBuilder {
      *
      * @return this object
      */
-    public CompoundTagBuilder putDouble(final String key, final double value) {
+    public CompoundTagBuilder putDouble(final String key, final double value)
+    {
         return put(key, new DoubleTag(key, value));
     }
 
@@ -96,7 +104,8 @@ public class CompoundTagBuilder {
      *
      * @return this object
      */
-    public CompoundTagBuilder putFloat(final String key, final float value) {
+    public CompoundTagBuilder putFloat(final String key, final float value)
+    {
         return put(key, new FloatTag(key, value));
     }
 
@@ -108,7 +117,8 @@ public class CompoundTagBuilder {
      *
      * @return this object
      */
-    public CompoundTagBuilder putIntArray(final String key, final int[] value) {
+    public CompoundTagBuilder putIntArray(final String key, final int[] value)
+    {
         return put(key, new IntArrayTag(key, value));
     }
 
@@ -120,7 +130,8 @@ public class CompoundTagBuilder {
      *
      * @return this object
      */
-    public CompoundTagBuilder putInt(final String key, final int value) {
+    public CompoundTagBuilder putInt(final String key, final int value)
+    {
         return put(key, new IntTag(key, value));
     }
 
@@ -132,7 +143,8 @@ public class CompoundTagBuilder {
      *
      * @return this object
      */
-    public CompoundTagBuilder putLong(final String key, final long value) {
+    public CompoundTagBuilder putLong(final String key, final long value)
+    {
         return put(key, new LongTag(key, value));
     }
 
@@ -144,7 +156,8 @@ public class CompoundTagBuilder {
      *
      * @return this object
      */
-    public CompoundTagBuilder putShort(final String key, final short value) {
+    public CompoundTagBuilder putShort(final String key, final short value)
+    {
         return put(key, new ShortTag(key, value));
     }
 
@@ -156,7 +169,8 @@ public class CompoundTagBuilder {
      *
      * @return this object
      */
-    public CompoundTagBuilder putString(final String key, final String value) {
+    public CompoundTagBuilder putString(final String key, final String value)
+    {
         return put(key, new StringTag(key, value));
     }
 
@@ -167,9 +181,11 @@ public class CompoundTagBuilder {
      *
      * @return this object
      */
-    public CompoundTagBuilder putAll(final Map<String, ? extends Tag> value) {
+    public CompoundTagBuilder putAll(final Map<String, ? extends Tag> value)
+    {
         checkNotNull(value);
-        for (final Map.Entry<String, ? extends Tag> entry : value.entrySet()) {
+        for (final Map.Entry<String, ? extends Tag> entry : value.entrySet())
+        {
             put(entry.getKey(), entry.getValue());
         }
         return this;
@@ -180,8 +196,9 @@ public class CompoundTagBuilder {
      *
      * @return the new compound tag
      */
-    public CompoundTag build() {
-        return new CompoundTag(new HashMap<String, Tag>(this.entries));
+    public CompoundTag build()
+    {
+        return new CompoundTag(new HashMap<String, Tag>(entries));
     }
 
     /**
@@ -191,7 +208,8 @@ public class CompoundTagBuilder {
      *
      * @return the created compound tag
      */
-    public CompoundTag build(final String name) {
-        return new CompoundTag(name, new HashMap<String, Tag>(this.entries));
+    public CompoundTag build(final String name)
+    {
+        return new CompoundTag(name, new HashMap<String, Tag>(entries));
     }
 }
diff --git a/src/main/java/com/intellectualcrafters/jnbt/DoubleTag.java b/src/main/java/com/intellectualcrafters/jnbt/DoubleTag.java
index f7db525b3..272571f16 100644
--- a/src/main/java/com/intellectualcrafters/jnbt/DoubleTag.java
+++ b/src/main/java/com/intellectualcrafters/jnbt/DoubleTag.java
@@ -3,7 +3,8 @@ package com.intellectualcrafters.jnbt;
 /**
  * The {@code TAG_Double} tag.
  */
-public final class DoubleTag extends Tag {
+public final class DoubleTag extends Tag
+{
     private final double value;
 
     /**
@@ -11,7 +12,8 @@ public final class DoubleTag extends Tag {
      *
      * @param value the value of the tag
      */
-    public DoubleTag(final double value) {
+    public DoubleTag(final double value)
+    {
         super();
         this.value = value;
     }
@@ -22,23 +24,27 @@ public final class DoubleTag extends Tag {
      * @param name  the name of the tag
      * @param value the value of the tag
      */
-    public DoubleTag(final String name, final double value) {
+    public DoubleTag(final String name, final double value)
+    {
         super(name);
         this.value = value;
     }
 
     @Override
-    public Double getValue() {
-        return this.value;
+    public Double getValue()
+    {
+        return value;
     }
 
     @Override
-    public String toString() {
+    public String toString()
+    {
         final String name = getName();
         String append = "";
-        if ((name != null) && !name.equals("")) {
-            append = "(\"" + this.getName() + "\")";
+        if ((name != null) && !name.equals(""))
+        {
+            append = "(\"" + getName() + "\")";
         }
-        return "TAG_Double" + append + ": " + this.value;
+        return "TAG_Double" + append + ": " + value;
     }
 }
diff --git a/src/main/java/com/intellectualcrafters/jnbt/EndTag.java b/src/main/java/com/intellectualcrafters/jnbt/EndTag.java
index 70ffaa488..811ab5e81 100644
--- a/src/main/java/com/intellectualcrafters/jnbt/EndTag.java
+++ b/src/main/java/com/intellectualcrafters/jnbt/EndTag.java
@@ -3,21 +3,25 @@ package com.intellectualcrafters.jnbt;
 /**
  * The {@code TAG_End} tag.
  */
-public final class EndTag extends Tag {
+public final class EndTag extends Tag
+{
     /**
      * Creates the tag.
      */
-    public EndTag() {
+    public EndTag()
+    {
         super();
     }
 
     @Override
-    public Object getValue() {
+    public Object getValue()
+    {
         return null;
     }
 
     @Override
-    public String toString() {
+    public String toString()
+    {
         return "TAG_End";
     }
 }
diff --git a/src/main/java/com/intellectualcrafters/jnbt/FloatTag.java b/src/main/java/com/intellectualcrafters/jnbt/FloatTag.java
index 02649fbad..6cb78472b 100644
--- a/src/main/java/com/intellectualcrafters/jnbt/FloatTag.java
+++ b/src/main/java/com/intellectualcrafters/jnbt/FloatTag.java
@@ -3,7 +3,8 @@ package com.intellectualcrafters.jnbt;
 /**
  * The {@code TAG_Float} tag.
  */
-public final class FloatTag extends Tag {
+public final class FloatTag extends Tag
+{
     private final float value;
 
     /**
@@ -11,7 +12,8 @@ public final class FloatTag extends Tag {
      *
      * @param value the value of the tag
      */
-    public FloatTag(final float value) {
+    public FloatTag(final float value)
+    {
         super();
         this.value = value;
     }
@@ -22,23 +24,27 @@ public final class FloatTag extends Tag {
      * @param name  the name of the tag
      * @param value the value of the tag
      */
-    public FloatTag(final String name, final float value) {
+    public FloatTag(final String name, final float value)
+    {
         super(name);
         this.value = value;
     }
 
     @Override
-    public Float getValue() {
-        return this.value;
+    public Float getValue()
+    {
+        return value;
     }
 
     @Override
-    public String toString() {
+    public String toString()
+    {
         final String name = getName();
         String append = "";
-        if ((name != null) && !name.equals("")) {
-            append = "(\"" + this.getName() + "\")";
+        if ((name != null) && !name.equals(""))
+        {
+            append = "(\"" + getName() + "\")";
         }
-        return "TAG_Float" + append + ": " + this.value;
+        return "TAG_Float" + append + ": " + value;
     }
 }
diff --git a/src/main/java/com/intellectualcrafters/jnbt/IntArrayTag.java b/src/main/java/com/intellectualcrafters/jnbt/IntArrayTag.java
index 372002f05..14df42798 100644
--- a/src/main/java/com/intellectualcrafters/jnbt/IntArrayTag.java
+++ b/src/main/java/com/intellectualcrafters/jnbt/IntArrayTag.java
@@ -5,7 +5,8 @@ import static com.google.common.base.Preconditions.checkNotNull;
 /**
  * The {@code TAG_Int_Array} tag.
  */
-public final class IntArrayTag extends Tag {
+public final class IntArrayTag extends Tag
+{
     private final int[] value;
 
     /**
@@ -13,7 +14,8 @@ public final class IntArrayTag extends Tag {
      *
      * @param value the value of the tag
      */
-    public IntArrayTag(final int[] value) {
+    public IntArrayTag(final int[] value)
+    {
         super();
         checkNotNull(value);
         this.value = value;
@@ -25,31 +27,37 @@ public final class IntArrayTag extends Tag {
      * @param name  the name of the tag
      * @param value the value of the tag
      */
-    public IntArrayTag(final String name, final int[] value) {
+    public IntArrayTag(final String name, final int[] value)
+    {
         super(name);
         checkNotNull(value);
         this.value = value;
     }
 
     @Override
-    public int[] getValue() {
-        return this.value;
+    public int[] getValue()
+    {
+        return value;
     }
 
     @Override
-    public String toString() {
+    public String toString()
+    {
         final StringBuilder hex = new StringBuilder();
-        for (final int b : this.value) {
+        for (final int b : value)
+        {
             final String hexDigits = Integer.toHexString(b).toUpperCase();
-            if (hexDigits.length() == 1) {
+            if (hexDigits.length() == 1)
+            {
                 hex.append("0");
             }
             hex.append(hexDigits).append(" ");
         }
         final String name = getName();
         String append = "";
-        if ((name != null) && !name.equals("")) {
-            append = "(\"" + this.getName() + "\")";
+        if ((name != null) && !name.equals(""))
+        {
+            append = "(\"" + getName() + "\")";
         }
         return "TAG_Int_Array" + append + ": " + hex;
     }
diff --git a/src/main/java/com/intellectualcrafters/jnbt/IntTag.java b/src/main/java/com/intellectualcrafters/jnbt/IntTag.java
index abffe3825..389f4a67d 100644
--- a/src/main/java/com/intellectualcrafters/jnbt/IntTag.java
+++ b/src/main/java/com/intellectualcrafters/jnbt/IntTag.java
@@ -3,7 +3,8 @@ package com.intellectualcrafters.jnbt;
 /**
  * The {@code TAG_Int} tag.
  */
-public final class IntTag extends Tag {
+public final class IntTag extends Tag
+{
     private final int value;
 
     /**
@@ -11,7 +12,8 @@ public final class IntTag extends Tag {
      *
      * @param value the value of the tag
      */
-    public IntTag(final int value) {
+    public IntTag(final int value)
+    {
         super();
         this.value = value;
     }
@@ -22,23 +24,27 @@ public final class IntTag extends Tag {
      * @param name  the name of the tag
      * @param value the value of the tag
      */
-    public IntTag(final String name, final int value) {
+    public IntTag(final String name, final int value)
+    {
         super(name);
         this.value = value;
     }
 
     @Override
-    public Integer getValue() {
-        return this.value;
+    public Integer getValue()
+    {
+        return value;
     }
 
     @Override
-    public String toString() {
+    public String toString()
+    {
         final String name = getName();
         String append = "";
-        if ((name != null) && !name.equals("")) {
-            append = "(\"" + this.getName() + "\")";
+        if ((name != null) && !name.equals(""))
+        {
+            append = "(\"" + getName() + "\")";
         }
-        return "TAG_Int" + append + ": " + this.value;
+        return "TAG_Int" + append + ": " + value;
     }
 }
diff --git a/src/main/java/com/intellectualcrafters/jnbt/ListTag.java b/src/main/java/com/intellectualcrafters/jnbt/ListTag.java
index 5a0cd5faf..6a859ed57 100644
--- a/src/main/java/com/intellectualcrafters/jnbt/ListTag.java
+++ b/src/main/java/com/intellectualcrafters/jnbt/ListTag.java
@@ -6,11 +6,11 @@ import java.util.Collections;
 import java.util.List;
 import java.util.NoSuchElementException;
 
-
 /**
  * The {@code TAG_List} tag.
  */
-public final class ListTag extends Tag {
+public final class ListTag extends Tag
+{
     private final Class<? extends Tag> type;
     private final List<Tag> value;
 
@@ -20,7 +20,8 @@ public final class ListTag extends Tag {
      * @param type  the type of tag
      * @param value the value of the tag
      */
-    public ListTag(final Class<? extends Tag> type, final List<? extends Tag> value) {
+    public ListTag(final Class<? extends Tag> type, final List<? extends Tag> value)
+    {
         super();
         checkNotNull(value);
         this.type = type;
@@ -34,7 +35,8 @@ public final class ListTag extends Tag {
      * @param type  the type of tag
      * @param value the value of the tag
      */
-    public ListTag(final String name, final Class<? extends Tag> type, final List<? extends Tag> value) {
+    public ListTag(final String name, final Class<? extends Tag> type, final List<? extends Tag> value)
+    {
         super(name);
         checkNotNull(value);
         this.type = type;
@@ -46,13 +48,15 @@ public final class ListTag extends Tag {
      *
      * @return The type of item in this list.
      */
-    public Class<? extends Tag> getType() {
-        return this.type;
+    public Class<? extends Tag> getType()
+    {
+        return type;
     }
 
     @Override
-    public List<Tag> getValue() {
-        return this.value;
+    public List<Tag> getValue()
+    {
+        return value;
     }
 
     /**
@@ -62,7 +66,8 @@ public final class ListTag extends Tag {
      *
      * @return a new list tag
      */
-    public ListTag setValue(final List<Tag> list) {
+    public ListTag setValue(final List<Tag> list)
+    {
         return new ListTag(getName(), getType(), list);
     }
 
@@ -73,10 +78,14 @@ public final class ListTag extends Tag {
      *
      * @return the tag or null
      */
-    public Tag getIfExists(final int index) {
-        try {
-            return this.value.get(index);
-        } catch (final NoSuchElementException e) {
+    public Tag getIfExists(final int index)
+    {
+        try
+        {
+            return value.get(index);
+        }
+        catch (final NoSuchElementException e)
+        {
             return null;
         }
     }
@@ -89,11 +98,15 @@ public final class ListTag extends Tag {
      *
      * @return a byte array
      */
-    public byte[] getByteArray(final int index) {
+    public byte[] getByteArray(final int index)
+    {
         final Tag tag = getIfExists(index);
-        if (tag instanceof ByteArrayTag) {
+        if (tag instanceof ByteArrayTag)
+        {
             return ((ByteArrayTag) tag).getValue();
-        } else {
+        }
+        else
+        {
             return new byte[0];
         }
     }
@@ -106,11 +119,15 @@ public final class ListTag extends Tag {
      *
      * @return a byte
      */
-    public byte getByte(final int index) {
+    public byte getByte(final int index)
+    {
         final Tag tag = getIfExists(index);
-        if (tag instanceof ByteTag) {
+        if (tag instanceof ByteTag)
+        {
             return ((ByteTag) tag).getValue();
-        } else {
+        }
+        else
+        {
             return (byte) 0;
         }
     }
@@ -123,11 +140,15 @@ public final class ListTag extends Tag {
      *
      * @return a double
      */
-    public double getDouble(final int index) {
+    public double getDouble(final int index)
+    {
         final Tag tag = getIfExists(index);
-        if (tag instanceof DoubleTag) {
+        if (tag instanceof DoubleTag)
+        {
             return ((DoubleTag) tag).getValue();
-        } else {
+        }
+        else
+        {
             return 0;
         }
     }
@@ -140,21 +161,35 @@ public final class ListTag extends Tag {
      *
      * @return a double
      */
-    public double asDouble(final int index) {
+    public double asDouble(final int index)
+    {
         final Tag tag = getIfExists(index);
-        if (tag instanceof ByteTag) {
+        if (tag instanceof ByteTag)
+        {
             return ((ByteTag) tag).getValue();
-        } else if (tag instanceof ShortTag) {
+        }
+        else if (tag instanceof ShortTag)
+        {
             return ((ShortTag) tag).getValue();
-        } else if (tag instanceof IntTag) {
+        }
+        else if (tag instanceof IntTag)
+        {
             return ((IntTag) tag).getValue();
-        } else if (tag instanceof LongTag) {
+        }
+        else if (tag instanceof LongTag)
+        {
             return ((LongTag) tag).getValue();
-        } else if (tag instanceof FloatTag) {
+        }
+        else if (tag instanceof FloatTag)
+        {
             return ((FloatTag) tag).getValue();
-        } else if (tag instanceof DoubleTag) {
+        }
+        else if (tag instanceof DoubleTag)
+        {
             return ((DoubleTag) tag).getValue();
-        } else {
+        }
+        else
+        {
             return 0;
         }
     }
@@ -167,11 +202,15 @@ public final class ListTag extends Tag {
      *
      * @return a float
      */
-    public float getFloat(final int index) {
+    public float getFloat(final int index)
+    {
         final Tag tag = getIfExists(index);
-        if (tag instanceof FloatTag) {
+        if (tag instanceof FloatTag)
+        {
             return ((FloatTag) tag).getValue();
-        } else {
+        }
+        else
+        {
             return 0;
         }
     }
@@ -184,11 +223,15 @@ public final class ListTag extends Tag {
      *
      * @return an int array
      */
-    public int[] getIntArray(final int index) {
+    public int[] getIntArray(final int index)
+    {
         final Tag tag = getIfExists(index);
-        if (tag instanceof IntArrayTag) {
+        if (tag instanceof IntArrayTag)
+        {
             return ((IntArrayTag) tag).getValue();
-        } else {
+        }
+        else
+        {
             return new int[0];
         }
     }
@@ -201,11 +244,15 @@ public final class ListTag extends Tag {
      *
      * @return an int
      */
-    public int getInt(final int index) {
+    public int getInt(final int index)
+    {
         final Tag tag = getIfExists(index);
-        if (tag instanceof IntTag) {
+        if (tag instanceof IntTag)
+        {
             return ((IntTag) tag).getValue();
-        } else {
+        }
+        else
+        {
             return 0;
         }
     }
@@ -218,21 +265,35 @@ public final class ListTag extends Tag {
      *
      * @return an int
      */
-    public int asInt(final int index) {
+    public int asInt(final int index)
+    {
         final Tag tag = getIfExists(index);
-        if (tag instanceof ByteTag) {
+        if (tag instanceof ByteTag)
+        {
             return ((ByteTag) tag).getValue();
-        } else if (tag instanceof ShortTag) {
+        }
+        else if (tag instanceof ShortTag)
+        {
             return ((ShortTag) tag).getValue();
-        } else if (tag instanceof IntTag) {
+        }
+        else if (tag instanceof IntTag)
+        {
             return ((IntTag) tag).getValue();
-        } else if (tag instanceof LongTag) {
+        }
+        else if (tag instanceof LongTag)
+        {
             return ((LongTag) tag).getValue().intValue();
-        } else if (tag instanceof FloatTag) {
+        }
+        else if (tag instanceof FloatTag)
+        {
             return ((FloatTag) tag).getValue().intValue();
-        } else if (tag instanceof DoubleTag) {
+        }
+        else if (tag instanceof DoubleTag)
+        {
             return ((DoubleTag) tag).getValue().intValue();
-        } else {
+        }
+        else
+        {
             return 0;
         }
     }
@@ -245,11 +306,15 @@ public final class ListTag extends Tag {
      *
      * @return a list of tags
      */
-    public List<Tag> getList(final int index) {
+    public List<Tag> getList(final int index)
+    {
         final Tag tag = getIfExists(index);
-        if (tag instanceof ListTag) {
+        if (tag instanceof ListTag)
+        {
             return ((ListTag) tag).getValue();
-        } else {
+        }
+        else
+        {
             return Collections.emptyList();
         }
     }
@@ -262,11 +327,15 @@ public final class ListTag extends Tag {
      *
      * @return a tag list instance
      */
-    public ListTag getListTag(final int index) {
+    public ListTag getListTag(final int index)
+    {
         final Tag tag = getIfExists(index);
-        if (tag instanceof ListTag) {
+        if (tag instanceof ListTag)
+        {
             return (ListTag) tag;
-        } else {
+        }
+        else
+        {
             return new ListTag(StringTag.class, Collections.<Tag> emptyList());
         }
     }
@@ -283,16 +352,23 @@ public final class ListTag extends Tag {
      * @return a list of tags
      */
     @SuppressWarnings("unchecked")
-    public <T extends Tag> List<T> getList(final int index, final Class<T> listType) {
+    public <T extends Tag> List<T> getList(final int index, final Class<T> listType)
+    {
         final Tag tag = getIfExists(index);
-        if (tag instanceof ListTag) {
+        if (tag instanceof ListTag)
+        {
             final ListTag listTag = (ListTag) tag;
-            if (listTag.getType().equals(listType)) {
+            if (listTag.getType().equals(listType))
+            {
                 return (List<T>) listTag.getValue();
-            } else {
+            }
+            else
+            {
                 return Collections.emptyList();
             }
-        } else {
+        }
+        else
+        {
             return Collections.emptyList();
         }
     }
@@ -305,11 +381,15 @@ public final class ListTag extends Tag {
      *
      * @return a long
      */
-    public long getLong(final int index) {
+    public long getLong(final int index)
+    {
         final Tag tag = getIfExists(index);
-        if (tag instanceof LongTag) {
+        if (tag instanceof LongTag)
+        {
             return ((LongTag) tag).getValue();
-        } else {
+        }
+        else
+        {
             return 0L;
         }
     }
@@ -322,21 +402,35 @@ public final class ListTag extends Tag {
      *
      * @return a long
      */
-    public long asLong(final int index) {
+    public long asLong(final int index)
+    {
         final Tag tag = getIfExists(index);
-        if (tag instanceof ByteTag) {
+        if (tag instanceof ByteTag)
+        {
             return ((ByteTag) tag).getValue();
-        } else if (tag instanceof ShortTag) {
+        }
+        else if (tag instanceof ShortTag)
+        {
             return ((ShortTag) tag).getValue();
-        } else if (tag instanceof IntTag) {
+        }
+        else if (tag instanceof IntTag)
+        {
             return ((IntTag) tag).getValue();
-        } else if (tag instanceof LongTag) {
+        }
+        else if (tag instanceof LongTag)
+        {
             return ((LongTag) tag).getValue();
-        } else if (tag instanceof FloatTag) {
+        }
+        else if (tag instanceof FloatTag)
+        {
             return ((FloatTag) tag).getValue().longValue();
-        } else if (tag instanceof DoubleTag) {
+        }
+        else if (tag instanceof DoubleTag)
+        {
             return ((DoubleTag) tag).getValue().longValue();
-        } else {
+        }
+        else
+        {
             return 0;
         }
     }
@@ -349,11 +443,15 @@ public final class ListTag extends Tag {
      *
      * @return a short
      */
-    public short getShort(final int index) {
+    public short getShort(final int index)
+    {
         final Tag tag = getIfExists(index);
-        if (tag instanceof ShortTag) {
+        if (tag instanceof ShortTag)
+        {
             return ((ShortTag) tag).getValue();
-        } else {
+        }
+        else
+        {
             return 0;
         }
     }
@@ -366,25 +464,32 @@ public final class ListTag extends Tag {
      *
      * @return a string
      */
-    public String getString(final int index) {
+    public String getString(final int index)
+    {
         final Tag tag = getIfExists(index);
-        if (tag instanceof StringTag) {
+        if (tag instanceof StringTag)
+        {
             return ((StringTag) tag).getValue();
-        } else {
+        }
+        else
+        {
             return "";
         }
     }
 
     @Override
-    public String toString() {
+    public String toString()
+    {
         final String name = getName();
         String append = "";
-        if ((name != null) && !name.equals("")) {
-            append = "(\"" + this.getName() + "\")";
+        if ((name != null) && !name.equals(""))
+        {
+            append = "(\"" + getName() + "\")";
         }
         final StringBuilder bldr = new StringBuilder();
-        bldr.append("TAG_List").append(append).append(": ").append(this.value.size()).append(" entries of type ").append(NBTUtils.getTypeName(this.type)).append("\r\n{\r\n");
-        for (final Tag t : this.value) {
+        bldr.append("TAG_List").append(append).append(": ").append(value.size()).append(" entries of type ").append(NBTUtils.getTypeName(type)).append("\r\n{\r\n");
+        for (final Tag t : value)
+        {
             bldr.append("   ").append(t.toString().replaceAll("\r\n", "\r\n   ")).append("\r\n");
         }
         bldr.append("}");
diff --git a/src/main/java/com/intellectualcrafters/jnbt/ListTagBuilder.java b/src/main/java/com/intellectualcrafters/jnbt/ListTagBuilder.java
index af94f866d..013529fbb 100644
--- a/src/main/java/com/intellectualcrafters/jnbt/ListTagBuilder.java
+++ b/src/main/java/com/intellectualcrafters/jnbt/ListTagBuilder.java
@@ -10,7 +10,8 @@ import java.util.List;
 /**
  * Helps create list tags.
  */
-public class ListTagBuilder {
+public class ListTagBuilder
+{
     private final Class<? extends Tag> type;
     private final List<Tag> entries;
 
@@ -19,42 +20,42 @@ public class ListTagBuilder {
      *
      * @param type of tag contained in this list
      */
-    ListTagBuilder(final Class<? extends Tag> type) {
+    ListTagBuilder(final Class<? extends Tag> type)
+    {
         checkNotNull(type);
         this.type = type;
-        this.entries = new ArrayList<Tag>();
+        entries = new ArrayList<Tag>();
     }
 
     /**
      * Create a new builder instance.
-     * 
+     *
      * @param type
      *
      * @return a new builder
      */
-    public static ListTagBuilder create(final Class<? extends Tag> type) {
+    public static ListTagBuilder create(final Class<? extends Tag> type)
+    {
         return new ListTagBuilder(type);
     }
 
     /**
      * Create a new builder instance.
-     * 
+     *
      * @param entries
      * @param <T>
      *
      * @return a new builder
      */
     @SafeVarargs
-    public static <T extends Tag> ListTagBuilder createWith(final T... entries) {
+    public static <T extends Tag> ListTagBuilder createWith(final T... entries)
+    {
         checkNotNull(entries);
-        if (entries.length == 0) {
-            throw new IllegalArgumentException("This method needs an array of at least one entry");
-        }
+        if (entries.length == 0) { throw new IllegalArgumentException("This method needs an array of at least one entry"); }
         final Class<? extends Tag> type = entries[0].getClass();
-        for (int i = 1; i < entries.length; i++) {
-            if (!type.isInstance(entries[i])) {
-                throw new IllegalArgumentException("An array of different tag types was provided");
-            }
+        for (int i = 1; i < entries.length; i++)
+        {
+            if (!type.isInstance(entries[i])) { throw new IllegalArgumentException("An array of different tag types was provided"); }
         }
         final ListTagBuilder builder = new ListTagBuilder(type);
         builder.addAll(Arrays.asList(entries));
@@ -68,12 +69,11 @@ public class ListTagBuilder {
      *
      * @return this object
      */
-    public ListTagBuilder add(final Tag value) {
+    public ListTagBuilder add(final Tag value)
+    {
         checkNotNull(value);
-        if (!this.type.isInstance(value)) {
-            throw new IllegalArgumentException(value.getClass().getCanonicalName() + " is not of expected type " + this.type.getCanonicalName());
-        }
-        this.entries.add(value);
+        if (!type.isInstance(value)) { throw new IllegalArgumentException(value.getClass().getCanonicalName() + " is not of expected type " + type.getCanonicalName()); }
+        entries.add(value);
         return this;
     }
 
@@ -84,9 +84,11 @@ public class ListTagBuilder {
      *
      * @return this object
      */
-    public ListTagBuilder addAll(final Collection<? extends Tag> value) {
+    public ListTagBuilder addAll(final Collection<? extends Tag> value)
+    {
         checkNotNull(value);
-        for (final Tag v : value) {
+        for (final Tag v : value)
+        {
             add(v);
         }
         return this;
@@ -97,8 +99,9 @@ public class ListTagBuilder {
      *
      * @return the new list tag
      */
-    public ListTag build() {
-        return new ListTag(this.type, new ArrayList<Tag>(this.entries));
+    public ListTag build()
+    {
+        return new ListTag(type, new ArrayList<Tag>(entries));
     }
 
     /**
@@ -108,7 +111,8 @@ public class ListTagBuilder {
      *
      * @return the created list tag
      */
-    public ListTag build(final String name) {
-        return new ListTag(name, this.type, new ArrayList<Tag>(this.entries));
+    public ListTag build(final String name)
+    {
+        return new ListTag(name, type, new ArrayList<Tag>(entries));
     }
 }
diff --git a/src/main/java/com/intellectualcrafters/jnbt/LongTag.java b/src/main/java/com/intellectualcrafters/jnbt/LongTag.java
index 0473c075d..f4e53f558 100644
--- a/src/main/java/com/intellectualcrafters/jnbt/LongTag.java
+++ b/src/main/java/com/intellectualcrafters/jnbt/LongTag.java
@@ -3,7 +3,8 @@ package com.intellectualcrafters.jnbt;
 /**
  * The {@code TAG_Long} tag.
  */
-public final class LongTag extends Tag {
+public final class LongTag extends Tag
+{
     private final long value;
 
     /**
@@ -11,7 +12,8 @@ public final class LongTag extends Tag {
      *
      * @param value the value of the tag
      */
-    public LongTag(final long value) {
+    public LongTag(final long value)
+    {
         super();
         this.value = value;
     }
@@ -22,23 +24,27 @@ public final class LongTag extends Tag {
      * @param name  the name of the tag
      * @param value the value of the tag
      */
-    public LongTag(final String name, final long value) {
+    public LongTag(final String name, final long value)
+    {
         super(name);
         this.value = value;
     }
 
     @Override
-    public Long getValue() {
-        return this.value;
+    public Long getValue()
+    {
+        return value;
     }
 
     @Override
-    public String toString() {
+    public String toString()
+    {
         final String name = getName();
         String append = "";
-        if ((name != null) && !name.equals("")) {
-            append = "(\"" + this.getName() + "\")";
+        if ((name != null) && !name.equals(""))
+        {
+            append = "(\"" + getName() + "\")";
         }
-        return "TAG_Long" + append + ": " + this.value;
+        return "TAG_Long" + append + ": " + value;
     }
 }
diff --git a/src/main/java/com/intellectualcrafters/jnbt/NBTConstants.java b/src/main/java/com/intellectualcrafters/jnbt/NBTConstants.java
index 891345802..57f431dbf 100644
--- a/src/main/java/com/intellectualcrafters/jnbt/NBTConstants.java
+++ b/src/main/java/com/intellectualcrafters/jnbt/NBTConstants.java
@@ -25,15 +25,17 @@ import java.nio.charset.Charset;
 /**
  * A class which holds constant values.
  */
-public final class NBTConstants {
+public final class NBTConstants
+{
     public static final Charset CHARSET = Charset.forName("UTF-8");
-    public static final int TYPE_END = 0, TYPE_BYTE = 1, TYPE_SHORT = 2, TYPE_INT = 3, TYPE_LONG = 4, TYPE_FLOAT = 5, TYPE_DOUBLE = 6, TYPE_BYTE_ARRAY = 7, TYPE_STRING = 8, TYPE_LIST = 9, TYPE_COMPOUND = 10, TYPE_INT_ARRAY = 11;
+    public static final int TYPE_END = 0, TYPE_BYTE = 1, TYPE_SHORT = 2, TYPE_INT = 3, TYPE_LONG = 4, TYPE_FLOAT = 5, TYPE_DOUBLE = 6, TYPE_BYTE_ARRAY = 7, TYPE_STRING = 8, TYPE_LIST = 9,
+    TYPE_COMPOUND = 10, TYPE_INT_ARRAY = 11;
 
     /**
      * Default private constructor.
      */
-    private NBTConstants() {
-    }
+    private NBTConstants()
+    {}
 
     /**
      * Convert a type ID to its corresponding {@link Tag} class.
@@ -44,8 +46,10 @@ public final class NBTConstants {
      *
      * @throws IllegalArgumentException thrown if the tag ID is not valid
      */
-    public static Class<? extends Tag> getClassFromType(final int id) {
-        switch (id) {
+    public static Class<? extends Tag> getClassFromType(final int id)
+    {
+        switch (id)
+        {
             case TYPE_END:
                 return EndTag.class;
             case TYPE_BYTE:
diff --git a/src/main/java/com/intellectualcrafters/jnbt/NBTInputStream.java b/src/main/java/com/intellectualcrafters/jnbt/NBTInputStream.java
index 2b5981b92..fce72a74b 100644
--- a/src/main/java/com/intellectualcrafters/jnbt/NBTInputStream.java
+++ b/src/main/java/com/intellectualcrafters/jnbt/NBTInputStream.java
@@ -14,11 +14,12 @@ import java.util.Map;
  * subclasses of the {@code Tag} object.  The NBT format was created by Markus Persson, and the specification
  * may be found at @linktourl http://www.minecraft.net/docs/NBT.txt"> http://www.minecraft.net/docs/NBT.txt.
  */
-public final class NBTInputStream implements Closeable {
+public final class NBTInputStream implements Closeable
+{
     private final DataInputStream is;
 
     private int count;
-    
+
     /**
      * Creates a new {@code NBTInputStream}, which will source its data from the specified input stream.
      *
@@ -26,7 +27,8 @@ public final class NBTInputStream implements Closeable {
      *
      * @throws IOException if an I/O error occurs
      */
-    public NBTInputStream(final InputStream is) throws IOException {
+    public NBTInputStream(final InputStream is) throws IOException
+    {
         this.is = new DataInputStream(is);
     }
 
@@ -37,10 +39,11 @@ public final class NBTInputStream implements Closeable {
      *
      * @throws IOException if an I/O error occurs.
      */
-    public Tag readTag() throws IOException {
+    public Tag readTag() throws IOException
+    {
         return readTag(0, Integer.MAX_VALUE);
     }
-    
+
     /**
      * Reads an NBT tag from the stream.
      *
@@ -48,7 +51,8 @@ public final class NBTInputStream implements Closeable {
      *
      * @throws IOException if an I/O error occurs.
      */
-    public Tag readTag(int maxDepth) throws IOException {
+    public Tag readTag(final int maxDepth) throws IOException
+    {
         return readTag(0, maxDepth);
     }
 
@@ -61,16 +65,20 @@ public final class NBTInputStream implements Closeable {
      *
      * @throws IOException if an I/O error occurs.
      */
-    private Tag readTag(final int depth, int maxDepth) throws IOException {
-        if ((count++) > maxDepth) throw new IOException("Exceeds max depth: " + count);
-        final int type = this.is.readByte() & 0xFF;
+    private Tag readTag(final int depth, final int maxDepth) throws IOException
+    {
+        if ((count++) > maxDepth) { throw new IOException("Exceeds max depth: " + count); }
+        final int type = is.readByte() & 0xFF;
         String name;
-        if (type != NBTConstants.TYPE_END) {
-            final int nameLength = this.is.readShort() & 0xFFFF;
+        if (type != NBTConstants.TYPE_END)
+        {
+            final int nameLength = is.readShort() & 0xFFFF;
             final byte[] nameBytes = new byte[nameLength];
-            this.is.readFully(nameBytes);
+            is.readFully(nameBytes);
             name = new String(nameBytes, NBTConstants.CHARSET);
-        } else {
+        }
+        else
+        {
             name = "";
         }
         return readTagPayload(type, name, depth, maxDepth);
@@ -87,84 +95,96 @@ public final class NBTInputStream implements Closeable {
      *
      * @throws IOException if an I/O error occurs.
      */
-    private Tag readTagPayload(final int type, final String name, final int depth, int maxDepth) throws IOException {
-        if ((count++) > maxDepth) throw new IOException("Exceeds max depth: " + count);
+    private Tag readTagPayload(final int type, final String name, final int depth, final int maxDepth) throws IOException
+    {
+        if ((count++) > maxDepth) { throw new IOException("Exceeds max depth: " + count); }
         count++;
-        switch (type) {
+        switch (type)
+        {
             case NBTConstants.TYPE_END:
-                if (depth == 0) {
+                if (depth == 0)
+                {
                     throw new IOException("TAG_End found without a TAG_Compound/TAG_List tag preceding it.");
-                } else {
+                }
+                else
+                {
                     return new EndTag();
                 }
             case NBTConstants.TYPE_BYTE:
-                return new ByteTag(name, this.is.readByte());
+                return new ByteTag(name, is.readByte());
             case NBTConstants.TYPE_SHORT:
-                return new ShortTag(name, this.is.readShort());
+                return new ShortTag(name, is.readShort());
             case NBTConstants.TYPE_INT:
-                return new IntTag(name, this.is.readInt());
+                return new IntTag(name, is.readInt());
             case NBTConstants.TYPE_LONG:
-                return new LongTag(name, this.is.readLong());
+                return new LongTag(name, is.readLong());
             case NBTConstants.TYPE_FLOAT:
-                return new FloatTag(name, this.is.readFloat());
+                return new FloatTag(name, is.readFloat());
             case NBTConstants.TYPE_DOUBLE:
-                return new DoubleTag(name, this.is.readDouble());
+                return new DoubleTag(name, is.readDouble());
             case NBTConstants.TYPE_BYTE_ARRAY:
-                int length = this.is.readInt();
-                
+                int length = is.readInt();
+
                 // Max depth
-                if ((count += length) > maxDepth) throw new IOException("Exceeds max depth: " + count);
+                if ((count += length) > maxDepth) { throw new IOException("Exceeds max depth: " + count);
                 //
-                
+                }
+
                 byte[] bytes = new byte[length];
-                this.is.readFully(bytes);
+                is.readFully(bytes);
                 return new ByteArrayTag(name, bytes);
             case NBTConstants.TYPE_STRING:
-                length = this.is.readShort();
-                
+                length = is.readShort();
+
                 // Max depth
-                if ((count += length) > maxDepth) throw new IOException("Exceeds max depth: " + count);
+                if ((count += length) > maxDepth) { throw new IOException("Exceeds max depth: " + count);
                 //
-                
+                }
+
                 bytes = new byte[length];
-                this.is.readFully(bytes);
+                is.readFully(bytes);
                 return new StringTag(name, new String(bytes, NBTConstants.CHARSET));
             case NBTConstants.TYPE_LIST:
-                final int childType = this.is.readByte();
-                length = this.is.readInt();
-                
+                final int childType = is.readByte();
+                length = is.readInt();
+
                 // Max depth
-                if ((count += length) > maxDepth) throw new IOException("Exceeds max depth: " + count);
+                if ((count += length) > maxDepth) { throw new IOException("Exceeds max depth: " + count);
                 //
-                
+                }
+
                 final List<Tag> tagList = new ArrayList<Tag>();
-                for (int i = 0; i < length; ++i) {
+                for (int i = 0; i < length; ++i)
+                {
                     final Tag tag = readTagPayload(childType, "", depth + 1, maxDepth);
-                    if (tag instanceof EndTag) {
-                        throw new IOException("TAG_End not permitted in a list.");
-                    }
+                    if (tag instanceof EndTag) { throw new IOException("TAG_End not permitted in a list."); }
                     tagList.add(tag);
                 }
                 return new ListTag(name, NBTUtils.getTypeClass(childType), tagList);
             case NBTConstants.TYPE_COMPOUND:
                 final Map<String, Tag> tagMap = new HashMap<String, Tag>();
-                while (true) {
+                while (true)
+                {
                     final Tag tag = readTag(depth + 1, maxDepth);
-                    if (tag instanceof EndTag) {
+                    if (tag instanceof EndTag)
+                    {
                         break;
-                    } else {
+                    }
+                    else
+                    {
                         tagMap.put(tag.getName(), tag);
                     }
                 }
                 return new CompoundTag(name, tagMap);
             case NBTConstants.TYPE_INT_ARRAY:
-                length = this.is.readInt();
+                length = is.readInt();
                 // Max depth
-                if ((count += length) > maxDepth) throw new IOException("Exceeds max depth: " + count);
+                if ((count += length) > maxDepth) { throw new IOException("Exceeds max depth: " + count); }
                 //
                 final int[] data = new int[length];
-                for (int i = 0; i < length; i++) {
-                    data[i] = this.is.readInt();
+                for (int i = 0; i < length; i++)
+                {
+                    data[i] = is.readInt();
                 }
                 return new IntArrayTag(name, data);
             default:
@@ -173,7 +193,8 @@ public final class NBTInputStream implements Closeable {
     }
 
     @Override
-    public void close() throws IOException {
-        this.is.close();
+    public void close() throws IOException
+    {
+        is.close();
     }
 }
diff --git a/src/main/java/com/intellectualcrafters/jnbt/NBTOutputStream.java b/src/main/java/com/intellectualcrafters/jnbt/NBTOutputStream.java
index 54a6f895a..2a628aeab 100644
--- a/src/main/java/com/intellectualcrafters/jnbt/NBTOutputStream.java
+++ b/src/main/java/com/intellectualcrafters/jnbt/NBTOutputStream.java
@@ -29,13 +29,14 @@ import java.util.List;
 /**
  * <p> This class writes <strong>NBT</strong>, or <strong>Named Binary Tag</strong> <code>Tag</code> objects to an
  * underlying <code>OutputStream</code>. </p>  <p> The NBT format was created by Markus Persson, and the
- * specification may be found at 
+ * specification may be found at
  * @linktourl http://www.minecraft.net/docs/NBT.txt
  * </p>
  *
  * @author Graham Edgecombe
  */
-public final class NBTOutputStream implements Closeable {
+public final class NBTOutputStream implements Closeable
+{
     /**
      * The output stream.
      */
@@ -48,7 +49,8 @@ public final class NBTOutputStream implements Closeable {
      *
      * @throws IOException if an I/O error occurs.
      */
-    public NBTOutputStream(final OutputStream os) throws IOException {
+    public NBTOutputStream(final OutputStream os) throws IOException
+    {
         this.os = new DataOutputStream(os);
     }
 
@@ -59,16 +61,15 @@ public final class NBTOutputStream implements Closeable {
      *
      * @throws IOException if an I/O error occurs.
      */
-    public void writeTag(final Tag tag) throws IOException {
+    public void writeTag(final Tag tag) throws IOException
+    {
         final int type = NBTUtils.getTypeCode(tag.getClass());
         final String name = tag.getName();
         final byte[] nameBytes = name.getBytes(NBTConstants.CHARSET);
-        this.os.writeByte(type);
-        this.os.writeShort(nameBytes.length);
-        this.os.write(nameBytes);
-        if (type == NBTConstants.TYPE_END) {
-            throw new IOException("Named TAG_End not permitted.");
-        }
+        os.writeByte(type);
+        os.writeShort(nameBytes.length);
+        os.write(nameBytes);
+        if (type == NBTConstants.TYPE_END) { throw new IOException("Named TAG_End not permitted."); }
         writeTagPayload(tag);
     }
 
@@ -79,9 +80,11 @@ public final class NBTOutputStream implements Closeable {
      *
      * @throws IOException if an I/O error occurs.
      */
-    private void writeTagPayload(final Tag tag) throws IOException {
+    private void writeTagPayload(final Tag tag) throws IOException
+    {
         final int type = NBTUtils.getTypeCode(tag.getClass());
-        switch (type) {
+        switch (type)
+        {
             case NBTConstants.TYPE_END:
                 writeEndTagPayload((EndTag) tag);
                 break;
@@ -130,8 +133,9 @@ public final class NBTOutputStream implements Closeable {
      *
      * @throws IOException if an I/O error occurs.
      */
-    private void writeByteTagPayload(final ByteTag tag) throws IOException {
-        this.os.writeByte(tag.getValue());
+    private void writeByteTagPayload(final ByteTag tag) throws IOException
+    {
+        os.writeByte(tag.getValue());
     }
 
     /**
@@ -141,10 +145,11 @@ public final class NBTOutputStream implements Closeable {
      *
      * @throws IOException if an I/O error occurs.
      */
-    private void writeByteArrayTagPayload(final ByteArrayTag tag) throws IOException {
+    private void writeByteArrayTagPayload(final ByteArrayTag tag) throws IOException
+    {
         final byte[] bytes = tag.getValue();
-        this.os.writeInt(bytes.length);
-        this.os.write(bytes);
+        os.writeInt(bytes.length);
+        os.write(bytes);
     }
 
     /**
@@ -154,11 +159,13 @@ public final class NBTOutputStream implements Closeable {
      *
      * @throws IOException if an I/O error occurs.
      */
-    private void writeCompoundTagPayload(final CompoundTag tag) throws IOException {
-        for (final Tag childTag : tag.getValue().values()) {
+    private void writeCompoundTagPayload(final CompoundTag tag) throws IOException
+    {
+        for (final Tag childTag : tag.getValue().values())
+        {
             writeTag(childTag);
         }
-        this.os.writeByte((byte) 0); // end tag - better way?
+        os.writeByte((byte) 0); // end tag - better way?
     }
 
     /**
@@ -168,13 +175,15 @@ public final class NBTOutputStream implements Closeable {
      *
      * @throws IOException if an I/O error occurs.
      */
-    private void writeListTagPayload(final ListTag tag) throws IOException {
+    private void writeListTagPayload(final ListTag tag) throws IOException
+    {
         final Class<? extends Tag> clazz = tag.getType();
         final List<Tag> tags = tag.getValue();
         final int size = tags.size();
-        this.os.writeByte(NBTUtils.getTypeCode(clazz));
-        this.os.writeInt(size);
-        for (final Tag tag1 : tags) {
+        os.writeByte(NBTUtils.getTypeCode(clazz));
+        os.writeInt(size);
+        for (final Tag tag1 : tags)
+        {
             writeTagPayload(tag1);
         }
     }
@@ -186,10 +195,11 @@ public final class NBTOutputStream implements Closeable {
      *
      * @throws IOException if an I/O error occurs.
      */
-    private void writeStringTagPayload(final StringTag tag) throws IOException {
+    private void writeStringTagPayload(final StringTag tag) throws IOException
+    {
         final byte[] bytes = tag.getValue().getBytes(NBTConstants.CHARSET);
-        this.os.writeShort(bytes.length);
-        this.os.write(bytes);
+        os.writeShort(bytes.length);
+        os.write(bytes);
     }
 
     /**
@@ -199,8 +209,9 @@ public final class NBTOutputStream implements Closeable {
      *
      * @throws IOException if an I/O error occurs.
      */
-    private void writeDoubleTagPayload(final DoubleTag tag) throws IOException {
-        this.os.writeDouble(tag.getValue());
+    private void writeDoubleTagPayload(final DoubleTag tag) throws IOException
+    {
+        os.writeDouble(tag.getValue());
     }
 
     /**
@@ -210,8 +221,9 @@ public final class NBTOutputStream implements Closeable {
      *
      * @throws IOException if an I/O error occurs.
      */
-    private void writeFloatTagPayload(final FloatTag tag) throws IOException {
-        this.os.writeFloat(tag.getValue());
+    private void writeFloatTagPayload(final FloatTag tag) throws IOException
+    {
+        os.writeFloat(tag.getValue());
     }
 
     /**
@@ -221,8 +233,9 @@ public final class NBTOutputStream implements Closeable {
      *
      * @throws IOException if an I/O error occurs.
      */
-    private void writeLongTagPayload(final LongTag tag) throws IOException {
-        this.os.writeLong(tag.getValue());
+    private void writeLongTagPayload(final LongTag tag) throws IOException
+    {
+        os.writeLong(tag.getValue());
     }
 
     /**
@@ -232,8 +245,9 @@ public final class NBTOutputStream implements Closeable {
      *
      * @throws IOException if an I/O error occurs.
      */
-    private void writeIntTagPayload(final IntTag tag) throws IOException {
-        this.os.writeInt(tag.getValue());
+    private void writeIntTagPayload(final IntTag tag) throws IOException
+    {
+        os.writeInt(tag.getValue());
     }
 
     /**
@@ -243,8 +257,9 @@ public final class NBTOutputStream implements Closeable {
      *
      * @throws IOException if an I/O error occurs.
      */
-    private void writeShortTagPayload(final ShortTag tag) throws IOException {
-        this.os.writeShort(tag.getValue());
+    private void writeShortTagPayload(final ShortTag tag) throws IOException
+    {
+        os.writeShort(tag.getValue());
     }
 
     /**
@@ -254,28 +269,33 @@ public final class NBTOutputStream implements Closeable {
      *
      * @throws IOException if an I/O error occurs.
      */
-    private void writeEndTagPayload(final EndTag tag) {
+    private void writeEndTagPayload(final EndTag tag)
+    {
         /* empty */
     }
 
-    private void writeIntArrayTagPayload(final IntArrayTag tag) throws IOException {
+    private void writeIntArrayTagPayload(final IntArrayTag tag) throws IOException
+    {
         final int[] data = tag.getValue();
-        this.os.writeInt(data.length);
-        for (final int element : data) {
-            this.os.writeInt(element);
+        os.writeInt(data.length);
+        for (final int element : data)
+        {
+            os.writeInt(element);
         }
     }
 
     @Override
-    public void close() throws IOException {
-        this.os.close();
+    public void close() throws IOException
+    {
+        os.close();
     }
 
     /**
      * Flush output
-     * @throws IOException 
+     * @throws IOException
      */
-    public void flush() throws IOException {
-        this.os.flush();
+    public void flush() throws IOException
+    {
+        os.flush();
     }
 }
diff --git a/src/main/java/com/intellectualcrafters/jnbt/NBTUtils.java b/src/main/java/com/intellectualcrafters/jnbt/NBTUtils.java
index 06b23b22c..a130d525e 100644
--- a/src/main/java/com/intellectualcrafters/jnbt/NBTUtils.java
+++ b/src/main/java/com/intellectualcrafters/jnbt/NBTUtils.java
@@ -5,12 +5,13 @@ import java.util.Map;
 /**
  * A class which contains NBT-related utility methods.
  */
-public final class NBTUtils {
+public final class NBTUtils
+{
     /**
      * Default private constructor.
      */
-    private NBTUtils() {
-    }
+    private NBTUtils()
+    {}
 
     /**
      * Gets the type name of a tag.
@@ -19,32 +20,58 @@ public final class NBTUtils {
      *
      * @return The type name.
      */
-    public static String getTypeName(final Class<? extends Tag> clazz) {
-        if (clazz.equals(ByteArrayTag.class)) {
+    public static String getTypeName(final Class<? extends Tag> clazz)
+    {
+        if (clazz.equals(ByteArrayTag.class))
+        {
             return "TAG_Byte_Array";
-        } else if (clazz.equals(ByteTag.class)) {
+        }
+        else if (clazz.equals(ByteTag.class))
+        {
             return "TAG_Byte";
-        } else if (clazz.equals(CompoundTag.class)) {
+        }
+        else if (clazz.equals(CompoundTag.class))
+        {
             return "TAG_Compound";
-        } else if (clazz.equals(DoubleTag.class)) {
+        }
+        else if (clazz.equals(DoubleTag.class))
+        {
             return "TAG_Double";
-        } else if (clazz.equals(EndTag.class)) {
+        }
+        else if (clazz.equals(EndTag.class))
+        {
             return "TAG_End";
-        } else if (clazz.equals(FloatTag.class)) {
+        }
+        else if (clazz.equals(FloatTag.class))
+        {
             return "TAG_Float";
-        } else if (clazz.equals(IntTag.class)) {
+        }
+        else if (clazz.equals(IntTag.class))
+        {
             return "TAG_Int";
-        } else if (clazz.equals(ListTag.class)) {
+        }
+        else if (clazz.equals(ListTag.class))
+        {
             return "TAG_List";
-        } else if (clazz.equals(LongTag.class)) {
+        }
+        else if (clazz.equals(LongTag.class))
+        {
             return "TAG_Long";
-        } else if (clazz.equals(ShortTag.class)) {
+        }
+        else if (clazz.equals(ShortTag.class))
+        {
             return "TAG_Short";
-        } else if (clazz.equals(StringTag.class)) {
+        }
+        else if (clazz.equals(StringTag.class))
+        {
             return "TAG_String";
-        } else if (clazz.equals(IntArrayTag.class)) {
+        }
+        else if (clazz.equals(IntArrayTag.class))
+        {
             return "TAG_Int_Array";
-        } else {
+        }
+        else
+        {
             throw new IllegalArgumentException("Invalid tag classs (" + clazz.getName() + ").");
         }
     }
@@ -58,32 +85,58 @@ public final class NBTUtils {
      *
      * @throws IllegalArgumentException if the tag class is invalid.
      */
-    public static int getTypeCode(final Class<? extends Tag> clazz) {
-        if (clazz.equals(ByteArrayTag.class)) {
+    public static int getTypeCode(final Class<? extends Tag> clazz)
+    {
+        if (clazz.equals(ByteArrayTag.class))
+        {
             return NBTConstants.TYPE_BYTE_ARRAY;
-        } else if (clazz.equals(ByteTag.class)) {
+        }
+        else if (clazz.equals(ByteTag.class))
+        {
             return NBTConstants.TYPE_BYTE;
-        } else if (clazz.equals(CompoundTag.class)) {
+        }
+        else if (clazz.equals(CompoundTag.class))
+        {
             return NBTConstants.TYPE_COMPOUND;
-        } else if (clazz.equals(DoubleTag.class)) {
+        }
+        else if (clazz.equals(DoubleTag.class))
+        {
             return NBTConstants.TYPE_DOUBLE;
-        } else if (clazz.equals(EndTag.class)) {
+        }
+        else if (clazz.equals(EndTag.class))
+        {
             return NBTConstants.TYPE_END;
-        } else if (clazz.equals(FloatTag.class)) {
+        }
+        else if (clazz.equals(FloatTag.class))
+        {
             return NBTConstants.TYPE_FLOAT;
-        } else if (clazz.equals(IntTag.class)) {
+        }
+        else if (clazz.equals(IntTag.class))
+        {
             return NBTConstants.TYPE_INT;
-        } else if (clazz.equals(ListTag.class)) {
+        }
+        else if (clazz.equals(ListTag.class))
+        {
             return NBTConstants.TYPE_LIST;
-        } else if (clazz.equals(LongTag.class)) {
+        }
+        else if (clazz.equals(LongTag.class))
+        {
             return NBTConstants.TYPE_LONG;
-        } else if (clazz.equals(ShortTag.class)) {
+        }
+        else if (clazz.equals(ShortTag.class))
+        {
             return NBTConstants.TYPE_SHORT;
-        } else if (clazz.equals(StringTag.class)) {
+        }
+        else if (clazz.equals(StringTag.class))
+        {
             return NBTConstants.TYPE_STRING;
-        } else if (clazz.equals(IntArrayTag.class)) {
+        }
+        else if (clazz.equals(IntArrayTag.class))
+        {
             return NBTConstants.TYPE_INT_ARRAY;
-        } else {
+        }
+        else
+        {
             throw new IllegalArgumentException("Invalid tag classs (" + clazz.getName() + ").");
         }
     }
@@ -97,8 +150,10 @@ public final class NBTUtils {
      *
      * @throws IllegalArgumentException if the tag type is invalid.
      */
-    public static Class<? extends Tag> getTypeClass(final int type) {
-        switch (type) {
+    public static Class<? extends Tag> getTypeClass(final int type)
+    {
+        switch (type)
+        {
             case NBTConstants.TYPE_END:
                 return EndTag.class;
             case NBTConstants.TYPE_BYTE:
@@ -138,14 +193,11 @@ public final class NBTUtils {
      *
      * @return child tag
      */
-    public static <T extends Tag> T getChildTag(final Map<String, Tag> items, final String key, final Class<T> expected) throws IllegalArgumentException {
-        if (!items.containsKey(key)) {
-            throw new IllegalArgumentException("Missing a \"" + key + "\" tag");
-        }
+    public static <T extends Tag> T getChildTag(final Map<String, Tag> items, final String key, final Class<T> expected) throws IllegalArgumentException
+    {
+        if (!items.containsKey(key)) { throw new IllegalArgumentException("Missing a \"" + key + "\" tag"); }
         final Tag tag = items.get(key);
-        if (!expected.isInstance(tag)) {
-            throw new IllegalArgumentException(key + " tag is not of tag type " + expected.getName());
-        }
+        if (!expected.isInstance(tag)) { throw new IllegalArgumentException(key + " tag is not of tag type " + expected.getName()); }
         return expected.cast(tag);
     }
 }
diff --git a/src/main/java/com/intellectualcrafters/jnbt/ShortTag.java b/src/main/java/com/intellectualcrafters/jnbt/ShortTag.java
index 5f3b7ec6d..34a1adf9a 100644
--- a/src/main/java/com/intellectualcrafters/jnbt/ShortTag.java
+++ b/src/main/java/com/intellectualcrafters/jnbt/ShortTag.java
@@ -23,7 +23,8 @@ package com.intellectualcrafters.jnbt;
 /**
  * The {@code TAG_Short} tag.
  */
-public final class ShortTag extends Tag {
+public final class ShortTag extends Tag
+{
     private final short value;
 
     /**
@@ -31,7 +32,8 @@ public final class ShortTag extends Tag {
      *
      * @param value the value of the tag
      */
-    public ShortTag(final short value) {
+    public ShortTag(final short value)
+    {
         super();
         this.value = value;
     }
@@ -42,23 +44,27 @@ public final class ShortTag extends Tag {
      * @param name  the name of the tag
      * @param value the value of the tag
      */
-    public ShortTag(final String name, final short value) {
+    public ShortTag(final String name, final short value)
+    {
         super(name);
         this.value = value;
     }
 
     @Override
-    public Short getValue() {
-        return this.value;
+    public Short getValue()
+    {
+        return value;
     }
 
     @Override
-    public String toString() {
+    public String toString()
+    {
         final String name = getName();
         String append = "";
-        if ((name != null) && !name.equals("")) {
-            append = "(\"" + this.getName() + "\")";
+        if ((name != null) && !name.equals(""))
+        {
+            append = "(\"" + getName() + "\")";
         }
-        return "TAG_Short" + append + ": " + this.value;
+        return "TAG_Short" + append + ": " + value;
     }
 }
diff --git a/src/main/java/com/intellectualcrafters/jnbt/StringTag.java b/src/main/java/com/intellectualcrafters/jnbt/StringTag.java
index cb50376a8..e69a75bcc 100644
--- a/src/main/java/com/intellectualcrafters/jnbt/StringTag.java
+++ b/src/main/java/com/intellectualcrafters/jnbt/StringTag.java
@@ -5,7 +5,8 @@ import static com.google.common.base.Preconditions.checkNotNull;
 /**
  * The {@code TAG_String} tag.
  */
-public final class StringTag extends Tag {
+public final class StringTag extends Tag
+{
     private final String value;
 
     /**
@@ -13,7 +14,8 @@ public final class StringTag extends Tag {
      *
      * @param value the value of the tag
      */
-    public StringTag(final String value) {
+    public StringTag(final String value)
+    {
         super();
         checkNotNull(value);
         this.value = value;
@@ -25,24 +27,28 @@ public final class StringTag extends Tag {
      * @param name  the name of the tag
      * @param value the value of the tag
      */
-    public StringTag(final String name, final String value) {
+    public StringTag(final String name, final String value)
+    {
         super(name);
         checkNotNull(value);
         this.value = value;
     }
 
     @Override
-    public String getValue() {
-        return this.value;
+    public String getValue()
+    {
+        return value;
     }
 
     @Override
-    public String toString() {
+    public String toString()
+    {
         final String name = getName();
         String append = "";
-        if ((name != null) && !name.equals("")) {
-            append = "(\"" + this.getName() + "\")";
+        if ((name != null) && !name.equals(""))
+        {
+            append = "(\"" + getName() + "\")";
         }
-        return "TAG_String" + append + ": " + this.value;
+        return "TAG_String" + append + ": " + value;
     }
 }
diff --git a/src/main/java/com/intellectualcrafters/jnbt/Tag.java b/src/main/java/com/intellectualcrafters/jnbt/Tag.java
index 6fce19169..0c50682ba 100644
--- a/src/main/java/com/intellectualcrafters/jnbt/Tag.java
+++ b/src/main/java/com/intellectualcrafters/jnbt/Tag.java
@@ -23,13 +23,15 @@ package com.intellectualcrafters.jnbt;
 /**
  * Represents a NBT tag.
  */
-public abstract class Tag {
+public abstract class Tag
+{
     private final String name;
 
     /**
      * Create a new tag with an empty name.
      */
-    Tag() {
+    Tag()
+    {
         this("");
     }
 
@@ -38,8 +40,10 @@ public abstract class Tag {
      *
      * @param name the name
      */
-    Tag(String name) {
-        if (name == null) {
+    Tag(String name)
+    {
+        if (name == null)
+        {
             name = "";
         }
         this.name = name;
@@ -50,8 +54,9 @@ public abstract class Tag {
      *
      * @return the name of this tag
      */
-    public final String getName() {
-        return this.name;
+    public final String getName()
+    {
+        return name;
     }
 
     /**
diff --git a/src/main/java/com/intellectualcrafters/json/CDL.java b/src/main/java/com/intellectualcrafters/json/CDL.java
index fb69ce28b..0704da569 100644
--- a/src/main/java/com/intellectualcrafters/json/CDL.java
+++ b/src/main/java/com/intellectualcrafters/json/CDL.java
@@ -4,20 +4,21 @@ package com.intellectualcrafters.json;
  * This provides static methods to convert comma delimited text into a JSONArray, and to covert a JSONArray into comma
  * delimited text. Comma delimited text is a very popular format for data interchange. It is understood by most
  * database, spreadsheet, and organizer programs.
- * 
+ *
  * Each row of text represents a row in a table or a data record. Each row ends with a NEWLINE character. Each row
  * contains one or more values. Values are separated by commas. A value can contain any character except for comma,
  * unless is is wrapped in single quotes or double quotes.
- * 
+ *
  * The first row usually contains the names of the columns.
- * 
+ *
  * A comma delimited list can be converted into a JSONArray of JSONObjects. The names for the elements in the
  * JSONObjects can be taken from the names in the first row.
  *
  * @author JSON.org
  * @version 2014-05-03
  */
-public class CDL {
+public class CDL
+{
     /**
      * Get the next value. The value can be wrapped in quotes. The value can be empty.
      *
@@ -27,28 +28,32 @@ public class CDL {
      *
      * @throws JSONException if the quoted string is badly formed.
      */
-    private static String getValue(final JSONTokener x) throws JSONException {
+    private static String getValue(final JSONTokener x) throws JSONException
+    {
         char c;
         char q;
         StringBuffer sb;
-        do {
+        do
+        {
             c = x.next();
-        } while ((c == ' ') || (c == '\t'));
-        switch (c) {
+        }
+        while ((c == ' ') || (c == '\t'));
+        switch (c)
+        {
             case 0:
                 return null;
             case '"':
             case '\'':
                 q = c;
                 sb = new StringBuffer();
-                for (;;) {
+                for (;;)
+                {
                     c = x.next();
-                    if (c == q) {
+                    if (c == q)
+                    {
                         break;
                     }
-                    if ((c == 0) || (c == '\n') || (c == '\r')) {
-                        throw x.syntaxError("Missing close quote '" + q + "'.");
-                    }
+                    if ((c == 0) || (c == '\n') || (c == '\r')) { throw x.syntaxError("Missing close quote '" + q + "'."); }
                     sb.append(c);
                 }
                 return sb.toString();
@@ -70,23 +75,24 @@ public class CDL {
      *
      * @throws JSONException
      */
-    public static JSONArray rowToJSONArray(final JSONTokener x) throws JSONException {
+    public static JSONArray rowToJSONArray(final JSONTokener x) throws JSONException
+    {
         final JSONArray ja = new JSONArray();
-        for (;;) {
+        for (;;)
+        {
             final String value = getValue(x);
             char c = x.next();
-            if ((value == null) || ((ja.length() == 0) && (value.length() == 0) && (c != ','))) {
-                return null;
-            }
+            if ((value == null) || ((ja.length() == 0) && (value.length() == 0) && (c != ','))) { return null; }
             ja.put(value);
-            for (;;) {
-                if (c == ',') {
+            for (;;)
+            {
+                if (c == ',')
+                {
                     break;
                 }
-                if (c != ' ') {
-                    if ((c == '\n') || (c == '\r') || (c == 0)) {
-                        return ja;
-                    }
+                if (c != ' ')
+                {
+                    if ((c == '\n') || (c == '\r') || (c == 0)) { return ja; }
                     throw x.syntaxError("Bad character '" + c + "' (" + (int) c + ").");
                 }
                 c = x.next();
@@ -106,7 +112,8 @@ public class CDL {
      *
      * @throws JSONException
      */
-    public static JSONObject rowToJSONObject(final JSONArray names, final JSONTokener x) throws JSONException {
+    public static JSONObject rowToJSONObject(final JSONArray names, final JSONTokener x) throws JSONException
+    {
         final JSONArray ja = rowToJSONArray(x);
         return ja != null ? ja.toJSONObject(names) : null;
     }
@@ -119,26 +126,35 @@ public class CDL {
      *
      * @return A string ending in NEWLINE.
      */
-    public static String rowToString(final JSONArray ja) {
+    public static String rowToString(final JSONArray ja)
+    {
         final StringBuilder sb = new StringBuilder();
-        for (int i = 0; i < ja.length(); i += 1) {
-            if (i > 0) {
+        for (int i = 0; i < ja.length(); i += 1)
+        {
+            if (i > 0)
+            {
                 sb.append(',');
             }
             final Object object = ja.opt(i);
-            if (object != null) {
+            if (object != null)
+            {
                 final String string = object.toString();
-                if ((string.length() > 0) && ((string.indexOf(',') >= 0) || (string.indexOf('\n') >= 0) || (string.indexOf('\r') >= 0) || (string.indexOf(0) >= 0) || (string.charAt(0) == '"'))) {
+                if ((string.length() > 0) && ((string.indexOf(',') >= 0) || (string.indexOf('\n') >= 0) || (string.indexOf('\r') >= 0) || (string.indexOf(0) >= 0) || (string.charAt(0) == '"')))
+                {
                     sb.append('"');
                     final int length = string.length();
-                    for (int j = 0; j < length; j += 1) {
+                    for (int j = 0; j < length; j += 1)
+                    {
                         final char c = string.charAt(j);
-                        if ((c >= ' ') && (c != '"')) {
+                        if ((c >= ' ') && (c != '"'))
+                        {
                             sb.append(c);
                         }
                     }
                     sb.append('"');
-                } else {
+                }
+                else
+                {
                     sb.append(string);
                 }
             }
@@ -156,7 +172,8 @@ public class CDL {
      *
      * @throws JSONException
      */
-    public static JSONArray toJSONArray(final String string) throws JSONException {
+    public static JSONArray toJSONArray(final String string) throws JSONException
+    {
         return toJSONArray(new JSONTokener(string));
     }
 
@@ -169,7 +186,8 @@ public class CDL {
      *
      * @throws JSONException
      */
-    public static JSONArray toJSONArray(final JSONTokener x) throws JSONException {
+    public static JSONArray toJSONArray(final JSONTokener x) throws JSONException
+    {
         return toJSONArray(rowToJSONArray(x), x);
     }
 
@@ -184,7 +202,8 @@ public class CDL {
      *
      * @throws JSONException
      */
-    public static JSONArray toJSONArray(final JSONArray names, final String string) throws JSONException {
+    public static JSONArray toJSONArray(final JSONArray names, final String string) throws JSONException
+    {
         return toJSONArray(names, new JSONTokener(string));
     }
 
@@ -199,21 +218,20 @@ public class CDL {
      *
      * @throws JSONException
      */
-    public static JSONArray toJSONArray(final JSONArray names, final JSONTokener x) throws JSONException {
-        if ((names == null) || (names.length() == 0)) {
-            return null;
-        }
+    public static JSONArray toJSONArray(final JSONArray names, final JSONTokener x) throws JSONException
+    {
+        if ((names == null) || (names.length() == 0)) { return null; }
         final JSONArray ja = new JSONArray();
-        for (;;) {
+        for (;;)
+        {
             final JSONObject jo = rowToJSONObject(names, x);
-            if (jo == null) {
+            if (jo == null)
+            {
                 break;
             }
             ja.put(jo);
         }
-        if (ja.length() == 0) {
-            return null;
-        }
+        if (ja.length() == 0) { return null; }
         return ja;
     }
 
@@ -227,13 +245,13 @@ public class CDL {
      *
      * @throws JSONException
      */
-    public static String toString(final JSONArray ja) throws JSONException {
+    public static String toString(final JSONArray ja) throws JSONException
+    {
         final JSONObject jo = ja.optJSONObject(0);
-        if (jo != null) {
+        if (jo != null)
+        {
             final JSONArray names = jo.names();
-            if (names != null) {
-                return rowToString(names) + toString(names, ja);
-            }
+            if (names != null) { return rowToString(names) + toString(names, ja); }
         }
         return null;
     }
@@ -249,14 +267,15 @@ public class CDL {
      *
      * @throws JSONException
      */
-    public static String toString(final JSONArray names, final JSONArray ja) throws JSONException {
-        if ((names == null) || (names.length() == 0)) {
-            return null;
-        }
+    public static String toString(final JSONArray names, final JSONArray ja) throws JSONException
+    {
+        if ((names == null) || (names.length() == 0)) { return null; }
         final StringBuilder sb = new StringBuilder();
-        for (int i = 0; i < ja.length(); i += 1) {
+        for (int i = 0; i < ja.length(); i += 1)
+        {
             final JSONObject jo = ja.optJSONObject(i);
-            if (jo != null) {
+            if (jo != null)
+            {
                 sb.append(rowToString(jo.toJSONArray(names)));
             }
         }
diff --git a/src/main/java/com/intellectualcrafters/json/Cookie.java b/src/main/java/com/intellectualcrafters/json/Cookie.java
index 13a11c597..52f90895d 100644
--- a/src/main/java/com/intellectualcrafters/json/Cookie.java
+++ b/src/main/java/com/intellectualcrafters/json/Cookie.java
@@ -27,7 +27,8 @@ package com.intellectualcrafters.json;
  * @author JSON.org
  * @version 2014-05-03
  */
-public class Cookie {
+public class Cookie
+{
     /**
      * Produce a copy of a string in which the characters '+', '%', '=', ';' and control characters are replaced with
      * "%hh". This is a gentle form of URL encoding, attempting to cause as little distortion to the string as possible.
@@ -39,18 +40,23 @@ public class Cookie {
      *
      * @return The escaped result.
      */
-    public static String escape(final String string) {
+    public static String escape(final String string)
+    {
         char c;
         final String s = string.trim();
         final int length = s.length();
         final StringBuilder sb = new StringBuilder(length);
-        for (int i = 0; i < length; i += 1) {
+        for (int i = 0; i < length; i += 1)
+        {
             c = s.charAt(i);
-            if ((c < ' ') || (c == '+') || (c == '%') || (c == '=') || (c == ';')) {
+            if ((c < ' ') || (c == '+') || (c == '%') || (c == '=') || (c == ';'))
+            {
                 sb.append('%');
                 sb.append(Character.forDigit((char) ((c >>> 4) & 0x0f), 16));
                 sb.append(Character.forDigit((char) (c & 0x0f), 16));
-            } else {
+            }
+            else
+            {
                 sb.append(c);
             }
         }
@@ -71,7 +77,8 @@ public class Cookie {
      *
      * @throws JSONException
      */
-    public static JSONObject toJSONObject(final String string) throws JSONException {
+    public static JSONObject toJSONObject(final String string) throws JSONException
+    {
         String name;
         final JSONObject jo = new JSONObject();
         Object value;
@@ -80,15 +87,22 @@ public class Cookie {
         x.next('=');
         jo.put("value", x.nextTo(';'));
         x.next();
-        while (x.more()) {
+        while (x.more())
+        {
             name = unescape(x.nextTo("=;"));
-            if (x.next() != '=') {
-                if (name.equals("secure")) {
+            if (x.next() != '=')
+            {
+                if (name.equals("secure"))
+                {
                     value = Boolean.TRUE;
-                } else {
+                }
+                else
+                {
                     throw x.syntaxError("Missing '=' in cookie parameter.");
                 }
-            } else {
+            }
+            else
+            {
                 value = unescape(x.nextTo(';'));
                 x.next();
             }
@@ -108,24 +122,29 @@ public class Cookie {
      *
      * @throws JSONException
      */
-    public static String toString(final JSONObject jo) throws JSONException {
+    public static String toString(final JSONObject jo) throws JSONException
+    {
         final StringBuilder sb = new StringBuilder();
         sb.append(escape(jo.getString("name")));
         sb.append("=");
         sb.append(escape(jo.getString("value")));
-        if (jo.has("expires")) {
+        if (jo.has("expires"))
+        {
             sb.append(";expires=");
             sb.append(jo.getString("expires"));
         }
-        if (jo.has("domain")) {
+        if (jo.has("domain"))
+        {
             sb.append(";domain=");
             sb.append(escape(jo.getString("domain")));
         }
-        if (jo.has("path")) {
+        if (jo.has("path"))
+        {
             sb.append(";path=");
             sb.append(escape(jo.getString("path")));
         }
-        if (jo.optBoolean("secure")) {
+        if (jo.optBoolean("secure"))
+        {
             sb.append(";secure");
         }
         return sb.toString();
@@ -139,17 +158,23 @@ public class Cookie {
      *
      * @return The unescaped string.
      */
-    public static String unescape(final String string) {
+    public static String unescape(final String string)
+    {
         final int length = string.length();
         final StringBuilder sb = new StringBuilder(length);
-        for (int i = 0; i < length; ++i) {
+        for (int i = 0; i < length; ++i)
+        {
             char c = string.charAt(i);
-            if (c == '+') {
+            if (c == '+')
+            {
                 c = ' ';
-            } else if ((c == '%') && ((i + 2) < length)) {
+            }
+            else if ((c == '%') && ((i + 2) < length))
+            {
                 final int d = JSONTokener.dehexchar(string.charAt(i + 1));
                 final int e = JSONTokener.dehexchar(string.charAt(i + 2));
-                if ((d >= 0) && (e >= 0)) {
+                if ((d >= 0) && (e >= 0))
+                {
                     c = (char) ((d * 16) + e);
                     i += 2;
                 }
diff --git a/src/main/java/com/intellectualcrafters/json/CookieList.java b/src/main/java/com/intellectualcrafters/json/CookieList.java
index 85553dc13..add20262f 100644
--- a/src/main/java/com/intellectualcrafters/json/CookieList.java
+++ b/src/main/java/com/intellectualcrafters/json/CookieList.java
@@ -8,12 +8,13 @@ import java.util.Iterator;
  * @author JSON.org
  * @version 2014-05-03
  */
-public class CookieList {
+public class CookieList
+{
     /**
      * Convert a cookie list into a JSONObject. A cookie list is a sequence of name/value pairs. The names are separated
      * from the values by '='. The pairs are separated by ';'. The names and the values will be unescaped, possibly
      * converting '+' and '%' sequences.
-     * 
+     *
      * To add a cookie to a cooklist, cookielistJSONObject.put(cookieJSONObject.getString("name"),
      * cookieJSONObject.getString("value"));
      *
@@ -23,10 +24,12 @@ public class CookieList {
      *
      * @throws JSONException
      */
-    public static JSONObject toJSONObject(final String string) throws JSONException {
+    public static JSONObject toJSONObject(final String string) throws JSONException
+    {
         final JSONObject jo = new JSONObject();
         final JSONTokener x = new JSONTokener(string);
-        while (x.more()) {
+        while (x.more())
+        {
             final String name = Cookie.unescape(x.nextTo('='));
             x.next('=');
             jo.put(name, Cookie.unescape(x.nextTo(';')));
@@ -46,15 +49,19 @@ public class CookieList {
      *
      * @throws JSONException
      */
-    public static String toString(final JSONObject jo) throws JSONException {
+    public static String toString(final JSONObject jo) throws JSONException
+    {
         boolean b = false;
         final Iterator<String> keys = jo.keys();
         String string;
         final StringBuilder sb = new StringBuilder();
-        while (keys.hasNext()) {
+        while (keys.hasNext())
+        {
             string = keys.next();
-            if (!jo.isNull(string)) {
-                if (b) {
+            if (!jo.isNull(string))
+            {
+                if (b)
+                {
                     sb.append(';');
                 }
                 sb.append(Cookie.escape(string));
diff --git a/src/main/java/com/intellectualcrafters/json/HTTP.java b/src/main/java/com/intellectualcrafters/json/HTTP.java
index 2e5f2b763..01d5e26e9 100644
--- a/src/main/java/com/intellectualcrafters/json/HTTP.java
+++ b/src/main/java/com/intellectualcrafters/json/HTTP.java
@@ -28,31 +28,37 @@ import java.util.Iterator;
  * @author JSON.org
  * @version 2014-05-03
  */
-public class HTTP {
+public class HTTP
+{
     /**
      * Carriage return/line feed.
      */
     public static final String CRLF = "\r\n";
 
-    public static JSONObject toJSONObject(final String string) throws JSONException {
+    public static JSONObject toJSONObject(final String string) throws JSONException
+    {
         final JSONObject jo = new JSONObject();
         final HTTPTokener x = new HTTPTokener(string);
         String token;
         token = x.nextToken();
-        if (token.toUpperCase().startsWith("HTTP")) {
+        if (token.toUpperCase().startsWith("HTTP"))
+        {
             // Response
             jo.put("HTTP-Version", token);
             jo.put("Status-Code", x.nextToken());
             jo.put("Reason-Phrase", x.nextTo('\0'));
             x.next();
-        } else {
+        }
+        else
+        {
             // Request
             jo.put("Method", token);
             jo.put("Request-URI", x.nextToken());
             jo.put("HTTP-Version", x.nextToken());
         }
         // Fields
-        while (x.more()) {
+        while (x.more())
+        {
             final String name = x.nextTo(':');
             x.next(':');
             jo.put(name, x.nextTo('\0'));
@@ -63,8 +69,8 @@ public class HTTP {
 
     /**
      * Convert a JSONObject into an HTTP header. A request header must contain
-     * 
-     * 
+     *
+     *
      * <pre>
      * {
      *    Method: "POST" (for example),
@@ -72,10 +78,10 @@ public class HTTP {
      *    "HTTP-Version": "HTTP/1.1" (for example)
      * }
      * </pre>
-     * 
+     *
      * A response header must contain
-     * 
-     * 
+     *
+     *
      * <pre>
      * {
      *    "HTTP-Version": "HTTP/1.1" (for example),
@@ -83,7 +89,7 @@ public class HTTP {
      *    "Reason-Phrase": "OK" (for example)
      * }
      * </pre>
-     * 
+     *
      * Any other members of the JSONObject will be output as HTTP fields. The result will end with two CRLF pairs.
      *
      * @param jo A JSONObject
@@ -92,17 +98,21 @@ public class HTTP {
      *
      * @throws JSONException if the object does not contain enough information.
      */
-    public static String toString(final JSONObject jo) throws JSONException {
+    public static String toString(final JSONObject jo) throws JSONException
+    {
         final Iterator<String> keys = jo.keys();
         String string;
         final StringBuilder sb = new StringBuilder();
-        if (jo.has("Status-Code") && jo.has("Reason-Phrase")) {
+        if (jo.has("Status-Code") && jo.has("Reason-Phrase"))
+        {
             sb.append(jo.getString("HTTP-Version"));
             sb.append(' ');
             sb.append(jo.getString("Status-Code"));
             sb.append(' ');
             sb.append(jo.getString("Reason-Phrase"));
-        } else if (jo.has("Method") && jo.has("Request-URI")) {
+        }
+        else if (jo.has("Method") && jo.has("Request-URI"))
+        {
             sb.append(jo.getString("Method"));
             sb.append(' ');
             sb.append('"');
@@ -110,13 +120,17 @@ public class HTTP {
             sb.append('"');
             sb.append(' ');
             sb.append(jo.getString("HTTP-Version"));
-        } else {
+        }
+        else
+        {
             throw new JSONException("Not enough material for an HTTP header.");
         }
         sb.append(CRLF);
-        while (keys.hasNext()) {
+        while (keys.hasNext())
+        {
             string = keys.next();
-            if (!"HTTP-Version".equals(string) && !"Status-Code".equals(string) && !"Reason-Phrase".equals(string) && !"Method".equals(string) && !"Request-URI".equals(string) && !jo.isNull(string)) {
+            if (!"HTTP-Version".equals(string) && !"Status-Code".equals(string) && !"Reason-Phrase".equals(string) && !"Method".equals(string) && !"Request-URI".equals(string) && !jo.isNull(string))
+            {
                 sb.append(string);
                 sb.append(": ");
                 sb.append(jo.getString(string));
diff --git a/src/main/java/com/intellectualcrafters/json/HTTPTokener.java b/src/main/java/com/intellectualcrafters/json/HTTPTokener.java
index d6bb2cf1e..ad99eae1d 100644
--- a/src/main/java/com/intellectualcrafters/json/HTTPTokener.java
+++ b/src/main/java/com/intellectualcrafters/json/HTTPTokener.java
@@ -6,13 +6,15 @@ package com.intellectualcrafters.json;
  * @author JSON.org
  * @version 2014-05-03
  */
-public class HTTPTokener extends JSONTokener {
+public class HTTPTokener extends JSONTokener
+{
     /**
      * Construct an HTTPTokener from a string.
      *
      * @param string A source string.
      */
-    public HTTPTokener(final String string) {
+    public HTTPTokener(final String string)
+    {
         super(string);
     }
 
@@ -23,30 +25,30 @@ public class HTTPTokener extends JSONTokener {
      *
      * @throws JSONException
      */
-    public String nextToken() throws JSONException {
+    public String nextToken() throws JSONException
+    {
         char c;
         char q;
         final StringBuilder sb = new StringBuilder();
-        do {
+        do
+        {
             c = next();
-        } while (Character.isWhitespace(c));
-        if ((c == '"') || (c == '\'')) {
+        }
+        while (Character.isWhitespace(c));
+        if ((c == '"') || (c == '\''))
+        {
             q = c;
-            for (;;) {
+            for (;;)
+            {
                 c = next();
-                if (c < ' ') {
-                    throw syntaxError("Unterminated string.");
-                }
-                if (c == q) {
-                    return sb.toString();
-                }
+                if (c < ' ') { throw syntaxError("Unterminated string."); }
+                if (c == q) { return sb.toString(); }
                 sb.append(c);
             }
         }
-        for (;;) {
-            if ((c == 0) || Character.isWhitespace(c)) {
-                return sb.toString();
-            }
+        for (;;)
+        {
+            if ((c == 0) || Character.isWhitespace(c)) { return sb.toString(); }
             sb.append(c);
             c = next();
         }
diff --git a/src/main/java/com/intellectualcrafters/json/JSONArray.java b/src/main/java/com/intellectualcrafters/json/JSONArray.java
index c31b44653..64711cea6 100644
--- a/src/main/java/com/intellectualcrafters/json/JSONArray.java
+++ b/src/main/java/com/intellectualcrafters/json/JSONArray.java
@@ -34,16 +34,16 @@ import java.util.Map;
  * accessing the values by index, and <code>put</code> methods for adding or replacing values. The values can be any of
  * these types: <code>Boolean</code>, <code>JSONArray</code>, <code>JSONObject</code>, <code>Number</code>,
  * <code>String</code>, or the <code>JSONObject.NULL object</code>.
- * 
+ *
  * The constructor can convert a JSON text into a Java object. The <code>toString</code> method converts to JSON text.
- * 
+ *
  * A <code>get</code> method returns a value if one can be found, and throws an exception if one cannot be found. An
  * <code>opt</code> method returns a default value instead of throwing an exception, and so is useful for obtaining
  * optional values.
- * 
+ *
  * The generic <code>get()</code> and <code>opt()</code> methods return an object which you can cast or query for type.
  * There are also typed <code>get</code> and <code>opt</code> methods that do type checking and type coercion for you.
- * 
+ *
  * The texts produced by the <code>toString</code> methods strictly conform to JSON syntax rules. The constructors are
  * more forgiving in the texts they will accept: <ul> <li>An extra <code>,</code>&nbsp;<small>(comma)</small> may appear
  * just before the closing bracket.</li> <li>The <code>null</code> value will be inserted when there is <code>,</code>
@@ -56,7 +56,8 @@ import java.util.Map;
  * @author JSON.org
  * @version 2014-05-03
  */
-public class JSONArray {
+public class JSONArray
+{
     /**
      * The arrayList where the JSONArray's properties are kept.
      */
@@ -65,8 +66,9 @@ public class JSONArray {
     /**
      * Construct an empty JSONArray.
      */
-    public JSONArray() {
-        this.myArrayList = new ArrayList<Object>();
+    public JSONArray()
+    {
+        myArrayList = new ArrayList<Object>();
     }
 
     /**
@@ -76,26 +78,29 @@ public class JSONArray {
      *
      * @throws JSONException If there is a syntax error.
      */
-    public JSONArray(final JSONTokener x) throws JSONException {
+    public JSONArray(final JSONTokener x) throws JSONException
+    {
         this();
-        if (x.nextClean() != '[') {
-            throw x.syntaxError("A JSONArray text must start with '['");
-        }
-        if (x.nextClean() != ']') {
+        if (x.nextClean() != '[') { throw x.syntaxError("A JSONArray text must start with '['"); }
+        if (x.nextClean() != ']')
+        {
             x.back();
-            for (;;) {
-                if (x.nextClean() == ',') {
+            for (;;)
+            {
+                if (x.nextClean() == ',')
+                {
                     x.back();
-                    this.myArrayList.add(JSONObject.NULL);
-                } else {
-                    x.back();
-                    this.myArrayList.add(x.nextValue());
+                    myArrayList.add(JSONObject.NULL);
                 }
-                switch (x.nextClean()) {
+                else
+                {
+                    x.back();
+                    myArrayList.add(x.nextValue());
+                }
+                switch (x.nextClean())
+                {
                     case ',':
-                        if (x.nextClean() == ']') {
-                            return;
-                        }
+                        if (x.nextClean() == ']') { return; }
                         x.back();
                         break;
                     case ']':
@@ -115,7 +120,8 @@ public class JSONArray {
      *
      * @throws JSONException If there is a syntax error.
      */
-    public JSONArray(final String source) throws JSONException {
+    public JSONArray(final String source) throws JSONException
+    {
         this(new JSONTokener(source));
     }
 
@@ -124,11 +130,14 @@ public class JSONArray {
      *
      * @param collection A Collection.
      */
-    public JSONArray(final Collection<Object> collection) {
-        this.myArrayList = new ArrayList<Object>();
-        if (collection != null) {
-            for (final Object aCollection : collection) {
-                this.myArrayList.add(JSONObject.wrap(aCollection));
+    public JSONArray(final Collection<Object> collection)
+    {
+        myArrayList = new ArrayList<Object>();
+        if (collection != null)
+        {
+            for (final Object aCollection : collection)
+            {
+                myArrayList.add(JSONObject.wrap(aCollection));
             }
         }
     }
@@ -138,14 +147,19 @@ public class JSONArray {
      *
      * @throws JSONException If not an array.
      */
-    public JSONArray(final Object array) throws JSONException {
+    public JSONArray(final Object array) throws JSONException
+    {
         this();
-        if (array.getClass().isArray()) {
+        if (array.getClass().isArray())
+        {
             final int length = Array.getLength(array);
-            for (int i = 0; i < length; i += 1) {
+            for (int i = 0; i < length; i += 1)
+            {
                 this.put(JSONObject.wrap(Array.get(array, i)));
             }
-        } else {
+        }
+        else
+        {
             throw new JSONException("JSONArray initial value should be a string or collection or array.");
         }
     }
@@ -159,11 +173,10 @@ public class JSONArray {
      *
      * @throws JSONException If there is no value for the index.
      */
-    public Object get(final int index) throws JSONException {
-        final Object object = this.opt(index);
-        if (object == null) {
-            throw new JSONException("JSONArray[" + index + "] not found.");
-        }
+    public Object get(final int index) throws JSONException
+    {
+        final Object object = opt(index);
+        if (object == null) { throw new JSONException("JSONArray[" + index + "] not found."); }
         return object;
     }
 
@@ -176,13 +189,14 @@ public class JSONArray {
      *
      * @throws JSONException If there is no value for the index or if the value is not convertible to boolean.
      */
-    public boolean getBoolean(final int index) throws JSONException {
-        final Object object = this.get(index);
-        if (object.equals(Boolean.FALSE) || ((object instanceof String) && ((String) object).equalsIgnoreCase("false"))) {
+    public boolean getBoolean(final int index) throws JSONException
+    {
+        final Object object = get(index);
+        if (object.equals(Boolean.FALSE) || ((object instanceof String) && ((String) object).equalsIgnoreCase("false")))
+        {
             return false;
-        } else if (object.equals(Boolean.TRUE) || ((object instanceof String) && ((String) object).equalsIgnoreCase("true"))) {
-            return true;
         }
+        else if (object.equals(Boolean.TRUE) || ((object instanceof String) && ((String) object).equalsIgnoreCase("true"))) { return true; }
         throw new JSONException("JSONArray[" + index + "] is not a boolean.");
     }
 
@@ -195,11 +209,15 @@ public class JSONArray {
      *
      * @throws JSONException If the key is not found or if the value cannot be converted to a number.
      */
-    public double getDouble(final int index) throws JSONException {
-        final Object object = this.get(index);
-        try {
+    public double getDouble(final int index) throws JSONException
+    {
+        final Object object = get(index);
+        try
+        {
             return object instanceof Number ? ((Number) object).doubleValue() : Double.parseDouble((String) object);
-        } catch (final Exception e) {
+        }
+        catch (final Exception e)
+        {
             throw new JSONException("JSONArray[" + index + "] is not a number.");
         }
     }
@@ -213,11 +231,15 @@ public class JSONArray {
      *
      * @throws JSONException If the key is not found or if the value is not a number.
      */
-    public int getInt(final int index) throws JSONException {
-        final Object object = this.get(index);
-        try {
+    public int getInt(final int index) throws JSONException
+    {
+        final Object object = get(index);
+        try
+        {
             return object instanceof Number ? ((Number) object).intValue() : Integer.parseInt((String) object);
-        } catch (final Exception e) {
+        }
+        catch (final Exception e)
+        {
             throw new JSONException("JSONArray[" + index + "] is not a number.");
         }
     }
@@ -231,11 +253,10 @@ public class JSONArray {
      *
      * @throws JSONException If there is no value for the index. or if the value is not a JSONArray
      */
-    public JSONArray getJSONArray(final int index) throws JSONException {
-        final Object object = this.get(index);
-        if (object instanceof JSONArray) {
-            return (JSONArray) object;
-        }
+    public JSONArray getJSONArray(final int index) throws JSONException
+    {
+        final Object object = get(index);
+        if (object instanceof JSONArray) { return (JSONArray) object; }
         throw new JSONException("JSONArray[" + index + "] is not a JSONArray.");
     }
 
@@ -248,11 +269,10 @@ public class JSONArray {
      *
      * @throws JSONException If there is no value for the index or if the value is not a JSONObject
      */
-    public JSONObject getJSONObject(final int index) throws JSONException {
-        final Object object = this.get(index);
-        if (object instanceof JSONObject) {
-            return (JSONObject) object;
-        }
+    public JSONObject getJSONObject(final int index) throws JSONException
+    {
+        final Object object = get(index);
+        if (object instanceof JSONObject) { return (JSONObject) object; }
         throw new JSONException("JSONArray[" + index + "] is not a JSONObject.");
     }
 
@@ -265,11 +285,15 @@ public class JSONArray {
      *
      * @throws JSONException If the key is not found or if the value cannot be converted to a number.
      */
-    public long getLong(final int index) throws JSONException {
-        final Object object = this.get(index);
-        try {
+    public long getLong(final int index) throws JSONException
+    {
+        final Object object = get(index);
+        try
+        {
             return object instanceof Number ? ((Number) object).longValue() : Long.parseLong((String) object);
-        } catch (final Exception e) {
+        }
+        catch (final Exception e)
+        {
             throw new JSONException("JSONArray[" + index + "] is not a number.");
         }
     }
@@ -283,11 +307,10 @@ public class JSONArray {
      *
      * @throws JSONException If there is no string value for the index.
      */
-    public String getString(final int index) throws JSONException {
-        final Object object = this.get(index);
-        if (object instanceof String) {
-            return (String) object;
-        }
+    public String getString(final int index) throws JSONException
+    {
+        final Object object = get(index);
+        if (object instanceof String) { return (String) object; }
         throw new JSONException("JSONArray[" + index + "] not a string.");
     }
 
@@ -298,8 +321,9 @@ public class JSONArray {
      *
      * @return true if the value at the index is null, or if there is no value.
      */
-    public boolean isNull(final int index) {
-        return JSONObject.NULL.equals(this.opt(index));
+    public boolean isNull(final int index)
+    {
+        return JSONObject.NULL.equals(opt(index));
     }
 
     /**
@@ -312,14 +336,17 @@ public class JSONArray {
      *
      * @throws JSONException If the array contains an invalid number.
      */
-    public String join(final String separator) throws JSONException {
-        final int len = this.length();
+    public String join(final String separator) throws JSONException
+    {
+        final int len = length();
         final StringBuilder sb = new StringBuilder();
-        for (int i = 0; i < len; i += 1) {
-            if (i > 0) {
+        for (int i = 0; i < len; i += 1)
+        {
+            if (i > 0)
+            {
                 sb.append(separator);
             }
-            sb.append(JSONObject.valueToString(this.myArrayList.get(i)));
+            sb.append(JSONObject.valueToString(myArrayList.get(i)));
         }
         return sb.toString();
     }
@@ -329,8 +356,9 @@ public class JSONArray {
      *
      * @return The length (or size).
      */
-    public int length() {
-        return this.myArrayList.size();
+    public int length()
+    {
+        return myArrayList.size();
     }
 
     /**
@@ -340,8 +368,9 @@ public class JSONArray {
      *
      * @return An object value, or null if there is no object at that index.
      */
-    public Object opt(final int index) {
-        return ((index < 0) || (index >= this.length())) ? null : this.myArrayList.get(index);
+    public Object opt(final int index)
+    {
+        return ((index < 0) || (index >= length())) ? null : myArrayList.get(index);
     }
 
     /**
@@ -352,7 +381,8 @@ public class JSONArray {
      *
      * @return The truth.
      */
-    public boolean optBoolean(final int index) {
+    public boolean optBoolean(final int index)
+    {
         return this.optBoolean(index, false);
     }
 
@@ -365,10 +395,14 @@ public class JSONArray {
      *
      * @return The truth.
      */
-    public boolean optBoolean(final int index, final boolean defaultValue) {
-        try {
-            return this.getBoolean(index);
-        } catch (final Exception e) {
+    public boolean optBoolean(final int index, final boolean defaultValue)
+    {
+        try
+        {
+            return getBoolean(index);
+        }
+        catch (final Exception e)
+        {
             return defaultValue;
         }
     }
@@ -381,7 +415,8 @@ public class JSONArray {
      *
      * @return The value.
      */
-    public double optDouble(final int index) {
+    public double optDouble(final int index)
+    {
         return this.optDouble(index, Double.NaN);
     }
 
@@ -394,10 +429,14 @@ public class JSONArray {
      *
      * @return The value.
      */
-    public double optDouble(final int index, final double defaultValue) {
-        try {
-            return this.getDouble(index);
-        } catch (final Exception e) {
+    public double optDouble(final int index, final double defaultValue)
+    {
+        try
+        {
+            return getDouble(index);
+        }
+        catch (final Exception e)
+        {
             return defaultValue;
         }
     }
@@ -410,7 +449,8 @@ public class JSONArray {
      *
      * @return The value.
      */
-    public int optInt(final int index) {
+    public int optInt(final int index)
+    {
         return this.optInt(index, 0);
     }
 
@@ -423,10 +463,14 @@ public class JSONArray {
      *
      * @return The value.
      */
-    public int optInt(final int index, final int defaultValue) {
-        try {
-            return this.getInt(index);
-        } catch (final Exception e) {
+    public int optInt(final int index, final int defaultValue)
+    {
+        try
+        {
+            return getInt(index);
+        }
+        catch (final Exception e)
+        {
             return defaultValue;
         }
     }
@@ -438,8 +482,9 @@ public class JSONArray {
      *
      * @return A JSONArray value, or null if the index has no value, or if the value is not a JSONArray.
      */
-    public JSONArray optJSONArray(final int index) {
-        final Object o = this.opt(index);
+    public JSONArray optJSONArray(final int index)
+    {
+        final Object o = opt(index);
         return o instanceof JSONArray ? (JSONArray) o : null;
     }
 
@@ -451,8 +496,9 @@ public class JSONArray {
      *
      * @return A JSONObject value.
      */
-    public JSONObject optJSONObject(final int index) {
-        final Object o = this.opt(index);
+    public JSONObject optJSONObject(final int index)
+    {
+        final Object o = opt(index);
         return o instanceof JSONObject ? (JSONObject) o : null;
     }
 
@@ -464,7 +510,8 @@ public class JSONArray {
      *
      * @return The value.
      */
-    public long optLong(final int index) {
+    public long optLong(final int index)
+    {
         return this.optLong(index, 0);
     }
 
@@ -477,10 +524,14 @@ public class JSONArray {
      *
      * @return The value.
      */
-    public long optLong(final int index, final long defaultValue) {
-        try {
-            return this.getLong(index);
-        } catch (final Exception e) {
+    public long optLong(final int index, final long defaultValue)
+    {
+        try
+        {
+            return getLong(index);
+        }
+        catch (final Exception e)
+        {
             return defaultValue;
         }
     }
@@ -493,7 +544,8 @@ public class JSONArray {
      *
      * @return A String value.
      */
-    public String optString(final int index) {
+    public String optString(final int index)
+    {
         return this.optString(index, "");
     }
 
@@ -505,8 +557,9 @@ public class JSONArray {
      *
      * @return A String value.
      */
-    public String optString(final int index, final String defaultValue) {
-        final Object object = this.opt(index);
+    public String optString(final int index, final String defaultValue)
+    {
+        final Object object = opt(index);
         return JSONObject.NULL.equals(object) ? defaultValue : object.toString();
     }
 
@@ -517,7 +570,8 @@ public class JSONArray {
      *
      * @return this.
      */
-    public JSONArray put(final boolean value) {
+    public JSONArray put(final boolean value)
+    {
         this.put(value ? Boolean.TRUE : Boolean.FALSE);
         return this;
     }
@@ -529,7 +583,8 @@ public class JSONArray {
      *
      * @return this.
      */
-    public JSONArray put(final Collection<Object> value) {
+    public JSONArray put(final Collection<Object> value)
+    {
         this.put(new JSONArray(value));
         return this;
     }
@@ -543,7 +598,8 @@ public class JSONArray {
      *
      * @throws JSONException if the value is not finite.
      */
-    public JSONArray put(final double value) throws JSONException {
+    public JSONArray put(final double value) throws JSONException
+    {
         final Double d = value;
         JSONObject.testValidity(d);
         this.put(d);
@@ -557,7 +613,8 @@ public class JSONArray {
      *
      * @return this.
      */
-    public JSONArray put(final int value) {
+    public JSONArray put(final int value)
+    {
         this.put(new Integer(value));
         return this;
     }
@@ -569,7 +626,8 @@ public class JSONArray {
      *
      * @return this.
      */
-    public JSONArray put(final long value) {
+    public JSONArray put(final long value)
+    {
         this.put(new Long(value));
         return this;
     }
@@ -581,7 +639,8 @@ public class JSONArray {
      *
      * @return this.
      */
-    public JSONArray put(final Map<String, Object> value) {
+    public JSONArray put(final Map<String, Object> value)
+    {
         this.put(new JSONObject(value));
         return this;
     }
@@ -594,8 +653,9 @@ public class JSONArray {
      *
      * @return this.
      */
-    public JSONArray put(final Object value) {
-        this.myArrayList.add(value);
+    public JSONArray put(final Object value)
+    {
+        myArrayList.add(value);
         return this;
     }
 
@@ -610,7 +670,8 @@ public class JSONArray {
      *
      * @throws JSONException If the index is negative.
      */
-    public JSONArray put(final int index, final boolean value) throws JSONException {
+    public JSONArray put(final int index, final boolean value) throws JSONException
+    {
         this.put(index, value ? Boolean.TRUE : Boolean.FALSE);
         return this;
     }
@@ -625,7 +686,8 @@ public class JSONArray {
      *
      * @throws JSONException If the index is negative or if the value is not finite.
      */
-    public JSONArray put(final int index, final Collection<Object> value) throws JSONException {
+    public JSONArray put(final int index, final Collection<Object> value) throws JSONException
+    {
         this.put(index, new JSONArray(value));
         return this;
     }
@@ -641,7 +703,8 @@ public class JSONArray {
      *
      * @throws JSONException If the index is negative or if the value is not finite.
      */
-    public JSONArray put(final int index, final double value) throws JSONException {
+    public JSONArray put(final int index, final double value) throws JSONException
+    {
         this.put(index, new Double(value));
         return this;
     }
@@ -657,7 +720,8 @@ public class JSONArray {
      *
      * @throws JSONException If the index is negative.
      */
-    public JSONArray put(final int index, final int value) throws JSONException {
+    public JSONArray put(final int index, final int value) throws JSONException
+    {
         this.put(index, new Integer(value));
         return this;
     }
@@ -673,7 +737,8 @@ public class JSONArray {
      *
      * @throws JSONException If the index is negative.
      */
-    public JSONArray put(final int index, final long value) throws JSONException {
+    public JSONArray put(final int index, final long value) throws JSONException
+    {
         this.put(index, new Long(value));
         return this;
     }
@@ -688,7 +753,8 @@ public class JSONArray {
      *
      * @throws JSONException If the index is negative or if the the value is an invalid number.
      */
-    public JSONArray put(final int index, final Map<String, Object> value) throws JSONException {
+    public JSONArray put(final int index, final Map<String, Object> value) throws JSONException
+    {
         this.put(index, new JSONObject(value));
         return this;
     }
@@ -705,15 +771,18 @@ public class JSONArray {
      *
      * @throws JSONException If the index is negative or if the the value is an invalid number.
      */
-    public JSONArray put(final int index, final Object value) throws JSONException {
+    public JSONArray put(final int index, final Object value) throws JSONException
+    {
         JSONObject.testValidity(value);
-        if (index < 0) {
-            throw new JSONException("JSONArray[" + index + "] not found.");
+        if (index < 0) { throw new JSONException("JSONArray[" + index + "] not found."); }
+        if (index < length())
+        {
+            myArrayList.set(index, value);
         }
-        if (index < this.length()) {
-            this.myArrayList.set(index, value);
-        } else {
-            while (index != this.length()) {
+        else
+        {
+            while (index != length())
+            {
                 this.put(JSONObject.NULL);
             }
             this.put(value);
@@ -728,8 +797,9 @@ public class JSONArray {
      *
      * @return The value that was associated with the index, or null if there was no value.
      */
-    public Object remove(final int index) {
-        return (index >= 0) && (index < this.length()) ? this.myArrayList.remove(index) : null;
+    public Object remove(final int index)
+    {
+        return (index >= 0) && (index < length()) ? myArrayList.remove(index) : null;
     }
 
     /**
@@ -739,28 +809,24 @@ public class JSONArray {
      *
      * @return true if they are equal
      */
-    public boolean similar(final Object other) {
-        if (!(other instanceof JSONArray)) {
-            return false;
-        }
-        final int len = this.length();
-        if (len != ((JSONArray) other).length()) {
-            return false;
-        }
-        for (int i = 0; i < len; i += 1) {
-            final Object valueThis = this.get(i);
+    public boolean similar(final Object other)
+    {
+        if (!(other instanceof JSONArray)) { return false; }
+        final int len = length();
+        if (len != ((JSONArray) other).length()) { return false; }
+        for (int i = 0; i < len; i += 1)
+        {
+            final Object valueThis = get(i);
             final Object valueOther = ((JSONArray) other).get(i);
-            if (valueThis instanceof JSONObject) {
-                if (!((JSONObject) valueThis).similar(valueOther)) {
-                    return false;
-                }
-            } else if (valueThis instanceof JSONArray) {
-                if (!((JSONArray) valueThis).similar(valueOther)) {
-                    return false;
-                }
-            } else if (!valueThis.equals(valueOther)) {
-                return false;
+            if (valueThis instanceof JSONObject)
+            {
+                if (!((JSONObject) valueThis).similar(valueOther)) { return false; }
             }
+            else if (valueThis instanceof JSONArray)
+            {
+                if (!((JSONArray) valueThis).similar(valueOther)) { return false; }
+            }
+            else if (!valueThis.equals(valueOther)) { return false; }
         }
         return true;
     }
@@ -774,13 +840,13 @@ public class JSONArray {
      *
      * @throws JSONException If any of the names are null.
      */
-    public JSONObject toJSONObject(final JSONArray names) throws JSONException {
-        if ((names == null) || (names.length() == 0) || (this.length() == 0)) {
-            return null;
-        }
+    public JSONObject toJSONObject(final JSONArray names) throws JSONException
+    {
+        if ((names == null) || (names.length() == 0) || (length() == 0)) { return null; }
         final JSONObject jo = new JSONObject();
-        for (int i = 0; i < names.length(); i += 1) {
-            jo.put(names.getString(i), this.opt(i));
+        for (int i = 0; i < names.length(); i += 1)
+        {
+            jo.put(names.getString(i), opt(i));
         }
         return jo;
     }
@@ -789,16 +855,20 @@ public class JSONArray {
      * Make a JSON text of this JSONArray. For compactness, no unnecessary whitespace is added. If it is not possible to
      * produce a syntactically correct JSON text then null will be returned instead. This could occur if the array
      * contains an invalid number.
-     * 
+     *
      * Warning: This method assumes that the data structure is acyclical.
      *
      * @return a printable, displayable, transmittable representation of the array.
      */
     @Override
-    public String toString() {
-        try {
+    public String toString()
+    {
+        try
+        {
             return this.toString(0);
-        } catch (final Exception e) {
+        }
+        catch (final Exception e)
+        {
             return null;
         }
     }
@@ -815,29 +885,32 @@ public class JSONArray {
      *
      * @throws JSONException
      */
-    public String toString(final int indentFactor) throws JSONException {
+    public String toString(final int indentFactor) throws JSONException
+    {
         final StringWriter sw = new StringWriter();
-        synchronized (sw.getBuffer()) {
+        synchronized (sw.getBuffer())
+        {
             return this.write(sw, indentFactor, 0).toString();
         }
     }
 
     /**
      * Write the contents of the JSONArray as JSON text to a writer. For compactness, no whitespace is added.
-     * 
+     *
      * Warning: This method assumes that the data structure is acyclical.
      *
      * @return The writer.
      *
      * @throws JSONException
      */
-    public Writer write(final Writer writer) throws JSONException {
+    public Writer write(final Writer writer) throws JSONException
+    {
         return this.write(writer, 0, 0);
     }
 
     /**
      * Write the contents of the JSONArray as JSON text to a writer. For compactness, no whitespace is added.
-     * 
+     *
      * Warning: This method assumes that the data structure is acyclical.
      *
      * @param indentFactor The number of spaces to add to each level of indentation.
@@ -847,34 +920,45 @@ public class JSONArray {
      *
      * @throws JSONException
      */
-    Writer write(final Writer writer, final int indentFactor, final int indent) throws JSONException {
-        try {
+    Writer write(final Writer writer, final int indentFactor, final int indent) throws JSONException
+    {
+        try
+        {
             boolean commanate = false;
-            final int length = this.length();
+            final int length = length();
             writer.write('[');
-            if (length == 1) {
-                JSONObject.writeValue(writer, this.myArrayList.get(0), indentFactor, indent);
-            } else if (length != 0) {
+            if (length == 1)
+            {
+                JSONObject.writeValue(writer, myArrayList.get(0), indentFactor, indent);
+            }
+            else if (length != 0)
+            {
                 final int newindent = indent + indentFactor;
-                for (int i = 0; i < length; i += 1) {
-                    if (commanate) {
+                for (int i = 0; i < length; i += 1)
+                {
+                    if (commanate)
+                    {
                         writer.write(',');
                     }
-                    if (indentFactor > 0) {
+                    if (indentFactor > 0)
+                    {
                         writer.write('\n');
                     }
                     JSONObject.indent(writer, newindent);
-                    JSONObject.writeValue(writer, this.myArrayList.get(i), indentFactor, newindent);
+                    JSONObject.writeValue(writer, myArrayList.get(i), indentFactor, newindent);
                     commanate = true;
                 }
-                if (indentFactor > 0) {
+                if (indentFactor > 0)
+                {
                     writer.write('\n');
                 }
                 JSONObject.indent(writer, indent);
             }
             writer.write(']');
             return writer;
-        } catch (final IOException e) {
+        }
+        catch (final IOException e)
+        {
             throw new JSONException(e);
         }
     }
diff --git a/src/main/java/com/intellectualcrafters/json/JSONException.java b/src/main/java/com/intellectualcrafters/json/JSONException.java
index 090d4e4f7..b30bd7425 100644
--- a/src/main/java/com/intellectualcrafters/json/JSONException.java
+++ b/src/main/java/com/intellectualcrafters/json/JSONException.java
@@ -6,7 +6,8 @@ package com.intellectualcrafters.json;
  * @author JSON.org
  * @version 2014-05-03
  */
-public class JSONException extends RuntimeException {
+public class JSONException extends RuntimeException
+{
     private static final long serialVersionUID = 0;
     private Throwable cause;
 
@@ -15,7 +16,8 @@ public class JSONException extends RuntimeException {
      *
      * @param message Detail about the reason for the exception.
      */
-    public JSONException(final String message) {
+    public JSONException(final String message)
+    {
         super(message);
     }
 
@@ -24,7 +26,8 @@ public class JSONException extends RuntimeException {
      *
      * @param cause The cause.
      */
-    public JSONException(final Throwable cause) {
+    public JSONException(final Throwable cause)
+    {
         super(cause.getMessage());
         this.cause = cause;
     }
@@ -35,7 +38,8 @@ public class JSONException extends RuntimeException {
      * @return the cause of this exception or null if the cause is nonexistent or unknown.
      */
     @Override
-    public Throwable getCause() {
-        return this.cause;
+    public Throwable getCause()
+    {
+        return cause;
     }
 }
diff --git a/src/main/java/com/intellectualcrafters/json/JSONML.java b/src/main/java/com/intellectualcrafters/json/JSONML.java
index c63a5670b..0153d1e0c 100644
--- a/src/main/java/com/intellectualcrafters/json/JSONML.java
+++ b/src/main/java/com/intellectualcrafters/json/JSONML.java
@@ -9,7 +9,8 @@ import java.util.Iterator;
  * @author JSON.org
  * @version 2014-05-03
  */
-public class JSONML {
+public class JSONML
+{
     /**
      * Parse XML values and store them in a JSONArray.
      *
@@ -21,7 +22,8 @@ public class JSONML {
      *
      * @throws JSONException
      */
-    private static Object parse(final XMLTokener x, final boolean arrayForm, final JSONArray ja) throws JSONException {
+    private static Object parse(final XMLTokener x, final boolean arrayForm, final JSONArray ja) throws JSONException
+    {
         String attribute;
         char c;
         String closeTag = null;
@@ -35,149 +37,188 @@ public class JSONML {
         // <![ ... ]]>
         // <! ... >
         // <? ... ?>
-        while (true) {
-            if (!x.more()) {
-                throw x.syntaxError("Bad XML");
-            }
+        while (true)
+        {
+            if (!x.more()) { throw x.syntaxError("Bad XML"); }
             token = x.nextContent();
-            if (token == XML.LT) {
+            if (token == XML.LT)
+            {
                 token = x.nextToken();
-                if (token instanceof Character) {
-                    if (token == XML.SLASH) {
+                if (token instanceof Character)
+                {
+                    if (token == XML.SLASH)
+                    {
                         // Close tag </
                         token = x.nextToken();
-                        if (!(token instanceof String)) {
-                            throw new JSONException("Expected a closing name instead of '" + token + "'.");
-                        }
-                        if (x.nextToken() != XML.GT) {
-                            throw x.syntaxError("Misshaped close tag");
-                        }
+                        if (!(token instanceof String)) { throw new JSONException("Expected a closing name instead of '" + token + "'."); }
+                        if (x.nextToken() != XML.GT) { throw x.syntaxError("Misshaped close tag"); }
                         return token;
-                    } else if (token == XML.BANG) {
+                    }
+                    else if (token == XML.BANG)
+                    {
                         // <!
                         c = x.next();
-                        if (c == '-') {
-                            if (x.next() == '-') {
+                        if (c == '-')
+                        {
+                            if (x.next() == '-')
+                            {
                                 x.skipPast("-->");
-                            } else {
+                            }
+                            else
+                            {
                                 x.back();
                             }
-                        } else if (c == '[') {
+                        }
+                        else if (c == '[')
+                        {
                             token = x.nextToken();
-                            if (token.equals("CDATA") && (x.next() == '[')) {
-                                if (ja != null) {
+                            if (token.equals("CDATA") && (x.next() == '['))
+                            {
+                                if (ja != null)
+                                {
                                     ja.put(x.nextCDATA());
                                 }
-                            } else {
+                            }
+                            else
+                            {
                                 throw x.syntaxError("Expected 'CDATA['");
                             }
-                        } else {
+                        }
+                        else
+                        {
                             i = 1;
-                            do {
+                            do
+                            {
                                 token = x.nextMeta();
-                                if (token == null) {
+                                if (token == null)
+                                {
                                     throw x.syntaxError("Missing '>' after '<!'.");
-                                } else if (token == XML.LT) {
+                                }
+                                else if (token == XML.LT)
+                                {
                                     i += 1;
-                                } else if (token == XML.GT) {
+                                }
+                                else if (token == XML.GT)
+                                {
                                     i -= 1;
                                 }
-                            } while (i > 0);
+                            }
+                            while (i > 0);
                         }
-                    } else if (token == XML.QUEST) {
+                    }
+                    else if (token == XML.QUEST)
+                    {
                         // <?
                         x.skipPast("?>");
-                    } else {
+                    }
+                    else
+                    {
                         throw x.syntaxError("Misshaped tag");
                     }
                     // Open tag <
-                } else {
-                    if (!(token instanceof String)) {
-                        throw x.syntaxError("Bad tagName '" + token + "'.");
-                    }
+                }
+                else
+                {
+                    if (!(token instanceof String)) { throw x.syntaxError("Bad tagName '" + token + "'."); }
                     tagName = (String) token;
                     newja = new JSONArray();
                     newjo = new JSONObject();
-                    if (arrayForm) {
+                    if (arrayForm)
+                    {
                         newja.put(tagName);
-                        if (ja != null) {
+                        if (ja != null)
+                        {
                             ja.put(newja);
                         }
-                    } else {
+                    }
+                    else
+                    {
                         newjo.put("tagName", tagName);
-                        if (ja != null) {
+                        if (ja != null)
+                        {
                             ja.put(newjo);
                         }
                     }
                     token = null;
-                    for (;;) {
-                        if (token == null) {
+                    for (;;)
+                    {
+                        if (token == null)
+                        {
                             token = x.nextToken();
                         }
-                        if (token == null) {
-                            throw x.syntaxError("Misshaped tag");
-                        }
-                        if (!(token instanceof String)) {
+                        if (token == null) { throw x.syntaxError("Misshaped tag"); }
+                        if (!(token instanceof String))
+                        {
                             break;
                         }
                         // attribute = value
                         attribute = (String) token;
-                        if (!arrayForm && ("tagName".equals(attribute) || "childNode".equals(attribute))) {
-                            throw x.syntaxError("Reserved attribute.");
-                        }
+                        if (!arrayForm && ("tagName".equals(attribute) || "childNode".equals(attribute))) { throw x.syntaxError("Reserved attribute."); }
                         token = x.nextToken();
-                        if (token == XML.EQ) {
+                        if (token == XML.EQ)
+                        {
                             token = x.nextToken();
-                            if (!(token instanceof String)) {
-                                throw x.syntaxError("Missing value");
-                            }
+                            if (!(token instanceof String)) { throw x.syntaxError("Missing value"); }
                             newjo.accumulate(attribute, XML.stringToValue((String) token));
                             token = null;
-                        } else {
+                        }
+                        else
+                        {
                             newjo.accumulate(attribute, "");
                         }
                     }
-                    if (arrayForm && (newjo.length() > 0)) {
+                    if (arrayForm && (newjo.length() > 0))
+                    {
                         newja.put(newjo);
                     }
                     // Empty tag <.../>
-                    if (token == XML.SLASH) {
-                        if (x.nextToken() != XML.GT) {
-                            throw x.syntaxError("Misshaped tag");
-                        }
-                        if (ja == null) {
-                            if (arrayForm) {
+                    if (token == XML.SLASH)
+                    {
+                        if (x.nextToken() != XML.GT) { throw x.syntaxError("Misshaped tag"); }
+                        if (ja == null)
+                        {
+                            if (arrayForm)
+                            {
                                 return newja;
-                            } else {
+                            }
+                            else
+                            {
                                 return newjo;
                             }
                         }
                         // Content, between <...> and </...>
-                    } else {
-                        if (token != XML.GT) {
-                            throw x.syntaxError("Misshaped tag");
-                        }
+                    }
+                    else
+                    {
+                        if (token != XML.GT) { throw x.syntaxError("Misshaped tag"); }
                         closeTag = (String) parse(x, arrayForm, newja);
-                        if (closeTag != null) {
-                            if (!closeTag.equals(tagName)) {
-                                throw x.syntaxError("Mismatched '" + tagName + "' and '" + closeTag + "'");
-                            }
+                        if (closeTag != null)
+                        {
+                            if (!closeTag.equals(tagName)) { throw x.syntaxError("Mismatched '" + tagName + "' and '" + closeTag + "'"); }
                             tagName = null;
-                            if (!arrayForm && (newja.length() > 0)) {
+                            if (!arrayForm && (newja.length() > 0))
+                            {
                                 newjo.put("childNodes", newja);
                             }
-                            if (ja == null) {
-                                if (arrayForm) {
+                            if (ja == null)
+                            {
+                                if (arrayForm)
+                                {
                                     return newja;
-                                } else {
+                                }
+                                else
+                                {
                                     return newjo;
                                 }
                             }
                         }
                     }
                 }
-            } else {
-                if (ja != null) {
+            }
+            else
+            {
+                if (ja != null)
+                {
                     ja.put(token instanceof String ? XML.stringToValue((String) token) : token);
                 }
             }
@@ -195,7 +236,8 @@ public class JSONML {
      *
      * @throws JSONException
      */
-    public static JSONArray toJSONArray(final String string) throws JSONException {
+    public static JSONArray toJSONArray(final String string) throws JSONException
+    {
         return toJSONArray(new XMLTokener(string));
     }
 
@@ -212,7 +254,8 @@ public class JSONML {
      *
      * @throws JSONException
      */
-    public static JSONArray toJSONArray(final XMLTokener x) throws JSONException {
+    public static JSONArray toJSONArray(final XMLTokener x) throws JSONException
+    {
         return (JSONArray) parse(x, true, null);
     }
 
@@ -221,7 +264,7 @@ public class JSONML {
      * XML tag is represented as a JSONObject with a "tagName" property. If the tag has attributes, then the attributes
      * will be in the JSONObject as properties. If the tag contains children, the object will have a "childNodes"
      * property which will be an array of strings and JsonML JSONObjects.
-     * 
+     *
      * Comments, prologs, DTDs, and <code>&lt;[ [ ]]></code> are ignored.
      *
      * @param x An XMLTokener of the XML source text.
@@ -230,7 +273,8 @@ public class JSONML {
      *
      * @throws JSONException
      */
-    public static JSONObject toJSONObject(final XMLTokener x) throws JSONException {
+    public static JSONObject toJSONObject(final XMLTokener x) throws JSONException
+    {
         return (JSONObject) parse(x, false, null);
     }
 
@@ -239,7 +283,7 @@ public class JSONML {
      * XML tag is represented as a JSONObject with a "tagName" property. If the tag has attributes, then the attributes
      * will be in the JSONObject as properties. If the tag contains children, the object will have a "childNodes"
      * property which will be an array of strings and JsonML JSONObjects.
-     * 
+     *
      * Comments, prologs, DTDs, and <code>&lt;[ [ ]]></code> are ignored.
      *
      * @param string The XML source text.
@@ -248,7 +292,8 @@ public class JSONML {
      *
      * @throws JSONException
      */
-    public static JSONObject toJSONObject(final String string) throws JSONException {
+    public static JSONObject toJSONObject(final String string) throws JSONException
+    {
         return toJSONObject(new XMLTokener(string));
     }
 
@@ -261,7 +306,8 @@ public class JSONML {
      *
      * @throws JSONException
      */
-    public static String toString(final JSONArray ja) throws JSONException {
+    public static String toString(final JSONArray ja) throws JSONException
+    {
         int i;
         JSONObject jo;
         String key;
@@ -278,16 +324,19 @@ public class JSONML {
         sb.append('<');
         sb.append(tagName);
         object = ja.opt(1);
-        if (object instanceof JSONObject) {
+        if (object instanceof JSONObject)
+        {
             i = 2;
             jo = (JSONObject) object;
             // Emit the attributes
             keys = jo.keys();
-            while (keys.hasNext()) {
+            while (keys.hasNext())
+            {
                 key = keys.next();
                 XML.noSpace(key);
                 value = jo.optString(key);
-                if (value != null) {
+                if (value != null)
+                {
                     sb.append(' ');
                     sb.append(XML.escape(key));
                     sb.append('=');
@@ -296,29 +345,42 @@ public class JSONML {
                     sb.append('"');
                 }
             }
-        } else {
+        }
+        else
+        {
             i = 1;
         }
         // Emit content in body
         length = ja.length();
-        if (i >= length) {
+        if (i >= length)
+        {
             sb.append('/');
             sb.append('>');
-        } else {
+        }
+        else
+        {
             sb.append('>');
-            do {
+            do
+            {
                 object = ja.get(i);
                 i += 1;
-                if (object != null) {
-                    if (object instanceof String) {
+                if (object != null)
+                {
+                    if (object instanceof String)
+                    {
                         sb.append(XML.escape(object.toString()));
-                    } else if (object instanceof JSONObject) {
+                    }
+                    else if (object instanceof JSONObject)
+                    {
                         sb.append(toString((JSONObject) object));
-                    } else if (object instanceof JSONArray) {
+                    }
+                    else if (object instanceof JSONArray)
+                    {
                         sb.append(toString((JSONArray) object));
                     }
                 }
-            } while (i < length);
+            }
+            while (i < length);
             sb.append('<');
             sb.append('/');
             sb.append(tagName);
@@ -338,7 +400,8 @@ public class JSONML {
      *
      * @throws JSONException
      */
-    public static String toString(final JSONObject jo) throws JSONException {
+    public static String toString(final JSONObject jo) throws JSONException
+    {
         final StringBuilder sb = new StringBuilder();
         int i;
         JSONArray ja;
@@ -350,21 +413,22 @@ public class JSONML {
         String value;
         // Emit <tagName
         tagName = jo.optString("tagName");
-        if (tagName == null) {
-            return XML.escape(jo.toString());
-        }
+        if (tagName == null) { return XML.escape(jo.toString()); }
         XML.noSpace(tagName);
         tagName = XML.escape(tagName);
         sb.append('<');
         sb.append(tagName);
         // Emit the attributes
         keys = jo.keys();
-        while (keys.hasNext()) {
+        while (keys.hasNext())
+        {
             key = keys.next();
-            if (!"tagName".equals(key) && !"childNodes".equals(key)) {
+            if (!"tagName".equals(key) && !"childNodes".equals(key))
+            {
                 XML.noSpace(key);
                 value = jo.optString(key);
-                if (value != null) {
+                if (value != null)
+                {
                     sb.append(' ');
                     sb.append(XML.escape(key));
                     sb.append('=');
@@ -376,22 +440,34 @@ public class JSONML {
         }
         // Emit content in body
         ja = jo.optJSONArray("childNodes");
-        if (ja == null) {
+        if (ja == null)
+        {
             sb.append('/');
             sb.append('>');
-        } else {
+        }
+        else
+        {
             sb.append('>');
             length = ja.length();
-            for (i = 0; i < length; i += 1) {
+            for (i = 0; i < length; i += 1)
+            {
                 object = ja.get(i);
-                if (object != null) {
-                    if (object instanceof String) {
+                if (object != null)
+                {
+                    if (object instanceof String)
+                    {
                         sb.append(XML.escape(object.toString()));
-                    } else if (object instanceof JSONObject) {
+                    }
+                    else if (object instanceof JSONObject)
+                    {
                         sb.append(toString((JSONObject) object));
-                    } else if (object instanceof JSONArray) {
+                    }
+                    else if (object instanceof JSONArray)
+                    {
                         sb.append(toString((JSONArray) object));
-                    } else {
+                    }
+                    else
+                    {
                         sb.append(object.toString());
                     }
                 }
diff --git a/src/main/java/com/intellectualcrafters/json/JSONObject.java b/src/main/java/com/intellectualcrafters/json/JSONObject.java
index 3cac13db7..2f126f21d 100644
--- a/src/main/java/com/intellectualcrafters/json/JSONObject.java
+++ b/src/main/java/com/intellectualcrafters/json/JSONObject.java
@@ -27,21 +27,21 @@ import java.util.Set;
  * values into a JSON text using the <code>put</code> and <code>toString</code> methods. A <code>get</code> method
  * returns a value if one can be found, and throws an exception if one cannot be found. An <code>opt</code> method
  * returns a default value instead of throwing an exception, and so is useful for obtaining optional values.
- * 
+ *
  * The generic <code>get()</code> and <code>opt()</code> methods return an object, which you can cast or query for type.
  * There are also typed <code>get</code> and <code>opt</code> methods that do type checking and type coercion for you.
  * The opt methods differ from the get methods in that they do not throw. Instead, they return a specified value, such
  * as null.
- * 
+ *
  * The <code>put</code> methods add or replace values in an object. For example,
- * 
- * 
+ *
+ *
  * <pre>
  * myString = new JSONObject().put(&quot;JSON&quot;, &quot;Hello, World!&quot;).toString();
  * </pre>
- * 
+ *
  * produces the string <code>{"JSON": "Hello, World"}</code>.
- * 
+ *
  * The texts produced by the <code>toString</code> methods strictly conform to the JSON syntax rules. The constructors
  * are more forgiving in the texts they will accept: <ul> <li>An extra <code>,</code>&nbsp;<small>(comma)</small> may
  * appear just before the closing brace.</li> <li>Strings may be quoted with <code>'</code>&nbsp;<small>(single
@@ -53,7 +53,8 @@ import java.util.Set;
  * @author JSON.org
  * @version 2014-05-03
  */
-public class JSONObject {
+public class JSONObject
+{
     /**
      * It is sometimes more convenient and less ambiguous to have a <code>NULL</code> object than to use Java's
      * <code>null</code> value. <code>JSONObject.NULL.equals(null)</code> returns <code>true</code>.
@@ -68,8 +69,9 @@ public class JSONObject {
     /**
      * Construct an empty JSONObject.
      */
-    public JSONObject() {
-        this.map = new HashMap<String, Object>();
+    public JSONObject()
+    {
+        map = new HashMap<String, Object>();
     }
 
     /**
@@ -82,13 +84,17 @@ public class JSONObject {
      * @throws JSONException
      * @throws JSONException If a value is a non-finite number or if a name is duplicated.
      */
-    public JSONObject(final JSONObject jo, final String[] names) {
+    public JSONObject(final JSONObject jo, final String[] names)
+    {
         this();
-        for (final String name : names) {
-            try {
-                this.putOnce(name, jo.opt(name));
-            } catch (final Exception ignore) {
+        for (final String name : names)
+        {
+            try
+            {
+                putOnce(name, jo.opt(name));
             }
+            catch (final Exception ignore)
+            {}
         }
     }
 
@@ -99,16 +105,17 @@ public class JSONObject {
      *
      * @throws JSONException If there is a syntax error in the source string or a duplicated key.
      */
-    public JSONObject(final JSONTokener x) throws JSONException {
+    public JSONObject(final JSONTokener x) throws JSONException
+    {
         this();
         char c;
         String key;
-        if (x.nextClean() != '{') {
-            throw x.syntaxError("A JSONObject text must begin with '{'");
-        }
-        for (;;) {
+        if (x.nextClean() != '{') { throw x.syntaxError("A JSONObject text must begin with '{'"); }
+        for (;;)
+        {
             c = x.nextClean();
-            switch (c) {
+            switch (c)
+            {
                 case 0:
                     throw x.syntaxError("A JSONObject text must end with '}'");
                 case '}':
@@ -119,17 +126,14 @@ public class JSONObject {
             }
             // The key is followed by ':'.
             c = x.nextClean();
-            if (c != ':') {
-                throw x.syntaxError("Expected a ':' after a key");
-            }
-            this.putOnce(key, x.nextValue());
+            if (c != ':') { throw x.syntaxError("Expected a ':' after a key"); }
+            putOnce(key, x.nextValue());
             // Pairs are separated by ','.
-            switch (x.nextClean()) {
+            switch (x.nextClean())
+            {
                 case ';':
                 case ',':
-                    if (x.nextClean() == '}') {
-                        return;
-                    }
+                    if (x.nextClean() == '}') { return; }
                     x.back();
                     break;
                 case '}':
@@ -147,12 +151,16 @@ public class JSONObject {
      *
      * @throws JSONException
      */
-    public JSONObject(final Map<String, Object> map) {
+    public JSONObject(final Map<String, Object> map)
+    {
         this.map = new HashMap<String, Object>();
-        if (map != null) {
-            for (final Entry<String, Object> entry : map.entrySet()) {
+        if (map != null)
+        {
+            for (final Entry<String, Object> entry : map.entrySet())
+            {
                 final Object value = entry.getValue();
-                if (value != null) {
+                if (value != null)
+                {
                     this.map.put(entry.getKey(), wrap(value));
                 }
             }
@@ -164,19 +172,20 @@ public class JSONObject {
      * For each of the methods with no parameters and a name starting with <code>"get"</code> or <code>"is"</code>
      * followed by an uppercase letter, the method is invoked, and a key and the value returned from the getter method
      * are put into the new JSONObject.
-     * 
+     *
      * The key is formed by removing the <code>"get"</code> or <code>"is"</code> prefix. If the second remaining
      * character is not upper case, then the first character is converted to lower case.
-     * 
+     *
      * For example, if an object has a method named <code>"getName"</code>, and if the result of calling
      * <code>object.getName()</code> is <code>"Larry Fine"</code>, then the JSONObject will contain <code>"name": "Larry
      * Fine"</code>.
      *
      * @param bean An object that has getter methods that should be used to make a JSONObject.
      */
-    public JSONObject(final Object bean) {
+    public JSONObject(final Object bean)
+    {
         this();
-        this.populateMap(bean);
+        populateMap(bean);
     }
 
     /**
@@ -187,14 +196,18 @@ public class JSONObject {
      * @param object An object that has fields that should be used to make a JSONObject.
      * @param names  An array of strings, the names of the fields to be obtained from the object.
      */
-    public JSONObject(final Object object, final String names[]) {
+    public JSONObject(final Object object, final String names[])
+    {
         this();
         final Class c = object.getClass();
-        for (final String name : names) {
-            try {
-                this.putOpt(name, c.getField(name).get(object));
-            } catch (final Exception ignore) {
+        for (final String name : names)
+        {
+            try
+            {
+                putOpt(name, c.getField(name).get(object));
             }
+            catch (final Exception ignore)
+            {}
         }
     }
 
@@ -206,7 +219,8 @@ public class JSONObject {
      *
      * @throws JSONException If there is a syntax error in the source string or a duplicated key.
      */
-    public JSONObject(final String source) throws JSONException {
+    public JSONObject(final String source) throws JSONException
+    {
         this(new JSONTokener(source));
     }
 
@@ -218,14 +232,17 @@ public class JSONObject {
      *
      * @throws JSONException If any JSONExceptions are detected.
      */
-    public JSONObject(final String baseName, final Locale locale) throws JSONException {
+    public JSONObject(final String baseName, final Locale locale) throws JSONException
+    {
         this();
         final ResourceBundle bundle = ResourceBundle.getBundle(baseName, locale, Thread.currentThread().getContextClassLoader());
         // Iterate through the keys in the bundle.
         final Enumeration<String> keys = bundle.getKeys();
-        while (keys.hasMoreElements()) {
+        while (keys.hasMoreElements())
+        {
             final Object key = keys.nextElement();
-            if (key != null) {
+            if (key != null)
+            {
                 // Go through the path, ensuring that there is a nested
                 // JSONObject for each
                 // segment except the last. Add the value using the last
@@ -234,10 +251,12 @@ public class JSONObject {
                 final String[] path = ((String) key).split("\\.");
                 final int last = path.length - 1;
                 JSONObject target = this;
-                for (int i = 0; i < last; i += 1) {
+                for (int i = 0; i < last; i += 1)
+                {
                     final String segment = path[i];
                     JSONObject nextTarget = target.optJSONObject(segment);
-                    if (nextTarget == null) {
+                    if (nextTarget == null)
+                    {
                         nextTarget = new JSONObject();
                         target.put(segment, nextTarget);
                     }
@@ -255,17 +274,19 @@ public class JSONObject {
      *
      * @return A String.
      */
-    public static String doubleToString(final double d) {
-        if (Double.isInfinite(d) || Double.isNaN(d)) {
-            return "null";
-        }
+    public static String doubleToString(final double d)
+    {
+        if (Double.isInfinite(d) || Double.isNaN(d)) { return "null"; }
         // Shave off trailing zeros and decimal point, if possible.
         String string = Double.toString(d);
-        if ((string.indexOf('.') > 0) && (string.indexOf('e') < 0) && (string.indexOf('E') < 0)) {
-            while (string.endsWith("0")) {
+        if ((string.indexOf('.') > 0) && (string.indexOf('e') < 0) && (string.indexOf('E') < 0))
+        {
+            while (string.endsWith("0"))
+            {
                 string = string.substring(0, string.length() - 1);
             }
-            if (string.endsWith(".")) {
+            if (string.endsWith("."))
+            {
                 string = string.substring(0, string.length() - 1);
             }
         }
@@ -277,15 +298,15 @@ public class JSONObject {
      *
      * @return An array of field names, or null if there are no names.
      */
-    public static String[] getNames(final JSONObject jo) {
+    public static String[] getNames(final JSONObject jo)
+    {
         final int length = jo.length();
-        if (length == 0) {
-            return null;
-        }
+        if (length == 0) { return null; }
         final Iterator<String> iterator = jo.keys();
         final String[] names = new String[length];
         int i = 0;
-        while (iterator.hasNext()) {
+        while (iterator.hasNext())
+        {
             names[i] = iterator.next();
             i += 1;
         }
@@ -297,18 +318,16 @@ public class JSONObject {
      *
      * @return An array of field names, or null if there are no names.
      */
-    public static String[] getNames(final Object object) {
-        if (object == null) {
-            return null;
-        }
+    public static String[] getNames(final Object object)
+    {
+        if (object == null) { return null; }
         final Class klass = object.getClass();
         final Field[] fields = klass.getFields();
         final int length = fields.length;
-        if (length == 0) {
-            return null;
-        }
+        if (length == 0) { return null; }
         final String[] names = new String[length];
-        for (int i = 0; i < length; i += 1) {
+        for (int i = 0; i < length; i += 1)
+        {
             names[i] = fields[i].getName();
         }
         return names;
@@ -323,18 +342,20 @@ public class JSONObject {
      *
      * @throws JSONException If n is a non-finite number.
      */
-    public static String numberToString(final Number number) throws JSONException {
-        if (number == null) {
-            throw new JSONException("Null pointer");
-        }
+    public static String numberToString(final Number number) throws JSONException
+    {
+        if (number == null) { throw new JSONException("Null pointer"); }
         testValidity(number);
         // Shave off trailing zeros and decimal point, if possible.
         String string = number.toString();
-        if ((string.indexOf('.') > 0) && (string.indexOf('e') < 0) && (string.indexOf('E') < 0)) {
-            while (string.endsWith("0")) {
+        if ((string.indexOf('.') > 0) && (string.indexOf('e') < 0) && (string.indexOf('E') < 0))
+        {
+            while (string.endsWith("0"))
+            {
                 string = string.substring(0, string.length() - 1);
             }
-            if (string.endsWith(".")) {
+            if (string.endsWith("."))
+            {
                 string = string.substring(0, string.length() - 1);
             }
         }
@@ -349,20 +370,27 @@ public class JSONObject {
      *
      * @return A String correctly formatted for insertion in a JSON text.
      */
-    public static String quote(final String string) {
+    public static String quote(final String string)
+    {
         final StringWriter sw = new StringWriter();
-        synchronized (sw.getBuffer()) {
-            try {
+        synchronized (sw.getBuffer())
+        {
+            try
+            {
                 return quote(string, sw).toString();
-            } catch (final IOException ignored) {
+            }
+            catch (final IOException ignored)
+            {
                 // will never happen - we are writing to a string writer
                 return "";
             }
         }
     }
 
-    public static Writer quote(final String string, final Writer w) throws IOException {
-        if ((string == null) || (string.length() == 0)) {
+    public static Writer quote(final String string, final Writer w) throws IOException
+    {
+        if ((string == null) || (string.length() == 0))
+        {
             w.write("\"\"");
             return w;
         }
@@ -372,17 +400,20 @@ public class JSONObject {
         int i;
         final int len = string.length();
         w.write('"');
-        for (i = 0; i < len; i += 1) {
+        for (i = 0; i < len; i += 1)
+        {
             b = c;
             c = string.charAt(i);
-            switch (c) {
+            switch (c)
+            {
                 case '\\':
                 case '"':
                     w.write('\\');
                     w.write(c);
                     break;
                 case '/':
-                    if (b == '<') {
+                    if (b == '<')
+                    {
                         w.write('\\');
                     }
                     w.write(c);
@@ -403,12 +434,15 @@ public class JSONObject {
                     w.write("\\r");
                     break;
                 default:
-                    if ((c < ' ') || ((c >= '\u0080') && (c < '\u00a0')) || ((c >= '\u2000') && (c < '\u2100'))) {
+                    if ((c < ' ') || ((c >= '\u0080') && (c < '\u00a0')) || ((c >= '\u2000') && (c < '\u2100')))
+                    {
                         w.write("\\u");
                         hhhh = Integer.toHexString(c);
                         w.write("0000", 0, 4 - hhhh.length());
                         w.write(hhhh);
-                    } else {
+                    }
+                    else
+                    {
                         w.write(c);
                     }
             }
@@ -424,44 +458,45 @@ public class JSONObject {
      *
      * @return A simple JSON value.
      */
-    public static Object stringToValue(final String string) {
+    public static Object stringToValue(final String string)
+    {
         Double d;
-        if (string.equals("")) {
-            return string;
-        }
-        if (string.equalsIgnoreCase("true")) {
-            return Boolean.TRUE;
-        }
-        if (string.equalsIgnoreCase("false")) {
-            return Boolean.FALSE;
-        }
-        if (string.equalsIgnoreCase("null")) {
-            return JSONObject.NULL;
-        }
+        if (string.equals("")) { return string; }
+        if (string.equalsIgnoreCase("true")) { return Boolean.TRUE; }
+        if (string.equalsIgnoreCase("false")) { return Boolean.FALSE; }
+        if (string.equalsIgnoreCase("null")) { return JSONObject.NULL; }
         /*
          * If it might be a number, try converting it. If a number cannot be
          * produced, then the value will just be a string.
          */
         final char b = string.charAt(0);
-        if (((b >= '0') && (b <= '9')) || (b == '-')) {
-            try {
-                if ((string.indexOf('.') > -1) || (string.indexOf('e') > -1) || (string.indexOf('E') > -1)) {
+        if (((b >= '0') && (b <= '9')) || (b == '-'))
+        {
+            try
+            {
+                if ((string.indexOf('.') > -1) || (string.indexOf('e') > -1) || (string.indexOf('E') > -1))
+                {
                     d = Double.valueOf(string);
-                    if (!d.isInfinite() && !d.isNaN()) {
-                        return d;
-                    }
-                } else {
+                    if (!d.isInfinite() && !d.isNaN()) { return d; }
+                }
+                else
+                {
                     final Long myLong = new Long(string);
-                    if (string.equals(myLong.toString())) {
-                        if (myLong == myLong.intValue()) {
+                    if (string.equals(myLong.toString()))
+                    {
+                        if (myLong == myLong.intValue())
+                        {
                             return myLong.intValue();
-                        } else {
+                        }
+                        else
+                        {
                             return myLong;
                         }
                     }
                 }
-            } catch (final Exception ignore) {
             }
+            catch (final Exception ignore)
+            {}
         }
         return string;
     }
@@ -473,16 +508,17 @@ public class JSONObject {
      *
      * @throws JSONException If o is a non-finite number.
      */
-    public static void testValidity(final Object o) throws JSONException {
-        if (o != null) {
-            if (o instanceof Double) {
-                if (((Double) o).isInfinite() || ((Double) o).isNaN()) {
-                    throw new JSONException("JSON does not allow non-finite numbers.");
-                }
-            } else if (o instanceof Float) {
-                if (((Float) o).isInfinite() || ((Float) o).isNaN()) {
-                    throw new JSONException("JSON does not allow non-finite numbers.");
-                }
+    public static void testValidity(final Object o) throws JSONException
+    {
+        if (o != null)
+        {
+            if (o instanceof Double)
+            {
+                if (((Double) o).isInfinite() || ((Double) o).isNaN()) { throw new JSONException("JSON does not allow non-finite numbers."); }
+            }
+            else if (o instanceof Float)
+            {
+                if (((Float) o).isInfinite() || ((Float) o).isNaN()) { throw new JSONException("JSON does not allow non-finite numbers."); }
             }
         }
     }
@@ -494,8 +530,8 @@ public class JSONObject {
      * If the value is an array or Collection, then a JSONArray will be made from it and its toJSONString method will be
      * called. If the value is a MAP, then a JSONObject will be made from it and its toJSONString method will be called.
      * Otherwise, the value's toString method will be called, and the result will be quoted.
-     * 
-     * 
+     *
+     *
      * Warning: This method assumes that the data structure is acyclical.
      *
      * @param value The value to be serialized.
@@ -506,37 +542,28 @@ public class JSONObject {
      *
      * @throws JSONException If the value is or contains an invalid number.
      */
-    public static String valueToString(final Object value) throws JSONException {
-        if ((value == null) || value.equals(null)) {
-            return "null";
-        }
-        if (value instanceof JSONString) {
+    public static String valueToString(final Object value) throws JSONException
+    {
+        if ((value == null) || value.equals(null)) { return "null"; }
+        if (value instanceof JSONString)
+        {
             Object object;
-            try {
+            try
+            {
                 object = ((JSONString) value).toJSONString();
-            } catch (final Exception e) {
+            }
+            catch (final Exception e)
+            {
                 throw new JSONException(e);
             }
-            if (object instanceof String) {
-                return (String) object;
-            }
+            if (object instanceof String) { return (String) object; }
             throw new JSONException("Bad value from toJSONString: " + object);
         }
-        if (value instanceof Number) {
-            return numberToString((Number) value);
-        }
-        if ((value instanceof Boolean) || (value instanceof JSONObject) || (value instanceof JSONArray)) {
-            return value.toString();
-        }
-        if (value instanceof Map) {
-            return new JSONObject((Map<String, Object>) value).toString();
-        }
-        if (value instanceof Collection) {
-            return new JSONArray((Collection<Object>) value).toString();
-        }
-        if (value.getClass().isArray()) {
-            return new JSONArray(value).toString();
-        }
+        if (value instanceof Number) { return numberToString((Number) value); }
+        if ((value instanceof Boolean) || (value instanceof JSONObject) || (value instanceof JSONArray)) { return value.toString(); }
+        if (value instanceof Map) { return new JSONObject((Map<String, Object>) value).toString(); }
+        if (value instanceof Collection) { return new JSONArray((Collection<Object>) value).toString(); }
+        if (value.getClass().isArray()) { return new JSONArray(value).toString(); }
         return quote(value.toString());
     }
 
@@ -550,67 +577,96 @@ public class JSONObject {
      *
      * @return The wrapped value
      */
-    public static Object wrap(final Object object) {
-        try {
-            if (object == null) {
-                return NULL;
-            }
-            if ((object instanceof JSONObject) || (object instanceof JSONArray) || NULL.equals(object) || (object instanceof JSONString) || (object instanceof Byte) || (object instanceof Character) || (object instanceof Short) || (object instanceof Integer) || (object instanceof Long) || (object instanceof Boolean) || (object instanceof Float) || (object instanceof Double) || (object instanceof String)) {
-                return object;
-            }
-            if (object instanceof Collection) {
-                return new JSONArray((Collection<Object>) object);
-            }
-            if (object.getClass().isArray()) {
-                return new JSONArray(object);
-            }
-            if (object instanceof Map) {
-                return new JSONObject((Map<String, Object>) object);
-            }
+    public static Object wrap(final Object object)
+    {
+        try
+        {
+            if (object == null) { return NULL; }
+            if ((object instanceof JSONObject)
+            || (object instanceof JSONArray)
+            || NULL.equals(object)
+            || (object instanceof JSONString)
+            || (object instanceof Byte)
+            || (object instanceof Character)
+            || (object instanceof Short)
+            || (object instanceof Integer)
+            || (object instanceof Long)
+            || (object instanceof Boolean)
+            || (object instanceof Float)
+            || (object instanceof Double)
+            || (object instanceof String)) { return object; }
+            if (object instanceof Collection) { return new JSONArray((Collection<Object>) object); }
+            if (object.getClass().isArray()) { return new JSONArray(object); }
+            if (object instanceof Map) { return new JSONObject((Map<String, Object>) object); }
             final Package objectPackage = object.getClass().getPackage();
             final String objectPackageName = objectPackage != null ? objectPackage.getName() : "";
-            if (objectPackageName.startsWith("java.") || objectPackageName.startsWith("javax.") || (object.getClass().getClassLoader() == null)) {
-                return object.toString();
-            }
+            if (objectPackageName.startsWith("java.") || objectPackageName.startsWith("javax.") || (object.getClass().getClassLoader() == null)) { return object.toString(); }
             return new JSONObject(object);
-        } catch (final Exception exception) {
+        }
+        catch (final Exception exception)
+        {
             return null;
         }
     }
 
-    static final Writer writeValue(final Writer writer, final Object value, final int indentFactor, final int indent) throws JSONException, IOException {
-        if ((value == null) || value.equals(null)) {
+    static final Writer writeValue(final Writer writer, final Object value, final int indentFactor, final int indent) throws JSONException, IOException
+    {
+        if ((value == null) || value.equals(null))
+        {
             writer.write("null");
-        } else if (value instanceof JSONObject) {
+        }
+        else if (value instanceof JSONObject)
+        {
             ((JSONObject) value).write(writer, indentFactor, indent);
-        } else if (value instanceof JSONArray) {
+        }
+        else if (value instanceof JSONArray)
+        {
             ((JSONArray) value).write(writer, indentFactor, indent);
-        } else if (value instanceof Map) {
+        }
+        else if (value instanceof Map)
+        {
             new JSONObject((Map<String, Object>) value).write(writer, indentFactor, indent);
-        } else if (value instanceof Collection) {
+        }
+        else if (value instanceof Collection)
+        {
             new JSONArray((Collection<Object>) value).write(writer, indentFactor, indent);
-        } else if (value.getClass().isArray()) {
+        }
+        else if (value.getClass().isArray())
+        {
             new JSONArray(value).write(writer, indentFactor, indent);
-        } else if (value instanceof Number) {
+        }
+        else if (value instanceof Number)
+        {
             writer.write(numberToString((Number) value));
-        } else if (value instanceof Boolean) {
+        }
+        else if (value instanceof Boolean)
+        {
             writer.write(value.toString());
-        } else if (value instanceof JSONString) {
+        }
+        else if (value instanceof JSONString)
+        {
             Object o;
-            try {
+            try
+            {
                 o = ((JSONString) value).toJSONString();
-            } catch (final Exception e) {
+            }
+            catch (final Exception e)
+            {
                 throw new JSONException(e);
             }
             writer.write(o != null ? o.toString() : quote(value.toString()));
-        } else {
+        }
+        else
+        {
             quote(value.toString(), writer);
         }
         return writer;
     }
 
-    static final void indent(final Writer writer, final int indent) throws IOException {
-        for (int i = 0; i < indent; i += 1) {
+    static final void indent(final Writer writer, final int indent) throws IOException
+    {
+        for (int i = 0; i < indent; i += 1)
+        {
             writer.write(' ');
         }
     }
@@ -619,7 +675,7 @@ public class JSONObject {
      * Accumulate values under a key. It is similar to the put method except that if there is already an object stored
      * under the key then a JSONArray is stored under the key to hold all of the accumulated values. If there is already
      * a JSONArray, then the new value is appended to it. In contrast, the put method replaces the previous value.
-     * 
+     *
      * If only one value is accumulated that is not a JSONArray, then the result will be the same as using put. But if
      * multiple values are accumulated, then the result will be like append.
      *
@@ -630,14 +686,20 @@ public class JSONObject {
      *
      * @throws JSONException If the value is an invalid number or if the key is null.
      */
-    public JSONObject accumulate(final String key, final Object value) throws JSONException {
+    public JSONObject accumulate(final String key, final Object value) throws JSONException
+    {
         testValidity(value);
-        final Object object = this.opt(key);
-        if (object == null) {
+        final Object object = opt(key);
+        if (object == null)
+        {
             this.put(key, value instanceof JSONArray ? new JSONArray().put(value) : value);
-        } else if (object instanceof JSONArray) {
+        }
+        else if (object instanceof JSONArray)
+        {
             ((JSONArray) object).put(value);
-        } else {
+        }
+        else
+        {
             this.put(key, new JSONArray().put(object).put(value));
         }
         return this;
@@ -655,14 +717,20 @@ public class JSONObject {
      *
      * @throws JSONException If the key is null or if the current value associated with the key is not a JSONArray.
      */
-    public JSONObject append(final String key, final Object value) throws JSONException {
+    public JSONObject append(final String key, final Object value) throws JSONException
+    {
         testValidity(value);
-        final Object object = this.opt(key);
-        if (object == null) {
+        final Object object = opt(key);
+        if (object == null)
+        {
             this.put(key, new JSONArray().put(value));
-        } else if (object instanceof JSONArray) {
+        }
+        else if (object instanceof JSONArray)
+        {
             this.put(key, ((JSONArray) object).put(value));
-        } else {
+        }
+        else
+        {
             throw new JSONException("JSONObject[" + key + "] is not a JSONArray.");
         }
         return this;
@@ -677,14 +745,11 @@ public class JSONObject {
      *
      * @throws JSONException if the key is not found.
      */
-    public Object get(final String key) throws JSONException {
-        if (key == null) {
-            throw new JSONException("Null key.");
-        }
-        final Object object = this.opt(key);
-        if (object == null) {
-            throw new JSONException("JSONObject[" + quote(key) + "] not found.");
-        }
+    public Object get(final String key) throws JSONException
+    {
+        if (key == null) { throw new JSONException("Null key."); }
+        final Object object = opt(key);
+        if (object == null) { throw new JSONException("JSONObject[" + quote(key) + "] not found."); }
         return object;
     }
 
@@ -697,13 +762,14 @@ public class JSONObject {
      *
      * @throws JSONException if the value is not a Boolean or the String "true" or "false".
      */
-    public boolean getBoolean(final String key) throws JSONException {
-        final Object object = this.get(key);
-        if (object.equals(Boolean.FALSE) || ((object instanceof String) && ((String) object).equalsIgnoreCase("false"))) {
+    public boolean getBoolean(final String key) throws JSONException
+    {
+        final Object object = get(key);
+        if (object.equals(Boolean.FALSE) || ((object instanceof String) && ((String) object).equalsIgnoreCase("false")))
+        {
             return false;
-        } else if (object.equals(Boolean.TRUE) || ((object instanceof String) && ((String) object).equalsIgnoreCase("true"))) {
-            return true;
         }
+        else if (object.equals(Boolean.TRUE) || ((object instanceof String) && ((String) object).equalsIgnoreCase("true"))) { return true; }
         throw new JSONException("JSONObject[" + quote(key) + "] is not a Boolean.");
     }
 
@@ -717,11 +783,15 @@ public class JSONObject {
      * @throws JSONException if the key is not found or if the value is not a Number object and cannot be converted to a
      *                       number.
      */
-    public double getDouble(final String key) throws JSONException {
-        final Object object = this.get(key);
-        try {
+    public double getDouble(final String key) throws JSONException
+    {
+        final Object object = get(key);
+        try
+        {
             return object instanceof Number ? ((Number) object).doubleValue() : Double.parseDouble((String) object);
-        } catch (final Exception e) {
+        }
+        catch (final Exception e)
+        {
             throw new JSONException("JSONObject[" + quote(key) + "] is not a number.");
         }
     }
@@ -735,11 +805,15 @@ public class JSONObject {
      *
      * @throws JSONException if the key is not found or if the value cannot be converted to an integer.
      */
-    public int getInt(final String key) throws JSONException {
-        final Object object = this.get(key);
-        try {
+    public int getInt(final String key) throws JSONException
+    {
+        final Object object = get(key);
+        try
+        {
             return object instanceof Number ? ((Number) object).intValue() : Integer.parseInt((String) object);
-        } catch (final Exception e) {
+        }
+        catch (final Exception e)
+        {
             throw new JSONException("JSONObject[" + quote(key) + "] is not an int.");
         }
     }
@@ -753,11 +827,10 @@ public class JSONObject {
      *
      * @throws JSONException if the key is not found or if the value is not a JSONArray.
      */
-    public JSONArray getJSONArray(final String key) throws JSONException {
-        final Object object = this.get(key);
-        if (object instanceof JSONArray) {
-            return (JSONArray) object;
-        }
+    public JSONArray getJSONArray(final String key) throws JSONException
+    {
+        final Object object = get(key);
+        if (object instanceof JSONArray) { return (JSONArray) object; }
         throw new JSONException("JSONObject[" + quote(key) + "] is not a JSONArray.");
     }
 
@@ -770,11 +843,10 @@ public class JSONObject {
      *
      * @throws JSONException if the key is not found or if the value is not a JSONObject.
      */
-    public JSONObject getJSONObject(final String key) throws JSONException {
-        final Object object = this.get(key);
-        if (object instanceof JSONObject) {
-            return (JSONObject) object;
-        }
+    public JSONObject getJSONObject(final String key) throws JSONException
+    {
+        final Object object = get(key);
+        if (object instanceof JSONObject) { return (JSONObject) object; }
         throw new JSONException("JSONObject[" + quote(key) + "] is not a JSONObject.");
     }
 
@@ -787,11 +859,15 @@ public class JSONObject {
      *
      * @throws JSONException if the key is not found or if the value cannot be converted to a long.
      */
-    public long getLong(final String key) throws JSONException {
-        final Object object = this.get(key);
-        try {
+    public long getLong(final String key) throws JSONException
+    {
+        final Object object = get(key);
+        try
+        {
             return object instanceof Number ? ((Number) object).longValue() : Long.parseLong((String) object);
-        } catch (final Exception e) {
+        }
+        catch (final Exception e)
+        {
             throw new JSONException("JSONObject[" + quote(key) + "] is not a long.");
         }
     }
@@ -805,11 +881,10 @@ public class JSONObject {
      *
      * @throws JSONException if there is no string value for the key.
      */
-    public String getString(final String key) throws JSONException {
-        final Object object = this.get(key);
-        if (object instanceof String) {
-            return (String) object;
-        }
+    public String getString(final String key) throws JSONException
+    {
+        final Object object = get(key);
+        if (object instanceof String) { return (String) object; }
         throw new JSONException("JSONObject[" + quote(key) + "] not a string.");
     }
 
@@ -820,8 +895,9 @@ public class JSONObject {
      *
      * @return true if the key exists in the JSONObject.
      */
-    public boolean has(final String key) {
-        return this.map.containsKey(key);
+    public boolean has(final String key)
+    {
+        return map.containsKey(key);
     }
 
     /**
@@ -835,19 +911,31 @@ public class JSONObject {
      * @throws JSONException If there is already a property with this name that is not an Integer, Long, Double, or
      *                       Float.
      */
-    public JSONObject increment(final String key) throws JSONException {
-        final Object value = this.opt(key);
-        if (value == null) {
+    public JSONObject increment(final String key) throws JSONException
+    {
+        final Object value = opt(key);
+        if (value == null)
+        {
             this.put(key, 1);
-        } else if (value instanceof Integer) {
+        }
+        else if (value instanceof Integer)
+        {
             this.put(key, (Integer) value + 1);
-        } else if (value instanceof Long) {
+        }
+        else if (value instanceof Long)
+        {
             this.put(key, (Long) value + 1);
-        } else if (value instanceof Double) {
+        }
+        else if (value instanceof Double)
+        {
             this.put(key, (Double) value + 1);
-        } else if (value instanceof Float) {
+        }
+        else if (value instanceof Float)
+        {
             this.put(key, (Float) value + 1);
-        } else {
+        }
+        else
+        {
             throw new JSONException("Unable to increment [" + quote(key) + "].");
         }
         return this;
@@ -860,8 +948,9 @@ public class JSONObject {
      *
      * @return true if there is no value associated with the key or if the value is the JSONObject.NULL object.
      */
-    public boolean isNull(final String key) {
-        return JSONObject.NULL.equals(this.opt(key));
+    public boolean isNull(final String key)
+    {
+        return JSONObject.NULL.equals(opt(key));
     }
 
     /**
@@ -869,8 +958,9 @@ public class JSONObject {
      *
      * @return An iterator of the keys.
      */
-    public Iterator<String> keys() {
-        return this.keySet().iterator();
+    public Iterator<String> keys()
+    {
+        return keySet().iterator();
     }
 
     /**
@@ -878,8 +968,9 @@ public class JSONObject {
      *
      * @return A keySet.
      */
-    public Set<String> keySet() {
-        return this.map.keySet();
+    public Set<String> keySet()
+    {
+        return map.keySet();
     }
 
     /**
@@ -887,8 +978,9 @@ public class JSONObject {
      *
      * @return The number of keys in the JSONObject.
      */
-    public int length() {
-        return this.map.size();
+    public int length()
+    {
+        return map.size();
     }
 
     /**
@@ -896,10 +988,12 @@ public class JSONObject {
      *
      * @return A JSONArray containing the key strings, or null if the JSONObject is empty.
      */
-    public JSONArray names() {
+    public JSONArray names()
+    {
         final JSONArray ja = new JSONArray();
-        final Iterator<String> keys = this.keys();
-        while (keys.hasNext()) {
+        final Iterator<String> keys = keys();
+        while (keys.hasNext())
+        {
             ja.put(keys.next());
         }
         return ja.length() == 0 ? null : ja;
@@ -912,8 +1006,9 @@ public class JSONObject {
      *
      * @return An object which is the value, or null if there is no value.
      */
-    public Object opt(final String key) {
-        return key == null ? null : this.map.get(key);
+    public Object opt(final String key)
+    {
+        return key == null ? null : map.get(key);
     }
 
     /**
@@ -924,7 +1019,8 @@ public class JSONObject {
      *
      * @return The truth.
      */
-    public boolean optBoolean(final String key) {
+    public boolean optBoolean(final String key)
+    {
         return this.optBoolean(key, false);
     }
 
@@ -937,10 +1033,14 @@ public class JSONObject {
      *
      * @return The truth.
      */
-    public boolean optBoolean(final String key, final boolean defaultValue) {
-        try {
-            return this.getBoolean(key);
-        } catch (final Exception e) {
+    public boolean optBoolean(final String key, final boolean defaultValue)
+    {
+        try
+        {
+            return getBoolean(key);
+        }
+        catch (final Exception e)
+        {
             return defaultValue;
         }
     }
@@ -953,7 +1053,8 @@ public class JSONObject {
      *
      * @return An object which is the value.
      */
-    public double optDouble(final String key) {
+    public double optDouble(final String key)
+    {
         return this.optDouble(key, Double.NaN);
     }
 
@@ -966,10 +1067,14 @@ public class JSONObject {
      *
      * @return An object which is the value.
      */
-    public double optDouble(final String key, final double defaultValue) {
-        try {
-            return this.getDouble(key);
-        } catch (final Exception e) {
+    public double optDouble(final String key, final double defaultValue)
+    {
+        try
+        {
+            return getDouble(key);
+        }
+        catch (final Exception e)
+        {
             return defaultValue;
         }
     }
@@ -982,7 +1087,8 @@ public class JSONObject {
      *
      * @return An object which is the value.
      */
-    public int optInt(final String key) {
+    public int optInt(final String key)
+    {
         return this.optInt(key, 0);
     }
 
@@ -995,10 +1101,14 @@ public class JSONObject {
      *
      * @return An object which is the value.
      */
-    public int optInt(final String key, final int defaultValue) {
-        try {
-            return this.getInt(key);
-        } catch (final Exception e) {
+    public int optInt(final String key, final int defaultValue)
+    {
+        try
+        {
+            return getInt(key);
+        }
+        catch (final Exception e)
+        {
             return defaultValue;
         }
     }
@@ -1011,8 +1121,9 @@ public class JSONObject {
      *
      * @return A JSONArray which is the value.
      */
-    public JSONArray optJSONArray(final String key) {
-        final Object o = this.opt(key);
+    public JSONArray optJSONArray(final String key)
+    {
+        final Object o = opt(key);
         return o instanceof JSONArray ? (JSONArray) o : null;
     }
 
@@ -1024,8 +1135,9 @@ public class JSONObject {
      *
      * @return A JSONObject which is the value.
      */
-    public JSONObject optJSONObject(final String key) {
-        final Object object = this.opt(key);
+    public JSONObject optJSONObject(final String key)
+    {
+        final Object object = opt(key);
         return object instanceof JSONObject ? (JSONObject) object : null;
     }
 
@@ -1037,7 +1149,8 @@ public class JSONObject {
      *
      * @return An object which is the value.
      */
-    public long optLong(final String key) {
+    public long optLong(final String key)
+    {
         return this.optLong(key, 0);
     }
 
@@ -1050,10 +1163,14 @@ public class JSONObject {
      *
      * @return An object which is the value.
      */
-    public long optLong(final String key, final long defaultValue) {
-        try {
-            return this.getLong(key);
-        } catch (final Exception e) {
+    public long optLong(final String key, final long defaultValue)
+    {
+        try
+        {
+            return getLong(key);
+        }
+        catch (final Exception e)
+        {
             return defaultValue;
         }
     }
@@ -1066,7 +1183,8 @@ public class JSONObject {
      *
      * @return A string which is the value.
      */
-    public String optString(final String key) {
+    public String optString(final String key)
+    {
         return this.optString(key, "");
     }
 
@@ -1078,44 +1196,61 @@ public class JSONObject {
      *
      * @return A string which is the value.
      */
-    public String optString(final String key, final String defaultValue) {
-        final Object object = this.opt(key);
+    public String optString(final String key, final String defaultValue)
+    {
+        final Object object = opt(key);
         return NULL.equals(object) ? defaultValue : object.toString();
     }
 
-    private void populateMap(final Object bean) {
+    private void populateMap(final Object bean)
+    {
         final Class klass = bean.getClass();
         // If klass is a System class then set includeSuperClass to false.
         final boolean includeSuperClass = klass.getClassLoader() != null;
         final Method[] methods = includeSuperClass ? klass.getMethods() : klass.getDeclaredMethods();
-        for (final Method method : methods) {
-            try {
-                if (Modifier.isPublic(method.getModifiers())) {
+        for (final Method method : methods)
+        {
+            try
+            {
+                if (Modifier.isPublic(method.getModifiers()))
+                {
                     final String name = method.getName();
                     String key = "";
-                    if (name.startsWith("get")) {
-                        if ("getClass".equals(name) || "getDeclaringClass".equals(name)) {
+                    if (name.startsWith("get"))
+                    {
+                        if ("getClass".equals(name) || "getDeclaringClass".equals(name))
+                        {
                             key = "";
-                        } else {
+                        }
+                        else
+                        {
                             key = name.substring(3);
                         }
-                    } else if (name.startsWith("is")) {
+                    }
+                    else if (name.startsWith("is"))
+                    {
                         key = name.substring(2);
                     }
-                    if ((key.length() > 0) && Character.isUpperCase(key.charAt(0)) && (method.getParameterTypes().length == 0)) {
-                        if (key.length() == 1) {
+                    if ((key.length() > 0) && Character.isUpperCase(key.charAt(0)) && (method.getParameterTypes().length == 0))
+                    {
+                        if (key.length() == 1)
+                        {
                             key = key.toLowerCase();
-                        } else if (!Character.isUpperCase(key.charAt(1))) {
+                        }
+                        else if (!Character.isUpperCase(key.charAt(1)))
+                        {
                             key = key.substring(0, 1).toLowerCase() + key.substring(1);
                         }
                         final Object result = method.invoke(bean, (Object[]) null);
-                        if (result != null) {
-                            this.map.put(key, wrap(result));
+                        if (result != null)
+                        {
+                            map.put(key, wrap(result));
                         }
                     }
                 }
-            } catch (final Exception ignore) {
             }
+            catch (final Exception ignore)
+            {}
         }
     }
 
@@ -1129,7 +1264,8 @@ public class JSONObject {
      *
      * @throws JSONException If the key is null.
      */
-    public JSONObject put(final String key, final boolean value) throws JSONException {
+    public JSONObject put(final String key, final boolean value) throws JSONException
+    {
         this.put(key, value ? Boolean.TRUE : Boolean.FALSE);
         return this;
     }
@@ -1144,7 +1280,8 @@ public class JSONObject {
      *
      * @throws JSONException
      */
-    public JSONObject put(final String key, final Collection<Object> value) throws JSONException {
+    public JSONObject put(final String key, final Collection<Object> value) throws JSONException
+    {
         this.put(key, new JSONArray(value));
         return this;
     }
@@ -1159,7 +1296,8 @@ public class JSONObject {
      *
      * @throws JSONException If the key is null or if the number is invalid.
      */
-    public JSONObject put(final String key, final double value) throws JSONException {
+    public JSONObject put(final String key, final double value) throws JSONException
+    {
         this.put(key, new Double(value));
         return this;
     }
@@ -1174,7 +1312,8 @@ public class JSONObject {
      *
      * @throws JSONException If the key is null.
      */
-    public JSONObject put(final String key, final int value) throws JSONException {
+    public JSONObject put(final String key, final int value) throws JSONException
+    {
         this.put(key, new Integer(value));
         return this;
     }
@@ -1189,7 +1328,8 @@ public class JSONObject {
      *
      * @throws JSONException If the key is null.
      */
-    public JSONObject put(final String key, final long value) throws JSONException {
+    public JSONObject put(final String key, final long value) throws JSONException
+    {
         this.put(key, new Long(value));
         return this;
     }
@@ -1204,7 +1344,8 @@ public class JSONObject {
      *
      * @throws JSONException
      */
-    public JSONObject put(final String key, final Map<String, Object> value) throws JSONException {
+    public JSONObject put(final String key, final Map<String, Object> value) throws JSONException
+    {
         this.put(key, new JSONObject(value));
         return this;
     }
@@ -1221,15 +1362,17 @@ public class JSONObject {
      *
      * @throws JSONException If the value is non-finite number or if the key is null.
      */
-    public JSONObject put(final String key, final Object value) throws JSONException {
-        if (key == null) {
-            throw new NullPointerException("Null key.");
-        }
-        if (value != null) {
+    public JSONObject put(final String key, final Object value) throws JSONException
+    {
+        if (key == null) { throw new NullPointerException("Null key."); }
+        if (value != null)
+        {
             testValidity(value);
-            this.map.put(key, value);
-        } else {
-            this.remove(key);
+            map.put(key, value);
+        }
+        else
+        {
+            remove(key);
         }
         return this;
     }
@@ -1245,11 +1388,11 @@ public class JSONObject {
      *
      * @throws JSONException if the key is a duplicate
      */
-    public JSONObject putOnce(final String key, final Object value) throws JSONException {
-        if ((key != null) && (value != null)) {
-            if (this.opt(key) != null) {
-                throw new JSONException("Duplicate key \"" + key + "\"");
-            }
+    public JSONObject putOnce(final String key, final Object value) throws JSONException
+    {
+        if ((key != null) && (value != null))
+        {
+            if (opt(key) != null) { throw new JSONException("Duplicate key \"" + key + "\""); }
             this.put(key, value);
         }
         return this;
@@ -1266,8 +1409,10 @@ public class JSONObject {
      *
      * @throws JSONException If the value is a non-finite number.
      */
-    public JSONObject putOpt(final String key, final Object value) throws JSONException {
-        if ((key != null) && (value != null)) {
+    public JSONObject putOpt(final String key, final Object value) throws JSONException
+    {
+        if ((key != null) && (value != null))
+        {
             this.put(key, value);
         }
         return this;
@@ -1280,8 +1425,9 @@ public class JSONObject {
      *
      * @return The value that was associated with the name, or null if there was no value.
      */
-    public Object remove(final String key) {
-        return this.map.remove(key);
+    public Object remove(final String key)
+    {
+        return map.remove(key);
     }
 
     /**
@@ -1292,32 +1438,31 @@ public class JSONObject {
      *
      * @return true if they are equal
      */
-    public boolean similar(final Object other) {
-        try {
-            if (!(other instanceof JSONObject)) {
-                return false;
-            }
-            final Set<String> set = this.keySet();
-            if (!set.equals(((JSONObject) other).keySet())) {
-                return false;
-            }
-            for (final String name : set) {
-                final Object valueThis = this.get(name);
+    public boolean similar(final Object other)
+    {
+        try
+        {
+            if (!(other instanceof JSONObject)) { return false; }
+            final Set<String> set = keySet();
+            if (!set.equals(((JSONObject) other).keySet())) { return false; }
+            for (final String name : set)
+            {
+                final Object valueThis = get(name);
                 final Object valueOther = ((JSONObject) other).get(name);
-                if (valueThis instanceof JSONObject) {
-                    if (!((JSONObject) valueThis).similar(valueOther)) {
-                        return false;
-                    }
-                } else if (valueThis instanceof JSONArray) {
-                    if (!((JSONArray) valueThis).similar(valueOther)) {
-                        return false;
-                    }
-                } else if (!valueThis.equals(valueOther)) {
-                    return false;
+                if (valueThis instanceof JSONObject)
+                {
+                    if (!((JSONObject) valueThis).similar(valueOther)) { return false; }
                 }
+                else if (valueThis instanceof JSONArray)
+                {
+                    if (!((JSONArray) valueThis).similar(valueOther)) { return false; }
+                }
+                else if (!valueThis.equals(valueOther)) { return false; }
             }
             return true;
-        } catch (final Throwable exception) {
+        }
+        catch (final Throwable exception)
+        {
             return false;
         }
     }
@@ -1332,13 +1477,13 @@ public class JSONObject {
      *
      * @throws JSONException If any of the values are non-finite numbers.
      */
-    public JSONArray toJSONArray(final JSONArray names) throws JSONException {
-        if ((names == null) || (names.length() == 0)) {
-            return null;
-        }
+    public JSONArray toJSONArray(final JSONArray names) throws JSONException
+    {
+        if ((names == null) || (names.length() == 0)) { return null; }
         final JSONArray ja = new JSONArray();
-        for (int i = 0; i < names.length(); i += 1) {
-            ja.put(this.opt(names.getString(i)));
+        for (int i = 0; i < names.length(); i += 1)
+        {
+            ja.put(opt(names.getString(i)));
         }
         return ja;
     }
@@ -1346,7 +1491,7 @@ public class JSONObject {
     /**
      * Make a JSON text of this JSONObject. For compactness, no whitespace is added. If this would not result in a
      * syntactically correct JSON text, then null will be returned instead.
-     * 
+     *
      * Warning: This method assumes that the data structure is acyclical.
      *
      * @return a printable, displayable, portable, transmittable representation of the object, beginning with
@@ -1354,17 +1499,21 @@ public class JSONObject {
      * brace)</small>.
      */
     @Override
-    public String toString() {
-        try {
+    public String toString()
+    {
+        try
+        {
             return this.toString(0);
-        } catch (final Exception e) {
+        }
+        catch (final Exception e)
+        {
             return null;
         }
     }
 
     /**
      * Make a prettyprinted JSON text of this JSONObject.
-     * 
+     *
      * Warning: This method assumes that the data structure is acyclical.
      *
      * @param indentFactor The number of spaces to add to each level of indentation.
@@ -1375,76 +1524,92 @@ public class JSONObject {
      *
      * @throws JSONException If the object contains an invalid number.
      */
-    public String toString(final int indentFactor) throws JSONException {
+    public String toString(final int indentFactor) throws JSONException
+    {
         final StringWriter w = new StringWriter();
-        synchronized (w.getBuffer()) {
+        synchronized (w.getBuffer())
+        {
             return this.write(w, indentFactor, 0).toString();
         }
     }
 
     /**
      * Write the contents of the JSONObject as JSON text to a writer. For compactness, no whitespace is added.
-     * 
+     *
      * Warning: This method assumes that the data structure is acyclical.
      *
      * @return The writer.
      *
      * @throws JSONException
      */
-    public Writer write(final Writer writer) throws JSONException {
+    public Writer write(final Writer writer) throws JSONException
+    {
         return this.write(writer, 0, 0);
     }
 
     /**
      * Write the contents of the JSONObject as JSON text to a writer. For compactness, no whitespace is added.
-     * 
+     *
      * Warning: This method assumes that the data structure is acyclical.
      *
      * @return The writer.
      *
      * @throws JSONException
      */
-    Writer write(final Writer writer, final int indentFactor, final int indent) throws JSONException {
-        try {
+    Writer write(final Writer writer, final int indentFactor, final int indent) throws JSONException
+    {
+        try
+        {
             boolean commanate = false;
-            final int length = this.length();
-            final Iterator<String> keys = this.keys();
+            final int length = length();
+            final Iterator<String> keys = keys();
             writer.write('{');
-            if (length == 1) {
+            if (length == 1)
+            {
                 final Object key = keys.next();
                 writer.write(quote(key.toString()));
                 writer.write(':');
-                if (indentFactor > 0) {
+                if (indentFactor > 0)
+                {
                     writer.write(' ');
                 }
-                writeValue(writer, this.map.get(key), indentFactor, indent);
-            } else if (length != 0) {
+                writeValue(writer, map.get(key), indentFactor, indent);
+            }
+            else if (length != 0)
+            {
                 final int newindent = indent + indentFactor;
-                while (keys.hasNext()) {
+                while (keys.hasNext())
+                {
                     final Object key = keys.next();
-                    if (commanate) {
+                    if (commanate)
+                    {
                         writer.write(',');
                     }
-                    if (indentFactor > 0) {
+                    if (indentFactor > 0)
+                    {
                         writer.write('\n');
                     }
                     indent(writer, newindent);
                     writer.write(quote(key.toString()));
                     writer.write(':');
-                    if (indentFactor > 0) {
+                    if (indentFactor > 0)
+                    {
                         writer.write(' ');
                     }
-                    writeValue(writer, this.map.get(key), indentFactor, newindent);
+                    writeValue(writer, map.get(key), indentFactor, newindent);
                     commanate = true;
                 }
-                if (indentFactor > 0) {
+                if (indentFactor > 0)
+                {
                     writer.write('\n');
                 }
                 indent(writer, indent);
             }
             writer.write('}');
             return writer;
-        } catch (final IOException exception) {
+        }
+        catch (final IOException exception)
+        {
             throw new JSONException(exception);
         }
     }
@@ -1453,17 +1618,22 @@ public class JSONObject {
      * JSONObject.NULL is equivalent to the value that JavaScript calls null, whilst Java's null is equivalent to the
      * value that JavaScript calls undefined.
      */
-    private static final class Null {
+    private static final class Null
+    {
         /**
          * There is only intended to be a single instance of the NULL object, so the clone method returns itself.
          *
          * @return NULL.
          */
         @Override
-        protected final Object clone() {
-            try {
+        protected final Object clone()
+        {
+            try
+            {
                 return super.clone();
-            } catch (final Exception e) {
+            }
+            catch (final Exception e)
+            {
                 return this;
             }
         }
@@ -1476,7 +1646,8 @@ public class JSONObject {
          * @return true if the object parameter is the JSONObject.NULL object or null.
          */
         @Override
-        public boolean equals(final Object object) {
+        public boolean equals(final Object object)
+        {
             return (object == null) || (object == this);
         }
 
@@ -1486,7 +1657,8 @@ public class JSONObject {
          * @return The string "null".
          */
         @Override
-        public String toString() {
+        public String toString()
+        {
             return "null";
         }
     }
diff --git a/src/main/java/com/intellectualcrafters/json/JSONString.java b/src/main/java/com/intellectualcrafters/json/JSONString.java
index 2cf8273a9..c8494287f 100644
--- a/src/main/java/com/intellectualcrafters/json/JSONString.java
+++ b/src/main/java/com/intellectualcrafters/json/JSONString.java
@@ -6,7 +6,8 @@ package com.intellectualcrafters.json;
  * <code>JSONWriter.value(</code>Object<code>)</code>. The <code>toJSONString</code> method will be used instead of the
  * default behavior of using the Object's <code>toString()</code> method and quoting the result.
  */
-public interface JSONString {
+public interface JSONString
+{
     /**
      * The <code>toJSONString</code> method allows a class to produce its own JSON serialization.
      *
diff --git a/src/main/java/com/intellectualcrafters/json/JSONStringer.java b/src/main/java/com/intellectualcrafters/json/JSONStringer.java
index 56d67ad6f..fbc59094a 100644
--- a/src/main/java/com/intellectualcrafters/json/JSONStringer.java
+++ b/src/main/java/com/intellectualcrafters/json/JSONStringer.java
@@ -6,38 +6,40 @@ import java.io.StringWriter;
  * JSONStringer provides a quick and convenient way of producing JSON text. The texts produced strictly conform to JSON
  * syntax rules. No whitespace is added, so the results are ready for transmission or storage. Each instance of
  * JSONStringer can produce one JSON text.
- * 
+ *
  * A JSONStringer instance provides a <code>value</code> method for appending values to the text, and a <code>key</code>
  * method for adding keys before values in objects. There are <code>array</code> and <code>endArray</code> methods that
  * make and bound array values, and <code>object</code> and <code>endObject</code> methods which make and bound object
  * values. All of these methods return the JSONWriter instance, permitting cascade style. For example,
- * 
- * 
+ *
+ *
  * <pre>
  * myString = new JSONStringer().object().key(&quot;JSON&quot;).value(&quot;Hello,
  * World!&quot;).endObject().toString();
  * </pre>
- * 
+ *
  * which produces the string
- * 
- * 
+ *
+ *
  * <pre>
  * {"JSON":"Hello, World!"}
  * </pre>
- * 
+ *
  * The first method called must be <code>array</code> or <code>object</code>. There are no methods for adding commas or
  * colons. JSONStringer adds them for you. Objects and arrays can be nested up to 20 levels deep.
- * 
+ *
  * This can sometimes be easier than using a JSONObject to build a string.
  *
  * @author JSON.org
  * @version 2008-09-18
  */
-public class JSONStringer extends JSONWriter {
+public class JSONStringer extends JSONWriter
+{
     /**
      * Make a fresh JSONStringer. It can be used to build one JSON text.
      */
-    public JSONStringer() {
+    public JSONStringer()
+    {
         super(new StringWriter());
     }
 
@@ -49,7 +51,8 @@ public class JSONStringer extends JSONWriter {
      * @return The JSON text.
      */
     @Override
-    public String toString() {
-        return this.mode == 'd' ? this.writer.toString() : null;
+    public String toString()
+    {
+        return mode == 'd' ? writer.toString() : null;
     }
 }
diff --git a/src/main/java/com/intellectualcrafters/json/JSONTokener.java b/src/main/java/com/intellectualcrafters/json/JSONTokener.java
index 0c86068ea..3391e1255 100644
--- a/src/main/java/com/intellectualcrafters/json/JSONTokener.java
+++ b/src/main/java/com/intellectualcrafters/json/JSONTokener.java
@@ -14,7 +14,8 @@ import java.io.StringReader;
  * @author JSON.org
  * @version 2014-05-03
  */
-public class JSONTokener {
+public class JSONTokener
+{
     private final Reader reader;
     private long character;
     private boolean eof;
@@ -28,14 +29,15 @@ public class JSONTokener {
      *
      * @param reader A reader.
      */
-    public JSONTokener(final Reader reader) {
+    public JSONTokener(final Reader reader)
+    {
         this.reader = reader.markSupported() ? reader : new BufferedReader(reader);
-        this.eof = false;
-        this.usePrevious = false;
-        this.previous = 0;
-        this.index = 0;
-        this.character = 1;
-        this.line = 1;
+        eof = false;
+        usePrevious = false;
+        previous = 0;
+        index = 0;
+        character = 1;
+        line = 1;
     }
 
     /**
@@ -43,7 +45,8 @@ public class JSONTokener {
      *
      * @param inputStream The source.
      */
-    public JSONTokener(final InputStream inputStream) throws JSONException {
+    public JSONTokener(final InputStream inputStream) throws JSONException
+    {
         this(new InputStreamReader(inputStream));
     }
 
@@ -52,7 +55,8 @@ public class JSONTokener {
      *
      * @param s A source string.
      */
-    public JSONTokener(final String s) {
+    public JSONTokener(final String s)
+    {
         this(new StringReader(s));
     }
 
@@ -63,16 +67,11 @@ public class JSONTokener {
      *
      * @return An int between 0 and 15, or -1 if c was not a hex digit.
      */
-    public static int dehexchar(final char c) {
-        if ((c >= '0') && (c <= '9')) {
-            return c - '0';
-        }
-        if ((c >= 'A') && (c <= 'F')) {
-            return c - ('A' - 10);
-        }
-        if ((c >= 'a') && (c <= 'f')) {
-            return c - ('a' - 10);
-        }
+    public static int dehexchar(final char c)
+    {
+        if ((c >= '0') && (c <= '9')) { return c - '0'; }
+        if ((c >= 'A') && (c <= 'F')) { return c - ('A' - 10); }
+        if ((c >= 'a') && (c <= 'f')) { return c - ('a' - 10); }
         return -1;
     }
 
@@ -80,18 +79,18 @@ public class JSONTokener {
      * Back up one character. This provides a sort of lookahead capability, so that you can test for a digit or letter
      * before attempting to parse the next number or identifier.
      */
-    public void back() throws JSONException {
-        if (this.usePrevious || (this.index <= 0)) {
-            throw new JSONException("Stepping back two steps is not supported");
-        }
-        this.index -= 1;
-        this.character -= 1;
-        this.usePrevious = true;
-        this.eof = false;
+    public void back() throws JSONException
+    {
+        if (usePrevious || (index <= 0)) { throw new JSONException("Stepping back two steps is not supported"); }
+        index -= 1;
+        character -= 1;
+        usePrevious = true;
+        eof = false;
     }
 
-    public boolean end() {
-        return this.eof && !this.usePrevious;
+    public boolean end()
+    {
+        return eof && !usePrevious;
     }
 
     /**
@@ -99,12 +98,11 @@ public class JSONTokener {
      *
      * @return true if not yet at the end of the source.
      */
-    public boolean more() throws JSONException {
+    public boolean more() throws JSONException
+    {
         this.next();
-        if (this.end()) {
-            return false;
-        }
-        this.back();
+        if (end()) { return false; }
+        back();
         return true;
     }
 
@@ -113,34 +111,47 @@ public class JSONTokener {
      *
      * @return The next character, or 0 if past the end of the source string.
      */
-    public char next() throws JSONException {
+    public char next() throws JSONException
+    {
         int c;
-        if (this.usePrevious) {
-            this.usePrevious = false;
-            c = this.previous;
-        } else {
-            try {
-                c = this.reader.read();
-            } catch (final IOException exception) {
+        if (usePrevious)
+        {
+            usePrevious = false;
+            c = previous;
+        }
+        else
+        {
+            try
+            {
+                c = reader.read();
+            }
+            catch (final IOException exception)
+            {
                 throw new JSONException(exception);
             }
-            if (c <= 0) { // End of stream
-                this.eof = true;
+            if (c <= 0)
+            { // End of stream
+                eof = true;
                 c = 0;
             }
         }
-        this.index += 1;
-        if (this.previous == '\r') {
-            this.line += 1;
-            this.character = c == '\n' ? 0 : 1;
-        } else if (c == '\n') {
-            this.line += 1;
-            this.character = 0;
-        } else {
-            this.character += 1;
+        index += 1;
+        if (previous == '\r')
+        {
+            line += 1;
+            character = c == '\n' ? 0 : 1;
         }
-        this.previous = (char) c;
-        return this.previous;
+        else if (c == '\n')
+        {
+            line += 1;
+            character = 0;
+        }
+        else
+        {
+            character += 1;
+        }
+        previous = (char) c;
+        return previous;
     }
 
     /**
@@ -152,11 +163,10 @@ public class JSONTokener {
      *
      * @throws JSONException if the character does not match.
      */
-    public char next(final char c) throws JSONException {
+    public char next(final char c) throws JSONException
+    {
         final char n = this.next();
-        if (n != c) {
-            throw this.syntaxError("Expected '" + c + "' and instead saw '" + n + "'");
-        }
+        if (n != c) { throw syntaxError("Expected '" + c + "' and instead saw '" + n + "'"); }
         return n;
     }
 
@@ -169,17 +179,15 @@ public class JSONTokener {
      *
      * @throws JSONException Substring bounds error if there are not n characters remaining in the source string.
      */
-    public String next(final int n) throws JSONException {
-        if (n == 0) {
-            return "";
-        }
+    public String next(final int n) throws JSONException
+    {
+        if (n == 0) { return ""; }
         final char[] chars = new char[n];
         int pos = 0;
-        while (pos < n) {
+        while (pos < n)
+        {
             chars[pos] = this.next();
-            if (this.end()) {
-                throw this.syntaxError("Substring bounds error");
-            }
+            if (end()) { throw syntaxError("Substring bounds error"); }
             pos += 1;
         }
         return new String(chars);
@@ -192,12 +200,12 @@ public class JSONTokener {
      *
      * @throws JSONException
      */
-    public char nextClean() throws JSONException {
-        for (;;) {
+    public char nextClean() throws JSONException
+    {
+        for (;;)
+        {
             final char c = this.next();
-            if ((c == 0) || (c > ' ')) {
-                return c;
-            }
+            if ((c == 0) || (c > ' ')) { return c; }
         }
     }
 
@@ -212,19 +220,23 @@ public class JSONTokener {
      *
      * @throws JSONException Unterminated string.
      */
-    public String nextString(final char quote) throws JSONException {
+    public String nextString(final char quote) throws JSONException
+    {
         char c;
         final StringBuilder sb = new StringBuilder();
-        for (;;) {
+        for (;;)
+        {
             c = this.next();
-            switch (c) {
+            switch (c)
+            {
                 case 0:
                 case '\n':
                 case '\r':
-                    throw this.syntaxError("Unterminated string");
+                    throw syntaxError("Unterminated string");
                 case '\\':
                     c = this.next();
-                    switch (c) {
+                    switch (c)
+                    {
                         case 'b':
                             sb.append('\b');
                             break;
@@ -250,13 +262,11 @@ public class JSONTokener {
                             sb.append(c);
                             break;
                         default:
-                            throw this.syntaxError("Illegal escape.");
+                            throw syntaxError("Illegal escape.");
                     }
                     break;
                 default:
-                    if (c == quote) {
-                        return sb.toString();
-                    }
+                    if (c == quote) { return sb.toString(); }
                     sb.append(c);
             }
         }
@@ -269,13 +279,17 @@ public class JSONTokener {
      *
      * @return A string.
      */
-    public String nextTo(final char delimiter) throws JSONException {
+    public String nextTo(final char delimiter) throws JSONException
+    {
         final StringBuilder sb = new StringBuilder();
-        for (;;) {
+        for (;;)
+        {
             final char c = this.next();
-            if ((c == delimiter) || (c == 0) || (c == '\n') || (c == '\r')) {
-                if (c != 0) {
-                    this.back();
+            if ((c == delimiter) || (c == 0) || (c == '\n') || (c == '\r'))
+            {
+                if (c != 0)
+                {
+                    back();
                 }
                 return sb.toString().trim();
             }
@@ -291,14 +305,18 @@ public class JSONTokener {
      *
      * @return A string, trimmed.
      */
-    public String nextTo(final String delimiters) throws JSONException {
+    public String nextTo(final String delimiters) throws JSONException
+    {
         char c;
         final StringBuilder sb = new StringBuilder();
-        for (;;) {
+        for (;;)
+        {
             c = this.next();
-            if ((delimiters.indexOf(c) >= 0) || (c == 0) || (c == '\n') || (c == '\r')) {
-                if (c != 0) {
-                    this.back();
+            if ((delimiters.indexOf(c) >= 0) || (c == 0) || (c == '\n') || (c == '\r'))
+            {
+                if (c != 0)
+                {
+                    back();
                 }
                 return sb.toString().trim();
             }
@@ -314,18 +332,20 @@ public class JSONTokener {
      *
      * @throws JSONException If syntax error.
      */
-    public Object nextValue() throws JSONException {
-        char c = this.nextClean();
+    public Object nextValue() throws JSONException
+    {
+        char c = nextClean();
         String string;
-        switch (c) {
+        switch (c)
+        {
             case '"':
             case '\'':
-                return this.nextString(c);
+                return nextString(c);
             case '{':
-                this.back();
+                back();
                 return new JSONObject(this);
             case '[':
-                this.back();
+                back();
                 return new JSONArray(this);
         }
         /*
@@ -336,15 +356,14 @@ public class JSONTokener {
          * formatting character.
          */
         final StringBuilder sb = new StringBuilder();
-        while ((c >= ' ') && (",:]}/\\\"[{;=#".indexOf(c) < 0)) {
+        while ((c >= ' ') && (",:]}/\\\"[{;=#".indexOf(c) < 0))
+        {
             sb.append(c);
             c = this.next();
         }
-        this.back();
+        back();
         string = sb.toString().trim();
-        if ("".equals(string)) {
-            throw this.syntaxError("Missing value");
-        }
+        if ("".equals(string)) { throw syntaxError("Missing value"); }
         return JSONObject.stringToValue(string);
     }
 
@@ -356,27 +375,34 @@ public class JSONTokener {
      *
      * @return The requested character, or zero if the requested character is not found.
      */
-    public char skipTo(final char to) throws JSONException {
+    public char skipTo(final char to) throws JSONException
+    {
         char c;
-        try {
-            final long startIndex = this.index;
-            final long startCharacter = this.character;
-            final long startLine = this.line;
-            this.reader.mark(1000000);
-            do {
+        try
+        {
+            final long startIndex = index;
+            final long startCharacter = character;
+            final long startLine = line;
+            reader.mark(1000000);
+            do
+            {
                 c = this.next();
-                if (c == 0) {
-                    this.reader.reset();
-                    this.index = startIndex;
-                    this.character = startCharacter;
-                    this.line = startLine;
+                if (c == 0)
+                {
+                    reader.reset();
+                    index = startIndex;
+                    character = startCharacter;
+                    line = startLine;
                     return c;
                 }
-            } while (c != to);
-        } catch (final IOException exception) {
+            }
+            while (c != to);
+        }
+        catch (final IOException exception)
+        {
             throw new JSONException(exception);
         }
-        this.back();
+        back();
         return c;
     }
 
@@ -387,8 +413,9 @@ public class JSONTokener {
      *
      * @return A JSONException object, suitable for throwing
      */
-    public JSONException syntaxError(final String message) {
-        return new JSONException(message + this.toString());
+    public JSONException syntaxError(final String message)
+    {
+        return new JSONException(message + toString());
     }
 
     /**
@@ -397,7 +424,8 @@ public class JSONTokener {
      * @return " at {index} [character {character} line {line}]"
      */
     @Override
-    public String toString() {
-        return " at " + this.index + " [character " + this.character + " line " + this.line + "]";
+    public String toString()
+    {
+        return " at " + index + " [character " + character + " line " + line + "]";
     }
 }
diff --git a/src/main/java/com/intellectualcrafters/json/JSONWriter.java b/src/main/java/com/intellectualcrafters/json/JSONWriter.java
index 7530c40f2..52ac862ce 100644
--- a/src/main/java/com/intellectualcrafters/json/JSONWriter.java
+++ b/src/main/java/com/intellectualcrafters/json/JSONWriter.java
@@ -7,33 +7,34 @@ import java.io.Writer;
  * JSONWriter provides a quick and convenient way of producing JSON text. The texts produced strictly conform to JSON
  * syntax rules. No whitespace is added, so the results are ready for transmission or storage. Each instance of
  * JSONWriter can produce one JSON text.
- * 
+ *
  * A JSONWriter instance provides a <code>value</code> method for appending values to the text, and a <code>key</code>
  * method for adding keys before values in objects. There are <code>array</code> and <code>endArray</code> methods that
  * make and bound array values, and <code>object</code> and <code>endObject</code> methods which make and bound object
  * values. All of these methods return the JSONWriter instance, permitting a cascade style. For example,
- * 
- * 
+ *
+ *
  * <pre>
  * new JSONWriter(myWriter).object().key(&quot;JSON&quot;).value(&quot;Hello, World!&quot;).endObject();
  * </pre>
- * 
+ *
  * which writes
- * 
- * 
+ *
+ *
  * <pre>
  * {"JSON":"Hello, World!"}
  * </pre>
- * 
+ *
  * The first method called must be <code>array</code> or <code>object</code>. There are no methods for adding commas or
  * colons. JSONWriter adds them for you. Objects and arrays can be nested up to 20 levels deep.
- * 
+ *
  * This can sometimes be easier than using a JSONObject to build a string.
  *
  * @author JSON.org
  * @version 2011-11-24
  */
-public class JSONWriter {
+public class JSONWriter
+{
     private static final int maxdepth = 200;
     /**
      * The writer that will receive the output.
@@ -59,12 +60,13 @@ public class JSONWriter {
     /**
      * Make a fresh JSONWriter. It can be used to build one JSON text.
      */
-    public JSONWriter(final Writer w) {
-        this.comma = false;
-        this.mode = 'i';
-        this.stack = new JSONObject[maxdepth];
-        this.top = 0;
-        this.writer = w;
+    public JSONWriter(final Writer w)
+    {
+        comma = false;
+        mode = 'i';
+        stack = new JSONObject[maxdepth];
+        top = 0;
+        writer = w;
     }
 
     /**
@@ -76,23 +78,28 @@ public class JSONWriter {
      *
      * @throws JSONException If the value is out of sequence.
      */
-    private JSONWriter append(final String string) throws JSONException {
-        if (string == null) {
-            throw new JSONException("Null pointer");
-        }
-        if ((this.mode == 'o') || (this.mode == 'a')) {
-            try {
-                if (this.comma && (this.mode == 'a')) {
-                    this.writer.write(',');
+    private JSONWriter append(final String string) throws JSONException
+    {
+        if (string == null) { throw new JSONException("Null pointer"); }
+        if ((mode == 'o') || (mode == 'a'))
+        {
+            try
+            {
+                if (comma && (mode == 'a'))
+                {
+                    writer.write(',');
                 }
-                this.writer.write(string);
-            } catch (final IOException e) {
+                writer.write(string);
+            }
+            catch (final IOException e)
+            {
                 throw new JSONException(e);
             }
-            if (this.mode == 'o') {
-                this.mode = 'k';
+            if (mode == 'o')
+            {
+                mode = 'k';
             }
-            this.comma = true;
+            comma = true;
             return this;
         }
         throw new JSONException("Value out of sequence.");
@@ -107,11 +114,13 @@ public class JSONWriter {
      * @throws JSONException If the nesting is too deep, or if the object is started in the wrong place (for example as
      *                       a key or after the end of the outermost array or object).
      */
-    public JSONWriter array() throws JSONException {
-        if ((this.mode == 'i') || (this.mode == 'o') || (this.mode == 'a')) {
-            this.push(null);
-            this.append("[");
-            this.comma = false;
+    public JSONWriter array() throws JSONException
+    {
+        if ((mode == 'i') || (mode == 'o') || (mode == 'a'))
+        {
+            push(null);
+            append("[");
+            comma = false;
             return this;
         }
         throw new JSONException("Misplaced array.");
@@ -127,17 +136,19 @@ public class JSONWriter {
      *
      * @throws JSONException If unbalanced.
      */
-    private JSONWriter end(final char mode, final char c) throws JSONException {
-        if (this.mode != mode) {
-            throw new JSONException(mode == 'a' ? "Misplaced endArray." : "Misplaced endObject.");
+    private JSONWriter end(final char mode, final char c) throws JSONException
+    {
+        if (this.mode != mode) { throw new JSONException(mode == 'a' ? "Misplaced endArray." : "Misplaced endObject."); }
+        pop(mode);
+        try
+        {
+            writer.write(c);
         }
-        this.pop(mode);
-        try {
-            this.writer.write(c);
-        } catch (final IOException e) {
+        catch (final IOException e)
+        {
             throw new JSONException(e);
         }
-        this.comma = true;
+        comma = true;
         return this;
     }
 
@@ -148,8 +159,9 @@ public class JSONWriter {
      *
      * @throws JSONException If incorrectly nested.
      */
-    public JSONWriter endArray() throws JSONException {
-        return this.end('a', ']');
+    public JSONWriter endArray() throws JSONException
+    {
+        return end('a', ']');
     }
 
     /**
@@ -159,8 +171,9 @@ public class JSONWriter {
      *
      * @throws JSONException If incorrectly nested.
      */
-    public JSONWriter endObject() throws JSONException {
-        return this.end('k', '}');
+    public JSONWriter endObject() throws JSONException
+    {
+        return end('k', '}');
     }
 
     /**
@@ -174,22 +187,26 @@ public class JSONWriter {
      * @throws JSONException If the key is out of place. For example, keys do not belong in arrays or if the key is
      *                       null.
      */
-    public JSONWriter key(final String string) throws JSONException {
-        if (string == null) {
-            throw new JSONException("Null key.");
-        }
-        if (this.mode == 'k') {
-            try {
-                this.stack[this.top - 1].putOnce(string, Boolean.TRUE);
-                if (this.comma) {
-                    this.writer.write(',');
+    public JSONWriter key(final String string) throws JSONException
+    {
+        if (string == null) { throw new JSONException("Null key."); }
+        if (mode == 'k')
+        {
+            try
+            {
+                stack[top - 1].putOnce(string, Boolean.TRUE);
+                if (comma)
+                {
+                    writer.write(',');
                 }
-                this.writer.write(JSONObject.quote(string));
-                this.writer.write(':');
-                this.comma = false;
-                this.mode = 'o';
+                writer.write(JSONObject.quote(string));
+                writer.write(':');
+                comma = false;
+                mode = 'o';
                 return this;
-            } catch (final IOException e) {
+            }
+            catch (final IOException e)
+            {
                 throw new JSONException(e);
             }
         }
@@ -205,14 +222,17 @@ public class JSONWriter {
      * @throws JSONException If the nesting is too deep, or if the object is started in the wrong place (for example as
      *                       a key or after the end of the outermost array or object).
      */
-    public JSONWriter object() throws JSONException {
-        if (this.mode == 'i') {
-            this.mode = 'o';
+    public JSONWriter object() throws JSONException
+    {
+        if (mode == 'i')
+        {
+            mode = 'o';
         }
-        if ((this.mode == 'o') || (this.mode == 'a')) {
-            this.append("{");
-            this.push(new JSONObject());
-            this.comma = false;
+        if ((mode == 'o') || (mode == 'a'))
+        {
+            append("{");
+            push(new JSONObject());
+            comma = false;
             return this;
         }
         throw new JSONException("Misplaced object.");
@@ -225,16 +245,13 @@ public class JSONWriter {
      *
      * @throws JSONException If nesting is wrong.
      */
-    private void pop(final char c) throws JSONException {
-        if (this.top <= 0) {
-            throw new JSONException("Nesting error.");
-        }
-        final char m = this.stack[this.top - 1] == null ? 'a' : 'k';
-        if (m != c) {
-            throw new JSONException("Nesting error.");
-        }
-        this.top -= 1;
-        this.mode = this.top == 0 ? 'd' : this.stack[this.top - 1] == null ? 'a' : 'k';
+    private void pop(final char c) throws JSONException
+    {
+        if (top <= 0) { throw new JSONException("Nesting error."); }
+        final char m = stack[top - 1] == null ? 'a' : 'k';
+        if (m != c) { throw new JSONException("Nesting error."); }
+        top -= 1;
+        mode = top == 0 ? 'd' : stack[top - 1] == null ? 'a' : 'k';
     }
 
     /**
@@ -244,13 +261,12 @@ public class JSONWriter {
      *
      * @throws JSONException If nesting is too deep.
      */
-    private void push(final JSONObject jo) throws JSONException {
-        if (this.top >= maxdepth) {
-            throw new JSONException("Nesting too deep.");
-        }
-        this.stack[this.top] = jo;
-        this.mode = jo == null ? 'a' : 'k';
-        this.top += 1;
+    private void push(final JSONObject jo) throws JSONException
+    {
+        if (top >= maxdepth) { throw new JSONException("Nesting too deep."); }
+        stack[top] = jo;
+        mode = jo == null ? 'a' : 'k';
+        top += 1;
     }
 
     /**
@@ -262,8 +278,9 @@ public class JSONWriter {
      *
      * @throws JSONException
      */
-    public JSONWriter value(final boolean b) throws JSONException {
-        return this.append(b ? "true" : "false");
+    public JSONWriter value(final boolean b) throws JSONException
+    {
+        return append(b ? "true" : "false");
     }
 
     /**
@@ -275,7 +292,8 @@ public class JSONWriter {
      *
      * @throws JSONException If the number is not finite.
      */
-    public JSONWriter value(final double d) throws JSONException {
+    public JSONWriter value(final double d) throws JSONException
+    {
         return this.value(new Double(d));
     }
 
@@ -288,8 +306,9 @@ public class JSONWriter {
      *
      * @throws JSONException
      */
-    public JSONWriter value(final long l) throws JSONException {
-        return this.append(Long.toString(l));
+    public JSONWriter value(final long l) throws JSONException
+    {
+        return append(Long.toString(l));
     }
 
     /**
@@ -302,7 +321,8 @@ public class JSONWriter {
      *
      * @throws JSONException If the value is out of sequence.
      */
-    public JSONWriter value(final Object object) throws JSONException {
-        return this.append(JSONObject.valueToString(object));
+    public JSONWriter value(final Object object) throws JSONException
+    {
+        return append(JSONObject.valueToString(object));
     }
 }
diff --git a/src/main/java/com/intellectualcrafters/json/Kim.java b/src/main/java/com/intellectualcrafters/json/Kim.java
index e8e90a7a8..391bcf4e2 100644
--- a/src/main/java/com/intellectualcrafters/json/Kim.java
+++ b/src/main/java/com/intellectualcrafters/json/Kim.java
@@ -5,28 +5,29 @@ package com.intellectualcrafters.json;
  * byte. The last byte of a character never has the MSB reset. Every byte that is not the last byte has the MSB set. Kim
  * stands for "Keep it minimal". A Unicode character is never longer than 3 bytes. Every byte contributes 7 bits to the
  * character. ASCII is unmodified.
- * 
+ *
  * Kim UTF-8 one byte U+007F U+007F two bytes U+3FFF U+07FF three bytes U+10FFF U+FFFF four bytes U+10FFFF
- * 
+ *
  * Characters in the ranges U+0800..U+3FFF and U+10000..U+10FFFF will be one byte smaller when encoded in Kim compared
  * to UTF-8.
- * 
+ *
  * Kim is beneficial when using scripts such as Old South Arabian, Aramaic, Avestan, Balinese, Batak, Bopomofo,
  * Buginese, Buhid, Carian, Cherokee, Coptic, Cyrillic, Deseret, Egyptian Hieroglyphs, Ethiopic, Georgian, Glagolitic,
  * Gothic, Hangul Jamo, Hanunoo, Hiragana, Kanbun, Kaithi, Kannada, Katakana, Kharoshthi, Khmer, Lao, Lepcha, Limbu,
  * Lycian, Lydian, Malayalam, Mandaic, Meroitic, Miao, Mongolian, Myanmar, New Tai Lue, Ol Chiki, Old Turkic, Oriya,
  * Osmanya, Pahlavi, Parthian, Phags-Pa, Phoenician, Samaritan, Sharada, Sinhala, Sora Sompeng, Tagalog, Tagbanwa,
  * Takri, Tai Le, Tai Tham, Tamil, Telugu, Thai, Tibetan, Tifinagh, UCAS.
- * 
+ *
  * A kim object can be constructed from an ordinary UTF-16 string, or from a byte array. A kim object can produce a
  * UTF-16 string.
- * 
+ *
  * As with UTF-8, it is possible to detect character boundaries within a byte sequence. UTF-8 is one of the world's
  * great inventions. While Kim is more efficient, it is not clear that it is worth the expense of transition.
  *
  * @version 2013-04-18
  */
-public class Kim {
+public class Kim
+{
     /**
      * The number of bytes in the kim. The number of bytes can be as much as three times the number of characters.
      */
@@ -51,23 +52,26 @@ public class Kim {
      * @param from  The index of the first byte.
      * @param thru  The index of the last byte plus one.
      */
-    public Kim(final byte[] bytes, final int from, final int thru) {
+    public Kim(final byte[] bytes, final int from, final int thru)
+    {
         // As the bytes are copied into the new kim, a hashcode is computed
         // using a
         // modified Fletcher code.
         int sum = 1;
         int value;
-        this.hashcode = 0;
-        this.length = thru - from;
-        if (this.length > 0) {
-            this.bytes = new byte[this.length];
-            for (int at = 0; at < this.length; at += 1) {
+        hashcode = 0;
+        length = thru - from;
+        if (length > 0)
+        {
+            this.bytes = new byte[length];
+            for (int at = 0; at < length; at += 1)
+            {
                 value = bytes[at + from] & 0xFF;
                 sum += value;
-                this.hashcode += sum;
+                hashcode += sum;
                 this.bytes[at] = (byte) value;
             }
-            this.hashcode += sum << 16;
+            hashcode += sum << 16;
         }
     }
 
@@ -77,7 +81,8 @@ public class Kim {
      * @param bytes  The byte array.
      * @param length The number of bytes.
      */
-    public Kim(final byte[] bytes, final int length) {
+    public Kim(final byte[] bytes, final int length)
+    {
         this(bytes, 0, length);
     }
 
@@ -88,7 +93,8 @@ public class Kim {
      * @param from The point at which to take bytes.
      * @param thru The point at which to stop taking bytes.
      */
-    public Kim(final Kim kim, final int from, final int thru) {
+    public Kim(final Kim kim, final int from, final int thru)
+    {
         this(kim.bytes, from, thru);
     }
 
@@ -99,78 +105,92 @@ public class Kim {
      *
      * @throws JSONException if surrogate pair mismatch.
      */
-    public Kim(final String string) throws JSONException {
+    public Kim(final String string) throws JSONException
+    {
         final int stringLength = string.length();
-        this.hashcode = 0;
-        this.length = 0;
+        hashcode = 0;
+        length = 0;
         // First pass: Determine the length of the kim, allowing for the UTF-16
         // to UTF-32 conversion, and then the UTF-32 to Kim conversion.
-        if (stringLength > 0) {
-            for (int i = 0; i < stringLength; i += 1) {
+        if (stringLength > 0)
+        {
+            for (int i = 0; i < stringLength; i += 1)
+            {
                 final int c = string.charAt(i);
-                if (c <= 0x7F) {
-                    this.length += 1;
-                } else if (c <= 0x3FFF) {
-                    this.length += 2;
-                } else {
-                    if ((c >= 0xD800) && (c <= 0xDFFF)) {
+                if (c <= 0x7F)
+                {
+                    length += 1;
+                }
+                else if (c <= 0x3FFF)
+                {
+                    length += 2;
+                }
+                else
+                {
+                    if ((c >= 0xD800) && (c <= 0xDFFF))
+                    {
                         i += 1;
                         final int d = string.charAt(i);
-                        if ((c > 0xDBFF) || (d < 0xDC00) || (d > 0xDFFF)) {
-                            throw new JSONException("Bad UTF16");
-                        }
+                        if ((c > 0xDBFF) || (d < 0xDC00) || (d > 0xDFFF)) { throw new JSONException("Bad UTF16"); }
                     }
-                    this.length += 3;
+                    length += 3;
                 }
             }
             // Second pass: Allocate a byte array and fill that array with the
             // conversion
             // while computing the hashcode.
-            this.bytes = new byte[this.length];
+            bytes = new byte[length];
             int at = 0;
             int b;
             int sum = 1;
-            for (int i = 0; i < stringLength; i += 1) {
+            for (int i = 0; i < stringLength; i += 1)
+            {
                 int character = string.charAt(i);
-                if (character <= 0x7F) {
-                    this.bytes[at] = (byte) character;
+                if (character <= 0x7F)
+                {
+                    bytes[at] = (byte) character;
                     sum += character;
-                    this.hashcode += sum;
+                    hashcode += sum;
                     at += 1;
-                } else if (character <= 0x3FFF) {
+                }
+                else if (character <= 0x3FFF)
+                {
                     b = 0x80 | (character >>> 7);
-                    this.bytes[at] = (byte) b;
+                    bytes[at] = (byte) b;
                     sum += b;
-                    this.hashcode += sum;
+                    hashcode += sum;
                     at += 1;
                     b = character & 0x7F;
-                    this.bytes[at] = (byte) b;
+                    bytes[at] = (byte) b;
                     sum += b;
-                    this.hashcode += sum;
+                    hashcode += sum;
                     at += 1;
-                } else {
-                    if ((character >= 0xD800) && (character <= 0xDBFF)) {
+                }
+                else
+                {
+                    if ((character >= 0xD800) && (character <= 0xDBFF))
+                    {
                         i += 1;
                         character = (((character & 0x3FF) << 10) | (string.charAt(i) & 0x3FF)) + 65536;
                     }
                     b = 0x80 | (character >>> 14);
-                    this.bytes[at] = (byte) b;
+                    bytes[at] = (byte) b;
                     sum += b;
-                    this.hashcode += sum;
+                    hashcode += sum;
                     at += 1;
                     b = 0x80 | ((character >>> 7) & 0xFF);
-                    this.bytes[at] = (byte) b;
+                    bytes[at] = (byte) b;
                     sum += b;
-                    this.hashcode += sum;
+                    hashcode += sum;
                     at += 1;
                     b = character & 0x7F;
-                    this.bytes[at] = (byte) b;
+                    bytes[at] = (byte) b;
                     sum += b;
-                    this.hashcode += sum;
+                    hashcode += sum;
                     at += 1;
                 }
             }
-            this.hashcode += sum << 16;
+            hashcode += sum << 16;
         }
     }
 
@@ -183,10 +203,9 @@ public class Kim {
      *
      * @throws JSONException if the character is not representable in a kim.
      */
-    public static int characterSize(final int character) throws JSONException {
-        if ((character < 0) || (character > 0x10FFFF)) {
-            throw new JSONException("Bad character " + character);
-        }
+    public static int characterSize(final int character) throws JSONException
+    {
+        if ((character < 0) || (character > 0x10FFFF)) { throw new JSONException("Bad character " + character); }
         return character <= 0x7F ? 1 : character <= 0x3FFF ? 2 : 3;
     }
 
@@ -199,24 +218,22 @@ public class Kim {
      * @throws JSONException if at does not point to a valid character.
      * @return a Unicode character between 0 and 0x10FFFF.
      */
-    public int characterAt(final int at) throws JSONException {
+    public int characterAt(final int at) throws JSONException
+    {
         final int c = get(at);
-        if ((c & 0x80) == 0) {
-            return c;
-        }
+        if ((c & 0x80) == 0) { return c; }
         int character;
         final int c1 = get(at + 1);
-        if ((c1 & 0x80) == 0) {
+        if ((c1 & 0x80) == 0)
+        {
             character = ((c & 0x7F) << 7) | c1;
-            if (character > 0x7F) {
-                return character;
-            }
-        } else {
+            if (character > 0x7F) { return character; }
+        }
+        else
+        {
             final int c2 = get(at + 2);
             character = ((c & 0x7F) << 14) | ((c1 & 0x7F) << 7) | c2;
-            if (((c2 & 0x80) == 0) && (character > 0x3FFF) && (character <= 0x10FFFF) && ((character < 0xD800) || (character > 0xDFFF))) {
-                return character;
-            }
+            if (((c2 & 0x80) == 0) && (character > 0x3FFF) && (character <= 0x10FFFF) && ((character < 0xD800) || (character > 0xDFFF))) { return character; }
         }
         throw new JSONException("Bad character at " + at);
     }
@@ -229,9 +246,10 @@ public class Kim {
      *
      * @return The position immediately after the copy.
      */
-    public int copy(final byte[] bytes, final int at) {
-        System.arraycopy(this.bytes, 0, bytes, at, this.length);
-        return at + this.length;
+    public int copy(final byte[] bytes, final int at)
+    {
+        System.arraycopy(this.bytes, 0, bytes, at, length);
+        return at + length;
     }
 
     /**
@@ -242,18 +260,13 @@ public class Kim {
      * @return true if this and obj are both kim objects containing identical byte sequences.
      */
     @Override
-    public boolean equals(final Object obj) {
-        if (!(obj instanceof Kim)) {
-            return false;
-        }
+    public boolean equals(final Object obj)
+    {
+        if (!(obj instanceof Kim)) { return false; }
         final Kim that = (Kim) obj;
-        if (this == that) {
-            return true;
-        }
-        if (this.hashcode != that.hashcode) {
-            return false;
-        }
-        return java.util.Arrays.equals(this.bytes, that.bytes);
+        if (this == that) { return true; }
+        if (hashcode != that.hashcode) { return false; }
+        return java.util.Arrays.equals(bytes, that.bytes);
     }
 
     /**
@@ -265,19 +278,19 @@ public class Kim {
      *
      * @throws JSONException if there is no byte at that position.
      */
-    public int get(final int at) throws JSONException {
-        if ((at < 0) || (at > this.length)) {
-            throw new JSONException("Bad character at " + at);
-        }
-        return (this.bytes[at]) & 0xFF;
+    public int get(final int at) throws JSONException
+    {
+        if ((at < 0) || (at > length)) { throw new JSONException("Bad character at " + at); }
+        return (bytes[at]) & 0xFF;
     }
 
     /**
      * Returns a hash code value for the kim.
      */
     @Override
-    public int hashCode() {
-        return this.hashcode;
+    public int hashCode()
+    {
+        return hashcode;
     }
 
     /**
@@ -289,25 +302,31 @@ public class Kim {
      * @throws JSONException if the kim is not valid.
      */
     @Override
-    public String toString() throws JSONException {
-        if (this.string == null) {
+    public String toString() throws JSONException
+    {
+        if (string == null)
+        {
             int c;
             int length = 0;
             final char chars[] = new char[this.length];
-            for (int at = 0; at < this.length; at += characterSize(c)) {
-                c = this.characterAt(at);
-                if (c < 0x10000) {
+            for (int at = 0; at < this.length; at += characterSize(c))
+            {
+                c = characterAt(at);
+                if (c < 0x10000)
+                {
                     chars[length] = (char) c;
                     length += 1;
-                } else {
+                }
+                else
+                {
                     chars[length] = (char) (0xD800 | ((c - 0x10000) >>> 10));
                     length += 1;
                     chars[length] = (char) (0xDC00 | (c & 0x03FF));
                     length += 1;
                 }
             }
-            this.string = new String(chars, 0, length);
+            string = new String(chars, 0, length);
         }
-        return this.string;
+        return string;
     }
 }
diff --git a/src/main/java/com/intellectualcrafters/json/Property.java b/src/main/java/com/intellectualcrafters/json/Property.java
index cdbaba42d..db31b325d 100644
--- a/src/main/java/com/intellectualcrafters/json/Property.java
+++ b/src/main/java/com/intellectualcrafters/json/Property.java
@@ -30,7 +30,8 @@ import java.util.Properties;
  * @author JSON.org
  * @version 2014-05-03
  */
-public class Property {
+public class Property
+{
     /**
      * Converts a property file object into a JSONObject. The property file object is a table of name value pairs.
      *
@@ -40,11 +41,14 @@ public class Property {
      *
      * @throws JSONException
      */
-    public static JSONObject toJSONObject(final java.util.Properties properties) throws JSONException {
+    public static JSONObject toJSONObject(final java.util.Properties properties) throws JSONException
+    {
         final JSONObject jo = new JSONObject();
-        if ((properties != null) && !properties.isEmpty()) {
+        if ((properties != null) && !properties.isEmpty())
+        {
             final Enumeration enumProperties = properties.propertyNames();
-            while (enumProperties.hasMoreElements()) {
+            while (enumProperties.hasMoreElements())
+            {
                 final String name = (String) enumProperties.nextElement();
                 jo.put(name, properties.getProperty(name));
             }
@@ -61,11 +65,14 @@ public class Property {
      *
      * @throws JSONException
      */
-    public static Properties toProperties(final JSONObject jo) throws JSONException {
+    public static Properties toProperties(final JSONObject jo) throws JSONException
+    {
         final Properties properties = new Properties();
-        if (jo != null) {
+        if (jo != null)
+        {
             final Iterator<String> keys = jo.keys();
-            while (keys.hasNext()) {
+            while (keys.hasNext())
+            {
                 final String name = keys.next();
                 properties.put(name, jo.getString(name));
             }
diff --git a/src/main/java/com/intellectualcrafters/json/XML.java b/src/main/java/com/intellectualcrafters/json/XML.java
index 52f6ea71e..594660570 100644
--- a/src/main/java/com/intellectualcrafters/json/XML.java
+++ b/src/main/java/com/intellectualcrafters/json/XML.java
@@ -8,7 +8,8 @@ import java.util.Iterator;
  * @author JSON.org
  * @version 2014-05-03
  */
-public class XML {
+public class XML
+{
     public static final Character AMP = '&';
     public static final Character APOS = '\'';
     public static final Character BANG = '!';
@@ -19,11 +20,14 @@ public class XML {
     public static final Character QUOT = '"';
     public static final Character SLASH = '/';
 
-    public static String escape(final String string) {
+    public static String escape(final String string)
+    {
         final StringBuilder sb = new StringBuilder(string.length());
-        for (int i = 0, length = string.length(); i < length; i++) {
+        for (int i = 0, length = string.length(); i < length; i++)
+        {
             final char c = string.charAt(i);
-            switch (c) {
+            switch (c)
+            {
                 case '&':
                     sb.append("&amp;");
                     break;
@@ -53,16 +57,14 @@ public class XML {
      *
      * @throws JSONException
      */
-    public static void noSpace(final String string) throws JSONException {
+    public static void noSpace(final String string) throws JSONException
+    {
         int i;
         final int length = string.length();
-        if (length == 0) {
-            throw new JSONException("Empty string.");
-        }
-        for (i = 0; i < length; i += 1) {
-            if (Character.isWhitespace(string.charAt(i))) {
-                throw new JSONException("'" + string + "' contains a space character.");
-            }
+        if (length == 0) { throw new JSONException("Empty string."); }
+        for (i = 0; i < length; i += 1)
+        {
+            if (Character.isWhitespace(string.charAt(i))) { throw new JSONException("'" + string + "' contains a space character."); }
         }
     }
 
@@ -77,7 +79,8 @@ public class XML {
      *
      * @throws JSONException
      */
-    private static boolean parse(final XMLTokener x, final JSONObject context, final String name) throws JSONException {
+    private static boolean parse(final XMLTokener x, final JSONObject context, final String name) throws JSONException
+    {
         char c;
         int i;
         JSONObject jsonobject = null;
@@ -95,20 +98,28 @@ public class XML {
         // <<
         token = x.nextToken();
         // <!
-        if (token == BANG) {
+        if (token == BANG)
+        {
             c = x.next();
-            if (c == '-') {
-                if (x.next() == '-') {
+            if (c == '-')
+            {
+                if (x.next() == '-')
+                {
                     x.skipPast("-->");
                     return false;
                 }
                 x.back();
-            } else if (c == '[') {
+            }
+            else if (c == '[')
+            {
                 token = x.nextToken();
-                if ("CDATA".equals(token)) {
-                    if (x.next() == '[') {
+                if ("CDATA".equals(token))
+                {
+                    if (x.next() == '[')
+                    {
                         string = x.nextCDATA();
-                        if (string.length() > 0) {
+                        if (string.length() > 0)
+                        {
                             context.accumulate("content", string);
                         }
                         return false;
@@ -117,99 +128,130 @@ public class XML {
                 throw x.syntaxError("Expected 'CDATA['");
             }
             i = 1;
-            do {
+            do
+            {
                 token = x.nextMeta();
-                if (token == null) {
+                if (token == null)
+                {
                     throw x.syntaxError("Missing '>' after '<!'.");
-                } else if (token == LT) {
+                }
+                else if (token == LT)
+                {
                     i += 1;
-                } else if (token == GT) {
+                }
+                else if (token == GT)
+                {
                     i -= 1;
                 }
-            } while (i > 0);
+            }
+            while (i > 0);
             return false;
-        } else if (token == QUEST) {
+        }
+        else if (token == QUEST)
+        {
             // <?
             x.skipPast("?>");
             return false;
-        } else if (token == SLASH) {
+        }
+        else if (token == SLASH)
+        {
             // Close tag </
             token = x.nextToken();
-            if (name == null) {
-                throw x.syntaxError("Mismatched close tag " + token);
-            }
-            if (!token.equals(name)) {
-                throw x.syntaxError("Mismatched " + name + " and " + token);
-            }
-            if (x.nextToken() != GT) {
-                throw x.syntaxError("Misshaped close tag");
-            }
+            if (name == null) { throw x.syntaxError("Mismatched close tag " + token); }
+            if (!token.equals(name)) { throw x.syntaxError("Mismatched " + name + " and " + token); }
+            if (x.nextToken() != GT) { throw x.syntaxError("Misshaped close tag"); }
             return true;
-        } else if (token instanceof Character) {
+        }
+        else if (token instanceof Character)
+        {
             throw x.syntaxError("Misshaped tag");
             // Open tag <
-        } else {
+        }
+        else
+        {
             tagName = (String) token;
             token = null;
             jsonobject = new JSONObject();
-            for (;;) {
-                if (token == null) {
+            for (;;)
+            {
+                if (token == null)
+                {
                     token = x.nextToken();
                 }
                 // attribute = value
-                if (token instanceof String) {
+                if (token instanceof String)
+                {
                     string = (String) token;
                     token = x.nextToken();
-                    if (token == EQ) {
+                    if (token == EQ)
+                    {
                         token = x.nextToken();
-                        if (!(token instanceof String)) {
-                            throw x.syntaxError("Missing value");
-                        }
+                        if (!(token instanceof String)) { throw x.syntaxError("Missing value"); }
                         jsonobject.accumulate(string, XML.stringToValue((String) token));
                         token = null;
-                    } else {
+                    }
+                    else
+                    {
                         jsonobject.accumulate(string, "");
                     }
                     // Empty tag <.../>
-                } else if (token == SLASH) {
-                    if (x.nextToken() != GT) {
-                        throw x.syntaxError("Misshaped tag");
-                    }
-                    if (jsonobject.length() > 0) {
+                }
+                else if (token == SLASH)
+                {
+                    if (x.nextToken() != GT) { throw x.syntaxError("Misshaped tag"); }
+                    if (jsonobject.length() > 0)
+                    {
                         context.accumulate(tagName, jsonobject);
-                    } else {
+                    }
+                    else
+                    {
                         context.accumulate(tagName, "");
                     }
                     return false;
                     // Content, between <...> and </...>
-                } else if (token == GT) {
-                    for (;;) {
+                }
+                else if (token == GT)
+                {
+                    for (;;)
+                    {
                         token = x.nextContent();
-                        if (token == null) {
-                            if (tagName != null) {
-                                throw x.syntaxError("Unclosed tag " + tagName);
-                            }
+                        if (token == null)
+                        {
+                            if (tagName != null) { throw x.syntaxError("Unclosed tag " + tagName); }
                             return false;
-                        } else if (token instanceof String) {
+                        }
+                        else if (token instanceof String)
+                        {
                             string = (String) token;
-                            if (string.length() > 0) {
+                            if (string.length() > 0)
+                            {
                                 jsonobject.accumulate("content", XML.stringToValue(string));
                             }
                             // Nested element
-                        } else if (token == LT) {
-                            if (parse(x, jsonobject, tagName)) {
-                                if (jsonobject.length() == 0) {
+                        }
+                        else if (token == LT)
+                        {
+                            if (parse(x, jsonobject, tagName))
+                            {
+                                if (jsonobject.length() == 0)
+                                {
                                     context.accumulate(tagName, "");
-                                } else if ((jsonobject.length() == 1) && (jsonobject.opt("content") != null)) {
+                                }
+                                else if ((jsonobject.length() == 1) && (jsonobject.opt("content") != null))
+                                {
                                     context.accumulate(tagName, jsonobject.opt("content"));
-                                } else {
+                                }
+                                else
+                                {
                                     context.accumulate(tagName, jsonobject);
                                 }
                                 return false;
                             }
                         }
                     }
-                } else {
+                }
+                else
+                {
                     throw x.syntaxError("Misshaped tag");
                 }
             }
@@ -225,43 +267,42 @@ public class XML {
      *
      * @return A simple JSON value.
      */
-    public static Object stringToValue(final String string) {
-        if ("true".equalsIgnoreCase(string)) {
-            return Boolean.TRUE;
-        }
-        if ("false".equalsIgnoreCase(string)) {
-            return Boolean.FALSE;
-        }
-        if ("null".equalsIgnoreCase(string)) {
-            return JSONObject.NULL;
-        }
+    public static Object stringToValue(final String string)
+    {
+        if ("true".equalsIgnoreCase(string)) { return Boolean.TRUE; }
+        if ("false".equalsIgnoreCase(string)) { return Boolean.FALSE; }
+        if ("null".equalsIgnoreCase(string)) { return JSONObject.NULL; }
         // If it might be a number, try converting it, first as a Long, and then
         // as a
         // Double. If that doesn't work, return the string.
-        try {
+        try
+        {
             final char initial = string.charAt(0);
-            if ((initial == '-') || ((initial >= '0') && (initial <= '9'))) {
+            if ((initial == '-') || ((initial >= '0') && (initial <= '9')))
+            {
                 final Long value = new Long(string);
-                if (value.toString().equals(string)) {
-                    return value;
-                }
+                if (value.toString().equals(string)) { return value; }
             }
-        } catch (final Exception ignore) {
-            try {
+        }
+        catch (final Exception ignore)
+        {
+            try
+            {
                 final Double value = new Double(string);
-                if (value.toString().equals(string)) {
-                    return value;
-                }
-            } catch (final Exception ignoreAlso) {
+                if (value.toString().equals(string)) { return value; }
             }
+            catch (final Exception ignoreAlso)
+            {}
         }
         return string;
     }
 
-    public static JSONObject toJSONObject(final String string) throws JSONException {
+    public static JSONObject toJSONObject(final String string) throws JSONException
+    {
         final JSONObject jo = new JSONObject();
         final XMLTokener x = new XMLTokener(string);
-        while (x.more() && x.skipPast("<")) {
+        while (x.more() && x.skipPast("<"))
+        {
             parse(x, jo, null);
         }
         return jo;
@@ -276,7 +317,8 @@ public class XML {
      *
      * @throws JSONException
      */
-    public static String toString(final Object object) throws JSONException {
+    public static String toString(final Object object) throws JSONException
+    {
         return toString(object, null);
     }
 
@@ -290,7 +332,8 @@ public class XML {
      *
      * @throws JSONException
      */
-    public static String toString(Object object, final String tagName) throws JSONException {
+    public static String toString(Object object, final String tagName) throws JSONException
+    {
         final StringBuilder sb = new StringBuilder();
         int i;
         JSONArray ja;
@@ -300,9 +343,11 @@ public class XML {
         int length;
         String string;
         Object value;
-        if (object instanceof JSONObject) {
+        if (object instanceof JSONObject)
+        {
             // Emit <tagName>
-            if (tagName != null) {
+            if (tagName != null)
+            {
                 sb.append('<');
                 sb.append(tagName);
                 sb.append('>');
@@ -310,34 +355,46 @@ public class XML {
             // Loop thru the keys.
             jo = (JSONObject) object;
             keys = jo.keys();
-            while (keys.hasNext()) {
+            while (keys.hasNext())
+            {
                 key = keys.next();
                 value = jo.opt(key);
-                if (value == null) {
+                if (value == null)
+                {
                     value = "";
                 }
                 string = value instanceof String ? (String) value : null;
                 // Emit content in body
-                if ("content".equals(key)) {
-                    if (value instanceof JSONArray) {
+                if ("content".equals(key))
+                {
+                    if (value instanceof JSONArray)
+                    {
                         ja = (JSONArray) value;
                         length = ja.length();
-                        for (i = 0; i < length; i += 1) {
-                            if (i > 0) {
+                        for (i = 0; i < length; i += 1)
+                        {
+                            if (i > 0)
+                            {
                                 sb.append('\n');
                             }
                             sb.append(escape(ja.get(i).toString()));
                         }
-                    } else {
+                    }
+                    else
+                    {
                         sb.append(escape(value.toString()));
                     }
                     // Emit an array of similar keys
-                } else if (value instanceof JSONArray) {
+                }
+                else if (value instanceof JSONArray)
+                {
                     ja = (JSONArray) value;
                     length = ja.length();
-                    for (i = 0; i < length; i += 1) {
+                    for (i = 0; i < length; i += 1)
+                    {
                         value = ja.get(i);
-                        if (value instanceof JSONArray) {
+                        if (value instanceof JSONArray)
+                        {
                             sb.append('<');
                             sb.append(key);
                             sb.append('>');
@@ -345,20 +402,27 @@ public class XML {
                             sb.append("</");
                             sb.append(key);
                             sb.append('>');
-                        } else {
+                        }
+                        else
+                        {
                             sb.append(toString(value, key));
                         }
                     }
-                } else if ("".equals(value)) {
+                }
+                else if ("".equals(value))
+                {
                     sb.append('<');
                     sb.append(key);
                     sb.append("/>");
                     // Emit a new tag <k>
-                } else {
+                }
+                else
+                {
                     sb.append(toString(value, key));
                 }
             }
-            if (tagName != null) {
+            if (tagName != null)
+            {
                 // Emit the </tagname> close tag
                 sb.append("</");
                 sb.append(tagName);
@@ -368,18 +432,25 @@ public class XML {
             // XML does not have good support for arrays. If an array appears in
             // a place
             // where XML is lacking, synthesize an <array> element.
-        } else {
-            if (object.getClass().isArray()) {
+        }
+        else
+        {
+            if (object.getClass().isArray())
+            {
                 object = new JSONArray(object);
             }
-            if (object instanceof JSONArray) {
+            if (object instanceof JSONArray)
+            {
                 ja = (JSONArray) object;
                 length = ja.length();
-                for (i = 0; i < length; i += 1) {
+                for (i = 0; i < length; i += 1)
+                {
                     sb.append(toString(ja.opt(i), tagName == null ? "array" : tagName));
                 }
                 return sb.toString();
-            } else {
+            }
+            else
+            {
                 string = (object == null) ? "null" : escape(object.toString());
                 return (tagName == null) ? "\"" + string + "\"" : (string.length() == 0) ? "<" + tagName + "/>" : "<" + tagName + ">" + string + "</" + tagName + ">";
             }
diff --git a/src/main/java/com/intellectualcrafters/json/XMLTokener.java b/src/main/java/com/intellectualcrafters/json/XMLTokener.java
index 94edd5792..e34e6dbe2 100644
--- a/src/main/java/com/intellectualcrafters/json/XMLTokener.java
+++ b/src/main/java/com/intellectualcrafters/json/XMLTokener.java
@@ -6,12 +6,14 @@ package com.intellectualcrafters.json;
  * @author JSON.org
  * @version 2014-05-03
  */
-public class XMLTokener extends JSONTokener {
+public class XMLTokener extends JSONTokener
+{
     /**
      * The table of entity values. It initially contains Character values for amp, apos, gt, lt, quot.
      */
     public static final java.util.HashMap<String, Character> entity;
-    static {
+    static
+    {
         entity = new java.util.HashMap<String, Character>(8);
         entity.put("amp", XML.AMP);
         entity.put("apos", XML.APOS);
@@ -25,7 +27,8 @@ public class XMLTokener extends JSONTokener {
      *
      * @param s A source string.
      */
-    public XMLTokener(final String s) {
+    public XMLTokener(final String s)
+    {
         super(s);
     }
 
@@ -36,18 +39,19 @@ public class XMLTokener extends JSONTokener {
      *
      * @throws JSONException If the <code>]]&gt;</code> is not found.
      */
-    public String nextCDATA() throws JSONException {
+    public String nextCDATA() throws JSONException
+    {
         char c;
         int i;
         final StringBuilder sb = new StringBuilder();
-        for (;;) {
+        for (;;)
+        {
             c = next();
-            if (end()) {
-                throw syntaxError("Unclosed CDATA");
-            }
+            if (end()) { throw syntaxError("Unclosed CDATA"); }
             sb.append(c);
             i = sb.length() - 3;
-            if ((i >= 0) && (sb.charAt(i) == ']') && (sb.charAt(i + 1) == ']') && (sb.charAt(i + 2) == '>')) {
+            if ((i >= 0) && (sb.charAt(i) == ']') && (sb.charAt(i + 1) == ']') && (sb.charAt(i + 2) == '>'))
+            {
                 sb.setLength(i);
                 return sb.toString();
             }
@@ -62,27 +66,31 @@ public class XMLTokener extends JSONTokener {
      *
      * @throws JSONException
      */
-    public Object nextContent() throws JSONException {
+    public Object nextContent() throws JSONException
+    {
         char c;
         StringBuilder sb;
-        do {
+        do
+        {
             c = next();
-        } while (Character.isWhitespace(c));
-        if (c == 0) {
-            return null;
-        }
-        if (c == '<') {
-            return XML.LT;
         }
+        while (Character.isWhitespace(c));
+        if (c == 0) { return null; }
+        if (c == '<') { return XML.LT; }
         sb = new StringBuilder();
-        for (;;) {
-            if ((c == '<') || (c == 0)) {
+        for (;;)
+        {
+            if ((c == '<') || (c == 0))
+            {
                 back();
                 return sb.toString().trim();
             }
-            if (c == '&') {
+            if (c == '&')
+            {
                 sb.append(nextEntity(c));
-            } else {
+            }
+            else
+            {
                 sb.append(c);
             }
             c = next();
@@ -99,15 +107,22 @@ public class XMLTokener extends JSONTokener {
      *
      * @throws JSONException If missing ';' in XML entity.
      */
-    public Object nextEntity(final char ampersand) throws JSONException {
+    public Object nextEntity(final char ampersand) throws JSONException
+    {
         final StringBuilder sb = new StringBuilder();
-        for (;;) {
+        for (;;)
+        {
             final char c = next();
-            if (Character.isLetterOrDigit(c) || (c == '#')) {
+            if (Character.isLetterOrDigit(c) || (c == '#'))
+            {
                 sb.append(Character.toLowerCase(c));
-            } else if (c == ';') {
+            }
+            else if (c == ';')
+            {
                 break;
-            } else {
+            }
+            else
+            {
                 throw syntaxError("Missing ';' in XML entity: &" + sb);
             }
         }
@@ -124,13 +139,17 @@ public class XMLTokener extends JSONTokener {
      *
      * @throws JSONException If a string is not properly closed or if the XML is badly structured.
      */
-    public Object nextMeta() throws JSONException {
+    public Object nextMeta() throws JSONException
+    {
         char c;
         char q;
-        do {
+        do
+        {
             c = next();
-        } while (Character.isWhitespace(c));
-        switch (c) {
+        }
+        while (Character.isWhitespace(c));
+        switch (c)
+        {
             case 0:
                 throw syntaxError("Misshaped meta tag");
             case '<':
@@ -148,22 +167,19 @@ public class XMLTokener extends JSONTokener {
             case '"':
             case '\'':
                 q = c;
-                for (;;) {
+                for (;;)
+                {
                     c = next();
-                    if (c == 0) {
-                        throw syntaxError("Unterminated string");
-                    }
-                    if (c == q) {
-                        return Boolean.TRUE;
-                    }
+                    if (c == 0) { throw syntaxError("Unterminated string"); }
+                    if (c == q) { return Boolean.TRUE; }
                 }
             default:
-                for (;;) {
+                for (;;)
+                {
                     c = next();
-                    if (Character.isWhitespace(c)) {
-                        return Boolean.TRUE;
-                    }
-                    switch (c) {
+                    if (Character.isWhitespace(c)) { return Boolean.TRUE; }
+                    switch (c)
+                    {
                         case 0:
                         case '<':
                         case '>':
@@ -188,14 +204,18 @@ public class XMLTokener extends JSONTokener {
      *
      * @throws JSONException If the XML is not well formed.
      */
-    public Object nextToken() throws JSONException {
+    public Object nextToken() throws JSONException
+    {
         char c;
         char q;
         StringBuilder sb;
-        do {
+        do
+        {
             c = next();
-        } while (Character.isWhitespace(c));
-        switch (c) {
+        }
+        while (Character.isWhitespace(c));
+        switch (c)
+        {
             case 0:
                 throw syntaxError("Misshaped element");
             case '<':
@@ -215,30 +235,30 @@ public class XMLTokener extends JSONTokener {
             case '\'':
                 q = c;
                 sb = new StringBuilder();
-                for (;;) {
+                for (;;)
+                {
                     c = next();
-                    if (c == 0) {
-                        throw syntaxError("Unterminated string");
-                    }
-                    if (c == q) {
-                        return sb.toString();
-                    }
-                    if (c == '&') {
+                    if (c == 0) { throw syntaxError("Unterminated string"); }
+                    if (c == q) { return sb.toString(); }
+                    if (c == '&')
+                    {
                         sb.append(nextEntity(c));
-                    } else {
+                    }
+                    else
+                    {
                         sb.append(c);
                     }
                 }
             default:
                 // Name
                 sb = new StringBuilder();
-                for (;;) {
+                for (;;)
+                {
                     sb.append(c);
                     c = next();
-                    if (Character.isWhitespace(c)) {
-                        return sb.toString();
-                    }
-                    switch (c) {
+                    if (Character.isWhitespace(c)) { return sb.toString(); }
+                    switch (c)
+                    {
                         case 0:
                             return sb.toString();
                         case '>':
@@ -267,7 +287,8 @@ public class XMLTokener extends JSONTokener {
      *
      * @throws JSONException
      */
-    public boolean skipPast(final String to) throws JSONException {
+    public boolean skipPast(final String to) throws JSONException
+    {
         boolean b;
         char c;
         int i;
@@ -279,44 +300,44 @@ public class XMLTokener extends JSONTokener {
          * First fill the circle buffer with as many characters as are in the
          * to string. If we reach an early end, bail.
          */
-        for (i = 0; i < length; i += 1) {
+        for (i = 0; i < length; i += 1)
+        {
             c = next();
-            if (c == 0) {
-                return false;
-            }
+            if (c == 0) { return false; }
             circle[i] = c;
         }
         /* We will loop, possibly for all of the remaining characters. */
-        for (;;) {
+        for (;;)
+        {
             j = offset;
             b = true;
             /* Compare the circle buffer with the to string. */
-            for (i = 0; i < length; i += 1) {
-                if (circle[j] != to.charAt(i)) {
+            for (i = 0; i < length; i += 1)
+            {
+                if (circle[j] != to.charAt(i))
+                {
                     b = false;
                     break;
                 }
                 j += 1;
-                if (j >= length) {
+                if (j >= length)
+                {
                     j -= length;
                 }
             }
             /* If we exit the loop with b intact, then victory is ours. */
-            if (b) {
-                return true;
-            }
+            if (b) { return true; }
             /* Get the next character. If there isn't one, then defeat is ours. */
             c = next();
-            if (c == 0) {
-                return false;
-            }
+            if (c == 0) { return false; }
             /*
              * Shove the character in the circle buffer and advance the
              * circle offset. The offset is mod n.
              */
             circle[offset] = c;
             offset += 1;
-            if (offset >= length) {
+            if (offset >= length)
+            {
                 offset -= length;
             }
         }
diff --git a/src/main/java/com/intellectualcrafters/plot/IPlotMain.java b/src/main/java/com/intellectualcrafters/plot/IPlotMain.java
index 6988fd6a9..81facb35b 100644
--- a/src/main/java/com/intellectualcrafters/plot/IPlotMain.java
+++ b/src/main/java/com/intellectualcrafters/plot/IPlotMain.java
@@ -16,29 +16,29 @@ import com.intellectualcrafters.plot.util.SchematicHandler;
 import com.intellectualcrafters.plot.util.SetupUtils;
 import com.intellectualcrafters.plot.util.TaskManager;
 import com.intellectualcrafters.plot.util.UUIDHandlerImplementation;
-import com.sk89q.worldedit.WorldEdit;
 
-public interface IPlotMain {
-    
+public interface IPlotMain
+{
+
     /**
      * Log a message to console
      * @param message
      */
-    void log(String message);
+    void log(final String message);
 
     /**
      * Get the `PlotSquared` directory (e.g. /plugins/PlotSquared or /mods/PlotSquared)
      * @return
      */
     File getDirectory();
-    
+
     /**
      * Wrap a player into a PlotPlayer object
      * @param obj
      * @return
      */
-    PlotPlayer wrapPlayer(Object obj);
-    
+    PlotPlayer wrapPlayer(final Object obj);
+
     /**
      * Disable the implementation
      *  - If a full disable isn't feasibly, just disable what it can
@@ -50,32 +50,32 @@ public interface IPlotMain {
      * @return
      */
     int[] getPluginVersion();
-    
+
     /**
      * Get the version of Minecraft that is running
      * (used to check what protocols and such are supported)
      * @return
      */
     int[] getServerVersion();
-    
+
     /**
      * Get the nms package prefix
      * @return
      */
     String getNMSPackage();
-    
+
     /**
      * Get the schematic handler
      * @return
      */
     SchematicHandler initSchematicHandler();
-    
+
     /**
      * Get the schematic handler
      * @return
      */
     ChatManager initChatManager();
-    
+
     /**
      * The task manager will run and manage minecraft tasks
      * @return
@@ -116,7 +116,7 @@ public interface IPlotMain {
      * Register the WorldEdit hook
      */
     boolean initWorldEdit();
-    
+
     /**
      * Register TNT related events (if TNT protection is enabled)
      */
@@ -133,7 +133,7 @@ public interface IPlotMain {
      * @return
      */
     BlockManager initBlockManager();
-    
+
     /**
      * Get the EventUtil class
      * @return
@@ -157,24 +157,24 @@ public interface IPlotMain {
      * @return
      */
     HybridUtils initHybridUtils();
-    
+
     /**
      * Start the metrics task
      */
     void startMetrics();
-    
+
     /**
      * If a world is already loaded, set the generator (use NMS if required)
      * @param world
      */
-    void setGenerator(String world);
+    void setGenerator(final String world);
 
     /**
      * Get the UUIDHandlerImplementation which will cache and provide UUIDs
      * @return
      */
     UUIDHandlerImplementation initUUIDHandler();
-    
+
     /**
      * Get the InventoryUtil class (used for implementation specific inventory guis)
      * @return
@@ -186,12 +186,12 @@ public interface IPlotMain {
      * @return
      */
     boolean initPlotMeConverter();
-    
+
     /**
      * Unregister a PlotPlayer from cache e.g. if they have logged off
      * @param player
      */
-    void unregister(PlotPlayer player);
+    void unregister(final PlotPlayer player);
 
     /**
      * Get the generator wrapper for a world (world) and generator (name)
@@ -199,7 +199,7 @@ public interface IPlotMain {
      * @param name
      * @return
      */
-    PlotGenerator<?> getGenerator(String world, String name);
+    PlotGenerator<?> getGenerator(final String world, final String name);
 
     /**
      * Register the chunk processor which will clean out chunks that have too many blockstates or entities
@@ -216,7 +216,7 @@ public interface IPlotMain {
      * @return
      */
     String getServerName();
-    
+
     /**
      * Get the class that will manage player titles
      * @return
diff --git a/src/main/java/com/intellectualcrafters/plot/PS.java b/src/main/java/com/intellectualcrafters/plot/PS.java
index 13a0cc60c..998e4d118 100644
--- a/src/main/java/com/intellectualcrafters/plot/PS.java
+++ b/src/main/java/com/intellectualcrafters/plot/PS.java
@@ -90,11 +90,12 @@ import com.sk89q.worldedit.WorldEdit;
  * @author Sauilitired | Citymonstret
  * @author boy0001 | Empire92
  */
-public class PS {
+public class PS
+{
 
     // protected static:
     public static PS instance;
-    
+
     // private final:
     private final HashMap<String, PlotWorld> plotworlds = new HashMap<>();
     private final HashMap<String, PlotManager> plotmanagers = new HashMap<>();
@@ -127,57 +128,68 @@ public class PS {
      * Initialize PlotSquared with the desired Implementation class
      * @param imp_class
      */
-    public PS(final IPlotMain imp_class, String platform) {
-        try {
+    public PS(final IPlotMain imp_class, final String platform)
+    {
+        try
+        {
             instance = this;
-            this.thread = Thread.currentThread();
+            thread = Thread.currentThread();
             SetupUtils.generators = new HashMap<>();
             IMP = imp_class;
             new ReflectionUtils(IMP.getNMSPackage());
             URL url;
-            try {
+            try
+            {
                 url = PS.class.getProtectionDomain().getCodeSource().getLocation();
                 FILE = new File(new URL(url.toURI().toString().split("\\!")[0].replaceAll("jar:file", "file")).toURI().getPath());
-            } catch (Exception e) {
+            }
+            catch (final Exception e)
+            {
                 e.printStackTrace();
                 FILE = new File(IMP.getDirectory().getParentFile(), "PlotSquared.jar");
-                if (!FILE.exists()) {
+                if (!FILE.exists())
+                {
                     FILE = new File(IMP.getDirectory().getParentFile(), "PlotSquared-" + platform + ".jar");
                 }
             }
             VERSION = IMP.getPluginVersion();
             PLATFORM = platform;
             EconHandler.manager = IMP.getEconomyHandler();
-            if (getJavaVersion() < 1.7) {
+            if (getJavaVersion() < 1.7)
+            {
                 log(C.PREFIX.s() + "&cYour java version is outdated. Please update to at least 1.7.");
                 // Didn't know of any other link :D
                 log(C.PREFIX.s() + "&cURL: &6https://java.com/en/download/index.jsp");
                 IMP.disable();
                 return;
             }
-            if (getJavaVersion() < 1.8) {
+            if (getJavaVersion() < 1.8)
+            {
                 log(C.PREFIX.s() + "&cIt's really recommended to run Java 1.8, as it increases performance");
             }
-            this.TASK = IMP.getTaskManager();
-            if (C.ENABLED.s().length() > 0) {
+            TASK = IMP.getTaskManager();
+            if (C.ENABLED.s().length() > 0)
+            {
                 log(C.ENABLED.s());
             }
             setupConfigs();
-            this.translationFile = new File(IMP.getDirectory() + File.separator + "translations" + File.separator + "PlotSquared.use_THIS.yml");
+            translationFile = new File(IMP.getDirectory() + File.separator + "translations" + File.separator + "PlotSquared.use_THIS.yml");
             C.load(translationFile);
             setupDefaultFlags();
             setupDatabase();
             CommentManager.registerDefaultInboxes();
             // Tasks
-            if (Settings.KILL_ROAD_MOBS || Settings.KILL_ROAD_VEHICLES) {
+            if (Settings.KILL_ROAD_MOBS || Settings.KILL_ROAD_VEHICLES)
+            {
                 IMP.runEntityTask();
             }
-            if (IMP.initWorldEdit()) {
+            if (IMP.initWorldEdit())
+            {
                 worldedit = WorldEdit.getInstance();
                 WorldEdit.getInstance().getEventBus().register(new WESubscriber());
                 MainCommand.getInstance().createCommand(new WE_Anywhere());
             }
-            
+
             // Events
             IMP.registerCommands();
             IMP.registerPlayerEvents();
@@ -185,30 +197,42 @@ public class PS {
             IMP.registerPlotPlusEvents();
             IMP.registerForceFieldEvents();
             IMP.registerWorldEvents();
-            if (Settings.METRICS) {
+            if (Settings.METRICS)
+            {
                 IMP.startMetrics();
-            } else {
+            }
+            else
+            {
                 log("&dUsing metrics will allow us to improve the plugin, please consider it :)");
             }
             IMP.startMetrics();
-            if (Settings.TNT_LISTENER) {
+            if (Settings.TNT_LISTENER)
+            {
                 IMP.registerTNTListener();
             }
-            if (Settings.CHUNK_PROCESSOR) {
+            if (Settings.CHUNK_PROCESSOR)
+            {
                 IMP.registerChunkProcessor();
             }
             // create UUIDWrapper
             UUIDHandler.implementation = IMP.initUUIDHandler();
-            TaskManager.runTaskLater(new Runnable() {
+            TaskManager.runTaskLater(new Runnable()
+            {
                 @Override
-                public void run() {
+                public void run()
+                {
                     PS.debug("Starting UUID caching");
-                    UUIDHandler.startCaching(new Runnable() {
+                    UUIDHandler.startCaching(new Runnable()
+                    {
                         @Override
-                        public void run() {
-                            for (Plot plot : getPlots()) {
-                                if (plot.owner != null && plot.temp != -1) {
-                                    if (UUIDHandler.getName(plot.owner) == null) {
+                        public void run()
+                        {
+                            for (final Plot plot : getPlots())
+                            {
+                                if ((plot.owner != null) && (plot.temp != -1))
+                                {
+                                    if (UUIDHandler.getName(plot.owner) == null)
+                                    {
                                         UUIDHandler.implementation.unknown.add(plot.owner);
                                     }
                                 }
@@ -235,27 +259,36 @@ public class PS {
             AbstractTitle.TITLE_CLASS = IMP.initTitleManager();
             // Chat
             ChatManager.manager = IMP.initChatManager();
-            
+
             // Check for updates
-            TaskManager.runTaskAsync(new Runnable() {
+            TaskManager.runTaskAsync(new Runnable()
+            {
                 @Override
-                public void run() {
-                    URL url = getUpdate();
-                    if (url != null) {
+                public void run()
+                {
+                    final URL url = getUpdate();
+                    if (url != null)
+                    {
                         update = url;
                     }
-                    else if (LAST_VERSION != null && !StringMan.join(VERSION,".").equals(LAST_VERSION)) {
+                    else if ((LAST_VERSION != null) && !StringMan.join(VERSION, ".").equals(LAST_VERSION))
+                    {
                         log("&aThanks for updating from: " + LAST_VERSION + " to " + StringMan.join(VERSION, "."));
                     }
                 }
             });
-            
+
             // PlotMe
-            if (Settings.CONVERT_PLOTME || Settings.CACHE_PLOTME) {
-                TaskManager.runTaskLater(new Runnable() {
-    
-                    public void run() {
-                        if (IMP.initPlotMeConverter()) {
+            if (Settings.CONVERT_PLOTME || Settings.CACHE_PLOTME)
+            {
+                TaskManager.runTaskLater(new Runnable()
+                {
+
+                    @Override
+                    public void run()
+                    {
+                        if (IMP.initPlotMeConverter())
+                        {
                             log("&c=== IMPORTANT ===");
                             log("&cTHIS MESSAGE MAY BE EXTREMELY HELPFUL IF YOU HAVE TROUBLE CONVERTING PLOTME!");
                             log("&c - Make sure 'UUID.read-from-disk' is disabled (false)!");
@@ -265,31 +298,41 @@ public class PS {
                     }
                 }, 200);
             }
-            
+
             // Auto clearing
-            if (Settings.AUTO_CLEAR) {
+            if (Settings.AUTO_CLEAR)
+            {
                 ExpireManager.runTask();
             }
-            
+
             // World generators:
             final ConfigurationSection section = config.getConfigurationSection("worlds");
-            if (section != null) {
-                for (String world : section.getKeys(false)) {
-                    if (world.equals("CheckingPlotSquaredGenerator")) {
+            if (section != null)
+            {
+                for (final String world : section.getKeys(false))
+                {
+                    if (world.equals("CheckingPlotSquaredGenerator"))
+                    {
                         continue;
                     }
-                    if (BlockManager.manager.isWorld(world)) {
+                    if (BlockManager.manager.isWorld(world))
+                    {
                         IMP.setGenerator(world);
                     }
                 }
-                TaskManager.runTaskLater(new Runnable() {
+                TaskManager.runTaskLater(new Runnable()
+                {
                     @Override
-                    public void run() {
-                        for (String world : section.getKeys(false)) {
-                            if (world.equals("CheckingPlotSquaredGenerator")) {
+                    public void run()
+                    {
+                        for (final String world : section.getKeys(false))
+                        {
+                            if (world.equals("CheckingPlotSquaredGenerator"))
+                            {
                                 continue;
                             }
-                            if (!BlockManager.manager.isWorld(world) || (BlockManager.manager.isWorld(world) && !isPlotWorld(world))) {
+                            if (!BlockManager.manager.isWorld(world) || (BlockManager.manager.isWorld(world) && !isPlotWorld(world)))
+                            {
                                 PS.debug("&c`" + world + "` was not properly loaded - PlotSquared will now try to load it properly: ");
                                 PS.debug("&8 - &7Are you trying to delete this world? Remember to remove it from the settings.yml as well");
                                 PS.debug("&8 - &7Your world management plugin may be faulty. Consider using an up to date plugin.");
@@ -299,7 +342,7 @@ public class PS {
                     }
                 }, 1);
             }
-    
+
             // Copy files
             copyFile("automerge.js", "scripts");
             copyFile("town.template", "templates");
@@ -310,49 +353,56 @@ public class PS {
             copyFile("italian.yml", "translations");
             showDebug();
         }
-        catch (Throwable e) {
+        catch (final Throwable e)
+        {
             e.printStackTrace();
         }
     }
-    
-    public boolean isMainThread(Thread thread) {
+
+    public boolean isMainThread(final Thread thread)
+    {
         return this.thread == thread;
     }
-    
-    public boolean checkVersion(int[] version, int major, int minor, int minor2) {
+
+    public boolean checkVersion(final int[] version, final int major, final int minor, final int minor2)
+    {
         return (version[0] > major) || ((version[0] == major) && (version[1] > minor)) || ((version[0] == major) && (version[1] == minor) && (version[2] >= minor2));
     }
-    
+
     /**
      * Get the instance of PlotSquared
      *
      * @return the instance created by IPlotMain
      */
-    public static PS get() {
+    public static PS get()
+    {
         return instance;
     }
-    
+
     /**
      * Get the last PlotSquared version
      * @return last version in config or null
      */
-    public String getLastVersion() {
+    public String getLastVersion()
+    {
         return LAST_VERSION;
     }
-    
+
     /**
      * Get the current PlotSquared version
      * @return current version in config or null
      */
-    public int[] getVersion() {
+    public int[] getVersion()
+    {
         return VERSION;
     }
-    
+
     /**
      * Get the platform this is running on (Bukkit, Sponge)
      * @return
      */
-    public String getPlatform() {
+    public String getPlatform()
+    {
         return PLATFORM;
     }
 
@@ -362,18 +412,21 @@ public class PS {
      * @param message Message to log
      * @see IPlotMain#log(String)
      */
-    public static void log(Object message) {
+    public static void log(final Object message)
+    {
         get().IMP.log(StringMan.getString(message));
     }
-    
+
     /**
      * Log a message to the IPlotMain logger
      *
      * @param message Message to log
      * @see IPlotMain#log(String)
      */
-    public static void debug(final Object message) {
-        if (Settings.DEBUG) {
+    public static void debug(final Object message)
+    {
+        if (Settings.DEBUG)
+        {
             log(message);
         }
     }
@@ -384,7 +437,8 @@ public class PS {
      * @return Database object
      * @see #getConnection() Get the database connection
      */
-    public Database getDatabase() {
+    public Database getDatabase()
+    {
         return database;
     }
 
@@ -394,9 +448,11 @@ public class PS {
      *
      * @param plot Plot Object to update
      */
-    public void updatePlot(final Plot plot) {
+    public void updatePlot(final Plot plot)
+    {
         final String world = plot.world;
-        if (!plots.containsKey(world)) {
+        if (!plots.containsKey(world))
+        {
             plots.put(world, new ConcurrentHashMap<PlotId, Plot>());
         }
         plots.get(world).put(plot.id, plot);
@@ -410,10 +466,9 @@ public class PS {
      * @return plot world | null if not existing
      * @see #getPlotWorldsString() Get all plot world names
      */
-    public PlotWorld getPlotWorld(final String world) {
-        if (plotworlds.containsKey(world)) {
-            return plotworlds.get(world);
-        }
+    public PlotWorld getPlotWorld(final String world)
+    {
+        if (plotworlds.containsKey(world)) { return plotworlds.get(world); }
         return null;
     }
 
@@ -425,10 +480,12 @@ public class PS {
      * @param manager   PlotManager
      * @see #removePlotWorld(String) To remove the reference
      */
-    public void addPlotWorld(final String world, final PlotWorld plotworld, final PlotManager manager) {
+    public void addPlotWorld(final String world, final PlotWorld plotworld, final PlotManager manager)
+    {
         plotworlds.put(world, plotworld);
         plotmanagers.put(world, manager);
-        if (!plots.containsKey(world)) {
+        if (!plots.containsKey(world))
+        {
             plots.put(world, new ConcurrentHashMap<PlotId, Plot>());
         }
     }
@@ -439,7 +496,8 @@ public class PS {
      * @param world World name
      * @see #addPlotWorld(String, PlotWorld, PlotManager) To add a reference
      */
-    public void removePlotWorld(final String world) {
+    public void removePlotWorld(final String world)
+    {
         plots.remove(world);
         plotmanagers.remove(world);
         plotworlds.remove(world);
@@ -448,7 +506,8 @@ public class PS {
     /**
      * @param world World Name
      */
-    public void removePlotWorldAbs(final String world) {
+    public void removePlotWorldAbs(final String world)
+    {
         plotmanagers.remove(world);
         plotworlds.remove(world);
     }
@@ -462,26 +521,34 @@ public class PS {
      * @return HashMap containing the world name, and another map with the plot id and the plot object
      */
     @Deprecated
-    public Map<String, ConcurrentHashMap<PlotId, Plot>> getAllPlotsRaw() {
+    public Map<String, ConcurrentHashMap<PlotId, Plot>> getAllPlotsRaw()
+    {
         return plots;
     }
-    
+
     /**
      * A more generic way to filter plots - make your own method if you need complex filters
      * @param filters
      * @return
      */
-    public Set<Plot> getPlots(PlotFilter... filters) {
-        HashSet<Plot> set = new HashSet<>();
-        for (Entry<String, ConcurrentHashMap<PlotId, Plot>> entry : plots.entrySet()) {
-            for (PlotFilter filter : filters) {
-                if (!filter.allowsWorld(entry.getKey())) {
+    public Set<Plot> getPlots(final PlotFilter... filters)
+    {
+        final HashSet<Plot> set = new HashSet<>();
+        for (final Entry<String, ConcurrentHashMap<PlotId, Plot>> entry : plots.entrySet())
+        {
+            for (final PlotFilter filter : filters)
+            {
+                if (!filter.allowsWorld(entry.getKey()))
+                {
                     continue;
                 }
             }
-            for (Plot plot : entry.getValue().values()) {
-                for (PlotFilter filter : filters) {
-                    if (!filter.allowsPlot(plot)) {
+            for (final Plot plot : entry.getValue().values())
+            {
+                for (final PlotFilter filter : filters)
+                {
+                    if (!filter.allowsPlot(plot))
+                    {
                         continue;
                     }
                 }
@@ -490,9 +557,6 @@ public class PS {
         }
         return set;
     }
-    
-    
-
 
     /**
      * Set all the plots as a raw object
@@ -500,48 +564,60 @@ public class PS {
      * @param plots
      */
     @Deprecated
-    public void setAllPlotsRaw(final ConcurrentHashMap<String, ConcurrentHashMap<PlotId, Plot>> plots) {
+    public void setAllPlotsRaw(final ConcurrentHashMap<String, ConcurrentHashMap<PlotId, Plot>> plots)
+    {
         this.plots = plots;
     }
 
-
     /**
      * Get all the plots in a single set
      * @return Set of Plot
      */
-    public Set<Plot> getPlots() {
+    public Set<Plot> getPlots()
+    {
         int size = 0;
-        for (Entry<String, ConcurrentHashMap<PlotId, Plot>> entry : plots.entrySet()) {
-            if (isPlotWorld(entry.getKey())) {
+        for (final Entry<String, ConcurrentHashMap<PlotId, Plot>> entry : plots.entrySet())
+        {
+            if (isPlotWorld(entry.getKey()))
+            {
                 size += entry.getValue().size();
             }
         }
-        Set<Plot> result = new HashSet<>(size);
-        for (Entry<String, ConcurrentHashMap<PlotId, Plot>> entry : plots.entrySet()) {
-            if (isPlotWorld(entry.getKey())) {
+        final Set<Plot> result = new HashSet<>(size);
+        for (final Entry<String, ConcurrentHashMap<PlotId, Plot>> entry : plots.entrySet())
+        {
+            if (isPlotWorld(entry.getKey()))
+            {
                 result.addAll(entry.getValue().values());
             }
         }
         return result;
     }
-    
+
     /**
      * Get all the base plots in a single set (for merged plots it just returns the bottom plot)
      * @return Set of base Plot
      */
-    public Set<Plot> getBasePlots() {
+    public Set<Plot> getBasePlots()
+    {
         int size = 0;
-        for (Entry<String, ConcurrentHashMap<PlotId, Plot>> entry : plots.entrySet()) {
-            if (isPlotWorld(entry.getKey())) {
+        for (final Entry<String, ConcurrentHashMap<PlotId, Plot>> entry : plots.entrySet())
+        {
+            if (isPlotWorld(entry.getKey()))
+            {
                 size += entry.getValue().size();
             }
         }
-        Set<Plot> result = new HashSet<>(size);
-        for (Entry<String, ConcurrentHashMap<PlotId, Plot>> entry : plots.entrySet()) {
-            if (isPlotWorld(entry.getKey())) {
-                for (Entry<PlotId, Plot> entry2 : entry.getValue().entrySet()) {
-                    Plot plot = entry2.getValue();
-                    if (plot.getMerged(0) || plot.getMerged(3)) {
+        final Set<Plot> result = new HashSet<>(size);
+        for (final Entry<String, ConcurrentHashMap<PlotId, Plot>> entry : plots.entrySet())
+        {
+            if (isPlotWorld(entry.getKey()))
+            {
+                for (final Entry<PlotId, Plot> entry2 : entry.getValue().entrySet())
+                {
+                    final Plot plot = entry2.getValue();
+                    if (plot.getMerged(0) || plot.getMerged(3))
+                    {
                         continue;
                     }
                     result.add(plot);
@@ -551,26 +627,27 @@ public class PS {
         return result;
     }
 
-
     /**
      * Get the raw plot object
      * @return set of plot
      * @see #setAllPlotsRaw(LinkedHashMap) to set the raw plot object
      */
     @Deprecated
-    public Set<Plot> getPlotsRaw() {
+    public Set<Plot> getPlotsRaw()
+    {
         int size = 0;
-        for (Entry<String, ConcurrentHashMap<PlotId, Plot>> entry : plots.entrySet()) {
+        for (final Entry<String, ConcurrentHashMap<PlotId, Plot>> entry : plots.entrySet())
+        {
             size += entry.getValue().size();
         }
-        Set<Plot> result = new HashSet<>(size);
-        for (Entry<String, ConcurrentHashMap<PlotId, Plot>> entry : plots.entrySet()) {
+        final Set<Plot> result = new HashSet<>(size);
+        for (final Entry<String, ConcurrentHashMap<PlotId, Plot>> entry : plots.entrySet())
+        {
             result.addAll(entry.getValue().values());
         }
         return result;
     }
 
-
     /**
      * Sort a collection of plots by the hashcode (assumes that all plots are in the same world)
      * @param plots
@@ -578,42 +655,55 @@ public class PS {
      * @deprecated use sortPlot
      */
     @Deprecated
-    public ArrayList<Plot> sortPlots(Collection<Plot> plots) {
+    public ArrayList<Plot> sortPlots(final Collection<Plot> plots)
+    {
         return sortPlots(plots, SortType.DISTANCE_FROM_ORIGIN, null);
     }
-    
-    public ArrayList<Plot> sortPlotsByTemp(Collection<Plot> plots) {
+
+    public ArrayList<Plot> sortPlotsByTemp(final Collection<Plot> plots)
+    {
         int max = 0;
         int overflowCount = 0;
-        for (Plot plot : plots) {
-            if (plot.temp > 0) {
-                if (plot.temp > max) {
+        for (final Plot plot : plots)
+        {
+            if (plot.temp > 0)
+            {
+                if (plot.temp > max)
+                {
                     max = plot.temp;
                 }
             }
-            else {
+            else
+            {
                 overflowCount++;
             }
         }
-        Plot[] array = new Plot[max + 1];
-        List<Plot> overflow = new ArrayList<>(overflowCount);
-        for (Plot plot : plots) {
-            if (plot.temp <= 0) {
+        final Plot[] array = new Plot[max + 1];
+        final List<Plot> overflow = new ArrayList<>(overflowCount);
+        for (final Plot plot : plots)
+        {
+            if (plot.temp <= 0)
+            {
                 overflow.add(plot);
             }
-            else {
+            else
+            {
                 array[plot.temp] = plot;
             }
         }
-        ArrayList<Plot> result = new ArrayList<>(plots.size());
-        for (Plot plot : array) {
-            if (plot != null) {
+        final ArrayList<Plot> result = new ArrayList<>(plots.size());
+        for (final Plot plot : array)
+        {
+            if (plot != null)
+            {
                 result.add(plot);
             }
         }
-        Collections.sort(overflow, new Comparator<Plot>() {
+        Collections.sort(overflow, new Comparator<Plot>()
+        {
             @Override
-            public int compare(Plot a, Plot b) {
+            public int compare(final Plot a, final Plot b)
+            {
                 return a.hashCode() - b.hashCode();
             }
         });
@@ -628,59 +718,74 @@ public class PS {
      * @deprecated Unchecked, please use {@link #sortPlots(Collection, SortType, String)} which has additional checks before calling this
      */
     @Deprecated
-    public ArrayList<Plot> sortPlotsByHash(Collection<Plot> plots) {
+    public ArrayList<Plot> sortPlotsByHash(final Collection<Plot> plots)
+    {
         int hardmax = 256000;
         int max = 0;
         int overflowSize = 0;
-        for (Plot plot : plots) {
-            int hash = MathMan.getPositiveId(plot.hashCode());
-            if (hash > max) {
-                if (hash >= hardmax) {
+        for (final Plot plot : plots)
+        {
+            final int hash = MathMan.getPositiveId(plot.hashCode());
+            if (hash > max)
+            {
+                if (hash >= hardmax)
+                {
                     overflowSize++;
                 }
-                else {
+                else
+                {
                     max = hash;
                 }
             }
         }
         hardmax = Math.min(hardmax, max);
-        Plot[] cache = new Plot[hardmax + 1];
-        List<Plot> overflow = new ArrayList<Plot>(overflowSize);
-        ArrayList<Plot> extra = new ArrayList<>();
-        for (Plot plot : plots) {
-            int hash = MathMan.getPositiveId(plot.hashCode());
-            if (hash < hardmax) {
-                if (hash >= 0) {
+        final Plot[] cache = new Plot[hardmax + 1];
+        final List<Plot> overflow = new ArrayList<Plot>(overflowSize);
+        final ArrayList<Plot> extra = new ArrayList<>();
+        for (final Plot plot : plots)
+        {
+            final int hash = MathMan.getPositiveId(plot.hashCode());
+            if (hash < hardmax)
+            {
+                if (hash >= 0)
+                {
                     cache[hash] = plot;
                 }
-                else {
+                else
+                {
                     extra.add(plot);
                 }
             }
-            else if (Math.abs(plot.id.x) > 15446 || Math.abs(plot.id.y) > 15446) {
+            else if ((Math.abs(plot.id.x) > 15446) || (Math.abs(plot.id.y) > 15446))
+            {
                 extra.add(plot);
             }
-            else {
+            else
+            {
                 overflow.add(plot);
             }
         }
-        Plot[] overflowArray = overflow.toArray(new Plot[overflow.size()]);
+        final Plot[] overflowArray = overflow.toArray(new Plot[overflow.size()]);
         sortPlotsByHash(overflowArray);
-        ArrayList<Plot> result = new ArrayList<Plot>(cache.length + overflowArray.length);
-        for (Plot plot : cache) {
-            if (plot != null) {
+        final ArrayList<Plot> result = new ArrayList<Plot>(cache.length + overflowArray.length);
+        for (final Plot plot : cache)
+        {
+            if (plot != null)
+            {
                 result.add(plot);
             }
         }
-        for (Plot plot : overflowArray) {
+        for (final Plot plot : overflowArray)
+        {
             result.add(plot);
         }
-        for (Plot plot : extra) {
+        for (final Plot plot : extra)
+        {
             result.add(plot);
         }
         return result;
     }
-    
+
     /**
      * Sort plots by creation timestamp
      * @param input
@@ -688,57 +793,72 @@ public class PS {
      * @return
      */
     @Deprecated
-    public ArrayList<Plot> sortPlotsByTimestamp(Collection<Plot> input) {
+    public ArrayList<Plot> sortPlotsByTimestamp(final Collection<Plot> input)
+    {
         List<Plot> list;
-        if (input instanceof ArrayList<?>) {
+        if (input instanceof ArrayList<?>)
+        {
             list = (List<Plot>) input;
         }
-        else {
+        else
+        {
             list = new ArrayList<Plot>(input);
         }
         long min = Integer.MAX_VALUE;
         long max = 0;
-        int size = list.size();
-        int limit = Math.min(1048576, size * 2);
-        for (int i = 0; i < size; i++) {
-            Plot plot = list.get(i);
-            long time = plot.getTimestamp();
-            if (time < min) {
+        final int size = list.size();
+        final int limit = Math.min(1048576, size * 2);
+        for (int i = 0; i < size; i++)
+        {
+            final Plot plot = list.get(i);
+            final long time = plot.getTimestamp();
+            if (time < min)
+            {
                 min = time;
             }
-            if (time > max) {
+            if (time > max)
+            {
                 max = time;
             }
         }
-        long range = max - min;
+        final long range = max - min;
         Plot[] plots;
-        try {
-            ArrayList<Plot> overflow = new ArrayList<>();
-            if (range > limit && size > 1024) {
+        try
+        {
+            final ArrayList<Plot> overflow = new ArrayList<>();
+            if ((range > limit) && (size > 1024))
+            {
                 plots = new Plot[Math.min((int) range, limit)];
-                int factor = (int) ((range / limit));
-                for (int i = 0; i < size; i++) {
+                final int factor = (int) ((range / limit));
+                for (int i = 0; i < size; i++)
+                {
                     Plot plot = list.get(i);
                     int index = (int) (plot.getTimestamp() - min) / factor;
-                    if (index < 0) {
+                    if (index < 0)
+                    {
                         index = 0;
                     }
-                    if (index >= plots.length) {
+                    if (index >= plots.length)
+                    {
                         overflow.add(plot);
                         continue;
                     }
                     Plot current = plots[index];
-                    while (true) {
-                        if (current == null) {
+                    while (true)
+                    {
+                        if (current == null)
+                        {
                             plots[index] = plot;
                             break;
                         }
-                        if (current.getTimestamp() > plot.getTimestamp()) {
+                        if (current.getTimestamp() > plot.getTimestamp())
+                        {
                             plots[index] = plot;
                             plot = current;
                         }
                         index++;
-                        if (index >= plots.length) {
+                        if (index >= plots.length)
+                        {
                             overflow.add(plot);
                             break;
                         }
@@ -746,43 +866,54 @@ public class PS {
                     }
                 }
             }
-            else if (range < size || size < 1024) {
-                ArrayList<Plot> result = new ArrayList<Plot>(list);
-                Collections.sort(result, new Comparator<Plot>() {
+            else if ((range < size) || (size < 1024))
+            {
+                final ArrayList<Plot> result = new ArrayList<Plot>(list);
+                Collections.sort(result, new Comparator<Plot>()
+                {
                     @Override
-                    public int compare(Plot a, Plot b) {
-                        if (a.getTimestamp() > b.getTimestamp()) {
+                    public int compare(final Plot a, final Plot b)
+                    {
+                        if (a.getTimestamp() > b.getTimestamp())
+                        {
                             return -1;
                         }
                         else if (b.getTimestamp() > a.getTimestamp()) {
-                            return 1;
+                        return 1;
                         }
                         return 0;
                     }
                 });
                 return result;
             }
-            else if (min != 0) {
+            else if (min != 0)
+            {
                 plots = new Plot[(int) range];
-                for (int i = 0; i < size; i++) {
+                for (int i = 0; i < size; i++)
+                {
                     Plot plot = list.get(i);
                     int index = (int) (plot.getTimestamp() - min);
-                    if (index >= plots.length) {
+                    if (index >= plots.length)
+                    {
                         overflow.add(plot);
                         continue;
                     }
                     Plot current = plots[index];
-                    while (true) {
-                        if (current == null) {
+                    while (true)
+                    {
+                        if (current == null)
+                        {
                             plots[index] = plot;
                             break;
                         }
-                        if (current.getTimestamp() > plot.getTimestamp()) {
+                        if (current.getTimestamp() > plot.getTimestamp())
+                        {
                             plots[index] = plot;
                             plot = current;
                         }
                         index++;
-                        if (index >= plots.length) {
+                        if (index >= plots.length)
+                        {
                             overflow.add(plot);
                             break;
                         }
@@ -790,28 +921,35 @@ public class PS {
                     }
                 }
             }
-            else {
+            else
+            {
                 plots = new Plot[(int) range];
-                for (int i = 0; i < size; i++) {
+                for (int i = 0; i < size; i++)
+                {
                     Plot plot = list.get(i);
                     int index = (int) (plot.getTimestamp());
-                    if (index >= plots.length) {
+                    if (index >= plots.length)
+                    {
                         overflow.add(plot);
                         continue;
                     }
                     Plot current = plots[index];
                     // Move everything along until a free spot is found
-                    while (true) {
-                        if (current == null) {
+                    while (true)
+                    {
+                        if (current == null)
+                        {
                             plots[index] = plot;
                             break;
                         }
-                        if (current.getTimestamp() > plot.getTimestamp()) {
+                        if (current.getTimestamp() > plot.getTimestamp())
+                        {
                             plots[index] = plot;
                             plot = current;
                         }
                         index++;
-                        if (index >= plots.length) {
+                        if (index >= plots.length)
+                        {
                             overflow.add(plot);
                             break;
                         }
@@ -819,42 +957,53 @@ public class PS {
                     }
                 }
             }
-            ArrayList<Plot> result = new ArrayList<>(size);
-            if (overflow.size() > 0) {
-                Collections.sort(overflow, new Comparator<Plot>() {
+            final ArrayList<Plot> result = new ArrayList<>(size);
+            if (overflow.size() > 0)
+            {
+                Collections.sort(overflow, new Comparator<Plot>()
+                {
                     @Override
-                    public int compare(Plot a, Plot b) {
-                        if (a.getTimestamp() > b.getTimestamp()) {
+                    public int compare(final Plot a, final Plot b)
+                    {
+                        if (a.getTimestamp() > b.getTimestamp())
+                        {
                             return -1;
                         }
                         else if (b.getTimestamp() > a.getTimestamp()) {
-                            return 1;
+                        return 1;
                         }
                         return 0;
                     }
                 });
-                for (Plot plot : overflow) {
+                for (final Plot plot : overflow)
+                {
                     result.add(plot);
                 }
             }
-            for (int i = plots.length - 1; i >= 0; i--) {
-                if (plots[i] != null) {
+            for (int i = plots.length - 1; i >= 0; i--)
+            {
+                if (plots[i] != null)
+                {
                     result.add(plots[i]);
                 }
             }
             return result;
         }
-        catch (Exception e) {
+        catch (final Exception e)
+        {
             e.printStackTrace();
-            ArrayList<Plot> result = new ArrayList<Plot>(list);
-            Collections.sort(result, new Comparator<Plot>() {
+            final ArrayList<Plot> result = new ArrayList<Plot>(list);
+            Collections.sort(result, new Comparator<Plot>()
+            {
                 @Override
-                public int compare(Plot a, Plot b) {
-                    if (a.getTimestamp() > b.getTimestamp()) {
+                public int compare(final Plot a, final Plot b)
+                {
+                    if (a.getTimestamp() > b.getTimestamp())
+                    {
                         return -1;
                     }
                     else if (b.getTimestamp() > a.getTimestamp()) {
-                        return 1;
+                    return 1;
                     }
                     return 0;
                 }
@@ -862,30 +1011,38 @@ public class PS {
             return result;
         }
     }
-    
+
     /**
      * @deprecated Unchecked, use {@link #sortPlots(Collection, SortType, String)} instead which will in turn call this
      * @param input
      */
-    public void sortPlotsByHash(Plot[] input) {
-        List<Plot>[] bucket = new ArrayList[64];
-        for (int i = 0; i < bucket.length; i++) {
+    @Deprecated
+    public void sortPlotsByHash(final Plot[] input)
+    {
+        final List<Plot>[] bucket = new ArrayList[64];
+        for (int i = 0; i < bucket.length; i++)
+        {
             bucket[i] = new ArrayList<Plot>();
         }
         boolean maxLength = false;
         int tmp = -1, placement = 1;
-        while (!maxLength) {
+        while (!maxLength)
+        {
             maxLength = true;
-            for (Plot i : input) {
+            for (final Plot i : input)
+            {
                 tmp = MathMan.getPositiveId(i.hashCode()) / placement;
                 bucket[tmp & 63].add(i);
-                if (maxLength && tmp > 0) {
+                if (maxLength && (tmp > 0))
+                {
                     maxLength = false;
                 }
             }
             int a = 0;
-            for (int b = 0; b < 64; b++) {
-                for (Plot i : bucket[b]) {
+            for (int b = 0; b < 64; b++)
+            {
+                for (final Plot i : bucket[b])
+                {
                     input[a++] = i;
                 }
                 bucket[b].clear();
@@ -893,33 +1050,40 @@ public class PS {
             placement *= 64;
         }
     }
-    
+
     /**
      * Sort plots by timestamp
      * @param input
      * @deprecated Unchecked, use {@link #sortPlots(Collection, SortType, String)} instead which will in turn call this
      */
     @Deprecated
-    public void sortPlotsByTimestamp(Plot[] input) {
+    public void sortPlotsByTimestamp(final Plot[] input)
+    {
         final int SIZE = 100;
-        List<Plot>[] bucket = new ArrayList[SIZE];
-        for (int i = 0; i < bucket.length; i++) {
+        final List<Plot>[] bucket = new ArrayList[SIZE];
+        for (int i = 0; i < bucket.length; i++)
+        {
             bucket[i] = new ArrayList<Plot>();
         }
         boolean maxLength = false;
         int tmp = -1, placement = 1;
-        while (!maxLength) {
+        while (!maxLength)
+        {
             maxLength = true;
-            for (Plot i : input) {
+            for (final Plot i : input)
+            {
                 tmp = MathMan.getPositiveId(i.hashCode()) / placement;
                 bucket[tmp % SIZE].add(i);
-                if (maxLength && tmp > 0) {
+                if (maxLength && (tmp > 0))
+                {
                     maxLength = false;
                 }
             }
             int a = 0;
-            for (int b = 0; b < SIZE; b++) {
-                for (Plot i : bucket[b]) {
+            for (int b = 0; b < SIZE; b++)
+            {
+                for (final Plot i : bucket[b])
+                {
                     input[a++] = i;
                 }
                 bucket[b].clear();
@@ -927,9 +1091,12 @@ public class PS {
             placement *= SIZE;
         }
     }
-    
-    public enum SortType { CREATION_DATE, CREATION_DATE_TIMESTAMP, DISTANCE_FROM_ORIGIN; }
-    
+
+    public enum SortType
+    {
+        CREATION_DATE, CREATION_DATE_TIMESTAMP, DISTANCE_FROM_ORIGIN;
+    }
+
     /**
      * Sort a collection of plots by world (with a priority world), then by hashcode
      * @param plots
@@ -937,49 +1104,62 @@ public class PS {
      * @param priorityWorld - Use null, "world" or "gibberish" if you want default world order
      * @return ArrayList of plot
      */
-    public ArrayList<Plot> sortPlots(Collection<Plot> plots, final SortType type, final String priorityWorld) {
+    public ArrayList<Plot> sortPlots(final Collection<Plot> plots, final SortType type, final String priorityWorld)
+    {
         // group by world
         // sort each
-        HashMap<String, Collection<Plot>> map = new HashMap<>();
-        ArrayList<String> worlds = new ArrayList<String>(getPlotWorlds());
+        final HashMap<String, Collection<Plot>> map = new HashMap<>();
+        final ArrayList<String> worlds = new ArrayList<String>(getPlotWorlds());
         int totalSize = 0;
-        for (Entry<String, ConcurrentHashMap<PlotId, Plot>> entry : this.plots.entrySet()) {
+        for (final Entry<String, ConcurrentHashMap<PlotId, Plot>> entry : this.plots.entrySet())
+        {
             totalSize += entry.getValue().size();
         }
-        if (plots.size() == totalSize) {
-            for (Entry<String, ConcurrentHashMap<PlotId, Plot>> entry : this.plots.entrySet()) {
+        if (plots.size() == totalSize)
+        {
+            for (final Entry<String, ConcurrentHashMap<PlotId, Plot>> entry : this.plots.entrySet())
+            {
                 map.put(entry.getKey(), entry.getValue().values());
             }
         }
-        else {
-            for (String world : worlds) {
+        else
+        {
+            for (final String world : worlds)
+            {
                 map.put(world, new ArrayList<Plot>(plots.size() / worlds.size()));
             }
             Collection<Plot> lastList = null;
             String lastWorld = "";
-            for (Plot plot : plots) {
-                if (StringMan.isEqual(lastWorld, plot.world)) {
+            for (final Plot plot : plots)
+            {
+                if (StringMan.isEqual(lastWorld, plot.world))
+                {
                     lastList.add(plot);
                 }
-                else {
+                else
+                {
                     lastWorld = plot.world;
                     lastList = map.get(lastWorld);
                     lastList.add(plot);
                 }
             }
         }
-        Collections.sort(worlds, new Comparator<String>() {
+        Collections.sort(worlds, new Comparator<String>()
+        {
             @Override
-            public int compare(String a, String b) {
-                if (priorityWorld != null && StringMan.isEqual(a, priorityWorld)) {
-                    return -1;
+            public int compare(final String a, final String b)
+            {
+                if ((priorityWorld != null) && StringMan.isEqual(a, priorityWorld)) {
+                return -1;
                 }
                 return a.hashCode() - b.hashCode();
             }
         });
-        ArrayList<Plot> toReturn = new ArrayList<Plot>(plots.size());
-        for (String world : worlds) {
-            switch (type) {
+        final ArrayList<Plot> toReturn = new ArrayList<Plot>(plots.size());
+        for (final String world : worlds)
+        {
+            switch (type)
+            {
                 case CREATION_DATE:
                     toReturn.addAll(sortPlotsByTemp(map.get(world)));
                     break;
@@ -991,13 +1171,12 @@ public class PS {
                     break;
                 default:
                     break;
-                
+
             }
         }
         return toReturn;
     }
 
-
     /**
      * Sort a collection of plots by world, then by hashcode
      * @param plots
@@ -1005,14 +1184,18 @@ public class PS {
      * @return ArrayList of plot
      */
     @Deprecated
-    public ArrayList<Plot> sortPlotsByWorld(Collection<Plot> plots) {
-        ArrayList<Plot> newPlots = new ArrayList<>();
-        ArrayList<String> worlds = new ArrayList<>(this.plotworlds.keySet());
-        HashSet<Plot> set = new HashSet<>(plots);
+    public ArrayList<Plot> sortPlotsByWorld(final Collection<Plot> plots)
+    {
+        final ArrayList<Plot> newPlots = new ArrayList<>();
+        final ArrayList<String> worlds = new ArrayList<>(plotworlds.keySet());
+        final HashSet<Plot> set = new HashSet<>(plots);
         Collections.sort(worlds);
-        for (String world : worlds) {
-            for (Plot plot : this.plots.get(world).values()) {
-                if (set.contains(plot)) {
+        for (final String world : worlds)
+        {
+            for (final Plot plot : this.plots.get(world).values())
+            {
+                if (set.contains(plot))
+                {
                     newPlots.add(plot);
                 }
             }
@@ -1020,14 +1203,14 @@ public class PS {
         return newPlots;
     }
 
-
     /**
      * Get all the plots owned by a player name
      * @param world
      * @param player
      * @return Set of Plot
      */
-    public Set<Plot> getPlots(final String world, final String player) {
+    public Set<Plot> getPlots(final String world, final String player)
+    {
         final UUID uuid = UUIDHandler.getUUID(player, null);
         return getPlots(world, uuid);
     }
@@ -1038,7 +1221,8 @@ public class PS {
      * @param player
      * @return Set of plot
      */
-    public Set<Plot> getPlots(final String world, final PlotPlayer player) {
+    public Set<Plot> getPlots(final String world, final PlotPlayer player)
+    {
         final UUID uuid = player.getUUID();
         return getPlots(world, uuid);
     }
@@ -1049,11 +1233,15 @@ public class PS {
      * @param uuid
      * @return Set of plot
      */
-    public Set<Plot> getPlots(final String world, final UUID uuid) {
+    public Set<Plot> getPlots(final String world, final UUID uuid)
+    {
         final ArrayList<Plot> myplots = new ArrayList<>();
-        for (final Plot plot : getPlotsInWorld(world)) {
-            if (plot.hasOwner()) {
-                if (PlotHandler.isOwner(plot, uuid)) {
+        for (final Plot plot : getPlotsInWorld(world))
+        {
+            if (plot.hasOwner())
+            {
+                if (PlotHandler.isOwner(plot, uuid))
+                {
                     myplots.add(plot);
                 }
             }
@@ -1061,14 +1249,14 @@ public class PS {
         return new HashSet<>(myplots);
     }
 
-
     /**
      * Check if a plot world
      * @param world
      * @see #getPlotWorld(String) to get the PlotWorld object
      * @return if a plot world is registered
      */
-    public boolean isPlotWorld(final String world) {
+    public boolean isPlotWorld(final String world)
+    {
         return (plotworlds.containsKey(world));
     }
 
@@ -1077,10 +1265,9 @@ public class PS {
      * @param world
      * @return the PlotManager object, or null if no registered PlotManager
      */
-    public PlotManager getPlotManager(final String world) {
-        if (plotmanagers.containsKey(world)) {
-            return plotmanagers.get(world);
-        }
+    public PlotManager getPlotManager(final String world)
+    {
+        if (plotmanagers.containsKey(world)) { return plotmanagers.get(world); }
         return null;
     }
 
@@ -1088,82 +1275,85 @@ public class PS {
      * Get a list of the plot worlds
      * @return A String array of the plot world names
      */
-    public String[] getPlotWorldsString() {
+    public String[] getPlotWorldsString()
+    {
         final Set<String> strings = plotworlds.keySet();
         return strings.toArray(new String[strings.size()]);
     }
 
-
     private String lastWorld;
     private Map<PlotId, Plot> lastMap;
-    
+
     /**
      * Get a map of the plots for a world
      * @param world
      * @return HashMap of PlotId to Plot
      */
     @Deprecated
-    public HashMap<PlotId, Plot> getPlots(final String world) {
-        ConcurrentHashMap<PlotId, Plot> myplots = plots.get(world);
-        if (myplots != null) {
-            if (world == lastWorld) {
-                return new HashMap<>(lastMap);
-            }
+    public HashMap<PlotId, Plot> getPlots(final String world)
+    {
+        final ConcurrentHashMap<PlotId, Plot> myplots = plots.get(world);
+        if (myplots != null)
+        {
+            if (world == lastWorld) { return new HashMap<>(lastMap); }
             return new HashMap<>(myplots);
         }
         return new HashMap<>();
     }
-    
-    public Collection<Plot> getPlotsInWorld(final String world) {
-        ConcurrentHashMap<PlotId, Plot> map = plots.get(world);
-        if (map == null) {
-            return new HashSet<>();
-        }
+
+    public Collection<Plot> getPlotsInWorld(final String world)
+    {
+        final ConcurrentHashMap<PlotId, Plot> map = plots.get(world);
+        if (map == null) { return new HashSet<>(); }
         return map.values();
     }
-    
-    public Plot getPlot(final String world, final PlotId id) {
-        if (world == lastWorld) {
-            if (lastMap != null) {
-                return lastMap.get(id);
-            }
+
+    public Plot getPlot(final String world, final PlotId id)
+    {
+        if (world == lastWorld)
+        {
+            if (lastMap != null) { return lastMap.get(id); }
             return null;
         }
         lastWorld = world;
-        if (plots.containsKey(world)) {
+        if (plots.containsKey(world))
+        {
             lastMap = plots.get(world);
-            if (lastMap != null) {
-                return lastMap.get(id);
-            }
+            if (lastMap != null) { return lastMap.get(id); }
             return null;
         }
         return null;
     }
 
-
     /**
      * Get the plots for a PlotPlayer
      * @param player
      * @return Set of Plot
      */
-    public Set<Plot> getPlots(final PlotPlayer player) {
+    public Set<Plot> getPlots(final PlotPlayer player)
+    {
         return getPlots(player.getUUID());
     }
 
-
     /**
      * Get the plots for a UUID
      * @param uuid
      * @return Set of Plot
      */
-    public Set<Plot> getPlots(final UUID uuid) {
+    public Set<Plot> getPlots(final UUID uuid)
+    {
         final ArrayList<Plot> myplots = new ArrayList<>();
-        for (Entry<String, ConcurrentHashMap<PlotId, Plot>> entry : plots.entrySet()) {
-            if (isPlotWorld(entry.getKey())) {
-                for (Entry<PlotId, Plot> entry2 : entry.getValue().entrySet()) {
-                    Plot plot = entry2.getValue();
-                    if (plot.hasOwner()) {
-                        if (PlotHandler.isOwner(plot, uuid)) {
+        for (final Entry<String, ConcurrentHashMap<PlotId, Plot>> entry : plots.entrySet())
+        {
+            if (isPlotWorld(entry.getKey()))
+            {
+                for (final Entry<PlotId, Plot> entry2 : entry.getValue().entrySet())
+                {
+                    final Plot plot = entry2.getValue();
+                    if (plot.hasOwner())
+                    {
+                        if (PlotHandler.isOwner(plot, uuid))
+                        {
                             myplots.add(plot);
                         }
                     }
@@ -1173,35 +1363,35 @@ public class PS {
         return new HashSet<>(myplots);
     }
 
-
     /**
      * Unregister a plot from local memory (does not call DB)
      * @param world
      * @param id
      * @param callEvent If to call an event about the plot being removed
-     * @return true if plot existed | false if it didn't 
+     * @return true if plot existed | false if it didn't
      */
-    public boolean removePlot(final String world, final PlotId id, final boolean callEvent) {
-        if (callEvent) {
+    public boolean removePlot(final String world, final PlotId id, final boolean callEvent)
+    {
+        if (callEvent)
+        {
             EventUtil.manager.callDelete(world, id);
         }
-        ConcurrentHashMap<PlotId, Plot> allPlots = plots.get(world);
-        if (allPlots == null) {
-            return false;
-        }
-        Plot plot = allPlots.remove(id);
-        if (MainUtil.lastPlot.containsKey(world)) {
+        final ConcurrentHashMap<PlotId, Plot> allPlots = plots.get(world);
+        if (allPlots == null) { return false; }
+        final Plot plot = allPlots.remove(id);
+        if (MainUtil.lastPlot.containsKey(world))
+        {
             final PlotId last = MainUtil.lastPlot.get(world);
             final int last_max = Math.max(last.x, last.y);
             final int this_max = Math.max(id.x, id.y);
-            if (this_max < last_max) {
+            if (this_max < last_max)
+            {
                 MainUtil.lastPlot.put(world, id);
             }
         }
         return plot != null;
     }
 
-
     /**
      * This method is called by the PlotGenerator class normally<br>
      *  - Initializes the PlotWorld and PlotManager classes<br>
@@ -1214,10 +1404,13 @@ public class PS {
      * @param world The world to load
      * @param generator The generator for that world, or null if no generator
      */
-    public void loadWorld(final String world, PlotGenerator<?> generator) {
+    public void loadWorld(final String world, final PlotGenerator<?> generator)
+    {
         PlotWorld plotWorld = getPlotWorld(world);
-        if (plotWorld != null) {
-            if (generator != null) {
+        if (plotWorld != null)
+        {
+            if (generator != null)
+            {
                 generator.initialize(plotWorld);
             }
             return;
@@ -1226,58 +1419,73 @@ public class PS {
         final PlotGenerator<?> plotGenerator;
         final PlotManager plotManager;
         final String path = "worlds." + world;
-        if (!LOADING_WORLD && (generator.isFull())) {
+        if (!LOADING_WORLD && (generator.isFull()))
+        {
             plotGenerator = generator;
             plotWorld = plotGenerator.getNewPlotWorld(world);
             plotManager = plotGenerator.getPlotManager();
-            if (!world.equals("CheckingPlotSquaredGenerator")) {
+            if (!world.equals("CheckingPlotSquaredGenerator"))
+            {
                 log(C.PREFIX.s() + "&aDetected world load for '" + world + "'");
                 log(C.PREFIX.s() + "&3 - generator: &7" + plotGenerator.getClass().getName());
                 log(C.PREFIX.s() + "&3 - plotworld: &7" + plotWorld.getClass().getName());
                 log(C.PREFIX.s() + "&3 - manager: &7" + plotManager.getClass().getName());
             }
-            if (!config.contains(path)) {
+            if (!config.contains(path))
+            {
                 config.createSection(path);
             }
             plotWorld.saveConfiguration(config.getConfigurationSection(path));
             plotWorld.loadDefaultConfiguration(config.getConfigurationSection(path));
-            try {
+            try
+            {
                 config.save(configFile);
-            } catch (final IOException e) {
+            }
+            catch (final IOException e)
+            {
                 e.printStackTrace();
             }
             // Now add it
             addPlotWorld(world, plotWorld, plotManager);
             generator.initialize(plotWorld);
             MainUtil.setupBorder(world);
-        } else {
-            if (!worlds.contains(world)) {
-                return;
-            }
-            if (!LOADING_WORLD) {
+        }
+        else
+        {
+            if (!worlds.contains(world)) { return; }
+            if (!LOADING_WORLD)
+            {
                 LOADING_WORLD = true;
-                try {
+                try
+                {
                     final String gen_string = config.getString("worlds." + world + "." + "generator.plugin");
                     generator.setGenerator(gen_string);
-//                    if (gen_string == null) {
-//                        generator = new HybridGen(world);
-//                    } else {
-//                        generator = (PlotGenerator) IMP.getGenerator(world, gen_string);
-//                    }
+                    //                    if (gen_string == null) {
+                    //                        generator = new HybridGen(world);
+                    //                    } else {
+                    //                        generator = (PlotGenerator) IMP.getGenerator(world, gen_string);
+                    //                    }
                     loadWorld(world, generator);
-                } catch (final Exception e) {
+                }
+                catch (final Exception e)
+                {
                     log("&d=== Oh no! Please set the generator for the " + world + " ===");
                     e.printStackTrace();
                     LOADING_WORLD = false;
                     removePlotWorld(world);
-                } finally {
+                }
+                finally
+                {
                     LOADING_WORLD = false;
                 }
-            } else {
+            }
+            else
+            {
                 LOADING_WORLD = false;
                 plotWorld = generator.getNewPlotWorld(world);
                 plotManager = generator.getPlotManager();
-                if (!config.contains(path)) {
+                if (!config.contains(path))
+                {
                     config.createSection(path);
                 }
                 plotWorld.TYPE = generator.isFull() ? 0 : 2;
@@ -1285,12 +1493,16 @@ public class PS {
                 plotWorld.saveConfiguration(config.getConfigurationSection(path));
                 plotWorld.loadDefaultConfiguration(config.getConfigurationSection(path));
 
-                try {
+                try
+                {
                     config.save(configFile);
-                } catch (final IOException e) {
+                }
+                catch (final IOException e)
+                {
                     e.printStackTrace();
                 }
-                if (((plotWorld.TYPE == 2) && !Settings.ENABLE_CLUSTERS) || !(plotManager instanceof SquarePlotManager)) {
+                if (((plotWorld.TYPE == 2) && !Settings.ENABLE_CLUSTERS) || !(plotManager instanceof SquarePlotManager))
+                {
                     log("&c[ERROR] World '" + world + "' in settings.yml is not using PlotSquared generator! Please set the generator correctly or delete the world from the 'settings.yml'!");
                     return;
                 }
@@ -1300,35 +1512,41 @@ public class PS {
                 log(C.PREFIX.s() + "&3 - manager: &7" + plotManager.getClass().getName());
                 log(C.PREFIX.s() + "&3 - | terrain: &7" + plotWorld.TERRAIN);
                 log(C.PREFIX.s() + "&3 - | type: &7" + plotWorld.TYPE);
-                
+
                 addPlotWorld(world, plotWorld, plotManager);
-                if (plotWorld.TYPE == 2) {
-                    if (ClusterManager.getClusters(world).size() > 0) {
-                        for (final PlotCluster cluster : ClusterManager.getClusters(world)) {
+                if (plotWorld.TYPE == 2)
+                {
+                    if (ClusterManager.getClusters(world).size() > 0)
+                    {
+                        for (final PlotCluster cluster : ClusterManager.getClusters(world))
+                        {
                             log(C.PREFIX.s() + "&3 - &7| cluster: " + cluster);
                             generator.augment(cluster, plotWorld);
-//                            new AugmentedPopulator(world, generator, cluster, plotWorld.TERRAIN == 2, plotWorld.TERRAIN != 2);
+                            //                            new AugmentedPopulator(world, generator, cluster, plotWorld.TERRAIN == 2, plotWorld.TERRAIN != 2);
                         }
                     }
-                } else if (plotWorld.TYPE == 1) {
+                }
+                else if (plotWorld.TYPE == 1)
+                {
                     generator.augment(null, plotWorld);
-//                    new AugmentedPopulator(world, gen_class, null, plotWorld.TERRAIN == 2, plotWorld.TERRAIN != 2);
+                    //                    new AugmentedPopulator(world, gen_class, null, plotWorld.TERRAIN == 2, plotWorld.TERRAIN != 2);
                 }
                 generator.initialize(plotWorld);
             }
         }
     }
 
-
     /**
      * Setup the configuration for a plot world based on world arguments<br>
      * e.g. /mv create <world> normal -g PlotSquared:<args>
      * @param world The name of the world
      * @param args The arguments
-     * @return boolean | if valid arguments were provided 
+     * @return boolean | if valid arguments were provided
      */
-    public boolean setupPlotWorld(final String world, final String args) {
-        if ((args != null) && (args.length() > 0)) {
+    public boolean setupPlotWorld(final String world, final String args)
+    {
+        if ((args != null) && (args.length() > 0))
+        {
             // save configuration
             final String[] split = args.split(",");
             final HybridPlotWorld plotworld = new HybridPlotWorld(world);
@@ -1339,67 +1557,83 @@ public class PS {
             final PlotBlock[] main = ClassicPlotWorld.MAIN_BLOCK_DEFAULT;
             final PlotBlock wall = ClassicPlotWorld.WALL_FILLING_DEFAULT;
             final PlotBlock border = ClassicPlotWorld.WALL_BLOCK_DEFAULT;
-            for (final String element : split) {
+            for (final String element : split)
+            {
                 final String[] pair = element.split("=");
-                if (pair.length != 2) {
+                if (pair.length != 2)
+                {
                     log("&cNo value provided for: &7" + element);
                     return false;
                 }
                 final String key = pair[0].toLowerCase();
                 final String value = pair[1];
-                try {
-                    switch (key) {
+                try
+                {
+                    switch (key)
+                    {
                         case "s":
-                        case "size": {
+                        case "size":
+                        {
                             SquarePlotWorld.PLOT_WIDTH_DEFAULT = Configuration.INTEGER.parseString(value).shortValue();
                             break;
                         }
                         case "g":
-                        case "gap": {
+                        case "gap":
+                        {
                             SquarePlotWorld.ROAD_WIDTH_DEFAULT = Configuration.INTEGER.parseString(value).shortValue();
                             break;
                         }
                         case "h":
-                        case "height": {
+                        case "height":
+                        {
                             ClassicPlotWorld.PLOT_HEIGHT_DEFAULT = Configuration.INTEGER.parseString(value);
                             ClassicPlotWorld.ROAD_HEIGHT_DEFAULT = Configuration.INTEGER.parseString(value);
                             ClassicPlotWorld.WALL_HEIGHT_DEFAULT = Configuration.INTEGER.parseString(value);
                             break;
                         }
                         case "f":
-                        case "floor": {
+                        case "floor":
+                        {
                             ClassicPlotWorld.TOP_BLOCK_DEFAULT = Configuration.BLOCKLIST.parseString(value);
                             break;
                         }
                         case "m":
-                        case "main": {
+                        case "main":
+                        {
                             ClassicPlotWorld.MAIN_BLOCK_DEFAULT = Configuration.BLOCKLIST.parseString(value);
                             break;
                         }
                         case "w":
-                        case "wall": {
+                        case "wall":
+                        {
                             ClassicPlotWorld.WALL_FILLING_DEFAULT = Configuration.BLOCK.parseString(value);
                             break;
                         }
                         case "b":
-                        case "border": {
+                        case "border":
+                        {
                             ClassicPlotWorld.WALL_BLOCK_DEFAULT = Configuration.BLOCK.parseString(value);
                             break;
                         }
-                        default: {
+                        default:
+                        {
                             log("&cKey not found: &7" + element);
                             return false;
                         }
                     }
-                } catch (final Exception e) {
+                }
+                catch (final Exception e)
+                {
                     e.printStackTrace();
                     log("&cInvalid value: &7" + value + " in arg " + element);
                     return false;
                 }
             }
-            try {
+            try
+            {
                 final String root = "worlds." + world;
-                if (!config.contains(root)) {
+                if (!config.contains(root))
+                {
                     config.createSection(root);
                 }
                 plotworld.saveConfiguration(config.getConfigurationSection(root));
@@ -1412,56 +1646,67 @@ public class PS {
                 ClassicPlotWorld.WALL_FILLING_DEFAULT = wall;
                 SquarePlotWorld.PLOT_WIDTH_DEFAULT = width;
                 SquarePlotWorld.ROAD_WIDTH_DEFAULT = gap;
-            } catch (final Exception e) {
+            }
+            catch (final Exception e)
+            {
                 e.printStackTrace();
             }
         }
         return true;
     }
-    
-    public boolean canUpdate(String current, String other) {
-        String s1 = normalisedVersion(current);
-        String s2 = normalisedVersion(other);
-        int cmp = s1.compareTo(s2);
+
+    public boolean canUpdate(final String current, final String other)
+    {
+        final String s1 = normalisedVersion(current);
+        final String s2 = normalisedVersion(other);
+        final int cmp = s1.compareTo(s2);
         return cmp < 0;
     }
 
-    public String normalisedVersion(String version) {
+    public String normalisedVersion(final String version)
+    {
         return normalisedVersion(version, ".", 4);
     }
 
-    public String normalisedVersion(String version, String sep, int maxWidth) {
-        String[] split = Pattern.compile(sep, Pattern.LITERAL).split(version);
-        StringBuilder sb = new StringBuilder();
-        for (String s : split) {
+    public String normalisedVersion(final String version, final String sep, final int maxWidth)
+    {
+        final String[] split = Pattern.compile(sep, Pattern.LITERAL).split(version);
+        final StringBuilder sb = new StringBuilder();
+        for (final String s : split)
+        {
             sb.append(String.format("%" + maxWidth + 's', s));
         }
         return sb.toString();
     }
-    
+
     /**
      * Gets the default update URL, or null if the plugin is up to date
      * @return
      */
-    public URL getUpdate() {
-        String pom = "https://raw.githubusercontent.com/IntellectualSites/PlotSquared/master/pom.xml";
+    public URL getUpdate()
+    {
+        final String pom = "https://raw.githubusercontent.com/IntellectualSites/PlotSquared/master/pom.xml";
         String dl = "https://raw.githubusercontent.com/IntellectualSites/PlotSquared/master/target/PlotSquared-${PLATFORM}.jar";
-        String agent = "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/535.1 (KHTML, like Gecko) Chrome/13.0.782.112 Safari/535.1";
-        try {
-            URL page = new URL(pom);
-            URLConnection con = page.openConnection();
+        final String agent = "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/535.1 (KHTML, like Gecko) Chrome/13.0.782.112 Safari/535.1";
+        try
+        {
+            final URL page = new URL(pom);
+            final URLConnection con = page.openConnection();
             con.addRequestProperty("User-Agent", agent);
-            BufferedReader in = new BufferedReader(new InputStreamReader(con.getInputStream()));
+            final BufferedReader in = new BufferedReader(new InputStreamReader(con.getInputStream()));
             String line = null;
-            while ((line = in.readLine()) !=  null) {
+            while ((line = in.readLine()) != null)
+            {
                 line = line.trim();
-                if (line.startsWith("<version>")) {
+                if (line.startsWith("<version>"))
+                {
                     line = line.replaceAll("[^\\d.]", "");
                     break;
                 }
             }
             in.close();
-            if (!canUpdate(config.getString("version"), line) ) {
+            if (!canUpdate(config.getString("version"), line))
+            {
                 PS.debug("&7PlotSquared is already up to date!");
                 return null;
             }
@@ -1470,38 +1715,42 @@ public class PS {
             log("&8 - &3Use: &7/plot update");
             log("&8 - &3Or: &7" + dl);
             return new URL(dl);
-        } catch (Exception e) {
+        }
+        catch (final Exception e)
+        {
             e.printStackTrace();
             log("&dCould not check for updates (0)");
             log("&7 - Manually check for updates: " + pom);
         }
         return null;
     }
-    
-    public boolean update(PlotPlayer sender, URL url) {
-        if (url == null) {
-            return false;
-        }
-        try {
-            String name = FILE.getName();
-            File newJar = new File("plugins/update/" + name);
+
+    public boolean update(final PlotPlayer sender, final URL url)
+    {
+        if (url == null) { return false; }
+        try
+        {
+            final String name = FILE.getName();
+            final File newJar = new File("plugins/update/" + name);
             MainUtil.sendMessage(sender, "$1Downloading from provided URL: &7" + url);
             MainUtil.sendMessage(sender, "$2 - User-Agent: " + "Mozilla/4.0");
-            URLConnection con = url.openConnection();
+            final URLConnection con = url.openConnection();
             con.addRequestProperty("User-Agent", "Mozilla/4.0");
-            InputStream stream = con.getInputStream();
-            File parent = newJar.getParentFile();
-            if (!parent.exists()) {
+            final InputStream stream = con.getInputStream();
+            final File parent = newJar.getParentFile();
+            if (!parent.exists())
+            {
                 parent.mkdirs();
             }
             MainUtil.sendMessage(sender, "$2 - Output: " + newJar);
             newJar.delete();
             Files.copy(stream, newJar.toPath());
             stream.close();
-            MainUtil.sendMessage(sender, "$1The update will take effect when the server is restarted next");  
+            MainUtil.sendMessage(sender, "$1The update will take effect when the server is restarted next");
             return true;
         }
-        catch (Exception e) {
+        catch (final Exception e)
+        {
             MainUtil.sendMessage(sender, "Failed to update PlotSquared");
             MainUtil.sendMessage(sender, " - Please update manually");
             log("============ Stacktrace ============");
@@ -1511,49 +1760,54 @@ public class PS {
         return false;
     }
 
-
     /**
      * Get the database connection
      * @return The database connection
      */
-    public Connection getConnection() {
+    public Connection getConnection()
+    {
         return connection;
     }
 
-
     /**
      * Copy a file from inside the jar to a location
      * @param file Name of the file inside PlotSquared.jar
      * @param folder The output location relative to /plugins/PlotSquared/
      */
-    public void copyFile(String file, String folder) {
-        try {
-            File output = IMP.getDirectory();
-            if (!output.exists()) {
+    public void copyFile(final String file, final String folder)
+    {
+        try
+        {
+            final File output = IMP.getDirectory();
+            if (!output.exists())
+            {
                 output.mkdirs();
             }
-            File newFile = new File((output + File.separator + folder + File.separator + file));
-            if (newFile.exists()) {
-                return;
-            }
-            InputStream stream = IMP.getClass().getResourceAsStream(file);
-            byte[] buffer = new byte[2048];
-            if (stream == null) {
-                ZipInputStream zis = new ZipInputStream(new FileInputStream(FILE));
+            final File newFile = new File((output + File.separator + folder + File.separator + file));
+            if (newFile.exists()) { return; }
+            final InputStream stream = IMP.getClass().getResourceAsStream(file);
+            final byte[] buffer = new byte[2048];
+            if (stream == null)
+            {
+                final ZipInputStream zis = new ZipInputStream(new FileInputStream(FILE));
                 ZipEntry ze = zis.getNextEntry();
-                while (ze != null) {
-                    String name = ze.getName();
-                    if (name.equals(file)) {
+                while (ze != null)
+                {
+                    final String name = ze.getName();
+                    if (name.equals(file))
+                    {
                         new File(newFile.getParent()).mkdirs();
-                        FileOutputStream fos = new FileOutputStream(newFile);
+                        final FileOutputStream fos = new FileOutputStream(newFile);
                         int len;
-                        while ((len = zis.read(buffer)) > 0) {
+                        while ((len = zis.read(buffer)) > 0)
+                        {
                             fos.write(buffer, 0, len);
                         }
                         fos.close();
                         ze = null;
                     }
-                    else {
+                    else
+                    {
                         ze = zis.getNextEntry();
                     }
                 }
@@ -1562,35 +1816,40 @@ public class PS {
                 return;
             }
             newFile.createNewFile();
-            FileOutputStream fos = new FileOutputStream(newFile);
+            final FileOutputStream fos = new FileOutputStream(newFile);
             int len;
-            while ((len = stream.read(buffer)) > 0) {
+            while ((len = stream.read(buffer)) > 0)
+            {
                 fos.write(buffer, 0, len);
             }
             fos.close();
             stream.close();
         }
-        catch (Exception e) {
+        catch (final Exception e)
+        {
             e.printStackTrace();
             log("&cCould not save " + file);
         }
     }
 
-
     /**
      * Close the database connection
      */
-    public void disable() {
-        try {
+    public void disable()
+    {
+        try
+        {
             TASK = null;
             database = null;
             // Validate that all data in the db is correct
             DBFunc.validatePlots(getPlotsRaw());
-            
+
             // Close the connection
             DBFunc.close();
             UUIDHandler.handleShutdown();
-        } catch (NullPointerException e) {
+        }
+        catch (final NullPointerException e)
+        {
             log("&cCould not close database connection!");
         }
     }
@@ -1598,22 +1857,29 @@ public class PS {
     /**
      * Setup the database connection
      */
-    public void setupDatabase() {
-        try {
-            if (Settings.DB.USE_MONGO) {
+    public void setupDatabase()
+    {
+        try
+        {
+            if (Settings.DB.USE_MONGO)
+            {
                 log(C.PREFIX.s() + "MongoDB is not yet implemented");
                 log(C.PREFIX + "&cNo storage type is set!");
                 IMP.disable();
                 return;
             }
-            if (DBFunc.dbManager == null) {
-                if (Settings.DB.USE_MYSQL) {
+            if (DBFunc.dbManager == null)
+            {
+                if (Settings.DB.USE_MYSQL)
+                {
                     database = new MySQL(Settings.DB.HOST_NAME, Settings.DB.PORT, Settings.DB.DATABASE, Settings.DB.USER, Settings.DB.PASSWORD);
                 }
-                else if (Settings.DB.USE_SQLITE) {
+                else if (Settings.DB.USE_SQLITE)
+                {
                     database = new SQLite(IMP.getDirectory() + File.separator + Settings.DB.SQLITE_DB + ".db");
                 }
-                else {
+                else
+                {
                     log(C.PREFIX + "&cNo storage type is set!");
                     IMP.disable();
                     return;
@@ -1621,19 +1887,24 @@ public class PS {
             }
             DBFunc.dbManager = new SQLManager(database, Settings.DB.PREFIX, false);
             plots = DBFunc.getPlots();
-            if (Settings.ENABLE_CLUSTERS) {
+            if (Settings.ENABLE_CLUSTERS)
+            {
                 ClusterManager.clusters = DBFunc.getClusters();
             }
         }
-        catch (Exception e) {
+        catch (final Exception e)
+        {
             log(C.PREFIX.s() + "&cFailed to open DATABASE connection. The plugin will disable itself.");
-            if (Settings.DB.USE_MONGO) {
+            if (Settings.DB.USE_MONGO)
+            {
                 log("$4MONGO");
             }
-            else if (Settings.DB.USE_MYSQL) {
+            else if (Settings.DB.USE_MYSQL)
+            {
                 log("$4MYSQL");
             }
-            else if (Settings.DB.USE_SQLITE) {
+            else if (Settings.DB.USE_SQLITE)
+            {
                 log("$4SQLITE");
             }
             log("&d==== Here is an ugly stacktrace, if you are interested in those things ===");
@@ -1645,33 +1916,40 @@ public class PS {
         }
     }
 
-
     /**
      * Setup the default flags for PlotSquared<br>
      *  - Create the flags
      *  - Register with FlagManager and parse raw flag values
      */
-    public void setupDefaultFlags() {
-        final List<String> booleanFlags = Arrays.asList("notify-enter", "notify-leave", "item-drop", "invincible", "instabreak", "drop-protection", "forcefield", "titles", "pve", "pvp", "no-worldedit", "redstone", "keep");
+    public void setupDefaultFlags()
+    {
+        final List<String> booleanFlags = Arrays.asList("notify-enter", "notify-leave", "item-drop", "invincible", "instabreak", "drop-protection", "forcefield", "titles", "pve", "pvp",
+        "no-worldedit", "redstone", "keep");
         final List<String> intervalFlags = Arrays.asList("feed", "heal");
         final List<String> stringFlags = Arrays.asList("greeting", "farewell");
         final List<String> intFlags = Arrays.asList("entity-cap", "mob-cap", "animal-cap", "hostile-cap", "vehicle-cap", "music");
-        for (final String flag : stringFlags) {
+        for (final String flag : stringFlags)
+        {
             FlagManager.addFlag(new AbstractFlag(flag));
         }
-        for (final String flag : intervalFlags) {
+        for (final String flag : intervalFlags)
+        {
             FlagManager.addFlag(new AbstractFlag(flag, new FlagValue.IntervalValue()));
         }
-        for (final String flag : booleanFlags) {
+        for (final String flag : booleanFlags)
+        {
             FlagManager.addFlag(new AbstractFlag(flag, new FlagValue.BooleanValue()));
         }
-        for (final String flag : intFlags) {
+        for (final String flag : intFlags)
+        {
             FlagManager.addFlag(new AbstractFlag(flag, new FlagValue.UnsignedIntegerValue()));
         }
-        FlagManager.addFlag(new AbstractFlag("cluster") {
+        FlagManager.addFlag(new AbstractFlag("cluster")
+        {
             @Override
-            public Object parseValueRaw(String value) {
-                String[] split = value.split(";");
+            public Object parseValueRaw(final String value)
+            {
+                final String[] split = value.split(";");
                 return ClusterManager.getCluster(split[0], split[1]);
             }
         }, true);
@@ -1703,10 +1981,14 @@ public class PS {
         FlagManager.addFlag(new AbstractFlag("use", new FlagValue.PlotBlockListValue()));
         FlagManager.addFlag(new AbstractFlag("blocked-cmds", new FlagValue.StringListValue()));
         FlagManager.addFlag(new AbstractFlag("ice-met", new FlagValue.BooleanValue()));
-        FlagManager.addFlag(new AbstractFlag("gamemode") {
+        FlagManager.addFlag(new AbstractFlag("gamemode")
+        {
 
-            public PlotGamemode parseValueRaw(final String value) {
-                switch (value.toLowerCase()) {
+            @Override
+            public PlotGamemode parseValueRaw(final String value)
+            {
+                switch (value.toLowerCase())
+                {
                     case "survival":
                     case "s":
                     case "0":
@@ -1727,17 +2009,22 @@ public class PS {
                 }
             }
 
-
-            public String getValueDesc() {
+            @Override
+            public String getValueDesc()
+            {
                 return "Flag value must be a gamemode: 'creative' , 'survival', 'adventure' or 'spectator'";
             }
         });
         FlagManager.addFlag(new AbstractFlag("price", new FlagValue.UnsignedDoubleValue()));
         FlagManager.addFlag(new AbstractFlag("time", new FlagValue.LongValue()));
-        FlagManager.addFlag(new AbstractFlag("weather") {
+        FlagManager.addFlag(new AbstractFlag("weather")
+        {
 
-            public PlotWeather parseValueRaw(final String value) {
-                switch (value.toLowerCase()) {
+            @Override
+            public PlotWeather parseValueRaw(final String value)
+            {
+                switch (value.toLowerCase())
+                {
                     case "rain":
                     case "storm":
                     case "on":
@@ -1753,54 +2040,55 @@ public class PS {
                 }
             }
 
-
-            public String getValueDesc() {
+            @Override
+            public String getValueDesc()
+            {
                 return "Flag value must be weather type: 'clear' or 'rain'";
             }
         });
         FlagManager.addFlag(new AbstractFlag("description", new FlagValue.StringValue()), true);
     }
 
-
     /**
      * Setup the default configuration (settings.yml)
      */
-    public void setupConfig() {
+    public void setupConfig()
+    {
         LAST_VERSION = config.getString("version");
-        config.set("version", StringMan.join(VERSION,"."));
+        config.set("version", StringMan.join(VERSION, "."));
         config.set("platform", PLATFORM);
-        
+
         final Map<String, Object> options = new HashMap<>();
         // Command confirmation
         options.put("confirmation.clear", Settings.CONFIRM_CLEAR);
         options.put("confirmation.delete", Settings.CONFIRM_DELETE);
         options.put("confirmation.unlink", Settings.CONFIRM_UNLINK);
-        
+
         // Protection
         options.put("protection.redstone.disable-offline", Settings.REDSTONE_DISABLER);
         options.put("protection.redstone.disable-unoccupied", Settings.REDSTONE_DISABLER_UNOCCUPIED);
         options.put("protection.tnt-listener.enabled", Settings.TNT_LISTENER);
         options.put("protection.piston.falling-blocks", Settings.PISTON_FALLING_BLOCK_CHECK);
-        
+
         // Clusters
         options.put("clusters.enabled", Settings.ENABLE_CLUSTERS);
-        
+
         // PlotMe
         options.put("plotme-alias", Settings.USE_PLOTME_ALIAS);
         options.put("plotme-convert.enabled", Settings.CONVERT_PLOTME);
         options.put("plotme-convert.cache-uuids", Settings.CACHE_PLOTME);
-        
+
         // UUID
         options.put("uuid.use_sqluuidhandler", Settings.USE_SQLUUIDHANDLER);
         options.put("UUID.offline", Settings.OFFLINE_MODE);
         options.put("UUID.force-lowercase", Settings.UUID_LOWERCASE);
         options.put("uuid.read-from-disk", Settings.UUID_FROM_DISK);
-        
+
         // Mob stuff
         options.put("kill_road_vehicles", Settings.KILL_ROAD_VEHICLES);
         options.put("kill_road_mobs", Settings.KILL_ROAD_MOBS_DEFAULT);
         options.put("mob_pathfinding", Settings.MOB_PATHFINDING_DEFAULT);
-        
+
         // Clearing + Expiry
         options.put("clear.fastmode", Settings.ENABLE_CLUSTERS);
         options.put("clear.on.ban", false);
@@ -1817,10 +2105,11 @@ public class PS {
         options.put("clear.auto.calibration.data_sd", 1);
         options.put("clear.auto.calibration.air_sd", 0);
         options.put("clear.auto.calibration.variety_sd", 1);
-        
-        int keep = config.getInt("clear.keep-if-modified");
-        int ignore = config.getInt("clear.ignore-if-modified");
-        if (keep > 0 || ignore > 0) {
+
+        final int keep = config.getInt("clear.keep-if-modified");
+        final int ignore = config.getInt("clear.ignore-if-modified");
+        if ((keep > 0) || (ignore > 0))
+        {
             options.put("clear.auto.threshold", 1);
             log("&cIMPORTANT MESSAGE ABOUT THIS UPDATE!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
             log("&cSorry for all the exclamation marks, but this could be important.");
@@ -1832,12 +2121,13 @@ public class PS {
             log("&c - To just clear all expired plot, ignore this and set: &7threshold: -1");
             log("&cMore information:&7 https://github.com/IntellectualSites/PlotSquared/wiki/Plot-analysis:");
         }
-        else {
+        else
+        {
             options.put("clear.auto.threshold", Settings.CLEAR_THRESHOLD);
         }
         config.set("clear.keep-if-modified", null);
         config.set("clear.ignore-if-modified", null);
-        
+
         // Done
         options.put("approval.ratings.require-done", Settings.REQUIRE_DONE);
         options.put("approval.done.counts-towards-limit", Settings.DONE_COUNTS_TOWARDS_LIMIT);
@@ -1847,22 +2137,22 @@ public class PS {
         // Schematics
         options.put("schematics.save_path", Settings.SCHEMATIC_SAVE_PATH);
         options.put("bo3.save_path", Settings.BO3_SAVE_PATH);
-        
+
         // Web
         options.put("web.url", Settings.WEB_URL);
         options.put("web.server-ip", Settings.WEB_IP);
-        
+
         // Caching
         options.put("cache.permissions", Settings.PERMISSION_CACHING);
         options.put("cache.ratings", Settings.CACHE_RATINGS);
-        
+
         // Titles
         options.put("titles", Settings.TITLES);
-        
+
         // Teleportation
         options.put("teleport.on_login", Settings.TELEPORT_ON_LOGIN);
         options.put("teleport.delay", 0);
-        
+
         // WorldEdit
         options.put("worldedit.require-selection-in-mask", Settings.REQUIRE_SELECTION);
         options.put("worldedit.queue-commands", Settings.QUEUE_COMMANDS);
@@ -1870,7 +2160,7 @@ public class PS {
         options.put("worldedit.max-volume", Settings.WE_MAX_VOLUME);
         options.put("worldedit.max-iterations", Settings.WE_MAX_ITERATIONS);
         options.put("worldedit.blacklist", Arrays.asList("cs", ".s", "restore", "snapshot", "delchunks", "listchunks"));
-        
+
         // Chunk processor
         options.put("chunk-processor.enabled", Settings.CHUNK_PROCESSOR);
         options.put("chunk-processor.auto-unload", Settings.CHUNK_PROCESSOR_GC);
@@ -1879,10 +2169,10 @@ public class PS {
         options.put("chunk-processor.max-blockstates", Settings.CHUNK_PROCESSOR_MAX_BLOCKSTATES);
         options.put("chunk-processor.max-entities", Settings.CHUNK_PROCESSOR_MAX_ENTITIES);
         options.put("chunk-processor.disable-physics", Settings.CHUNK_PROCESSOR_DISABLE_PHYSICS);
-        
+
         // Comments
         options.put("comments.notifications.enabled", Settings.COMMENT_NOTIFICATIONS);
-        
+
         // Plot limits
         options.put("global_limit", Settings.GLOBAL_LIMIT);
         options.put("max_plots", Settings.MAX_PLOTS);
@@ -1894,44 +2184,46 @@ public class PS {
         options.put("metrics", true);
         options.put("debug", true);
         options.put("update-notifications", true);
-        
-        for (final Entry<String, Object> node : options.entrySet()) {
-            if (!config.contains(node.getKey())) {
+
+        for (final Entry<String, Object> node : options.entrySet())
+        {
+            if (!config.contains(node.getKey()))
+            {
                 config.set(node.getKey(), node.getValue());
             }
         }
-        
+
         // Command confirmation
         Settings.CONFIRM_CLEAR = config.getBoolean("confirmation.clear");
         Settings.CONFIRM_DELETE = config.getBoolean("confirmation.delete");
         Settings.CONFIRM_UNLINK = config.getBoolean("confirmation.unlink");
-        
+
         // Protection
         Settings.REDSTONE_DISABLER = config.getBoolean("protection.redstone.disable-offline");
         Settings.REDSTONE_DISABLER_UNOCCUPIED = config.getBoolean("protection.redstone.disable-unoccupied");
-        
+
         Settings.TNT_LISTENER = config.getBoolean("protection.tnt-listener.enabled");
         Settings.PISTON_FALLING_BLOCK_CHECK = config.getBoolean("protection.piston.falling-blocks");
-        
+
         // Clusters
         Settings.ENABLE_CLUSTERS = config.getBoolean("clusters.enabled");
-        
+
         // PlotMe
         Settings.USE_PLOTME_ALIAS = config.getBoolean("plotme-alias");
         Settings.CONVERT_PLOTME = config.getBoolean("plotme-convert.enabled");
         Settings.CACHE_PLOTME = config.getBoolean("plotme-convert.cache-uuids");
-        
+
         // UUID
         Settings.USE_SQLUUIDHANDLER = config.getBoolean("uuid.use_sqluuidhandler");
         Settings.OFFLINE_MODE = config.getBoolean("UUID.offline");
         Settings.UUID_LOWERCASE = Settings.OFFLINE_MODE && config.getBoolean("UUID.force-lowercase");
         Settings.UUID_FROM_DISK = config.getBoolean("uuid.read-from-disk");
-        
+
         // Mob stuff
         Settings.KILL_ROAD_MOBS = config.getBoolean("kill_road_mobs");
         Settings.KILL_ROAD_VEHICLES = config.getBoolean("kill_road_vehicles");
         Settings.MOB_PATHFINDING = config.getBoolean("mob_pathfinding");
-        
+
         // Clearing + Expiry
         Settings.FAST_CLEAR = config.getBoolean("clear.fastmode");
         Settings.DELETE_PLOTS_ON_BAN = config.getBoolean("clear.on.ban");
@@ -1951,36 +2243,35 @@ public class PS {
         PlotAnalysis.MODIFIERS.data_sd = config.getInt("clear.auto.calibration.data_sd");
         PlotAnalysis.MODIFIERS.air_sd = config.getInt("clear.auto.calibration.air_sd");
         PlotAnalysis.MODIFIERS.variety_sd = config.getInt("clear.auto.calibration.variety_sd");
-        
+
         // Done
         Settings.REQUIRE_DONE = config.getBoolean("approval.ratings.require-done");
         Settings.DONE_COUNTS_TOWARDS_LIMIT = config.getBoolean("approval.done.counts-towards-limit");
         Settings.DONE_RESTRICTS_BUILDING = config.getBoolean("approval.done.restrict-building");
         Settings.DOWNLOAD_REQUIRES_DONE = config.getBoolean("approval.done.required-for-download");
-        
+
         // Schematics
         Settings.SCHEMATIC_SAVE_PATH = config.getString("schematics.save_path");
         Settings.BO3_SAVE_PATH = config.getString("bo3.save_path");
-        
+
         // Web
         Settings.WEB_URL = config.getString("web.url");
         Settings.WEB_IP = config.getString("web.server-ip");
-        
+
         // Caching
         Settings.PERMISSION_CACHING = config.getBoolean("cache.permissions");
         Settings.CACHE_RATINGS = config.getBoolean("cache.ratings");
-        
+
         // Rating system
         Settings.RATING_CATEGORIES = config.getStringList("ratings.categories");
-        
-        
+
         // Titles
         Settings.TITLES = config.getBoolean("titles");
-        
+
         // Teleportation
         Settings.TELEPORT_DELAY = config.getInt("teleport.delay");
         Settings.TELEPORT_ON_LOGIN = config.getBoolean("teleport.on_login");
-        
+
         // WorldEdit
         Settings.QUEUE_COMMANDS = config.getBoolean("worldedit.queue-commands");
         Settings.REQUIRE_SELECTION = config.getBoolean("worldedit.require-selection-in-mask");
@@ -1988,7 +2279,7 @@ public class PS {
         Settings.WE_MAX_VOLUME = config.getLong("worldedit.max-volume");
         Settings.WE_MAX_ITERATIONS = config.getLong("worldedit.max-iterations");
         Settings.WE_BLACKLIST = config.getStringList("worldedit.blacklist");
-        
+
         // Chunk processor
         Settings.CHUNK_PROCESSOR = config.getBoolean("chunk-processor.enabled");
         Settings.CHUNK_PROCESSOR_GC = config.getBoolean("chunk-processor.auto-unload");
@@ -1997,88 +2288,111 @@ public class PS {
         Settings.CHUNK_PROCESSOR_MAX_BLOCKSTATES = config.getInt("chunk-processor.max-blockstates");
         Settings.CHUNK_PROCESSOR_MAX_ENTITIES = config.getInt("chunk-processor.max-entities");
         Settings.CHUNK_PROCESSOR_DISABLE_PHYSICS = config.getBoolean("chunk-processor.disable-physics");
-        
+
         // Comments
         Settings.COMMENT_NOTIFICATIONS = config.getBoolean("comments.notifications.enabled");
-        
+
         // Plot limits
         Settings.MAX_AUTO_SIZE = config.getInt("claim.max-auto-area");
         Settings.MAX_PLOTS = config.getInt("max_plots");
-        if (Settings.MAX_PLOTS > 32767) {
+        if (Settings.MAX_PLOTS > 32767)
+        {
             log("&c`max_plots` Is set too high! This is a per player setting and does not need to be very large.");
             Settings.MAX_PLOTS = 32767;
         }
         Settings.GLOBAL_LIMIT = config.getBoolean("global_limit");
-        
+
         // Misc
         Settings.DEBUG = config.getBoolean("debug");
-        if (Settings.DEBUG) {
+        if (Settings.DEBUG)
+        {
             log(C.PREFIX.s() + "&6Debug Mode Enabled (Default). Edit the config to turn this off.");
         }
         Settings.CONSOLE_COLOR = config.getBoolean("console.color");
-        if (!config.getBoolean("chat.fancy") || !checkVersion(IMP.getServerVersion(), 1, 8, 0)) {
+        if (!config.getBoolean("chat.fancy") || !checkVersion(IMP.getServerVersion(), 1, 8, 0))
+        {
             Settings.FANCY_CHAT = false;
         }
         Settings.METRICS = config.getBoolean("metrics");
     }
 
-
     /**
      * Setup all configuration files<br>
      *  - Config: settings.yml<br>
      *  - Storage: storage.yml<br>
      *  - Translation: PlotSquared.use_THIS.yml, style.yml<br>
      */
-    public void setupConfigs() {
+    public void setupConfigs()
+    {
         final File folder = new File(IMP.getDirectory() + File.separator + "config");
-        if (!folder.exists() && !folder.mkdirs()) {
+        if (!folder.exists() && !folder.mkdirs())
+        {
             log(C.PREFIX.s() + "&cFailed to create the /plugins/config folder. Please create it manually.");
         }
-        try {
+        try
+        {
             styleFile = new File(IMP.getDirectory() + File.separator + "translations" + File.separator + "style.yml");
-            if (!styleFile.exists()) {
-                if (!styleFile.getParentFile().exists()) {
+            if (!styleFile.exists())
+            {
+                if (!styleFile.getParentFile().exists())
+                {
                     styleFile.getParentFile().mkdirs();
                 }
-                if (!styleFile.createNewFile()) {
+                if (!styleFile.createNewFile())
+                {
                     log("Could not create the style file, please create \"translations/style.yml\" manually");
                 }
             }
             style = YamlConfiguration.loadConfiguration(styleFile);
             setupStyle();
-        } catch (final Exception err) {
+        }
+        catch (final Exception err)
+        {
             err.printStackTrace();
             log("failed to save style.yml");
         }
-        try {
+        try
+        {
             configFile = new File(IMP.getDirectory() + File.separator + "config" + File.separator + "settings.yml");
-            if (!configFile.exists()) {
-                if (!configFile.createNewFile()) {
+            if (!configFile.exists())
+            {
+                if (!configFile.createNewFile())
+                {
                     log("Could not create the settings file, please create \"settings.yml\" manually.");
                 }
             }
             config = YamlConfiguration.loadConfiguration(configFile);
             setupConfig();
-        } catch (final Exception err_trans) {
+        }
+        catch (final Exception err_trans)
+        {
             log("Failed to save settings.yml");
         }
-        try {
+        try
+        {
             storageFile = new File(IMP.getDirectory() + File.separator + "config" + File.separator + "storage.yml");
-            if (!storageFile.exists()) {
-                if (!storageFile.createNewFile()) {
+            if (!storageFile.exists())
+            {
+                if (!storageFile.createNewFile())
+                {
                     log("Could not the storage settings file, please create \"storage.yml\" manually.");
                 }
             }
             storage = YamlConfiguration.loadConfiguration(storageFile);
             setupStorage();
-        } catch (final Exception err_trans) {
+        }
+        catch (final Exception err_trans)
+        {
             log("Failed to save storage.yml");
         }
-        try {
+        try
+        {
             style.save(styleFile);
             config.save(configFile);
             storage.save(storageFile);
-        } catch (final IOException e) {
+        }
+        catch (final IOException e)
+        {
             log("Configuration file saving failed");
             e.printStackTrace();
         }
@@ -2087,8 +2401,9 @@ public class PS {
     /**
      * Setup the storage file (load + save missing nodes)
      */
-    private void setupStorage() {
-        storage.set("version", StringMan.join(VERSION,"."));
+    private void setupStorage()
+    {
+        storage.set("version", StringMan.join(VERSION, "."));
         final Map<String, Object> options = new HashMap<>();
         options.put("mysql.use", false);
         options.put("sqlite.use", true);
@@ -2099,8 +2414,10 @@ public class PS {
         options.put("mysql.password", "password");
         options.put("mysql.database", "plot_db");
         options.put("prefix", "");
-        for (final Entry<String, Object> node : options.entrySet()) {
-            if (!storage.contains(node.getKey())) {
+        for (final Entry<String, Object> node : options.entrySet())
+        {
+            if (!storage.contains(node.getKey()))
+            {
                 storage.set(node.getKey(), node.getValue());
             }
         }
@@ -2119,12 +2436,13 @@ public class PS {
         Settings.DELETE_PLOTS_ON_BAN = config.getBoolean("clear.on.ban");
     }
 
-
     /**
      * Show startup debug information
      */
-    public void showDebug() {
-        if (Settings.DEBUG) {
+    public void showDebug()
+    {
+        if (Settings.DEBUG)
+        {
             final Map<String, String> settings = new HashMap<>();
             settings.put("Kill Road Mobs", "" + Settings.KILL_ROAD_MOBS);
             settings.put("Use Metrics", "" + Settings.METRICS);
@@ -2136,7 +2454,8 @@ public class PS {
             settings.put("Auto Clear Days", "" + Settings.AUTO_CLEAR_DAYS);
             settings.put("Schematics Save Path", "" + Settings.SCHEMATIC_SAVE_PATH);
             settings.put("API Location", "" + Settings.API_URL);
-            for (final Entry<String, String> setting : settings.entrySet()) {
+            for (final Entry<String, String> setting : settings.entrySet())
+            {
                 log(C.PREFIX.s() + String.format("&cKey: &6%s&c, Value: &6%s", setting.getKey(), setting.getValue()));
             }
         }
@@ -2145,44 +2464,47 @@ public class PS {
     /**
      * Setup the style.yml file
      */
-    private void setupStyle() {
-        style.set("version", StringMan.join(VERSION,"."));
+    private void setupStyle()
+    {
+        style.set("version", StringMan.join(VERSION, "."));
         final Map<String, Object> o = new HashMap<>();
         o.put("color.1", "6");
         o.put("color.2", "7");
         o.put("color.3", "8");
         o.put("color.4", "3");
-        if (!style.contains("color")) {
-            for (final Entry<String, Object> node : o.entrySet()) {
+        if (!style.contains("color"))
+        {
+            for (final Entry<String, Object> node : o.entrySet())
+            {
                 style.set(node.getKey(), node.getValue());
             }
         }
     }
 
-
     /**
      * Get the java version
      * @return Java version as a double
      */
-    public double getJavaVersion() {
+    public double getJavaVersion()
+    {
         return Double.parseDouble(System.getProperty("java.specification.version"));
     }
 
-
     /**
      * Get the list of plot world names
      * @return Set of world names (String)
      */
-    public Set<String> getPlotWorlds() {
+    public Set<String> getPlotWorlds()
+    {
         return plotworlds.keySet();
     }
 
-
     /**
      * Get a list of PlotWorld objects
      * @return Collection of PlotWorld objects
      */
-    public Collection<PlotWorld> getPlotWorldObjects() {
+    public Collection<PlotWorld> getPlotWorldObjects()
+    {
         return plotworlds.values();
     }
 }
diff --git a/src/main/java/com/intellectualcrafters/plot/api/PlotAPI.java b/src/main/java/com/intellectualcrafters/plot/api/PlotAPI.java
index b3f45a55e..d4d64ad32 100644
--- a/src/main/java/com/intellectualcrafters/plot/api/PlotAPI.java
+++ b/src/main/java/com/intellectualcrafters/plot/api/PlotAPI.java
@@ -1,737 +1,803 @@
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// PlotSquared - A plot manager and world generator for the Bukkit API                             /
-// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
-//                                                                                                 /
-// This program is free software; you can redistribute it and/or modify                            /
-// it under the terms of the GNU General Public License as published by                            /
-// the Free Software Foundation; either version 3 of the License, or                               /
-// (at your option) any later version.                                                             /
-//                                                                                                 /
-// This program is distributed in the hope that it will be useful,                                 /
-// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
-// GNU General Public License for more details.                                                    /
-//                                                                                                 /
-// You should have received a copy of the GNU General Public License                               /
-// along with this program; if not, write to the Free Software Foundation,                         /
-// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
-//                                                                                                 /
-// You can contact us via: support@intellectualsites.com                                           /
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-package com.intellectualcrafters.plot.api;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Set;
-import java.util.UUID;
-
-import org.bukkit.Location;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.World;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.java.JavaPlugin;
-
-import com.intellectualcrafters.configuration.file.YamlConfiguration;
-import com.intellectualcrafters.plot.PS;
-import com.intellectualcrafters.plot.commands.MainCommand;
-import com.intellectualcrafters.plot.commands.SubCommand;
-import com.intellectualcrafters.plot.config.C;
-import com.intellectualcrafters.plot.flag.AbstractFlag;
-import com.intellectualcrafters.plot.flag.FlagManager;
-import com.intellectualcrafters.plot.object.Plot;
-import com.intellectualcrafters.plot.object.PlotId;
-import com.intellectualcrafters.plot.object.PlotManager;
-import com.intellectualcrafters.plot.object.PlotPlayer;
-import com.intellectualcrafters.plot.object.PlotWorld;
-import com.intellectualcrafters.plot.util.BlockManager;
-import com.intellectualcrafters.plot.util.ChunkManager;
-import com.intellectualcrafters.plot.util.ClusterManager;
-import com.intellectualcrafters.plot.util.MainUtil;
-import com.intellectualcrafters.plot.util.Permissions;
-import com.intellectualcrafters.plot.util.SchematicHandler;
-import com.intellectualcrafters.plot.util.UUIDHandler;
-import com.intellectualcrafters.plot.uuid.UUIDWrapper;
-import com.plotsquared.bukkit.util.BukkitSetBlockManager;
-import com.plotsquared.bukkit.util.BukkitUtil;
-
-/**
- * PlotSquared API
- *
- * @author Citymonstret
- * @author Empire92
- * @version API 2.0
- *
- */
-
-public class PlotAPI {
-
-    /**
-     * Permission that allows for admin access, this permission node will allow the player to use any part of the
-     * plugin, without limitations.
-     * @deprecated Use C.PERMISSION_ADMIN.s() instead
-     */
-    @Deprecated
-    public static final String ADMIN_PERMISSION = C.PERMISSION_ADMIN.s();
-
-    /**
-     * @deprecated Use new PlotAPI() instead
-     */
-    @Deprecated
-    public PlotAPI(final JavaPlugin plugin) {
-    }
-    
-    /**
-     * @param plugin Plugin used to access this method
-     *
-     * @throws com.intellectualcrafters.plot.util.PlotSquaredException if the program fails to fetch the PlotSquared
-     *                                                                 instance
-     * @see com.intellectualcrafters.plot.PS
-     * 
-     * @deprecated Use new PlotAPI() instead
-     */
-    public PlotAPI() {
-    }
-
-    /**
-     * Get all plots
-     *
-     * @return all plots
-     *
-     * @see com.intellectualcrafters.plot.PS#getPlots()
-     */
-    public Set<Plot> getAllPlots() {
-        return PS.get().getPlots();
-    }
-
-    /**
-     * Return all plots for a player
-     *
-     * @param player Player, whose plots to search for
-     *
-     * @return all plots that a player owns
-     */
-    public Set<Plot> getPlayerPlots(final Player player) {
-        return PS.get().getPlots(BukkitUtil.getPlayer(player));
-    }
-
-    /**
-     * Add a plot world
-     *
-     * @param world     World Name
-     * @param plotWorld Plot World Object
-     * @param manager   World Manager
-     *
-     * @see com.intellectualcrafters.plot.PS#addPlotWorld(String, com.intellectualcrafters.plot.object.PlotWorld,
-     * com.intellectualcrafters.plot.object.PlotManager)
-     */
-    public void addPlotWorld(final String world, final PlotWorld plotWorld, final PlotManager manager) {
-        PS.get().addPlotWorld(world, plotWorld, manager);
-    }
-
-    /**
-     * @return main configuration
-     *
-     * @see com.intellectualcrafters.plot.PS#config
-     */
-    public YamlConfiguration getConfig() {
-        return PS.get().config;
-    }
-
-    /**
-     * @return storage configuration
-     *
-     * @see com.intellectualcrafters.plot.PS#storage
-     */
-    public YamlConfiguration getStorage() {
-        return PS.get().storage;
-    }
-
-    /**
-     * Get the main class for this plugin <br> - Contains a lot of fields and methods - not very well organized <br>
-     * Only use this if you really need it
-     *
-     * @return PlotSquared PlotSquared Main Class
-     *
-     * @see com.intellectualcrafters.plot.PS
-     */
-    public PS getMain() {
-        return PS.get();
-    }
-
-    /**
-     * ChunkManager class contains several useful methods<br>
-     *  - Chunk deletion<br>
-     *  - Moving or copying regions<br>
-     *  - plot swapping<br>
-     *  - Entity tracking<br>
-     *  - region regeneration<br>
-     *
-     * @return ChunkManager
-     *
-     * @see com.intellectualcrafters.plot.util.ChunkManager
-     */
-    public ChunkManager getChunkManager() {
-        return ChunkManager.manager;
-    }
-    
-    /**
-     * BlockManager class contains useful methods relating to blocks.
-     *
-     * @return BlockManager
-     *
-     * @see com.intellectualcrafters.plot.util.BlockManager
-     */
-    public BlockManager getBlockManager() {
-        return BlockManager.manager;
-    }
-    
-    /**
-     * BukkitSetBlockManager class contains useful methods relating to bukkit blocks.
-     *
-     * @return BukkitSetBlockManager
-     *
-     * @see com.plotsquared.bukkit.util.BukkitSetBlockManager
-     */
-    public BukkitSetBlockManager getBukkitBlockManager() {
-        return BukkitSetBlockManager.setBlockManager;
-    }
-
-    /**
-     * UUIDWrapper class has basic methods for getting UUIDS (it's recommended to use the UUIDHandler class instead)
-     *
-     * @return UUIDWrapper
-     *
-     * @see com.intellectualcrafters.plot.uuid.UUIDWrapper
-     */
-    public UUIDWrapper getUUIDWrapper() {
-        return UUIDHandler.getUUIDWrapper();
-    }
-
-    /**
-     * Do not use this. Instead use FlagManager.[method] in your code.
-     *  - Flag related stuff
-     *
-     * @return FlagManager
-     *
-     * @see com.intellectualcrafters.plot.flag.FlagManager
-     */
-    @Deprecated
-    public FlagManager getFlagManager() {
-        return new FlagManager();
-    }
-    
-    /**
-     * Do not use this. Instead use ClusterManager.[method] in your code.
-     *  - Plot cluster related stuff
-     *
-     * @return ClusterManager
-     *
-     * @see com.intellectualcrafters.plot.util.ClusterManager
-     */
-    @Deprecated
-    public ClusterManager getClusterManager() {
-        return new ClusterManager();
-    }
-    
-    /**
-     * Do not use this. Instead use MainUtil.[method] in your code.
-     *  - Basic plot management stuff
-     *
-     * @return MainUtil
-     *
-     * @see com.intellectualcrafters.plot.util.MainUtil
-     */
-    @Deprecated
-    public MainUtil getMainUtil() {
-        return new MainUtil();
-    }
-    
-    /**
-     * Do not use this. Instead use C.PERMISSION_[method] in your code.
-     *  - Basic permission management stuff
-     *
-     * @return Array of strings
-     *
-     * @see com.intellectualcrafters.plot.util.Permissions
-     */
-    @Deprecated
-    public String[] getPermissions() {
-        ArrayList<String> perms = new ArrayList<>();
-        for (C c : C.values()) {
-            if (c.getCat().equals("static.permissions")) {
-                perms.add(c.s());
-            }
-        }
-        return perms.toArray(new String[0]);
-    }
-
-    /**
-     * SchematicHandler class contains methods related to pasting, reading and writing schematics
-     *
-     * @return SchematicHandler
-     *
-     * @see com.intellectualcrafters.plot.util.SchematicHandler
-     */
-    public SchematicHandler getSchematicHandler() {
-        return SchematicHandler.manager;
-    }
-
-    /**
-     * Use C.[caption] instead
-     *
-     * @return C
-     *
-     * @see com.intellectualcrafters.plot.config.C
-     */
-    @Deprecated
-    public C[] getCaptions() {
-        return C.values();
-    }
-
-    /**
-     * Get the plot manager for a world. - Most of these methods can be accessed through the MainUtil
-     *
-     * @param world Which manager to get
-     *
-     * @return PlotManager
-     *
-     * @see com.intellectualcrafters.plot.object.PlotManager
-     * @see PS#getPlotManager(String)
-     */
-    public PlotManager getPlotManager(final World world) {
-        return PS.get().getPlotManager(world.getName());
-    }
-
-    /**
-     * Get the plot manager for a world. - Contains useful low level methods for plot merging, clearing, and
-     * tessellation
-     *
-     * @param world
-     *
-     * @return PlotManager
-     *
-     * @see PS#getPlotManager(String)
-     * @see com.intellectualcrafters.plot.object.PlotManager
-     */
-    public PlotManager getPlotManager(final String world) {
-        return PS.get().getPlotManager(world);
-    }
-
-    /**
-     * Get the settings for a world (settings bundled in PlotWorld class) - You will need to downcast for the specific
-     * settings a Generator has. e.g. DefaultPlotWorld class implements PlotWorld
-     *
-     * @param world (to get settings of)
-     *
-     * @return PlotWorld class for that world ! will return null if not a plot world world
-     *
-     * @see PS#getPlotWorld(String)
-     * @see com.intellectualcrafters.plot.object.PlotWorld
-     */
-    public PlotWorld getWorldSettings(final World world) {
-        return PS.get().getPlotWorld(world.getName());
-    }
-
-    /**
-     * Get the settings for a world (settings bundled in PlotWorld class)
-     *
-     * @param world (to get settings of)
-     *
-     * @return PlotWorld class for that world ! will return null if not a plot world world
-     *
-     * @see PS#getPlotWorld(String)
-     * @see com.intellectualcrafters.plot.object.PlotWorld
-     */
-    public PlotWorld getWorldSettings(final String world) {
-        return PS.get().getPlotWorld(world);
-    }
-
-    /**
-     * Send a message to a player.
-     *
-     * @param player Player that will receive the message
-     * @param c      (Caption)
-     *
-     * @see com.intellectualcrafters.plot.util.MainUtil#sendMessage(PlotPlayer, C, String...)
-     * com.intellectualcrafters.plot.config.C, String...)
-     */
-    public void sendMessage(final Player player, final C c) {
-        MainUtil.sendMessage(BukkitUtil.getPlayer(player), c);
-    }
-
-    /**
-     * Send a message to a player. - Supports color codes
-     *
-     * @param player Player that will receive the message
-     * @param string The message
-     *
-     * @see com.intellectualcrafters.plot.util.MainUtil#sendMessage(PlotPlayer, String)
-     */
-    public void sendMessage(final Player player, final String string) {
-        MainUtil.sendMessage(BukkitUtil.getPlayer(player), string);
-    }
-
-    /**
-     * Send a message to the console. - Supports color codes
-     *
-     * @param msg Message that should be sent to the console
-     *
-     * @see MainUtil#sendConsoleMessage(String)
-     */
-    public void sendConsoleMessage(final String msg) {
-        MainUtil.sendConsoleMessage(msg);
-    }
-
-    /**
-     * Send a message to the console
-     *
-     * @param c (Caption)
-     *
-     * @see #sendConsoleMessage(String)
-     * @see com.intellectualcrafters.plot.config.C
-     */
-    public void sendConsoleMessage(final C c) {
-        sendConsoleMessage(c.s());
-    }
-
-    /**
-     * Register a flag for use in plots
-     *
-     * @param flag Flag that should be registered
-     *
-     * @see com.intellectualcrafters.plot.flag.FlagManager#addFlag(com.intellectualcrafters.plot.flag.AbstractFlag)
-     * @see com.intellectualcrafters.plot.flag.AbstractFlag
-     */
-    public void addFlag(final AbstractFlag flag) {
-        FlagManager.addFlag(flag);
-    }
-
-    /**
-     * get all the currently registered flags
-     *
-     * @return array of Flag[]
-     *
-     * @see com.intellectualcrafters.plot.flag.FlagManager#getFlags()
-     * @see com.intellectualcrafters.plot.flag.AbstractFlag
-     */
-    public AbstractFlag[] getFlags() {
-        return FlagManager.getFlags().toArray(new AbstractFlag[FlagManager.getFlags().size()]);
-    }
-
-    /**
-     * Get a plot based on the ID
-     *
-     * @param world World in which the plot is located
-     * @param x     Plot Location X Co-ord
-     * @param z     Plot Location Z Co-ord
-     *
-     * @return plot, null if ID is wrong
-     *
-     * @see MainUtil#getPlot(String, com.intellectualcrafters.plot.object.PlotId)
-     * @see com.intellectualcrafters.plot.object.Plot
-     */
-    public Plot getPlot(final World world, final int x, final int z) {
-        return MainUtil.getPlot(world.getName(), new PlotId(x, z));
-    }
-
-    /**
-     * Get a plot based on the location
-     *
-     * @param l The location that you want to to retrieve the plot from
-     *
-     * @return plot if found, otherwise it creates a temporary plot-
-     *
-     * @see MainUtil#getPlot(com.intellectualcrafters.plot.object.Location)
-     * @see com.intellectualcrafters.plot.object.Plot
-     */
-    public Plot getPlot(final Location l) {
-        return MainUtil.getPlot(BukkitUtil.getLocation(l));
-    }
-
-    /**
-     * Get a plot based on the player location
-     *
-     * @param player Get the current plot for the player location
-     *
-     * @return plot if found, otherwise it creates a temporary plot
-     *
-     * @see #getPlot(org.bukkit.Location)
-     * @see com.intellectualcrafters.plot.object.Plot
-     */
-    public Plot getPlot(final Player player) {
-        return this.getPlot(player.getLocation());
-    }
-
-    /**
-     * Check whether or not a player has a plot
-     *
-     * @param player Player that you want to check for
-     *
-     * @return true if player has a plot, false if not.
-     *
-     * @see #getPlots(World, Player, boolean)
-     */
-    public boolean hasPlot(final World world, final Player player) {
-        return (getPlots(world, player, true) != null) && (getPlots(world, player, true).length > 0);
-    }
-
-    /**
-     * Get all plots for the player
-     *
-     * @param plr        to search for
-     * @param just_owner should we just search for owner? Or with rights?
-     *
-     * @see com.intellectualcrafters.plot.object.Plot
-     */
-    public Plot[] getPlots(final World world, final Player plr, final boolean just_owner) {
-        final ArrayList<Plot> pPlots = new ArrayList<>();
-        for (final Plot plot : PS.get().getPlotsInWorld(world.getName())) {
-            if (just_owner) {
-                if ((plot.owner != null) && (plot.owner.equals(UUIDHandler.getUUID(BukkitUtil.getPlayer(plr))))) {
-                    pPlots.add(plot);
-                }
-            } else {
-                if (plot.isAdded(UUIDHandler.getUUID(BukkitUtil.getPlayer(plr)))) {
-                    pPlots.add(plot);
-                }
-            }
-        }
-        return pPlots.toArray(new Plot[pPlots.size()]);
-    }
-
-    /**
-     * Get all plots for the world
-     *
-     * @param world to get plots of
-     *
-     * @return Plot[] - array of plot objects in world
-     *
-     * @see PS#getPlots(String)
-     * @see com.intellectualcrafters.plot.object.Plot
-     */
-    public Plot[] getPlots(final World world) {
-        Collection<Plot> plots = PS.get().getPlotsInWorld(world.getName());
-        return plots.toArray(new Plot[plots.size()]);
-    }
-
-    /**
-     * Get all plot worlds
-     *
-     * @return World[] - array of plot worlds
-     *
-     * @see com.intellectualcrafters.plot.PS#getPlotWorlds()
-     */
-    public String[] getPlotWorlds() {
-        Set<String> worlds = PS.get().getPlotWorlds();
-        return worlds.toArray(new String[worlds.size()]);
-    }
-
-    /**
-     * Get if plot world
-     *
-     * @param world (to check if plot world)
-     *
-     * @return boolean (if plot world or not)
-     *
-     * @see com.intellectualcrafters.plot.PS#isPlotWorld(String)
-     */
-    public boolean isPlotWorld(final World world) {
-        return PS.get().isPlotWorld(world.getName());
-    }
-
-    /**
-     * Get plot locations
-     *
-     * @param p Plot that you want to get the locations for
-     *
-     * @return [0] = bottomLc, [1] = topLoc, [2] = home
-     *
-     * @see com.intellectualcrafters.plot.util.MainUtil#getPlotBottomLoc(String,
-     * com.intellectualcrafters.plot.object.PlotId)
-     * @see com.intellectualcrafters.plot.util.MainUtil#getPlotTopLoc(String,
-     * com.intellectualcrafters.plot.object.PlotId)
-     * @see com.intellectualcrafters.plot.util.MainUtil#getPlotHome(String,
-     * com.intellectualcrafters.plot.object.Plot)
-     * @see com.intellectualcrafters.plot.object.Plot
-     */
-    public Location[] getLocations(final Plot p) {
-        return new Location[]{BukkitUtil.getLocation(MainUtil.getPlotBottomLoc(p.world, p.id)), BukkitUtil.getLocation(MainUtil.getPlotTopLoc(p.world, p.id)), BukkitUtil.getLocation(MainUtil.getPlotHome(p.world, p.id))};
-    }
-
-    /**
-     * Get home location
-     *
-     * @param p Plot that you want to get the location for
-     *
-     * @return plot bottom location
-     *
-     * @see com.intellectualcrafters.plot.util.MainUtil#getPlotHome(String,
-     * com.intellectualcrafters.plot.object.Plot)
-     * @see com.intellectualcrafters.plot.object.Plot
-     */
-    public Location getHomeLocation(final Plot p) {
-        return BukkitUtil.getLocation(MainUtil.getPlotHome(p.world, p.id));
-    }
-
-    /**
-     * Get Bottom Location (min, min, min)
-     *
-     * @param p Plot that you want to get the location for
-     *
-     * @return plot bottom location
-     *
-     * @see com.intellectualcrafters.plot.util.MainUtil#getPlotBottomLoc(String,
-     * com.intellectualcrafters.plot.object.PlotId)
-     * @see com.intellectualcrafters.plot.object.Plot
-     */
-    public Location getBottomLocation(final Plot p) {
-        return BukkitUtil.getLocation(MainUtil.getPlotBottomLoc(p.world, p.id));
-    }
-
-    /**
-     * Get Top Location (max, max, max)
-     *
-     * @param p Plot that you want to get the location for
-     *
-     * @return plot top location
-     *
-     * @see MainUtil#getPlotTopLoc(String, com.intellectualcrafters.plot.object.PlotId)
-     * @see com.intellectualcrafters.plot.object.Plot
-     */
-    public Location getTopLocation(final Plot p) {
-        return BukkitUtil.getLocation(MainUtil.getPlotTopLoc(p.world, p.id));
-    }
-
-    /**
-     * Check whether or not a player is in a plot
-     *
-     * @param player who we're checking for
-     *
-     * @return true if the player is in a plot, false if not-
-     *
-     * @see com.intellectualcrafters.plot.util.MainUtil#getPlot(com.intellectualcrafters.plot.object.Location)
-     */
-    public boolean isInPlot(final Player player) {
-        return MainUtil.getPlot(BukkitUtil.getLocation(player)) != null;
-    }
-
-    /**
-     * Register a subcommand
-     *
-     * @param c SubCommand, that we want to register
-     *
-     * @see com.intellectualcrafters.plot.commands.SubCommand
-     */
-    public void registerCommand(final SubCommand c) {
-        if (c.getCommand() != null) {
-            MainCommand.getInstance().addCommand(c);
-        } else {
-            MainCommand.getInstance().createCommand(c);
-        }
-    }
-
-    /**
-     * Get the PlotSquared class
-     *
-     * @return PlotSquared Class
-     *
-     * @see com.intellectualcrafters.plot.PS
-     */
-    public PS getPlotSquared() {
-        return PS.get();
-    }
-
-    /**
-     * Get the player plot count
-     *
-     * @param world  Specify the world we want to select the plots from
-     * @param player Player, for whom we're getting the plot count
-     *
-     * @return the number of plots the player has
-     *
-     * @see com.intellectualcrafters.plot.util.MainUtil#getPlayerPlotCount(String, PlotPlayer)
-     */
-    public int getPlayerPlotCount(final World world, final Player player) {
-        return MainUtil.getPlayerPlotCount(world.getName(), BukkitUtil.getPlayer(player));
-    }
-
-    /**
-     * Get a collection containing the players plots
-     *
-     * @param world  Specify the world we want to select the plots from
-     * @param player Player, for whom we're getting the plots
-     *
-     * @return a set containing the players plots
-     *
-     * @see com.intellectualcrafters.plot.PS#getPlots(String, PlotPlayer)
-     * org.bukkit.entity.Player)
-     * @see com.intellectualcrafters.plot.object.Plot
-     */
-    public Set<Plot> getPlayerPlots(final World world, final Player player) {
-        return PS.get().getPlots(world.getName(), BukkitUtil.getPlayer(player));
-    }
-
-    /**
-     * Get the numbers of plots, which the player is able to build in
-     *
-     * @param player Player, for whom we're getting the plots (trusted, member and owner)
-     *
-     * @return the number of allowed plots
-     *
-     */
-    public int getAllowedPlots(final Player player) {
-        PlotPlayer pp = BukkitUtil.getPlayer(player);
-        return MainUtil.getAllowedPlots(pp);
-    }
-    
-    /**
-     * Get the PlotPlayer for a player<br>
-     *  - The PlotPlayer is usually cached and will provide useful functions relating to players
-     * 
-     * @see PlotPlayer.wrap(Player|OfflinePlayer|String|UUID)
-     * 
-     * @param player
-     * @return
-     */
-    public PlotPlayer wrapPlayer(Player player) {
-        return PlotPlayer.wrap(player);
-    }
-    
-    /**
-     * Get the PlotPlayer for a UUID (Please note that PlotSquared can be configured to provide different UUIDs than bukkit)
-     * 
-     * @see PlotPlayer.wrap(UUID uuid)
-     * 
-     * @param player
-     * @return
-     */
-    public PlotPlayer wrapPlayer(UUID uuid) {
-        return PlotPlayer.wrap(uuid);
-    }
-    
-    /**
-     * Get the PlotPlayer for a username
-     * 
-     * @see PlotPlayer.wrap(String name)
-     * 
-     * @param player
-     * @return
-     */
-    public PlotPlayer wrapPlayer(String player) {
-        return PlotPlayer.wrap(player);
-    }
-    
-    /**
-     * Get the PlotPlayer for an offline player<br>
-     * Note that this will work if the player is offline, however not all functionality will work
-     * 
-     * @see PlotPlayer.wrap(OfflinePlayer op)
-     * 
-     * @param player
-     * @return
-     */
-    public PlotPlayer wrapPlayer(OfflinePlayer player) {
-        return PlotPlayer.wrap(player);
-    }
-}
\ No newline at end of file
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// PlotSquared - A plot manager and world generator for the Bukkit API                             /
+// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
+//                                                                                                 /
+// This program is free software; you can redistribute it and/or modify                            /
+// it under the terms of the GNU General Public License as published by                            /
+// the Free Software Foundation; either version 3 of the License, or                               /
+// (at your option) any later version.                                                             /
+//                                                                                                 /
+// This program is distributed in the hope that it will be useful,                                 /
+// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
+// GNU General Public License for more details.                                                    /
+//                                                                                                 /
+// You should have received a copy of the GNU General Public License                               /
+// along with this program; if not, write to the Free Software Foundation,                         /
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
+//                                                                                                 /
+// You can contact us via: support@intellectualsites.com                                           /
+////////////////////////////////////////////////////////////////////////////////////////////////////
+
+package com.intellectualcrafters.plot.api;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Set;
+import java.util.UUID;
+
+import org.bukkit.Location;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.World;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.java.JavaPlugin;
+
+import com.intellectualcrafters.configuration.file.YamlConfiguration;
+import com.intellectualcrafters.plot.PS;
+import com.intellectualcrafters.plot.commands.MainCommand;
+import com.intellectualcrafters.plot.commands.SubCommand;
+import com.intellectualcrafters.plot.config.C;
+import com.intellectualcrafters.plot.flag.AbstractFlag;
+import com.intellectualcrafters.plot.flag.FlagManager;
+import com.intellectualcrafters.plot.object.Plot;
+import com.intellectualcrafters.plot.object.PlotId;
+import com.intellectualcrafters.plot.object.PlotManager;
+import com.intellectualcrafters.plot.object.PlotPlayer;
+import com.intellectualcrafters.plot.object.PlotWorld;
+import com.intellectualcrafters.plot.util.BlockManager;
+import com.intellectualcrafters.plot.util.ChunkManager;
+import com.intellectualcrafters.plot.util.ClusterManager;
+import com.intellectualcrafters.plot.util.MainUtil;
+import com.intellectualcrafters.plot.util.SchematicHandler;
+import com.intellectualcrafters.plot.util.UUIDHandler;
+import com.intellectualcrafters.plot.uuid.UUIDWrapper;
+import com.plotsquared.bukkit.util.BukkitSetBlockManager;
+import com.plotsquared.bukkit.util.BukkitUtil;
+
+/**
+ * PlotSquared API
+ *


+ * @version API 2.0
+ *
+ */
+
+public class PlotAPI
+{
+
+    /**
+     * Permission that allows for admin access, this permission node will allow the player to use any part of the
+     * plugin, without limitations.
+     * @deprecated Use C.PERMISSION_ADMIN.s() instead
+     */
+    @Deprecated
+    public static final String ADMIN_PERMISSION = C.PERMISSION_ADMIN.s();
+
+    /**
+     * @deprecated Use new PlotAPI() instead
+     */
+    @Deprecated
+    public PlotAPI(final JavaPlugin plugin)
+    {}
+
+    /**
+     * @param plugin Plugin used to access this method
+     *
+     * @throws com.intellectualcrafters.plot.util.PlotSquaredException if the program fails to fetch the PlotSquared
+     *                                                                 instance
+     * @see com.intellectualcrafters.plot.PS
+     *
+     * @deprecated Use this class if you just want to do a few simple things.<br>
+     *  - It will remain stable for future versions of the plugin
+     *  - The PlotPlayer and Plot class should be considered relatively safe
+     *  - For more advanced/intensive tasks you should consider using other classes 
+     * 
+     * 
+     */
+    @Deprecated
+    public PlotAPI()
+    {}
+
+    /**
+     * Get all plots
+     *
+     * @return all plots
+     *
+     * @see com.intellectualcrafters.plot.PS#getPlots()
+     */
+    public Set<Plot> getAllPlots()
+    {
+        return PS.get().getPlots();
+    }
+
+    /**
+     * Return all plots for a player
+     *
+     * @param player Player, whose plots to search for
+     *
+     * @return all plots that a player owns
+     */
+    public Set<Plot> getPlayerPlots(final Player player)
+    {
+        return PS.get().getPlots(BukkitUtil.getPlayer(player));
+    }
+
+    /**
+     * Add a plot world
+     *
+     * @param world     World Name
+     * @param plotWorld Plot World Object
+     * @param manager   World Manager
+     *
+     * @see com.intellectualcrafters.plot.PS#addPlotWorld(String, com.intellectualcrafters.plot.object.PlotWorld,
+     * com.intellectualcrafters.plot.object.PlotManager)
+     */
+    public void addPlotWorld(final String world, final PlotWorld plotWorld, final PlotManager manager)
+    {
+        PS.get().addPlotWorld(world, plotWorld, manager);
+    }
+
+    /**
+     * @return main configuration
+     *
+     * @see com.intellectualcrafters.plot.PS#config
+     */
+    public YamlConfiguration getConfig()
+    {
+        return PS.get().config;
+    }
+
+    /**
+     * @return storage configuration
+     *
+     * @see com.intellectualcrafters.plot.PS#storage
+     */
+    public YamlConfiguration getStorage()
+    {
+        return PS.get().storage;
+    }
+
+    /**
+     * Get the main class for this plugin <br> - Contains a lot of fields and methods - not very well organized <br>
+     * Only use this if you really need it
+     *
+     * @return PlotSquared PlotSquared Main Class
+     *
+     * @see com.intellectualcrafters.plot.PS
+     */
+    public PS getMain()
+    {
+        return PS.get();
+    }
+
+    /**
+     * ChunkManager class contains several useful methods<br>
+     *  - Chunk deletion<br>
+     *  - Moving or copying regions<br>
+     *  - plot swapping<br>
+     *  - Entity tracking<br>
+     *  - region regeneration<br>
+     *
+     * @return ChunkManager
+     *
+     * @see com.intellectualcrafters.plot.util.ChunkManager
+     */
+    public ChunkManager getChunkManager()
+    {
+        return ChunkManager.manager;
+    }
+
+    /**
+     * BlockManager class contains useful methods relating to blocks.
+     *
+     * @return BlockManager
+     *
+     * @see com.intellectualcrafters.plot.util.BlockManager
+     */
+    public BlockManager getBlockManager()
+    {
+        return BlockManager.manager;
+    }
+
+    /**
+     * BukkitSetBlockManager class contains useful methods relating to bukkit blocks.
+     *
+     * @return BukkitSetBlockManager
+     *
+     * @see com.plotsquared.bukkit.util.BukkitSetBlockManager
+     */
+    public BukkitSetBlockManager getBukkitBlockManager()
+    {
+        return BukkitSetBlockManager.setBlockManager;
+    }
+
+    /**
+     * UUIDWrapper class has basic methods for getting UUIDS (it's recommended to use the UUIDHandler class instead)
+     *
+     * @return UUIDWrapper
+     *
+     * @see com.intellectualcrafters.plot.uuid.UUIDWrapper
+     */
+    public UUIDWrapper getUUIDWrapper()
+    {
+        return UUIDHandler.getUUIDWrapper();
+    }
+
+    /**
+     * Do not use this. Instead use FlagManager.[method] in your code.
+     *  - Flag related stuff
+     *
+     * @return FlagManager
+     *
+     * @see com.intellectualcrafters.plot.flag.FlagManager
+     */
+    @Deprecated
+    public FlagManager getFlagManager()
+    {
+        return new FlagManager();
+    }
+
+    /**
+     * Do not use this. Instead use ClusterManager.[method] in your code.
+     *  - Plot cluster related stuff
+     *
+     * @return ClusterManager
+     *
+     * @see com.intellectualcrafters.plot.util.ClusterManager
+     */
+    @Deprecated
+    public ClusterManager getClusterManager()
+    {
+        return new ClusterManager();
+    }
+
+    /**
+     * Do not use this. Instead use MainUtil.[method] in your code.
+     *  - Basic plot management stuff
+     *
+     * @return MainUtil
+     *
+     * @see com.intellectualcrafters.plot.util.MainUtil
+     */
+    @Deprecated
+    public MainUtil getMainUtil()
+    {
+        return new MainUtil();
+    }
+
+    /**
+     * Do not use this. Instead use C.PERMISSION_[method] in your code.
+     *  - Basic permission management stuff
+     *
+     * @return Array of strings
+     *
+     * @see com.intellectualcrafters.plot.util.Permissions
+     */
+    @Deprecated
+    public String[] getPermissions()
+    {
+        final ArrayList<String> perms = new ArrayList<>();
+        for (final C c : C.values())
+        {
+            if (c.getCat().equals("static.permissions"))
+            {
+                perms.add(c.s());
+            }
+        }
+        return perms.toArray(new String[0]);
+    }
+
+    /**
+     * SchematicHandler class contains methods related to pasting, reading and writing schematics
+     *
+     * @return SchematicHandler
+     *
+     * @see com.intellectualcrafters.plot.util.SchematicHandler
+     */
+    public SchematicHandler getSchematicHandler()
+    {
+        return SchematicHandler.manager;
+    }
+
+    /**
+     * Use C.[caption] instead
+     *
+     * @return C
+     *
+     * @see com.intellectualcrafters.plot.config.C
+     */
+    @Deprecated
+    public C[] getCaptions()
+    {
+        return C.values();
+    }
+
+    /**
+     * Get the plot manager for a world. - Most of these methods can be accessed through the MainUtil
+     *
+     * @param world Which manager to get
+     *
+     * @return PlotManager
+     *
+     * @see com.intellectualcrafters.plot.object.PlotManager
+     * @see PS#getPlotManager(String)
+     */
+    public PlotManager getPlotManager(final World world)
+    {
+        return PS.get().getPlotManager(world.getName());
+    }
+
+    /**
+     * Get the plot manager for a world. - Contains useful low level methods for plot merging, clearing, and
+     * tessellation
+     *
+     * @param world
+     *
+     * @return PlotManager
+     *
+     * @see PS#getPlotManager(String)
+     * @see com.intellectualcrafters.plot.object.PlotManager
+     */
+    public PlotManager getPlotManager(final String world)
+    {
+        return PS.get().getPlotManager(world);
+    }
+
+    /**
+     * Get the settings for a world (settings bundled in PlotWorld class) - You will need to downcast for the specific
+     * settings a Generator has. e.g. DefaultPlotWorld class implements PlotWorld
+     *
+     * @param world (to get settings of)
+     *
+     * @return PlotWorld class for that world ! will return null if not a plot world world
+     *
+     * @see PS#getPlotWorld(String)
+     * @see com.intellectualcrafters.plot.object.PlotWorld
+     */
+    public PlotWorld getWorldSettings(final World world)
+    {
+        return PS.get().getPlotWorld(world.getName());
+    }
+
+    /**
+     * Get the settings for a world (settings bundled in PlotWorld class)
+     *
+     * @param world (to get settings of)
+     *
+     * @return PlotWorld class for that world ! will return null if not a plot world world
+     *
+     * @see PS#getPlotWorld(String)
+     * @see com.intellectualcrafters.plot.object.PlotWorld
+     */
+    public PlotWorld getWorldSettings(final String world)
+    {
+        return PS.get().getPlotWorld(world);
+    }
+
+    /**
+     * Send a message to a player.
+     *
+     * @param player Player that will receive the message
+     * @param c      (Caption)
+     *
+     * @see com.intellectualcrafters.plot.util.MainUtil#sendMessage(PlotPlayer, C, String...)
+     * com.intellectualcrafters.plot.config.C, String...)
+     */
+    public void sendMessage(final Player player, final C c)
+    {
+        MainUtil.sendMessage(BukkitUtil.getPlayer(player), c);
+    }
+
+    /**
+     * Send a message to a player. - Supports color codes
+     *
+     * @param player Player that will receive the message
+     * @param string The message
+     *
+     * @see com.intellectualcrafters.plot.util.MainUtil#sendMessage(PlotPlayer, String)
+     */
+    public void sendMessage(final Player player, final String string)
+    {
+        MainUtil.sendMessage(BukkitUtil.getPlayer(player), string);
+    }
+
+    /**
+     * Send a message to the console. - Supports color codes
+     *
+     * @param msg Message that should be sent to the console
+     *
+     * @see MainUtil#sendConsoleMessage(String)
+     */
+    public void sendConsoleMessage(final String msg)
+    {
+        MainUtil.sendConsoleMessage(msg);
+    }
+
+    /**
+     * Send a message to the console
+     *
+     * @param c (Caption)
+     *
+     * @see #sendConsoleMessage(String)
+     * @see com.intellectualcrafters.plot.config.C
+     */
+    public void sendConsoleMessage(final C c)
+    {
+        sendConsoleMessage(c.s());
+    }
+
+    /**
+     * Register a flag for use in plots
+     *
+     * @param flag Flag that should be registered
+     *
+     * @see com.intellectualcrafters.plot.flag.FlagManager#addFlag(com.intellectualcrafters.plot.flag.AbstractFlag)
+     * @see com.intellectualcrafters.plot.flag.AbstractFlag
+     */
+    public void addFlag(final AbstractFlag flag)
+    {
+        FlagManager.addFlag(flag);
+    }
+
+    /**
+     * get all the currently registered flags
+     *
+     * @return array of Flag[]
+     *
+     * @see com.intellectualcrafters.plot.flag.FlagManager#getFlags()
+     * @see com.intellectualcrafters.plot.flag.AbstractFlag
+     */
+    public AbstractFlag[] getFlags()
+    {
+        return FlagManager.getFlags().toArray(new AbstractFlag[FlagManager.getFlags().size()]);
+    }
+
+    /**
+     * Get a plot based on the ID
+     *
+     * @param world World in which the plot is located
+     * @param x     Plot Location X Co-ord
+     * @param z     Plot Location Z Co-ord
+     *
+     * @return plot, null if ID is wrong
+     *
+     * @see MainUtil#getPlot(String, com.intellectualcrafters.plot.object.PlotId)
+     * @see com.intellectualcrafters.plot.object.Plot
+     */
+    public Plot getPlot(final World world, final int x, final int z)
+    {
+        return MainUtil.getPlot(world.getName(), new PlotId(x, z));
+    }
+
+    /**
+     * Get a plot based on the location
+     *
+     * @param l The location that you want to to retrieve the plot from
+     *
+     * @return plot if found, otherwise it creates a temporary plot-
+     *
+     * @see MainUtil#getPlot(com.intellectualcrafters.plot.object.Location)
+     * @see com.intellectualcrafters.plot.object.Plot
+     */
+    public Plot getPlot(final Location l)
+    {
+        return MainUtil.getPlot(BukkitUtil.getLocation(l));
+    }
+
+    /**
+     * Get a plot based on the player location
+     *
+     * @param player Get the current plot for the player location
+     *
+     * @return plot if found, otherwise it creates a temporary plot
+     *
+     * @see #getPlot(org.bukkit.Location)
+     * @see com.intellectualcrafters.plot.object.Plot
+     */
+    public Plot getPlot(final Player player)
+    {
+        return this.getPlot(player.getLocation());
+    }
+
+    /**
+     * Check whether or not a player has a plot
+     *
+     * @param player Player that you want to check for
+     *
+     * @return true if player has a plot, false if not.
+     *
+     * @see #getPlots(World, Player, boolean)
+     */
+    public boolean hasPlot(final World world, final Player player)
+    {
+        return (getPlots(world, player, true) != null) && (getPlots(world, player, true).length > 0);
+    }
+
+    /**
+     * Get all plots for the player
+     *
+     * @param plr        to search for
+     * @param just_owner should we just search for owner? Or with rights?
+     *
+     * @see com.intellectualcrafters.plot.object.Plot
+     */
+    public Plot[] getPlots(final World world, final Player plr, final boolean just_owner)
+    {
+        final ArrayList<Plot> pPlots = new ArrayList<>();
+        for (final Plot plot : PS.get().getPlotsInWorld(world.getName()))
+        {
+            if (just_owner)
+            {
+                if ((plot.owner != null) && (plot.owner.equals(UUIDHandler.getUUID(BukkitUtil.getPlayer(plr)))))
+                {
+                    pPlots.add(plot);
+                }
+            }
+            else
+            {
+                if (plot.isAdded(UUIDHandler.getUUID(BukkitUtil.getPlayer(plr))))
+                {
+                    pPlots.add(plot);
+                }
+            }
+        }
+        return pPlots.toArray(new Plot[pPlots.size()]);
+    }
+
+    /**
+     * Get all plots for the world
+     *
+     * @param world to get plots of
+     *
+     * @return Plot[] - array of plot objects in world
+     *
+     * @see PS#getPlots(String)
+     * @see com.intellectualcrafters.plot.object.Plot
+     */
+    public Plot[] getPlots(final World world)
+    {
+        final Collection<Plot> plots = PS.get().getPlotsInWorld(world.getName());
+        return plots.toArray(new Plot[plots.size()]);
+    }
+
+    /**
+     * Get all plot worlds
+     *
+     * @return World[] - array of plot worlds
+     *
+     * @see com.intellectualcrafters.plot.PS#getPlotWorlds()
+     */
+    public String[] getPlotWorlds()
+    {
+        final Set<String> worlds = PS.get().getPlotWorlds();
+        return worlds.toArray(new String[worlds.size()]);
+    }
+
+    /**
+     * Get if plot world
+     *
+     * @param world (to check if plot world)
+     *
+     * @return boolean (if plot world or not)
+     *
+     * @see com.intellectualcrafters.plot.PS#isPlotWorld(String)
+     */
+    public boolean isPlotWorld(final World world)
+    {
+        return PS.get().isPlotWorld(world.getName());
+    }
+
+    /**
+     * Get plot locations
+     *
+     * @param p Plot that you want to get the locations for
+     *
+     * @return [0] = bottomLc, [1] = topLoc, [2] = home
+     *
+     * @see com.intellectualcrafters.plot.util.MainUtil#getPlotBottomLoc(String,
+     * com.intellectualcrafters.plot.object.PlotId)
+     * @see com.intellectualcrafters.plot.util.MainUtil#getPlotTopLoc(String,
+     * com.intellectualcrafters.plot.object.PlotId)
+     * @see com.intellectualcrafters.plot.util.MainUtil#getPlotHome(String,
+     * com.intellectualcrafters.plot.object.Plot)
+     * @see com.intellectualcrafters.plot.object.Plot
+     */
+    public Location[] getLocations(final Plot p)
+    {
+        return new Location[] {
+        BukkitUtil.getLocation(MainUtil.getPlotBottomLoc(p.world, p.id)),
+        BukkitUtil.getLocation(MainUtil.getPlotTopLoc(p.world, p.id)),
+        BukkitUtil.getLocation(MainUtil.getPlotHome(p.world, p.id)) };
+    }
+
+    /**
+     * Get home location
+     *
+     * @param p Plot that you want to get the location for
+     *
+     * @return plot bottom location
+     *
+     * @see com.intellectualcrafters.plot.util.MainUtil#getPlotHome(String,
+     * com.intellectualcrafters.plot.object.Plot)
+     * @see com.intellectualcrafters.plot.object.Plot
+     */
+    public Location getHomeLocation(final Plot p)
+    {
+        return BukkitUtil.getLocation(MainUtil.getPlotHome(p.world, p.id));
+    }
+
+    /**
+     * Get Bottom Location (min, min, min)
+     *
+     * @param p Plot that you want to get the location for
+     *
+     * @return plot bottom location
+     *
+     * @see com.intellectualcrafters.plot.util.MainUtil#getPlotBottomLoc(String,
+     * com.intellectualcrafters.plot.object.PlotId)
+     * @see com.intellectualcrafters.plot.object.Plot
+     */
+    public Location getBottomLocation(final Plot p)
+    {
+        return BukkitUtil.getLocation(MainUtil.getPlotBottomLoc(p.world, p.id));
+    }
+
+    /**
+     * Get Top Location (max, max, max)
+     *
+     * @param p Plot that you want to get the location for
+     *
+     * @return plot top location
+     *
+     * @see MainUtil#getPlotTopLoc(String, com.intellectualcrafters.plot.object.PlotId)
+     * @see com.intellectualcrafters.plot.object.Plot
+     */
+    public Location getTopLocation(final Plot p)
+    {
+        return BukkitUtil.getLocation(MainUtil.getPlotTopLoc(p.world, p.id));
+    }
+
+    /**
+     * Check whether or not a player is in a plot
+     *
+     * @param player who we're checking for
+     *
+     * @return true if the player is in a plot, false if not-
+     *
+     * @see com.intellectualcrafters.plot.util.MainUtil#getPlot(com.intellectualcrafters.plot.object.Location)
+     */
+    public boolean isInPlot(final Player player)
+    {
+        return MainUtil.getPlot(BukkitUtil.getLocation(player)) != null;
+    }
+
+    /**
+     * Register a subcommand
+     *
+     * @param c SubCommand, that we want to register
+     *
+     * @see com.intellectualcrafters.plot.commands.SubCommand
+     */
+    public void registerCommand(final SubCommand c)
+    {
+        if (c.getCommand() != null)
+        {
+            MainCommand.getInstance().addCommand(c);
+        }
+        else
+        {
+            MainCommand.getInstance().createCommand(c);
+        }
+    }
+
+    /**
+     * Get the PlotSquared class
+     *
+     * @return PlotSquared Class
+     *
+     * @see com.intellectualcrafters.plot.PS
+     */
+    public PS getPlotSquared()
+    {
+        return PS.get();
+    }
+
+    /**
+     * Get the player plot count
+     *
+     * @param world  Specify the world we want to select the plots from
+     * @param player Player, for whom we're getting the plot count
+     *
+     * @return the number of plots the player has
+     *
+     * @see com.intellectualcrafters.plot.util.MainUtil#getPlayerPlotCount(String, PlotPlayer)
+     */
+    public int getPlayerPlotCount(final World world, final Player player)
+    {
+        return MainUtil.getPlayerPlotCount(world.getName(), BukkitUtil.getPlayer(player));
+    }
+
+    /**
+     * Get a collection containing the players plots
+     *
+     * @param world  Specify the world we want to select the plots from
+     * @param player Player, for whom we're getting the plots
+     *
+     * @return a set containing the players plots
+     *
+     * @see com.intellectualcrafters.plot.PS#getPlots(String, PlotPlayer)
+     * org.bukkit.entity.Player)
+     * @see com.intellectualcrafters.plot.object.Plot
+     */
+    public Set<Plot> getPlayerPlots(final World world, final Player player)
+    {
+        return PS.get().getPlots(world.getName(), BukkitUtil.getPlayer(player));
+    }
+
+    /**
+     * Get the numbers of plots, which the player is able to build in
+     *
+     * @param player Player, for whom we're getting the plots (trusted, member and owner)
+     *
+     * @return the number of allowed plots
+     *
+     */
+    public int getAllowedPlots(final Player player)
+    {
+        final PlotPlayer pp = BukkitUtil.getPlayer(player);
+        return MainUtil.getAllowedPlots(pp);
+    }
+
+    /**
+     * Get the PlotPlayer for a player<br>
+     *  - The PlotPlayer is usually cached and will provide useful functions relating to players
+     *
+     * @see PlotPlayer.wrap(Player|OfflinePlayer|String|UUID)
+     *
+     * @param player
+     * @return
+     */
+    public PlotPlayer wrapPlayer(final Player player)
+    {
+        return PlotPlayer.wrap(player);
+    }
+
+    /**
+     * Get the PlotPlayer for a UUID (Please note that PlotSquared can be configured to provide different UUIDs than bukkit)
+     *
+     * @see PlotPlayer.wrap(UUID uuid)
+     *
+     * @param player
+     * @return
+     */
+    public PlotPlayer wrapPlayer(final UUID uuid)
+    {
+        return PlotPlayer.wrap(uuid);
+    }
+
+    /**
+     * Get the PlotPlayer for a username
+     *
+     * @see PlotPlayer.wrap(String name)
+     *
+     * @param player
+     * @return
+     */
+    public PlotPlayer wrapPlayer(final String player)
+    {
+        return PlotPlayer.wrap(player);
+    }
+
+    /**
+     * Get the PlotPlayer for an offline player<br>
+     * Note that this will work if the player is offline, however not all functionality will work
+     *
+     * @see PlotPlayer.wrap(OfflinePlayer op)
+     *
+     * @param player
+     * @return
+     */
+    public PlotPlayer wrapPlayer(final OfflinePlayer player)
+    {
+        return PlotPlayer.wrap(player);
+    }
+}
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Add.java b/src/main/java/com/intellectualcrafters/plot/commands/Add.java
index e3926e49b..63dabddd5 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/Add.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/Add.java
@@ -32,71 +32,82 @@ import com.intellectualcrafters.plot.util.EventUtil;
 import com.intellectualcrafters.plot.util.MainUtil;
 import com.intellectualcrafters.plot.util.Permissions;
 import com.intellectualcrafters.plot.util.UUIDHandler;
-import com.plotsquared.bukkit.uuid.SQLUUIDHandler;
 import com.plotsquared.general.commands.Argument;
 import com.plotsquared.general.commands.CommandDeclaration;
 
 @CommandDeclaration(
-        command = "add",
-        aliases = {"a"},
-        description = "Allow a user to build while you are online",
-        usage = "/plot add <player>",
-        category = CommandCategory.ACTIONS,
-        permission = "plots.add",
-        requiredType = RequiredType.NONE
-)
-public class Add extends SubCommand {
+command = "add",
+aliases = { "a" },
+description = "Allow a user to build while you are online",
+usage = "/plot add <player>",
+category = CommandCategory.ACTIONS,
+permission = "plots.add",
+requiredType = RequiredType.NONE)
+public class Add extends SubCommand
+{
 
-    public Add() {
+    public Add()
+    {
         requiredArguments = new Argument[] {
-                Argument.PlayerName
+        Argument.PlayerName
         };
     }
 
     @Override
-    public boolean onCommand(PlotPlayer plr, String[] args) {
+    public boolean onCommand(final PlotPlayer plr, final String[] args)
+    {
         final Location loc = plr.getLocation();
         final Plot plot = MainUtil.getPlot(loc);
-        if (plot == null) {
-            return !sendMessage(plr, C.NOT_IN_PLOT);
-        }
-        if (!plot.hasOwner()) {
+        if (plot == null) { return !sendMessage(plr, C.NOT_IN_PLOT); }
+        if (!plot.hasOwner())
+        {
             MainUtil.sendMessage(plr, C.PLOT_UNOWNED);
             return false;
         }
-        if (!plot.isOwner(plr.getUUID()) && !Permissions.hasPermission(plr, "plots.admin.command.add")) {
+        if (!plot.isOwner(plr.getUUID()) && !Permissions.hasPermission(plr, "plots.admin.command.add"))
+        {
             MainUtil.sendMessage(plr, C.NO_PLOT_PERMS);
             return true;
         }
         UUID uuid;
-        if (args[0].equalsIgnoreCase("*")) {
+        if (args[0].equalsIgnoreCase("*"))
+        {
             uuid = DBFunc.everyone;
-        } else {
+        }
+        else
+        {
             // TODO have a runnable for fetch
             uuid = UUIDHandler.getUUID(args[0], null);
         }
-        if (uuid == null) {
+        if (uuid == null)
+        {
             MainUtil.sendMessage(plr, C.INVALID_PLAYER, args[0]);
             return false;
         }
-        if (plot.isOwner(uuid)) {
+        if (plot.isOwner(uuid))
+        {
             MainUtil.sendMessage(plr, C.ALREADY_OWNER);
             return false;
         }
-        
-        if (plot.getMembers().contains(uuid)) {
+
+        if (plot.getMembers().contains(uuid))
+        {
             MainUtil.sendMessage(plr, C.ALREADY_ADDED);
             return false;
         }
-        if (plot.removeTrusted(uuid)) {
+        if (plot.removeTrusted(uuid))
+        {
             plot.addMember(uuid);
         }
-        else {
-            if (plot.getMembers().size() + plot.getTrusted().size() >= PS.get().getPlotWorld(plot.world).MAX_PLOT_MEMBERS) {
+        else
+        {
+            if ((plot.getMembers().size() + plot.getTrusted().size()) >= PS.get().getPlotWorld(plot.world).MAX_PLOT_MEMBERS)
+            {
                 MainUtil.sendMessage(plr, C.PLOT_MAX_MEMBERS);
                 return false;
             }
-            if (plot.getDenied().contains(uuid)) {
+            if (plot.getDenied().contains(uuid))
+            {
                 plot.removeDenied(uuid);
             }
             plot.addMember(uuid);
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Auto.java b/src/main/java/com/intellectualcrafters/plot/commands/Auto.java
index aaa54114b..76d307673 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/Auto.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/Auto.java
@@ -29,84 +29,102 @@ import com.intellectualcrafters.plot.object.PlotCluster;
 import com.intellectualcrafters.plot.object.PlotId;
 import com.intellectualcrafters.plot.object.PlotPlayer;
 import com.intellectualcrafters.plot.object.PlotWorld;
-import com.intellectualcrafters.plot.util.ClusterManager;
 import com.intellectualcrafters.plot.util.EconHandler;
 import com.intellectualcrafters.plot.util.MainUtil;
 import com.intellectualcrafters.plot.util.Permissions;
 import com.plotsquared.general.commands.CommandDeclaration;
 
 @CommandDeclaration(
-        command = "auto",
-        permission = "plots.auto",
-        category = CommandCategory.CLAIMING,
-        requiredType = RequiredType.NONE,
-        description = "Claim the nearest plot",
-        aliases = {"a"},
-        usage = "/plot auto"
-)
-public class Auto extends SubCommand {
+command = "auto",
+permission = "plots.auto",
+category = CommandCategory.CLAIMING,
+requiredType = RequiredType.NONE,
+description = "Claim the nearest plot",
+aliases = { "a" },
+usage = "/plot auto")
+public class Auto extends SubCommand
+{
 
-    public static PlotId getNextPlot(final PlotId id, final int step) {
+    public static PlotId getNextPlot(final PlotId id, final int step)
+    {
         final int absX = Math.abs(id.x);
         final int absY = Math.abs(id.y);
-        if (absX > absY) {
-            if (id.x > 0) {
+        if (absX > absY)
+        {
+            if (id.x > 0)
+            {
                 return new PlotId(id.x, id.y + 1);
-            } else {
+            }
+            else
+            {
                 return new PlotId(id.x, id.y - 1);
             }
-        } else if (absY > absX) {
-            if (id.y > 0) {
+        }
+        else if (absY > absX)
+        {
+            if (id.y > 0)
+            {
                 return new PlotId(id.x - 1, id.y);
-            } else {
+            }
+            else
+            {
                 return new PlotId(id.x + 1, id.y);
             }
-        } else {
-            if (id.x.equals(id.y) && (id.x > 0)) {
-                return new PlotId(id.x, id.y + step);
-            }
-            if (id.x == absX) {
-                return new PlotId(id.x, id.y + 1);
-            }
-            if (id.y == absY) {
-                return new PlotId(id.x, id.y - 1);
-            }
+        }
+        else
+        {
+            if (id.x.equals(id.y) && (id.x > 0)) { return new PlotId(id.x, id.y + step); }
+            if (id.x == absX) { return new PlotId(id.x, id.y + 1); }
+            if (id.y == absY) { return new PlotId(id.x, id.y - 1); }
             return new PlotId(id.x + 1, id.y);
         }
     }
 
     @Override
-    public boolean onCommand(PlotPlayer plr, String[] args) {
-        
+    public boolean onCommand(final PlotPlayer plr, final String[] args)
+    {
+
         String world;
         int size_x = 1;
         int size_z = 1;
         String schematic = "";
-        if (PS.get().getPlotWorlds().size() == 1) {
+        if (PS.get().getPlotWorlds().size() == 1)
+        {
             world = PS.get().getPlotWorlds().iterator().next();
-        } else {
+        }
+        else
+        {
             world = plr.getLocation().getWorld();
-            if (!PS.get().isPlotWorld(world)) {
+            if (!PS.get().isPlotWorld(world))
+            {
                 MainUtil.sendMessage(plr, C.NOT_IN_PLOT_WORLD);
                 return false;
             }
         }
-        if (args.length > 0) {
-            if (Permissions.hasPermission(plr, "plots.auto.mega")) {
-                try {
+        if (args.length > 0)
+        {
+            if (Permissions.hasPermission(plr, "plots.auto.mega"))
+            {
+                try
+                {
                     final String[] split = args[0].split(",");
                     size_x = Integer.parseInt(split[0]);
                     size_z = Integer.parseInt(split[1]);
-                    if ((size_x < 1) || (size_z < 1)) {
+                    if ((size_x < 1) || (size_z < 1))
+                    {
                         MainUtil.sendMessage(plr, "&cError: size<=0");
                     }
-                    if ((size_x > 4) || (size_z > 4)) {
+                    if ((size_x > 4) || (size_z > 4))
+                    {
                         MainUtil.sendMessage(plr, "&cError: size>4");
                     }
-                    if (args.length > 1) {
+                    if (args.length > 1)
+                    {
                         schematic = args[1];
                     }
-                } catch (final Exception e) {
+                }
+                catch (final Exception e)
+                {
                     size_x = 1;
                     size_z = 1;
                     schematic = args[0];
@@ -114,32 +132,42 @@ public class Auto extends SubCommand {
                     // "&cError: Invalid size (X,Y)");
                     // return false;
                 }
-            } else {
+            }
+            else
+            {
                 schematic = args[0];
                 // PlayerFunctions.sendMessage(plr, C.NO_PERMISSION);
                 // return false;
             }
         }
-        if ((size_x * size_z) > Settings.MAX_AUTO_SIZE) {
+        if ((size_x * size_z) > Settings.MAX_AUTO_SIZE)
+        {
             MainUtil.sendMessage(plr, C.CANT_CLAIM_MORE_PLOTS_NUM, Settings.MAX_AUTO_SIZE + "");
             return false;
         }
         final int currentPlots = Settings.GLOBAL_LIMIT ? MainUtil.getPlayerPlotCount(plr) : MainUtil.getPlayerPlotCount(world, plr);
         final int diff = currentPlots - MainUtil.getAllowedPlots(plr);
-        if ((diff + (size_x * size_z)) > 0) {
-            if (diff < 0) {
+        if ((diff + (size_x * size_z)) > 0)
+        {
+            if (diff < 0)
+            {
                 MainUtil.sendMessage(plr, C.CANT_CLAIM_MORE_PLOTS_NUM, (-diff) + "");
-            } else {
+            }
+            else
+            {
                 MainUtil.sendMessage(plr, C.CANT_CLAIM_MORE_PLOTS);
             }
             return false;
         }
         final PlotWorld pWorld = PS.get().getPlotWorld(world);
-        if ((EconHandler.manager != null) && pWorld.USE_ECONOMY) {
+        if ((EconHandler.manager != null) && pWorld.USE_ECONOMY)
+        {
             double cost = pWorld.PLOT_PRICE;
             cost = (size_x * size_z) * cost;
-            if (cost > 0d) {
-                if (EconHandler.manager.getMoney(plr) < cost) {
+            if (cost > 0d)
+            {
+                if (EconHandler.manager.getMoney(plr) < cost)
+                {
                     sendMessage(plr, C.CANNOT_AFFORD_PLOT, "" + cost);
                     return true;
                 }
@@ -147,13 +175,16 @@ public class Auto extends SubCommand {
                 sendMessage(plr, C.REMOVED_BALANCE, cost + "");
             }
         }
-        if (!schematic.equals("")) {
+        if (!schematic.equals(""))
+        {
             // if (pWorld.SCHEMATIC_CLAIM_SPECIFY) {
-            if (!pWorld.SCHEMATICS.contains(schematic.toLowerCase())) {
+            if (!pWorld.SCHEMATICS.contains(schematic.toLowerCase()))
+            {
                 sendMessage(plr, C.SCHEMATIC_INVALID, "non-existent: " + schematic);
                 return true;
             }
-            if (!Permissions.hasPermission(plr, "plots.claim." + schematic) && !Permissions.hasPermission(plr, "plots.admin.command.schematic")) {
+            if (!Permissions.hasPermission(plr, "plots.claim." + schematic) && !Permissions.hasPermission(plr, "plots.admin.command.schematic"))
+            {
                 MainUtil.sendMessage(plr, C.NO_SCHEMATIC_PERMISSION, schematic);
                 return true;
             }
@@ -161,15 +192,15 @@ public class Auto extends SubCommand {
         }
         final String worldname = world;
         final PlotWorld plotworld = PS.get().getPlotWorld(worldname);
-        if (plotworld.TYPE == 2) {
+        if (plotworld.TYPE == 2)
+        {
             final Location loc = plr.getLocation();
             final Plot plot = MainUtil.getPlot(new Location(worldname, loc.getX(), loc.getY(), loc.getZ()));
-            if (plot == null) {
-                return sendMessage(plr, C.NOT_IN_PLOT);
-            }
+            if (plot == null) { return sendMessage(plr, C.NOT_IN_PLOT); }
             final PlotCluster cluster = plot.getCluster();
             // Must be standing in a cluster
-            if (cluster == null) {
+            if (cluster == null)
+            {
                 MainUtil.sendMessage(plr, C.NOT_IN_CLUSTER);
                 return false;
             }
@@ -180,10 +211,12 @@ public class Auto extends SubCommand {
             final int width = Math.max((top.x - bot.x) + 1, (top.y - bot.y) + 1);
             final int max = width * width;
             //
-            for (int i = 0; i <= max; i++) {
+            for (int i = 0; i <= max; i++)
+            {
                 final PlotId currentId = new PlotId(origin.x + id.x, origin.y + id.y);
                 final Plot current = MainUtil.getPlot(worldname, currentId);
-                if (MainUtil.canClaim(plr, current) && (current.getSettings().isMerged() == false) && cluster.equals(current.getCluster())) {
+                if (MainUtil.canClaim(plr, current) && (current.getSettings().isMerged() == false) && cluster.equals(current.getCluster()))
+                {
                     Claim.claimPlot(plr, current, true, true);
                     return true;
                 }
@@ -194,40 +227,50 @@ public class Auto extends SubCommand {
             return false;
         }
         boolean br = false;
-        if ((size_x == 1) && (size_z == 1)) {
-            while (!br) {
+        if ((size_x == 1) && (size_z == 1))
+        {
+            while (!br)
+            {
                 final Plot plot = MainUtil.getPlot(worldname, getLastPlot(worldname));
-                if (MainUtil.canClaim(plr, plot)) {
+                if (MainUtil.canClaim(plr, plot))
+                {
                     Claim.claimPlot(plr, plot, true, true);
                     br = true;
                 }
                 MainUtil.lastPlot.put(worldname, getNextPlot(getLastPlot(worldname), 1));
             }
-        } else {
+        }
+        else
+        {
             boolean lastPlot = true;
-            while (!br) {
+            while (!br)
+            {
                 final PlotId start = getNextPlot(getLastPlot(worldname), 1);
                 // Checking if the current set of plots is a viable option.
                 MainUtil.lastPlot.put(worldname, start);
-                if (lastPlot) {
-                }
-                if ((PS.get().getPlot(worldname, start) != null) && (PS.get().getPlot(worldname, start).owner != null)) {
+                if (lastPlot)
+                {}
+                if ((PS.get().getPlot(worldname, start) != null) && (PS.get().getPlot(worldname, start).owner != null))
+                {
                     continue;
-                } else {
+                }
+                else
+                {
                     lastPlot = false;
                 }
                 final PlotId end = new PlotId((start.x + size_x) - 1, (start.y + size_z) - 1);
-                if (MainUtil.canClaim(plr, worldname, start, end)) {
-                    for (int i = start.x; i <= end.x; i++) {
-                        for (int j = start.y; j <= end.y; j++) {
+                if (MainUtil.canClaim(plr, worldname, start, end))
+                {
+                    for (int i = start.x; i <= end.x; i++)
+                    {
+                        for (int j = start.y; j <= end.y; j++)
+                        {
                             final Plot plot = MainUtil.getPlot(worldname, new PlotId(i, j));
                             final boolean teleport = ((i == end.x) && (j == end.y));
                             Claim.claimPlot(plr, plot, teleport, true);
                         }
                     }
-                    if (!MainUtil.mergePlots(worldname, MainUtil.getPlotSelectionIds(start, end), true, true)) {
-                        return false;
-                    }
+                    if (!MainUtil.mergePlots(worldname, MainUtil.getPlotSelectionIds(start, end), true, true)) { return false; }
                     br = true;
                 }
             }
@@ -236,8 +279,10 @@ public class Auto extends SubCommand {
         return true;
     }
 
-    public PlotId getLastPlot(final String world) {
-        if ((MainUtil.lastPlot == null) || !MainUtil.lastPlot.containsKey(world)) {
+    public PlotId getLastPlot(final String world)
+    {
+        if ((MainUtil.lastPlot == null) || !MainUtil.lastPlot.containsKey(world))
+        {
             MainUtil.lastPlot.put(world, new PlotId(0, 0));
         }
         return MainUtil.lastPlot.get(world);
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/BO3.java b/src/main/java/com/intellectualcrafters/plot/commands/BO3.java
index a6524def7..a3710e056 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/BO3.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/BO3.java
@@ -21,67 +21,65 @@
 package com.intellectualcrafters.plot.commands;
 
 import com.intellectualcrafters.plot.config.C;
-import com.intellectualcrafters.plot.config.Settings;
-import com.intellectualcrafters.plot.flag.Flag;
-import com.intellectualcrafters.plot.flag.FlagManager;
-import com.intellectualcrafters.plot.generator.HybridUtils;
 import com.intellectualcrafters.plot.object.Location;
 import com.intellectualcrafters.plot.object.Plot;
-import com.intellectualcrafters.plot.object.PlotAnalysis;
 import com.intellectualcrafters.plot.object.PlotPlayer;
-import com.intellectualcrafters.plot.object.RunnableVal;
 import com.intellectualcrafters.plot.util.BO3Handler;
-import com.intellectualcrafters.plot.util.BlockManager;
 import com.intellectualcrafters.plot.util.MainUtil;
 import com.intellectualcrafters.plot.util.Permissions;
-import com.intellectualcrafters.plot.util.UUIDHandler;
 import com.plotsquared.general.commands.CommandDeclaration;
 
 @CommandDeclaration(
-        command = "bo3",
-        aliases = {"bo2"},
-        description = "Mark a plot as done",
-        permission = "plots.bo3",
-        category = CommandCategory.ACTIONS,
-        requiredType = RequiredType.NONE
-)
-public class BO3 extends SubCommand {
+command = "bo3",
+aliases = { "bo2" },
+description = "Mark a plot as done",
+permission = "plots.bo3",
+category = CommandCategory.ACTIONS,
+requiredType = RequiredType.NONE)
+public class BO3 extends SubCommand
+{
 
-    public void noArgs(PlotPlayer plr) {
+    public void noArgs(final PlotPlayer plr)
+    {
         MainUtil.sendMessage(plr, C.COMMAND_SYNTAX, "/plot bo3 export [category] [alias] [-r]");
         MainUtil.sendMessage(plr, C.COMMAND_SYNTAX, "/plot bo3 import <file>");
     }
-    
+
     @Override
-    public boolean onCommand(final PlotPlayer plr, final String[] args) {
+    public boolean onCommand(final PlotPlayer plr, final String[] args)
+    {
         final Location loc = plr.getLocation();
         final Plot plot = MainUtil.getPlot(loc);
-        if (plot == null || !plot.hasOwner()) {
-            return !sendMessage(plr, C.NOT_IN_PLOT);
-        }
-        if ((!plot.isOwner(plr.getUUID())) && !Permissions.hasPermission(plr, "plots.admin.command.bo3")) {
+        if ((plot == null) || !plot.hasOwner()) { return !sendMessage(plr, C.NOT_IN_PLOT); }
+        if ((!plot.isOwner(plr.getUUID())) && !Permissions.hasPermission(plr, "plots.admin.command.bo3"))
+        {
             MainUtil.sendMessage(plr, C.NO_PLOT_PERMS);
             return false;
         }
-        if (args.length == 0) {
+        if (args.length == 0)
+        {
             noArgs(plr);
             return false;
         }
-        switch (args[0].toLowerCase()) {
+        switch (args[0].toLowerCase())
+        {
             case "output":
             case "save":
-            case "export": {
+            case "export":
+            {
                 return BO3Handler.saveBO3(plr, plot);
             }
             case "paste":
             case "load":
             case "import":
-            case "input": {
+            case "input":
+            {
                 // TODO NOT IMPLEMENTED YET
                 MainUtil.sendMessage(plr, "NOT IMPLEMENTED YET!!!");
                 return false;
             }
-            default: {
+            default:
+            {
                 noArgs(plr);
                 return false;
             }
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Buy.java b/src/main/java/com/intellectualcrafters/plot/commands/Buy.java
index db6ef3fa9..fd23dda1a 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/Buy.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/Buy.java
@@ -38,83 +38,78 @@ import com.intellectualcrafters.plot.util.UUIDHandler;
 import com.plotsquared.general.commands.CommandDeclaration;
 
 @CommandDeclaration(
-        command = "buy",
-        aliases = {"b"},
-        description = "Buy the plot you are standing on",
-        usage = "/plot buy",
-        permission = "plots.buy",
-        category = CommandCategory.CLAIMING,
-        requiredType = RequiredType.NONE
-)
-public class Buy extends SubCommand {
+command = "buy",
+aliases = { "b" },
+description = "Buy the plot you are standing on",
+usage = "/plot buy",
+permission = "plots.buy",
+category = CommandCategory.CLAIMING,
+requiredType = RequiredType.NONE)
+public class Buy extends SubCommand
+{
 
     @Override
-    public boolean onCommand(final PlotPlayer plr, final String ... args) {
-        
-        if (EconHandler.manager == null) {
-            return sendMessage(plr, C.ECON_DISABLED);
-        }
+    public boolean onCommand(final PlotPlayer plr, final String... args)
+    {
+
+        if (EconHandler.manager == null) { return sendMessage(plr, C.ECON_DISABLED); }
         final Location loc = plr.getLocation();
         final String world = loc.getWorld();
-        if (!PS.get().isPlotWorld(world)) {
-            return sendMessage(plr, C.NOT_IN_PLOT_WORLD);
-        }
+        if (!PS.get().isPlotWorld(world)) { return sendMessage(plr, C.NOT_IN_PLOT_WORLD); }
         Plot plot;
-        if (args.length > 0) {
-            try {
+        if (args.length > 0)
+        {
+            try
+            {
                 final String[] split = args[0].split(";");
                 final PlotId id = new PlotId(Integer.parseInt(split[0]), Integer.parseInt(split[1]));
                 plot = MainUtil.getPlot(world, id);
-            } catch (final Exception e) {
+            }
+            catch (final Exception e)
+            {
                 return sendMessage(plr, C.NOT_VALID_PLOT_ID);
             }
-        } else {
+        }
+        else
+        {
             plot = MainUtil.getPlot(loc);
         }
-        if (plot == null) {
-            return sendMessage(plr, C.NOT_IN_PLOT);
-        }
+        if (plot == null) { return sendMessage(plr, C.NOT_IN_PLOT); }
         final int currentPlots = Settings.GLOBAL_LIMIT ? MainUtil.getPlayerPlotCount(plr) : MainUtil.getPlayerPlotCount(world, plr);
-        if (currentPlots >= MainUtil.getAllowedPlots(plr)) {
-            return sendMessage(plr, C.CANT_CLAIM_MORE_PLOTS);
-        }
-        if (!plot.hasOwner()) {
-            return sendMessage(plr, C.PLOT_UNOWNED);
-        }
-        if (PlotHandler.isOwner(plot, plr.getUUID())) {
-            return sendMessage(plr, C.CANNOT_BUY_OWN);
-        }
+        if (currentPlots >= MainUtil.getAllowedPlots(plr)) { return sendMessage(plr, C.CANT_CLAIM_MORE_PLOTS); }
+        if (!plot.hasOwner()) { return sendMessage(plr, C.PLOT_UNOWNED); }
+        if (PlotHandler.isOwner(plot, plr.getUUID())) { return sendMessage(plr, C.CANNOT_BUY_OWN); }
         final Flag flag = FlagManager.getPlotFlag(plot, "price");
-        if (flag == null) {
-            return sendMessage(plr, C.NOT_FOR_SALE);
-        }
+        if (flag == null) { return sendMessage(plr, C.NOT_FOR_SALE); }
         double initPrice = (double) flag.getValue();
         double price = initPrice;
         final PlotId id = plot.id;
         final PlotId id2 = MainUtil.getTopPlot(plot).id;
         final int size = MainUtil.getPlotSelectionIds(id, id2).size();
         final PlotWorld plotworld = PS.get().getPlotWorld(world);
-        if (plotworld.USE_ECONOMY) {
+        if (plotworld.USE_ECONOMY)
+        {
             price += plotworld.PLOT_PRICE * size;
             initPrice += plotworld.SELL_PRICE * size;
         }
-        if ((EconHandler.manager != null) && (price > 0d)) {
-            if (EconHandler.manager.getMoney(plr) < price) {
-                return sendMessage(plr, C.CANNOT_AFFORD_PLOT, "" + price);
-            }
+        if ((EconHandler.manager != null) && (price > 0d))
+        {
+            if (EconHandler.manager.getMoney(plr) < price) { return sendMessage(plr, C.CANNOT_AFFORD_PLOT, "" + price); }
             EconHandler.manager.withdrawMoney(plr, price);
             sendMessage(plr, C.REMOVED_BALANCE, price + "");
             EconHandler.manager.depositMoney(UUIDHandler.getUUIDWrapper().getOfflinePlayer(plot.owner), initPrice);
             final PlotPlayer owner = UUIDHandler.getPlayer(plot.owner);
-            if (owner != null) {
+            if (owner != null)
+            {
                 sendMessage(plr, C.PLOT_SOLD, plot.id + "", plr.getName(), initPrice + "");
             }
             FlagManager.removePlotFlag(plot, "price");
         }
-        Plot top = MainUtil.getTopPlot(plot);
-        
-        for (PlotId myId : MainUtil.getPlotSelectionIds(plot.id, top.id)) {
-            Plot myPlot = MainUtil.getPlot(plot.world, myId);
+        final Plot top = MainUtil.getTopPlot(plot);
+
+        for (final PlotId myId : MainUtil.getPlotSelectionIds(plot.id, top.id))
+        {
+            final Plot myPlot = MainUtil.getPlot(plot.world, myId);
             myPlot.owner = plr.getUUID();
             DBFunc.setOwner(plot, myPlot.owner);
         }
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Chat.java b/src/main/java/com/intellectualcrafters/plot/commands/Chat.java
index 8b1a54d8f..e34ab505f 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/Chat.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/Chat.java
@@ -1,23 +1,21 @@
 package com.intellectualcrafters.plot.commands;
 
-import com.intellectualcrafters.plot.PS;
-import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.object.PlotPlayer;
-import com.intellectualcrafters.plot.object.PlotWorld;
 import com.plotsquared.general.commands.CommandDeclaration;
 
 @CommandDeclaration(
-        command = "chat",
-        description = "Toggle plot chat on or off",
-        usage = "/plot chat [on|off]",
-        permission = "plots.chat",
-        category = CommandCategory.ACTIONS,
-        requiredType = RequiredType.NONE
-)
-public class Chat extends SubCommand {
+command = "chat",
+description = "Toggle plot chat on or off",
+usage = "/plot chat [on|off]",
+permission = "plots.chat",
+category = CommandCategory.ACTIONS,
+requiredType = RequiredType.NONE)
+public class Chat extends SubCommand
+{
 
     @Override
-    public boolean onCommand(final PlotPlayer player, final String ... args) {
-        return MainCommand.onCommand(player, "plot", new String[] {"toggle", "chat"});
+    public boolean onCommand(final PlotPlayer player, final String... args)
+    {
+        return MainCommand.onCommand(player, "plot", new String[] { "toggle", "chat" });
     }
 }
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Claim.java b/src/main/java/com/intellectualcrafters/plot/commands/Claim.java
index 2aaddd8d7..e7e963cca 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/Claim.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/Claim.java
@@ -37,53 +37,64 @@ import com.intellectualcrafters.plot.util.SchematicHandler.Schematic;
 import com.plotsquared.general.commands.CommandDeclaration;
 
 @CommandDeclaration(
-        command = "claim",
-        aliases = {"c"},
-        description = "Claim the current plot you're standing on",
-        category = CommandCategory.CLAIMING,
-        requiredType = RequiredType.NONE,
-        permission = "plots.claim",
-        usage = "/plot claim"
-)
-public class Claim extends SubCommand {
+command = "claim",
+aliases = { "c" },
+description = "Claim the current plot you're standing on",
+category = CommandCategory.CLAIMING,
+requiredType = RequiredType.NONE,
+permission = "plots.claim",
+usage = "/plot claim")
+public class Claim extends SubCommand
+{
 
-    public static boolean claimPlot(final PlotPlayer player, final Plot plot, final boolean teleport, final boolean auto) {
+    public static boolean claimPlot(final PlotPlayer player, final Plot plot, final boolean teleport, final boolean auto)
+    {
         return claimPlot(player, plot, teleport, "", auto);
     }
 
-    public static boolean claimPlot(final PlotPlayer player, final Plot plot, final boolean teleport, final String schematic, final boolean auto) {
-        if (plot.hasOwner() || plot.getSettings().isMerged()) {
-            return false;
-        }
+    public static boolean claimPlot(final PlotPlayer player, final Plot plot, final boolean teleport, final String schematic, final boolean auto)
+    {
+        if (plot.hasOwner() || plot.getSettings().isMerged()) { return false; }
         final boolean result = EventUtil.manager.callClaim(player, plot, false);
-        if (result) {
+        if (result)
+        {
             MainUtil.createPlot(player.getUUID(), plot);
             MainUtil.setSign(player.getName(), plot);
             MainUtil.sendMessage(player, C.CLAIMED);
             final Location loc = player.getLocation();
-            if (teleport) {
+            if (teleport)
+            {
                 MainUtil.teleportPlayer(player, loc, plot);
             }
             final String world = plot.world;
             final PlotWorld plotworld = PS.get().getPlotWorld(world);
             final Plot plot2 = PS.get().getPlot(world, plot.id);
-            if (plotworld.SCHEMATIC_ON_CLAIM) {
+            if (plotworld.SCHEMATIC_ON_CLAIM)
+            {
                 Schematic sch;
-                if (schematic.equals("")) {
+                if (schematic.equals(""))
+                {
                     sch = SchematicHandler.manager.getSchematic(plotworld.SCHEMATIC_FILE);
-                } else {
+                }
+                else
+                {
                     sch = SchematicHandler.manager.getSchematic(schematic);
-                    if (sch == null) {
+                    if (sch == null)
+                    {
                         sch = SchematicHandler.manager.getSchematic(plotworld.SCHEMATIC_FILE);
                     }
                 }
-                SchematicHandler.manager.paste(sch, plot2, 0, 0, new RunnableVal<Boolean>() {
+                SchematicHandler.manager.paste(sch, plot2, 0, 0, new RunnableVal<Boolean>()
+                {
                     @Override
-                    public void run() {
-                        if (value) {
+                    public void run()
+                    {
+                        if (value)
+                        {
                             MainUtil.sendMessage(player, C.SCHEMATIC_PASTE_SUCCESS);
                         }
-                        else {
+                        else
+                        {
                             MainUtil.sendMessage(player, C.SCHEMATIC_PASTE_FAILED);
                         }
                     }
@@ -95,43 +106,38 @@ public class Claim extends SubCommand {
     }
 
     @Override
-    public boolean onCommand(final PlotPlayer plr, final String ... args) {
-        
+    public boolean onCommand(final PlotPlayer plr, final String... args)
+    {
+
         String schematic = "";
-        if (args.length >= 1) {
+        if (args.length >= 1)
+        {
             schematic = args[0];
         }
         final Location loc = plr.getLocation();
         final Plot plot = MainUtil.getPlot(loc);
-        if (plot == null) {
-            return sendMessage(plr, C.NOT_IN_PLOT);
-        }
+        if (plot == null) { return sendMessage(plr, C.NOT_IN_PLOT); }
         final int currentPlots = Settings.GLOBAL_LIMIT ? MainUtil.getPlayerPlotCount(plr) : MainUtil.getPlayerPlotCount(loc.getWorld(), plr);
-        if (currentPlots >= MainUtil.getAllowedPlots(plr)) {
-            return sendMessage(plr, C.CANT_CLAIM_MORE_PLOTS);
-        }
-        if (!MainUtil.canClaim(plr, plot)) {
-            return sendMessage(plr, C.PLOT_IS_CLAIMED);
-        }
+        if (currentPlots >= MainUtil.getAllowedPlots(plr)) { return sendMessage(plr, C.CANT_CLAIM_MORE_PLOTS); }
+        if (!MainUtil.canClaim(plr, plot)) { return sendMessage(plr, C.PLOT_IS_CLAIMED); }
         final PlotWorld world = PS.get().getPlotWorld(plot.world);
-        if ((EconHandler.manager != null) && world.USE_ECONOMY) {
+        if ((EconHandler.manager != null) && world.USE_ECONOMY)
+        {
             final double cost = world.PLOT_PRICE;
-            if (cost > 0d) {
-                if (EconHandler.manager.getMoney(plr) < cost) {
-                    return sendMessage(plr, C.CANNOT_AFFORD_PLOT, "" + cost);
-                }
+            if (cost > 0d)
+            {
+                if (EconHandler.manager.getMoney(plr) < cost) { return sendMessage(plr, C.CANNOT_AFFORD_PLOT, "" + cost); }
                 EconHandler.manager.withdrawMoney(plr, cost);
                 sendMessage(plr, C.REMOVED_BALANCE, cost + "");
             }
         }
-        if (!schematic.equals("")) {
-            if (world.SCHEMATIC_CLAIM_SPECIFY) {
-                if (!world.SCHEMATICS.contains(schematic.toLowerCase())) {
-                    return sendMessage(plr, C.SCHEMATIC_INVALID, "non-existent: " + schematic);
-                }
-                if (!Permissions.hasPermission(plr, "plots.claim." + schematic) && !Permissions.hasPermission(plr, "plots.admin.command.schematic")) {
-                    return sendMessage(plr, C.NO_SCHEMATIC_PERMISSION, schematic);
-                }
+        if (!schematic.equals(""))
+        {
+            if (world.SCHEMATIC_CLAIM_SPECIFY)
+            {
+                if (!world.SCHEMATICS.contains(schematic.toLowerCase())) { return sendMessage(plr, C.SCHEMATIC_INVALID, "non-existent: " + schematic); }
+                if (!Permissions.hasPermission(plr, "plots.claim." + schematic) && !Permissions.hasPermission(plr, "plots.admin.command.schematic")) { return sendMessage(plr,
+                C.NO_SCHEMATIC_PERMISSION, schematic); }
             }
         }
         return claimPlot(plr, plot, false, schematic, false) || sendMessage(plr, C.PLOT_NOT_CLAIMED);
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Clear.java b/src/main/java/com/intellectualcrafters/plot/commands/Clear.java
index c6466995b..561e5a7bd 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/Clear.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/Clear.java
@@ -38,86 +38,105 @@ import com.intellectualcrafters.plot.util.UUIDHandler;
 import com.plotsquared.general.commands.CommandDeclaration;
 
 @CommandDeclaration(
-        command = "clear",
-        description = "Clear a plot",
-        permission = "plots.clear",
-        category = CommandCategory.ACTIONS,
-        usage = "/plot clear [id]"
-)
-public class Clear extends SubCommand {
+command = "clear",
+description = "Clear a plot",
+permission = "plots.clear",
+category = CommandCategory.ACTIONS,
+usage = "/plot clear [id]")
+public class Clear extends SubCommand
+{
 
     @Override
-    public boolean onCommand(final PlotPlayer plr, final String ... args) {
+    public boolean onCommand(final PlotPlayer plr, final String... args)
+    {
         final Location loc = plr.getLocation();
         final Plot plot;
-        if (args.length == 2) {
-            PlotId id = PlotId.fromString(args[0]);
-            if (id == null) {
-                if (args[1].equalsIgnoreCase("mine")) {
-                    Set<Plot> plots = PS.get().getPlots(plr);
-                    if (plots.size() == 0) {
+        if (args.length == 2)
+        {
+            final PlotId id = PlotId.fromString(args[0]);
+            if (id == null)
+            {
+                if (args[1].equalsIgnoreCase("mine"))
+                {
+                    final Set<Plot> plots = PS.get().getPlots(plr);
+                    if (plots.size() == 0)
+                    {
                         MainUtil.sendMessage(plr, C.NO_PLOTS);
                         return false;
                     }
                     plot = plots.iterator().next();
                 }
-                else {
+                else
+                {
                     MainUtil.sendMessage(plr, C.COMMAND_SYNTAX, "/plot clear [X;Z|mine]");
                     return false;
                 }
             }
-            else {
+            else
+            {
                 plot = MainUtil.getPlot(loc.getWorld(), id);
             }
         }
-        else {
+        else
+        {
             plot = MainUtil.getPlot(loc);
         }
-        if (plot == null) {
+        if (plot == null)
+        {
             MainUtil.sendMessage(plr, C.COMMAND_SYNTAX, "/plot clear [X;Z|mine]");
             return sendMessage(plr, C.NOT_IN_PLOT);
         }
-//        if (!MainUtil.getTopPlot(plot).equals(MainUtil.getBottomPlot(plot))) {
-//            return sendMessage(plr, C.UNLINK_REQUIRED);
-//        }
-        if (((plot == null) || !plot.hasOwner() || !plot.isOwner(UUIDHandler.getUUID(plr))) && !Permissions.hasPermission(plr, "plots.admin.command.clear")) {
-            return sendMessage(plr, C.NO_PLOT_PERMS);
-        }
+        //        if (!MainUtil.getTopPlot(plot).equals(MainUtil.getBottomPlot(plot))) {
+        //            return sendMessage(plr, C.UNLINK_REQUIRED);
+        //        }
+        if (((plot == null) || !plot.hasOwner() || !plot.isOwner(UUIDHandler.getUUID(plr))) && !Permissions.hasPermission(plr, "plots.admin.command.clear")) { return sendMessage(plr, C.NO_PLOT_PERMS); }
         assert plot != null;
-        if (MainUtil.runners.containsKey(plot)) {
+        if (MainUtil.runners.containsKey(plot))
+        {
             MainUtil.sendMessage(plr, C.WAIT_FOR_TIMER);
             return false;
         }
-        if (FlagManager.getPlotFlag(plot, "done") != null && (!Permissions.hasPermission(plr, "plots.continue") || (Settings.DONE_COUNTS_TOWARDS_LIMIT && MainUtil.getAllowedPlots(plr) >= MainUtil.getPlayerPlotCount(plr)))) {
+        if ((FlagManager.getPlotFlag(plot, "done") != null)
+        && (!Permissions.hasPermission(plr, "plots.continue") || (Settings.DONE_COUNTS_TOWARDS_LIMIT && (MainUtil.getAllowedPlots(plr) >= MainUtil.getPlayerPlotCount(plr)))))
+        {
             MainUtil.sendMessage(plr, C.DONE_ALREADY_DONE);
             return false;
         }
-        Runnable runnable = new Runnable() {
+        final Runnable runnable = new Runnable()
+        {
             @Override
-            public void run() {
+            public void run()
+            {
                 final long start = System.currentTimeMillis();
-                final boolean result = MainUtil.clearAsPlayer(plot, plot.owner == null, new Runnable() {
+                final boolean result = MainUtil.clearAsPlayer(plot, plot.owner == null, new Runnable()
+                {
                     @Override
-                    public void run() {
+                    public void run()
+                    {
                         // If the state changes, then mark it as no longer done
-                        if (FlagManager.getPlotFlag(plot, "done" ) != null) {
+                        if (FlagManager.getPlotFlag(plot, "done") != null)
+                        {
                             FlagManager.removePlotFlag(plot, "done");
                         }
-                        if (FlagManager.getPlotFlag(plot, "analysis") != null) {
+                        if (FlagManager.getPlotFlag(plot, "analysis") != null)
+                        {
                             FlagManager.removePlotFlag(plot, "analysis");
                         }
                         MainUtil.sendMessage(plr, C.CLEARING_DONE, "" + (System.currentTimeMillis() - start));
                     }
                 });
-                if (!result) {
+                if (!result)
+                {
                     MainUtil.sendMessage(plr, C.WAIT_FOR_TIMER);
                 }
             }
         };
-        if (Settings.CONFIRM_CLEAR && !(Permissions.hasPermission(plr, "plots.confirm.bypass"))) {
+        if (Settings.CONFIRM_CLEAR && !(Permissions.hasPermission(plr, "plots.confirm.bypass")))
+        {
             CmdConfirm.addPending(plr, "/plot clear " + plot.id, runnable);
         }
-        else {
+        else
+        {
             TaskManager.runTask(runnable);
         }
         return true;
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Cluster.java b/src/main/java/com/intellectualcrafters/plot/commands/Cluster.java
index 06f1010ec..111689323 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/Cluster.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/Cluster.java
@@ -53,60 +53,77 @@ import com.intellectualcrafters.plot.util.UUIDHandler;
 import com.plotsquared.general.commands.CommandDeclaration;
 
 @CommandDeclaration(
-        command = "cluster",
-        aliases = {"clusters"},
-        category = CommandCategory.ACTIONS,
-        requiredType = RequiredType.NONE,
-        permission = "plots.cluster",
-        description = "Manage a plot cluster"
-)
-public class Cluster extends SubCommand {
+command = "cluster",
+aliases = { "clusters" },
+category = CommandCategory.ACTIONS,
+requiredType = RequiredType.NONE,
+permission = "plots.cluster",
+description = "Manage a plot cluster")
+public class Cluster extends SubCommand
+{
 
     @Override
-    public boolean onCommand(final PlotPlayer plr, final String ... args) {
-        
+    public boolean onCommand(final PlotPlayer plr, final String... args)
+    {
+
         // list, create, delete, resize, invite, kick, leave, helpers, tp, sethome
-        if (args.length == 0) {
+        if (args.length == 0)
+        {
             // return arguments
             MainUtil.sendMessage(plr, C.CLUSTER_AVAILABLE_ARGS);
             return false;
         }
         final String sub = args[0].toLowerCase();
-        switch (sub) {
+        switch (sub)
+        {
             case "l":
-            case "list": {
-                if (!Permissions.hasPermission(plr, "plots.cluster.list")) {
+            case "list":
+            {
+                if (!Permissions.hasPermission(plr, "plots.cluster.list"))
+                {
                     MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.cluster.list");
                     return false;
                 }
-                if (args.length != 1) {
+                if (args.length != 1)
+                {
                     MainUtil.sendMessage(plr, C.COMMAND_SYNTAX, "/plot cluster list");
                     return false;
                 }
                 final HashSet<PlotCluster> clusters = ClusterManager.getClusters(plr.getLocation().getWorld());
                 MainUtil.sendMessage(plr, C.CLUSTER_LIST_HEADING, clusters.size() + "");
-                for (final PlotCluster cluster : clusters) {
+                for (final PlotCluster cluster : clusters)
+                {
                     // Ignore unmanaged clusters
                     final String name = "'" + cluster.getName() + "' : " + cluster.toString();
-                    if (UUIDHandler.getUUID(plr).equals(cluster.owner)) {
+                    if (UUIDHandler.getUUID(plr).equals(cluster.owner))
+                    {
                         MainUtil.sendMessage(plr, C.CLUSTER_LIST_ELEMENT, "&a" + name);
-                    } else if (cluster.helpers.contains(UUIDHandler.getUUID(plr))) {
+                    }
+                    else if (cluster.helpers.contains(UUIDHandler.getUUID(plr)))
+                    {
                         MainUtil.sendMessage(plr, C.CLUSTER_LIST_ELEMENT, "&3" + name);
-                    } else if (cluster.invited.contains(UUIDHandler.getUUID(plr))) {
+                    }
+                    else if (cluster.invited.contains(UUIDHandler.getUUID(plr)))
+                    {
                         MainUtil.sendMessage(plr, C.CLUSTER_LIST_ELEMENT, "&9" + name);
-                    } else {
+                    }
+                    else
+                    {
                         MainUtil.sendMessage(plr, C.CLUSTER_LIST_ELEMENT, cluster.toString());
                     }
                 }
                 return true;
             }
             case "c":
-            case "create": {
-                if (!Permissions.hasPermission(plr, "plots.cluster.create")) {
+            case "create":
+            {
+                if (!Permissions.hasPermission(plr, "plots.cluster.create"))
+                {
                     MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.cluster.create");
                     return false;
                 }
-                if (args.length != 4) {
+                if (args.length != 4)
+                {
                     final PlotId id = ClusterManager.estimatePlotId(plr.getLocation());
                     MainUtil.sendMessage(plr, C.COMMAND_SYNTAX, "/plot cluster create <name> <id-bot> <id-top>");
                     MainUtil.sendMessage(plr, C.CLUSTER_CURRENT_PLOTID, "" + id);
@@ -115,37 +132,46 @@ public class Cluster extends SubCommand {
                 // check pos1 / pos2
                 PlotId pos1 = MainUtil.parseId(args[2]);
                 PlotId pos2 = MainUtil.parseId(args[3]);
-                if ((pos1 == null) || (pos2 == null)) {
+                if ((pos1 == null) || (pos2 == null))
+                {
                     MainUtil.sendMessage(plr, C.NOT_VALID_PLOT_ID);
                     return false;
                 }
                 // check if name is taken
                 final String name = args[1];
-                for (final PlotCluster cluster : ClusterManager.getClusters(plr.getLocation().getWorld())) {
-                    if (name.equals(cluster.getName())) {
+                for (final PlotCluster cluster : ClusterManager.getClusters(plr.getLocation().getWorld()))
+                {
+                    if (name.equals(cluster.getName()))
+                    {
                         MainUtil.sendMessage(plr, C.ALIAS_IS_TAKEN);
                         return false;
                     }
                 }
-                if ((pos2.x < pos1.x) || (pos2.y < pos1.y) ) {
+                if ((pos2.x < pos1.x) || (pos2.y < pos1.y))
+                {
                     pos1 = new PlotId(Math.min(pos1.x, pos2.x), Math.min(pos1.y, pos2.y));
                     pos2 = new PlotId(Math.max(pos1.x, pos2.x), Math.max(pos1.y, pos2.y));
                 }
                 //check if overlap
-                String world = plr.getLocation().getWorld();
+                final String world = plr.getLocation().getWorld();
                 final PlotClusterId id = new PlotClusterId(pos1, pos2);
                 final HashSet<PlotCluster> intersects = ClusterManager.getIntersects(world, id);
-                if ((intersects.size() > 0)) {
+                if ((intersects.size() > 0))
+                {
                     MainUtil.sendMessage(plr, C.CLUSTER_INTERSECTION, intersects.size() + "");
                     return false;
                 }
                 // Check if it occupies existing plots
-                Set<Plot> plots = MainUtil.getPlotSelectionOwned(world, pos1, pos2);
-                if (plots.size() > 0) {
-                    if (!Permissions.hasPermission(plr, "plots.cluster.create.other")) {
-                        UUID uuid = plr.getUUID();
-                        for (Plot plot : plots) {
-                            if (!plot.isOwner(uuid)) {
+                final Set<Plot> plots = MainUtil.getPlotSelectionOwned(world, pos1, pos2);
+                if (plots.size() > 0)
+                {
+                    if (!Permissions.hasPermission(plr, "plots.cluster.create.other"))
+                    {
+                        final UUID uuid = plr.getUUID();
+                        for (final Plot plot : plots)
+                        {
+                            if (!plot.isOwner(uuid))
+                            {
                                 MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.cluster.create.other");
                                 return false;
                             }
@@ -155,64 +181,76 @@ public class Cluster extends SubCommand {
                 // Check allowed cluster size
                 final PlotCluster cluster = new PlotCluster(world, pos1, pos2, UUIDHandler.getUUID(plr));
                 int current;
-                if (Settings.GLOBAL_LIMIT) {
+                if (Settings.GLOBAL_LIMIT)
+                {
                     current = ClusterManager.getPlayerClusterCount(plr);
                 }
-                else {
+                else
+                {
                     current = ClusterManager.getPlayerClusterCount(world, plr);
                 }
-                int allowed = Permissions.hasPermissionRange(plr, "plots.cluster", Settings.MAX_PLOTS);
-                if (current + cluster.getArea() > allowed) {
+                final int allowed = Permissions.hasPermissionRange(plr, "plots.cluster", Settings.MAX_PLOTS);
+                if ((current + cluster.getArea()) > allowed)
+                {
                     MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.cluster." + (current + cluster.getArea()));
                     return false;
                 }
                 // Set the generator (if applicable)
-                PlotWorld plotworld = PS.get().getPlotWorld(world);
-                if (plotworld == null) {
+                final PlotWorld plotworld = PS.get().getPlotWorld(world);
+                if (plotworld == null)
+                {
                     PS.get().config.createSection("worlds." + world);
                     PS.get().loadWorld(world, PS.get().IMP.getGenerator(world, null));
                 }
-                else {
+                else
+                {
                     String gen_string = PS.get().config.getString("worlds." + world + "." + "generator.plugin");
-                    if (gen_string == null) {
+                    if (gen_string == null)
+                    {
                         gen_string = "PlotSquared";
                     }
-                    PlotGenerator<?> wrapper = PS.get().IMP.getGenerator(world, gen_string);
-                    if (wrapper.isFull()) {
+                    final PlotGenerator<?> wrapper = PS.get().IMP.getGenerator(world, gen_string);
+                    if (wrapper.isFull())
+                    {
                         wrapper.augment(cluster, plotworld);
                     }
-                    else {
+                    else
+                    {
                         MainUtil.sendMessage(plr, C.SETUP_INVALID_GENERATOR, StringMan.join(SetupUtils.generators.keySet(), ","));
                         return false;
                     }
-//                    BukkitPlotGenerator generator;
-//                    if (gen_string == null) {
-//                        generator = new HybridGen(world);
-//                    } else {
-//                        ChunkGenerator chunkgen = (ChunkGenerator) PS.get().IMP.getGenerator(world, gen_string).generator;
-//                        if (chunkgen instanceof BukkitPlotGenerator) {
-//                            generator = (BukkitPlotGenerator) chunkgen;
-//                        }
-//                        else {
-//                            MainUtil.sendMessage(plr, C.SETUP_INVALID_GENERATOR, StringMan.join(SetupUtils.generators.keySet(), ","));
-//                            return false;
-//                        }
-//                    }
-//                    new AugmentedPopulator(world, generator, cluster, plotworld.TERRAIN == 2, plotworld.TERRAIN != 2);
+                    //                    BukkitPlotGenerator generator;
+                    //                    if (gen_string == null) {
+                    //                        generator = new HybridGen(world);
+                    //                    } else {
+                    //                        ChunkGenerator chunkgen = (ChunkGenerator) PS.get().IMP.getGenerator(world, gen_string).generator;
+                    //                        if (chunkgen instanceof BukkitPlotGenerator) {
+                    //                            generator = (BukkitPlotGenerator) chunkgen;
+                    //                        }
+                    //                        else {
+                    //                            MainUtil.sendMessage(plr, C.SETUP_INVALID_GENERATOR, StringMan.join(SetupUtils.generators.keySet(), ","));
+                    //                            return false;
+                    //                        }
+                    //                    }
+                    //                    new AugmentedPopulator(world, generator, cluster, plotworld.TERRAIN == 2, plotworld.TERRAIN != 2);
                 }
                 // create cluster
                 cluster.settings.setAlias(name);
                 DBFunc.createCluster(world, cluster);
-                if (!ClusterManager.clusters.containsKey(world)) {
+                if (!ClusterManager.clusters.containsKey(world))
+                {
                     ClusterManager.clusters.put(world, new HashSet<PlotCluster>());
                 }
                 ClusterManager.clusters.get(world).add(cluster);
                 // Add any existing plots to the current cluster
-                for (Plot plot : plots) {
-                    if (plot.hasOwner()) {
-                        Flag flag = new Flag(FlagManager.getFlag("cluster"), cluster);
+                for (final Plot plot : plots)
+                {
+                    if (plot.hasOwner())
+                    {
+                        final Flag flag = new Flag(FlagManager.getFlag("cluster"), cluster);
                         FlagManager.addPlotFlag(plot, flag);
-                        if (!cluster.isAdded(plot.owner)) {
+                        if (!cluster.isAdded(plot.owner))
+                        {
                             cluster.invited.add(plot.owner);
                             DBFunc.setInvited(world, cluster, plot.owner);
                         }
@@ -223,50 +261,65 @@ public class Cluster extends SubCommand {
             }
             case "disband":
             case "del":
-            case "delete": {
-                if (!Permissions.hasPermission(plr, "plots.cluster.delete")) {
+            case "delete":
+            {
+                if (!Permissions.hasPermission(plr, "plots.cluster.delete"))
+                {
                     MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.cluster.delete");
                     return false;
                 }
-                if ((args.length != 1) && (args.length != 2)) {
+                if ((args.length != 1) && (args.length != 2))
+                {
                     MainUtil.sendMessage(plr, C.COMMAND_SYNTAX, "/plot cluster delete [name]");
                     return false;
                 }
                 PlotCluster cluster;
-                if (args.length == 2) {
+                if (args.length == 2)
+                {
                     cluster = ClusterManager.getCluster(plr.getLocation().getWorld(), args[1]);
-                    if (cluster == null) {
+                    if (cluster == null)
+                    {
                         MainUtil.sendMessage(plr, C.INVALID_CLUSTER, args[1]);
                         return false;
                     }
-                } else {
+                }
+                else
+                {
                     cluster = ClusterManager.getCluster(plr.getLocation());
-                    if (cluster == null) {
+                    if (cluster == null)
+                    {
                         MainUtil.sendMessage(plr, C.NOT_IN_CLUSTER);
                         return false;
                     }
                 }
-                if (!cluster.owner.equals(UUIDHandler.getUUID(plr))) {
-                    if (!Permissions.hasPermission(plr, "plots.cluster.delete.other")) {
+                if (!cluster.owner.equals(UUIDHandler.getUUID(plr)))
+                {
+                    if (!Permissions.hasPermission(plr, "plots.cluster.delete.other"))
+                    {
                         MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.cluster.delete.other");
                         return false;
                     }
                 }
                 final PlotWorld plotworld = PS.get().getPlotWorld(plr.getLocation().getWorld());
-                if (plotworld.TYPE == 2) {
+                if (plotworld.TYPE == 2)
+                {
                     final ArrayList<Plot> toRemove = new ArrayList<>();
-                    for (final Plot plot : PS.get().getPlotsInWorld(plr.getLocation().getWorld())) {
+                    for (final Plot plot : PS.get().getPlotsInWorld(plr.getLocation().getWorld()))
+                    {
                         final PlotCluster other = ClusterManager.getCluster(plot);
-                        if (cluster.equals(other)) {
+                        if (cluster.equals(other))
+                        {
                             toRemove.add(plot);
                         }
                     }
-                    for (final Plot plot : toRemove) {
+                    for (final Plot plot : toRemove)
+                    {
                         plot.unclaim();
                     }
                 }
                 DBFunc.delete(cluster);
-                if (plotworld.TYPE == 2) {
+                if (plotworld.TYPE == 2)
+                {
                     SetupUtils.manager.removePopulator(plr.getLocation().getWorld(), cluster);
                 }
                 ClusterManager.last = null;
@@ -276,36 +329,44 @@ public class Cluster extends SubCommand {
                 return true;
             }
             case "res":
-            case "resize": {
-                if (!Permissions.hasPermission(plr, "plots.cluster.resize")) {
+            case "resize":
+            {
+                if (!Permissions.hasPermission(plr, "plots.cluster.resize"))
+                {
                     MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.cluster.resize");
                     return false;
                 }
-                if (args.length != 3) {
+                if (args.length != 3)
+                {
                     MainUtil.sendMessage(plr, C.COMMAND_SYNTAX, "/plot cluster resize <pos1> <pos2>");
                     return false;
                 }
                 // check pos1 / pos2
                 PlotId pos1 = MainUtil.parseId(args[1]);
                 PlotId pos2 = MainUtil.parseId(args[2]);
-                if ((pos1 == null) || (pos2 == null)) {
+                if ((pos1 == null) || (pos2 == null))
+                {
                     MainUtil.sendMessage(plr, C.NOT_VALID_PLOT_ID);
                     return false;
                 }
-                if ((pos2.x < pos1.x) || (pos2.y < pos1.y) ) {
+                if ((pos2.x < pos1.x) || (pos2.y < pos1.y))
+                {
                     pos1 = new PlotId(Math.min(pos1.x, pos2.x), Math.min(pos1.y, pos2.y));
                     pos2 = new PlotId(Math.max(pos1.x, pos2.x), Math.max(pos1.y, pos2.y));
                 }
                 // check if in cluster
-                Location loc = plr.getLocation();
-                String world = loc.getWorld();
+                final Location loc = plr.getLocation();
+                final String world = loc.getWorld();
                 final PlotCluster cluster = ClusterManager.getCluster(loc);
-                if (cluster == null) {
+                if (cluster == null)
+                {
                     MainUtil.sendMessage(plr, C.NOT_IN_CLUSTER);
                     return false;
                 }
-                if (!cluster.hasHelperRights(UUIDHandler.getUUID(plr))) {
-                    if (!Permissions.hasPermission(plr, "plots.cluster.resize.other")) {
+                if (!cluster.hasHelperRights(UUIDHandler.getUUID(plr)))
+                {
+                    if (!Permissions.hasPermission(plr, "plots.cluster.resize.other"))
+                    {
                         MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.cluster.resize.other");
                         return false;
                     }
@@ -313,46 +374,56 @@ public class Cluster extends SubCommand {
                 //check if overlap
                 final PlotClusterId id = new PlotClusterId(pos1, pos2);
                 final HashSet<PlotCluster> intersects = ClusterManager.getIntersects(world, id);
-                if (intersects.size() > 1) {
+                if (intersects.size() > 1)
+                {
                     MainUtil.sendMessage(plr, C.CLUSTER_INTERSECTION, (intersects.size() - 1) + "");
                     return false;
                 }
-                HashSet<Plot> existing = MainUtil.getPlotSelectionOwned(world, cluster.getP1(), cluster.getP2());
-                HashSet<Plot> newplots = MainUtil.getPlotSelectionOwned(world, pos1, pos2);
-                HashSet<Plot> removed = ((HashSet<Plot>) existing.clone());
+                final HashSet<Plot> existing = MainUtil.getPlotSelectionOwned(world, cluster.getP1(), cluster.getP2());
+                final HashSet<Plot> newplots = MainUtil.getPlotSelectionOwned(world, pos1, pos2);
+                final HashSet<Plot> removed = ((HashSet<Plot>) existing.clone());
                 removed.removeAll(newplots);
                 // Check expand / shrink
-                if (removed.size() > 0) {
-                    if (!Permissions.hasPermission(plr, "plots.cluster.resize.shrink")) {
+                if (removed.size() > 0)
+                {
+                    if (!Permissions.hasPermission(plr, "plots.cluster.resize.shrink"))
+                    {
                         MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.cluster.resize.shrink");
                         return false;
                     }
                 }
                 newplots.removeAll(existing);
-                if (newplots.size() > 0) {
-                    if (!Permissions.hasPermission(plr, "plots.cluster.resize.expand")) {
+                if (newplots.size() > 0)
+                {
+                    if (!Permissions.hasPermission(plr, "plots.cluster.resize.expand"))
+                    {
                         MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.cluster.resize.expand");
                         return false;
                     }
                 }
                 // Check allowed cluster size
                 int current;
-                if (Settings.GLOBAL_LIMIT) {
+                if (Settings.GLOBAL_LIMIT)
+                {
                     current = ClusterManager.getPlayerClusterCount(plr);
                 }
-                else {
+                else
+                {
                     current = ClusterManager.getPlayerClusterCount(world, plr);
                 }
-                current -= cluster.getArea() + (1 + pos2.x - pos1.x) * (1 + pos2.y - pos1.y); 
-                int allowed = Permissions.hasPermissionRange(plr, "plots.cluster", Settings.MAX_PLOTS);
-                if (current + cluster.getArea() > allowed) {
+                current -= cluster.getArea() + (((1 + pos2.x) - pos1.x) * ((1 + pos2.y) - pos1.y));
+                final int allowed = Permissions.hasPermissionRange(plr, "plots.cluster", Settings.MAX_PLOTS);
+                if ((current + cluster.getArea()) > allowed)
+                {
                     MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.cluster." + (current + cluster.getArea()));
                     return false;
                 }
-                for (Plot plot : removed) {
+                for (final Plot plot : removed)
+                {
                     FlagManager.removePlotFlag(plot, "cluster");
                 }
-                for (Plot plot : newplots) {
+                for (final Plot plot : newplots)
+                {
                     FlagManager.addPlotFlag(plot, new Flag(FlagManager.getFlag("cluster"), cluster));
                 }
                 // resize cluster
@@ -362,76 +433,95 @@ public class Cluster extends SubCommand {
             }
             case "reg":
             case "regenerate":
-            case "regen": {
-                if (!Permissions.hasPermission(plr, "plots.cluster.delete")) {
+            case "regen":
+            {
+                if (!Permissions.hasPermission(plr, "plots.cluster.delete"))
+                {
                     MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.cluster.regen");
                     return false;
                 }
-                if ((args.length != 1) && (args.length != 2)) {
+                if ((args.length != 1) && (args.length != 2))
+                {
                     MainUtil.sendMessage(plr, C.COMMAND_SYNTAX, "/plot cluster regen [name]");
                     return false;
                 }
                 PlotCluster cluster;
-                if (args.length == 2) {
+                if (args.length == 2)
+                {
                     cluster = ClusterManager.getCluster(plr.getLocation().getWorld(), args[1]);
-                    if (cluster == null) {
+                    if (cluster == null)
+                    {
                         MainUtil.sendMessage(plr, C.INVALID_CLUSTER, args[1]);
                         return false;
                     }
-                } else {
+                }
+                else
+                {
                     cluster = ClusterManager.getCluster(plr.getLocation());
-                    if (cluster == null) {
+                    if (cluster == null)
+                    {
                         MainUtil.sendMessage(plr, C.NOT_IN_CLUSTER);
                         return false;
                     }
                 }
-                if (!cluster.owner.equals(UUIDHandler.getUUID(plr))) {
-                    if (!Permissions.hasPermission(plr, "plots.cluster.regen.other")) {
+                if (!cluster.owner.equals(UUIDHandler.getUUID(plr)))
+                {
+                    if (!Permissions.hasPermission(plr, "plots.cluster.regen.other"))
+                    {
                         MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.cluster.regen.other");
                         return false;
                     }
                 }
-                long start = System.currentTimeMillis();
+                final long start = System.currentTimeMillis();
                 ClusterManager.regenCluster(cluster);
                 MainUtil.sendMessage(plr, C.CLUSTER_REGENERATED, (System.currentTimeMillis() - start) + "");
                 return true;
             }
             case "add":
             case "inv":
-            case "invite": {
-                if (!Permissions.hasPermission(plr, "plots.cluster.invite")) {
+            case "invite":
+            {
+                if (!Permissions.hasPermission(plr, "plots.cluster.invite"))
+                {
                     MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.cluster.invite");
                     return false;
                 }
-                if (args.length != 2) {
+                if (args.length != 2)
+                {
                     MainUtil.sendMessage(plr, C.COMMAND_SYNTAX, "/plot cluster invite <player>");
                     return false;
                 }
                 // check if in cluster
                 final PlotCluster cluster = ClusterManager.getCluster(plr.getLocation());
-                if (cluster == null) {
+                if (cluster == null)
+                {
                     MainUtil.sendMessage(plr, C.NOT_IN_CLUSTER);
                     return false;
                 }
-                if (!cluster.hasHelperRights(UUIDHandler.getUUID(plr))) {
-                    if (!Permissions.hasPermission(plr, "plots.cluster.invite.other")) {
+                if (!cluster.hasHelperRights(UUIDHandler.getUUID(plr)))
+                {
+                    if (!Permissions.hasPermission(plr, "plots.cluster.invite.other"))
+                    {
                         MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.cluster.invite.other");
                         return false;
                     }
                 }
                 // check uuid
                 final UUID uuid = UUIDHandler.getUUID(args[1], null);
-                if (uuid == null) {
+                if (uuid == null)
+                {
                     MainUtil.sendMessage(plr, C.INVALID_PLAYER, args[2]);
                     return false;
                 }
-                if (!cluster.isAdded(uuid)) {
+                if (!cluster.isAdded(uuid))
+                {
                     // add the user if not added
                     cluster.invited.add(uuid);
                     final String world = plr.getLocation().getWorld();
                     DBFunc.setInvited(world, cluster, uuid);
                     final PlotPlayer player = UUIDHandler.getPlayer(uuid);
-                    if (player != null) {
+                    if (player != null)
+                    {
                         MainUtil.sendMessage(player, C.CLUSTER_INVITED, cluster.getName());
                     }
                 }
@@ -440,51 +530,63 @@ public class Cluster extends SubCommand {
             }
             case "k":
             case "remove":
-            case "kick": {
-                if (!Permissions.hasPermission(plr, "plots.cluster.kick")) {
+            case "kick":
+            {
+                if (!Permissions.hasPermission(plr, "plots.cluster.kick"))
+                {
                     MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.cluster.kick");
                     return false;
                 }
-                if (args.length != 2) {
+                if (args.length != 2)
+                {
                     MainUtil.sendMessage(plr, C.COMMAND_SYNTAX, "/plot cluster kick <player>");
                     return false;
                 }
                 final PlotCluster cluster = ClusterManager.getCluster(plr.getLocation());
-                if (cluster == null) {
+                if (cluster == null)
+                {
                     MainUtil.sendMessage(plr, C.NOT_IN_CLUSTER);
                     return false;
                 }
-                if (!cluster.hasHelperRights(UUIDHandler.getUUID(plr))) {
-                    if (!Permissions.hasPermission(plr, "plots.cluster.kick.other")) {
+                if (!cluster.hasHelperRights(UUIDHandler.getUUID(plr)))
+                {
+                    if (!Permissions.hasPermission(plr, "plots.cluster.kick.other"))
+                    {
                         MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.cluster.kick.other");
                         return false;
                     }
                 }
                 // check uuid
                 final UUID uuid = UUIDHandler.getUUID(args[1], null);
-                if (uuid == null) {
+                if (uuid == null)
+                {
                     MainUtil.sendMessage(plr, C.INVALID_PLAYER, args[1]);
                     return false;
                 }
                 // Can't kick if the player is yourself, the owner, or not added to the cluster
-                if (uuid.equals(UUIDHandler.getUUID(plr)) || uuid.equals(cluster.owner) || !cluster.isAdded(uuid)) {
+                if (uuid.equals(UUIDHandler.getUUID(plr)) || uuid.equals(cluster.owner) || !cluster.isAdded(uuid))
+                {
                     MainUtil.sendMessage(plr, C.CANNOT_KICK_PLAYER, cluster.getName());
                     return false;
                 }
-                if (cluster.helpers.contains(uuid)) {
+                if (cluster.helpers.contains(uuid))
+                {
                     cluster.helpers.remove(uuid);
                     DBFunc.removeHelper(cluster, uuid);
                 }
                 cluster.invited.remove(uuid);
                 DBFunc.removeInvited(cluster, uuid);
                 final PlotPlayer player = UUIDHandler.getPlayer(uuid);
-                if (player != null) {
+                if (player != null)
+                {
                     MainUtil.sendMessage(player, C.CLUSTER_REMOVED, cluster.getName());
                 }
-                for (final Plot plot : new ArrayList<>(PS.get().getPlots(plr.getLocation().getWorld(), uuid))) {
+                for (final Plot plot : new ArrayList<>(PS.get().getPlots(plr.getLocation().getWorld(), uuid)))
+                {
                     final PlotCluster current = ClusterManager.getCluster(plot);
-                    if ((current != null) && current.equals(cluster)) {
-                        final String world = plr.getLocation().getWorld();
+                    if ((current != null) && current.equals(cluster))
+                    {
+                        plr.getLocation().getWorld();
                         plot.unclaim();
                     }
                 }
@@ -492,49 +594,62 @@ public class Cluster extends SubCommand {
                 return true;
             }
             case "quit":
-            case "leave": {
-                if (!Permissions.hasPermission(plr, "plots.cluster.leave")) {
+            case "leave":
+            {
+                if (!Permissions.hasPermission(plr, "plots.cluster.leave"))
+                {
                     MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.cluster.leave");
                     return false;
                 }
-                if ((args.length != 1) && (args.length != 2)) {
+                if ((args.length != 1) && (args.length != 2))
+                {
                     MainUtil.sendMessage(plr, C.COMMAND_SYNTAX, "/plot cluster leave [name]");
                     return false;
                 }
                 PlotCluster cluster;
-                if (args.length == 2) {
+                if (args.length == 2)
+                {
                     cluster = ClusterManager.getCluster(plr.getLocation().getWorld(), args[1]);
-                    if (cluster == null) {
+                    if (cluster == null)
+                    {
                         MainUtil.sendMessage(plr, C.INVALID_CLUSTER, args[1]);
                         return false;
                     }
-                } else {
+                }
+                else
+                {
                     cluster = ClusterManager.getCluster(plr.getLocation());
-                    if (cluster == null) {
+                    if (cluster == null)
+                    {
                         MainUtil.sendMessage(plr, C.NOT_IN_CLUSTER);
                         return false;
                     }
                 }
                 final UUID uuid = UUIDHandler.getUUID(plr);
-                if (!cluster.isAdded(uuid)) {
+                if (!cluster.isAdded(uuid))
+                {
                     MainUtil.sendMessage(plr, C.CLUSTER_NOT_ADDED);
                     return false;
                 }
-                if (uuid.equals(cluster.owner)) {
+                if (uuid.equals(cluster.owner))
+                {
                     MainUtil.sendMessage(plr, C.CLUSTER_CANNOT_LEAVE);
                     return false;
                 }
-                if (cluster.helpers.contains(uuid)) {
+                if (cluster.helpers.contains(uuid))
+                {
                     cluster.helpers.remove(uuid);
                     DBFunc.removeHelper(cluster, uuid);
                 }
                 cluster.invited.remove(uuid);
                 DBFunc.removeInvited(cluster, uuid);
                 MainUtil.sendMessage(plr, C.CLUSTER_REMOVED, cluster.getName());
-                for (final Plot plot : new ArrayList<>(PS.get().getPlots(plr.getLocation().getWorld(), uuid))) {
+                for (final Plot plot : new ArrayList<>(PS.get().getPlots(plr.getLocation().getWorld(), uuid)))
+                {
                     final PlotCluster current = ClusterManager.getCluster(plot);
-                    if ((current != null) && current.equals(cluster)) {
-                        final String world = plr.getLocation().getWorld();
+                    if ((current != null) && current.equals(cluster))
+                    {
+                        plr.getLocation().getWorld();
                         plot.unclaim();
                     }
                 }
@@ -542,31 +657,38 @@ public class Cluster extends SubCommand {
             }
             case "admin":
             case "helper":
-            case "helpers": {
-                if (!Permissions.hasPermission(plr, "plots.cluster.helpers")) {
+            case "helpers":
+            {
+                if (!Permissions.hasPermission(plr, "plots.cluster.helpers"))
+                {
                     MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.cluster.helpers");
                     return false;
                 }
-                if (args.length != 3) {
+                if (args.length != 3)
+                {
                     MainUtil.sendMessage(plr, C.COMMAND_SYNTAX, "/plot cluster helpers <add|remove> <player>");
                     return false;
                 }
                 final PlotCluster cluster = ClusterManager.getCluster(plr.getLocation());
-                if (cluster == null) {
+                if (cluster == null)
+                {
                     MainUtil.sendMessage(plr, C.NOT_IN_CLUSTER);
                     return false;
                 }
                 final UUID uuid = UUIDHandler.getUUID(args[2], null);
-                if (uuid == null) {
+                if (uuid == null)
+                {
                     MainUtil.sendMessage(plr, C.INVALID_PLAYER, args[2]);
                     return false;
                 }
-                if (args[1].toLowerCase().equals("add")) {
+                if (args[1].toLowerCase().equals("add"))
+                {
                     cluster.helpers.add(uuid);
                     DBFunc.setHelper(cluster, uuid);
                     return MainUtil.sendMessage(plr, C.CLUSTER_ADDED_HELPER);
                 }
-                if (args[1].toLowerCase().equals("remove")) {
+                if (args[1].toLowerCase().equals("remove"))
+                {
                     cluster.helpers.remove(uuid);
                     DBFunc.removeHelper(cluster, uuid);
                     return MainUtil.sendMessage(plr, C.CLUSTER_REMOVED_HELPER);
@@ -576,23 +698,29 @@ public class Cluster extends SubCommand {
             }
             case "spawn":
             case "home":
-            case "tp": {
-                if (!Permissions.hasPermission(plr, "plots.cluster.tp")) {
+            case "tp":
+            {
+                if (!Permissions.hasPermission(plr, "plots.cluster.tp"))
+                {
                     MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.cluster.tp");
                     return false;
                 }
-                if (args.length != 2) {
+                if (args.length != 2)
+                {
                     MainUtil.sendMessage(plr, C.COMMAND_SYNTAX, "/plot cluster tp <name>");
                     return false;
                 }
                 final PlotCluster cluster = ClusterManager.getCluster(plr.getLocation().getWorld(), args[1]);
-                if (cluster == null) {
+                if (cluster == null)
+                {
                     MainUtil.sendMessage(plr, C.INVALID_CLUSTER, args[1]);
                     return false;
                 }
                 final UUID uuid = UUIDHandler.getUUID(plr);
-                if (!cluster.isAdded(uuid)) {
-                    if (!Permissions.hasPermission(plr, "plots.cluster.tp.other")) {
+                if (!cluster.isAdded(uuid))
+                {
+                    if (!Permissions.hasPermission(plr, "plots.cluster.tp.other"))
+                    {
                         MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.cluster.tp.other");
                         return false;
                     }
@@ -603,32 +731,41 @@ public class Cluster extends SubCommand {
             case "i":
             case "info":
             case "show":
-            case "information": {
-                if (!Permissions.hasPermission(plr, "plots.cluster.info")) {
+            case "information":
+            {
+                if (!Permissions.hasPermission(plr, "plots.cluster.info"))
+                {
                     MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.cluster.info");
                     return false;
                 }
-                if ((args.length != 1) && (args.length != 2)) {
+                if ((args.length != 1) && (args.length != 2))
+                {
                     MainUtil.sendMessage(plr, C.COMMAND_SYNTAX, "/plot cluster info [name]");
                     return false;
                 }
                 PlotCluster cluster;
-                if (args.length == 2) {
+                if (args.length == 2)
+                {
                     cluster = ClusterManager.getCluster(plr.getLocation().getWorld(), args[1]);
-                    if (cluster == null) {
+                    if (cluster == null)
+                    {
                         MainUtil.sendMessage(plr, C.INVALID_CLUSTER, args[1]);
                         return false;
                     }
-                } else {
+                }
+                else
+                {
                     cluster = ClusterManager.getCluster(plr.getLocation());
-                    if (cluster == null) {
+                    if (cluster == null)
+                    {
                         MainUtil.sendMessage(plr, C.NOT_IN_CLUSTER);
                         return false;
                     }
                 }
                 final String id = cluster.toString();
                 String owner = UUIDHandler.getName(cluster.owner);
-                if (owner == null) {
+                if (owner == null)
+                {
                     owner = "unknown";
                 }
                 final String name = cluster.getName();
@@ -645,22 +782,28 @@ public class Cluster extends SubCommand {
             }
             case "sh":
             case "setspawn":
-            case "sethome": {
-                if (!Permissions.hasPermission(plr, "plots.cluster.sethome")) {
+            case "sethome":
+            {
+                if (!Permissions.hasPermission(plr, "plots.cluster.sethome"))
+                {
                     MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.cluster.sethome");
                     return false;
                 }
-                if ((args.length != 1) && (args.length != 2)) {
+                if ((args.length != 1) && (args.length != 2))
+                {
                     MainUtil.sendMessage(plr, C.COMMAND_SYNTAX, "/plot cluster sethome");
                     return false;
                 }
                 final PlotCluster cluster = ClusterManager.getCluster(plr.getLocation());
-                if (cluster == null) {
+                if (cluster == null)
+                {
                     MainUtil.sendMessage(plr, C.NOT_IN_CLUSTER);
                     return false;
                 }
-                if (!cluster.hasHelperRights(UUIDHandler.getUUID(plr))) {
-                    if (!Permissions.hasPermission(plr, "plots.cluster.sethome.other")) {
+                if (!cluster.hasHelperRights(UUIDHandler.getUUID(plr)))
+                {
+                    if (!Permissions.hasPermission(plr, "plots.cluster.sethome.other"))
+                    {
                         MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.cluster.sethome.other");
                         return false;
                     }
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/CommandCategory.java b/src/main/java/com/intellectualcrafters/plot/commands/CommandCategory.java
index b9cc06fd2..2f324404e 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/CommandCategory.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/CommandCategory.java
@@ -1,58 +1,59 @@
-package com.intellectualcrafters.plot.commands;
-
-/**
- * CommandCategory
- *
- * @author Citymonstret
- * @author Empire92
- */
-public enum CommandCategory {
-    /**
-     * Claiming Commands
-     *
-     * Such as: /plot claim
-     */
-    CLAIMING("Claiming"),
-    /**
-     * Teleportation Commands
-     *
-     * Such as: /plot visit
-     */
-    TELEPORT("Teleportation"),
-    /**
-     * Action Commands
-     *
-     * Such as: /plot clear
-     */
-    ACTIONS("Actions"),
-    /**
-     * Information Commands
-     *
-     * Such as: /plot info
-     */
-    INFO("Information"),
-    /**
-     * Debug Commands
-     *
-     * Such as: /plot debug
-     */
-    DEBUG("Debug");
-    /**
-     * The category name (Readable)
-     */
-    private final String name;
-
-    /**
-     * Constructor
-     *
-     * @param name readable name
-     */
-    CommandCategory(final String name) {
-        this.name = name;
-    }
-
-    @Override
-    public String toString() {
-        return this.name;
-    }
-}
+package com.intellectualcrafters.plot.commands;
+
+/**
+ * CommandCategory
+ *


+ */
+public enum CommandCategory
+{
+    /**
+     * Claiming Commands
+     *
+     * Such as: /plot claim
+     */
+    CLAIMING("Claiming"),
+    /**
+     * Teleportation Commands
+     *
+     * Such as: /plot visit
+     */
+    TELEPORT("Teleportation"),
+    /**
+     * Action Commands
+     *
+     * Such as: /plot clear
+     */
+    ACTIONS("Actions"),
+    /**
+     * Information Commands
+     *
+     * Such as: /plot info
+     */
+    INFO("Information"),
+    /**
+     * Debug Commands
+     *
+     * Such as: /plot debug
+     */
+    DEBUG("Debug");
+    /**
+     * The category name (Readable)
+     */
+    private final String name;
+
+    /**
+     * Constructor
+     *
+     * @param name readable name
+     */
+    CommandCategory(final String name)
+    {
+        this.name = name;
+    }
+
+    @Override
+    public String toString()
+    {
+        return name;
+    }
+}
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/CommandPermission.java b/src/main/java/com/intellectualcrafters/plot/commands/CommandPermission.java
index 32f1901cf..ecd451c75 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/CommandPermission.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/CommandPermission.java
@@ -1,52 +1,54 @@
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// PlotSquared - A plot manager and world generator for the Bukkit API                             /
-// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
-//                                                                                                 /
-// This program is free software; you can redistribute it and/or modify                            /
-// it under the terms of the GNU General Public License as published by                            /
-// the Free Software Foundation; either version 3 of the License, or                               /
-// (at your option) any later version.                                                             /
-//                                                                                                 /
-// This program is distributed in the hope that it will be useful,                                 /
-// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
-// GNU General Public License for more details.                                                    /
-//                                                                                                 /
-// You should have received a copy of the GNU General Public License                               /
-// along with this program; if not, write to the Free Software Foundation,                         /
-// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
-//                                                                                                 /
-// You can contact us via: support@intellectualsites.com                                           /
-////////////////////////////////////////////////////////////////////////////////////////////////////
-package com.intellectualcrafters.plot.commands;
-
-import com.intellectualcrafters.plot.object.PlotPlayer;
-import com.intellectualcrafters.plot.util.Permissions;
-
-/**
- * Created by Citymonstret on 2014-08-03.
- *
- * @author Citymonstret
- */
-public class CommandPermission {
-    /**
-     * Permission Node
-     */
-    public final String permission;
-
-    /**
-     * @param permission Command Permission
-     */
-    public CommandPermission(final String permission) {
-        this.permission = permission.toLowerCase();
-    }
-
-    /**
-     * @param player Does the player have the permission?
-     *
-     * @return true of player has the required permission node
-     */
-    public boolean hasPermission(final PlotPlayer player) {
-        return Permissions.hasPermission(player, this.permission);
-    }
-}
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// PlotSquared - A plot manager and world generator for the Bukkit API                             /
+// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
+//                                                                                                 /
+// This program is free software; you can redistribute it and/or modify                            /
+// it under the terms of the GNU General Public License as published by                            /
+// the Free Software Foundation; either version 3 of the License, or                               /
+// (at your option) any later version.                                                             /
+//                                                                                                 /
+// This program is distributed in the hope that it will be useful,                                 /
+// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
+// GNU General Public License for more details.                                                    /
+//                                                                                                 /
+// You should have received a copy of the GNU General Public License                               /
+// along with this program; if not, write to the Free Software Foundation,                         /
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
+//                                                                                                 /
+// You can contact us via: support@intellectualsites.com                                           /
+////////////////////////////////////////////////////////////////////////////////////////////////////
+package com.intellectualcrafters.plot.commands;
+
+import com.intellectualcrafters.plot.object.PlotPlayer;
+import com.intellectualcrafters.plot.util.Permissions;
+
+/**
+ * Created by Citymonstret on 2014-08-03.
+ *

+ */
+public class CommandPermission
+{
+    /**
+     * Permission Node
+     */
+    public final String permission;
+
+    /**
+     * @param permission Command Permission
+     */
+    public CommandPermission(final String permission)
+    {
+        this.permission = permission.toLowerCase();
+    }
+
+    /**
+     * @param player Does the player have the permission?
+     *
+     * @return true of player has the required permission node
+     */
+    public boolean hasPermission(final PlotPlayer player)
+    {
+        return Permissions.hasPermission(player, permission);
+    }
+}
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Comment.java b/src/main/java/com/intellectualcrafters/plot/commands/Comment.java
index 7876bdeb1..f7b16cf6b 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/Comment.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/Comment.java
@@ -36,56 +36,66 @@ import com.intellectualcrafters.plot.util.UUIDHandler;
 import com.plotsquared.general.commands.CommandDeclaration;
 
 @CommandDeclaration(
-        command = "comment",
-        aliases = {"msg"},
-        description = "Comment on a plot",
-        category = CommandCategory.ACTIONS,
-        requiredType = RequiredType.NONE,
-        permission = "plots.comment"
-)
-public class Comment extends SubCommand {
+command = "comment",
+aliases = { "msg" },
+description = "Comment on a plot",
+category = CommandCategory.ACTIONS,
+requiredType = RequiredType.NONE,
+permission = "plots.comment")
+public class Comment extends SubCommand
+{
 
     @Override
-    public boolean onCommand(PlotPlayer player, String[] args) {
-        if (args.length < 2) {
-            sendMessage(player, C.COMMENT_SYNTAX, StringMan.join(CommentManager.inboxes.keySet(),"|"));
+    public boolean onCommand(final PlotPlayer player, final String[] args)
+    {
+        if (args.length < 2)
+        {
+            sendMessage(player, C.COMMENT_SYNTAX, StringMan.join(CommentManager.inboxes.keySet(), "|"));
             return false;
         }
-        CommentInbox inbox = CommentManager.inboxes.get(args[0].toLowerCase());
-        if (inbox == null) {
-            sendMessage(player, C.COMMENT_SYNTAX, StringMan.join(CommentManager.inboxes.keySet(),"|"));
+        final CommentInbox inbox = CommentManager.inboxes.get(args[0].toLowerCase());
+        if (inbox == null)
+        {
+            sendMessage(player, C.COMMENT_SYNTAX, StringMan.join(CommentManager.inboxes.keySet(), "|"));
             return false;
         }
         Plot plot;
-        Location loc = player.getLocation();
-        PlotId id = PlotId.fromString(args[1]);
+        final Location loc = player.getLocation();
+        final PlotId id = PlotId.fromString(args[1]);
         int index;
-        if (id != null) {
-            if (args.length < 4) {
-                sendMessage(player, C.COMMENT_SYNTAX, StringMan.join(CommentManager.inboxes.keySet(),"|"));
+        if (id != null)
+        {
+            if (args.length < 4)
+            {
+                sendMessage(player, C.COMMENT_SYNTAX, StringMan.join(CommentManager.inboxes.keySet(), "|"));
                 return false;
             }
             index = 2;
             plot = MainUtil.getPlot(loc.getWorld(), id);
         }
-        else {
+        else
+        {
             index = 1;
             plot = MainUtil.getPlot(loc);
         }
-        if (!inbox.canWrite(plot, player)) {
+        if (!inbox.canWrite(plot, player))
+        {
             sendMessage(player, C.NO_PERM_INBOX, "");
             return false;
         }
-        String message = StringMan.join(Arrays.copyOfRange(args,index, args.length), " ");
-        PlotComment comment = new PlotComment(loc.getWorld(), id, message, player.getName(), inbox.toString(), System.currentTimeMillis());
-        boolean result = inbox.addComment(plot, comment);
-        if (!result) {
+        final String message = StringMan.join(Arrays.copyOfRange(args, index, args.length), " ");
+        final PlotComment comment = new PlotComment(loc.getWorld(), id, message, player.getName(), inbox.toString(), System.currentTimeMillis());
+        final boolean result = inbox.addComment(plot, comment);
+        if (!result)
+        {
             sendMessage(player, C.NO_PLOT_INBOX, "");
-            sendMessage(player, C.COMMENT_SYNTAX, StringMan.join(CommentManager.inboxes.keySet(),"|"));
+            sendMessage(player, C.COMMENT_SYNTAX, StringMan.join(CommentManager.inboxes.keySet(), "|"));
             return false;
         }
-        for (PlotPlayer pp : UUIDHandler.getPlayers().values()) {
-            if (pp.getAttribute("chatspy")) {
+        for (final PlotPlayer pp : UUIDHandler.getPlayers().values())
+        {
+            if (pp.getAttribute("chatspy"))
+            {
                 MainUtil.sendMessage(pp, "/plot comment " + StringMan.join(args, " "));
             }
         }
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Condense.java b/src/main/java/com/intellectualcrafters/plot/commands/Condense.java
index 4dd63e88d..f57c54c96 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/Condense.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/Condense.java
@@ -36,42 +36,51 @@ import com.intellectualcrafters.plot.util.MathMan;
 import com.plotsquared.general.commands.CommandDeclaration;
 
 @CommandDeclaration(
-        command = "condense",
-        permission = "plots.admin",
-        description = "Condense a plotworld",
-        category = CommandCategory.DEBUG,
-        requiredType = RequiredType.CONSOLE
-)
-public class Condense extends SubCommand {
+command = "condense",
+permission = "plots.admin",
+description = "Condense a plotworld",
+category = CommandCategory.DEBUG,
+requiredType = RequiredType.CONSOLE)
+public class Condense extends SubCommand
+{
 
     public static boolean TASK = false;
 
     @Override
-    public boolean onCommand(final PlotPlayer plr, String ... args) {
-        if ((args.length != 2) && (args.length != 3)) {
+    public boolean onCommand(final PlotPlayer plr, final String... args)
+    {
+        if ((args.length != 2) && (args.length != 3))
+        {
             MainUtil.sendMessage(plr, "/plot condense <world> <start|stop|info> [radius]");
             return false;
         }
         final String worldname = args[0];
-        if (!BlockManager.manager.isWorld(worldname) || !PS.get().isPlotWorld(worldname)) {
+        if (!BlockManager.manager.isWorld(worldname) || !PS.get().isPlotWorld(worldname))
+        {
             MainUtil.sendMessage(plr, "INVALID WORLD");
             return false;
         }
-        switch (args[1].toLowerCase()) {
-            case "start": {
-                if (args.length == 2) {
+        switch (args[1].toLowerCase())
+        {
+            case "start":
+            {
+                if (args.length == 2)
+                {
                     MainUtil.sendMessage(plr, "/plot condense " + worldname + " start <radius>");
                     return false;
                 }
-                if (TASK) {
+                if (TASK)
+                {
                     MainUtil.sendMessage(plr, "TASK ALREADY STARTED");
                     return false;
                 }
-                if (args.length == 2) {
+                if (args.length == 2)
+                {
                     MainUtil.sendMessage(plr, "/plot condense " + worldname + " start <radius>");
                     return false;
                 }
-                if (!MathMan.isInteger(args[2])) {
+                if (!MathMan.isInteger(args[2]))
+                {
                     MainUtil.sendMessage(plr, "INVALID RADIUS");
                     return false;
                 }
@@ -79,61 +88,76 @@ public class Condense extends SubCommand {
                 final Collection<Plot> plots = PS.get().getPlotsInWorld(worldname);
                 final int size = plots.size();
                 final int minimum_radius = (int) Math.ceil((Math.sqrt(size) / 2) + 1);
-                if (radius < minimum_radius) {
+                if (radius < minimum_radius)
+                {
                     MainUtil.sendMessage(plr, "RADIUS TOO SMALL");
                     return false;
                 }
                 final List<PlotId> to_move = new ArrayList<>(getPlots(plots, radius));
                 final List<PlotId> free = new ArrayList<>();
                 PlotId start = new PlotId(0, 0);
-                while ((start.x <= minimum_radius) && (start.y <= minimum_radius)) {
+                while ((start.x <= minimum_radius) && (start.y <= minimum_radius))
+                {
                     final Plot plot = MainUtil.getPlot(worldname, start);
-                    if (!plot.hasOwner()) {
+                    if (!plot.hasOwner())
+                    {
                         free.add(plot.id);
                     }
                     start = Auto.getNextPlot(start, 1);
                 }
-                if (free.size() == 0 || to_move.size() == 0) {
+                if ((free.size() == 0) || (to_move.size() == 0))
+                {
                     MainUtil.sendMessage(plr, "NO FREE PLOTS FOUND");
                     return false;
                 }
-               MainUtil.move(MainUtil.getPlot(worldname, to_move.get(0)), MainUtil.getPlot(worldname, free.get(0)), new Runnable() {
+                MainUtil.move(MainUtil.getPlot(worldname, to_move.get(0)), MainUtil.getPlot(worldname, free.get(0)), new Runnable()
+                {
                     @Override
-                    public void run() {
-                        if (!TASK) {
+                    public void run()
+                    {
+                        if (!TASK)
+                        {
                             MainUtil.sendMessage(plr, "CONDENSE TASK CANCELLED");
                             return;
                         }
                         to_move.remove(0);
                         free.remove(0);
                         int index = 0;
-                        for (final PlotId id : to_move) {
+                        for (final PlotId id : to_move)
+                        {
                             final Plot plot = MainUtil.getPlot(worldname, id);
-                            if (plot.hasOwner()) {
+                            if (plot.hasOwner())
+                            {
                                 break;
                             }
                             index++;
                         }
-                        for (int i = 0; i < index; i++) {
+                        for (int i = 0; i < index; i++)
+                        {
                             to_move.remove(0);
                         }
                         index = 0;
-                        for (final PlotId id : free) {
+                        for (final PlotId id : free)
+                        {
                             final Plot plot = MainUtil.getPlot(worldname, id);
-                            if (!plot.hasOwner()) {
+                            if (!plot.hasOwner())
+                            {
                                 break;
                             }
                             index++;
                         }
-                        for (int i = 0; i < index; i++) {
+                        for (int i = 0; i < index; i++)
+                        {
                             free.remove(0);
                         }
-                        if (to_move.size() == 0) {
+                        if (to_move.size() == 0)
+                        {
                             MainUtil.sendMessage(plr, "TASK COMPLETE. PLEASE VERIFY THAT NO NEW PLOTS HAVE BEEN CLAIMED DURING TASK.");
                             TASK = false;
                             return;
                         }
-                        if (free.size() == 0) {
+                        if (free.size() == 0)
+                        {
                             MainUtil.sendMessage(plr, "TASK FAILED. NO FREE PLOTS FOUND!");
                             TASK = false;
                             return;
@@ -146,8 +170,10 @@ public class Condense extends SubCommand {
                 MainUtil.sendMessage(plr, "TASK STARTED...");
                 return true;
             }
-            case "stop": {
-                if (!TASK) {
+            case "stop":
+            {
+                if (!TASK)
+                {
                     MainUtil.sendMessage(plr, "TASK ALREADY STOPPED");
                     return false;
                 }
@@ -155,12 +181,15 @@ public class Condense extends SubCommand {
                 MainUtil.sendMessage(plr, "TASK STOPPED");
                 return true;
             }
-            case "info": {
-                if (args.length == 2) {
+            case "info":
+            {
+                if (args.length == 2)
+                {
                     MainUtil.sendMessage(plr, "/plot condense " + worldname + " info <radius>");
                     return false;
                 }
-                if (!MathMan.isInteger(args[2])) {
+                if (!MathMan.isInteger(args[2]))
+                {
                     MainUtil.sendMessage(plr, "INVALID RADIUS");
                     return false;
                 }
@@ -168,7 +197,8 @@ public class Condense extends SubCommand {
                 final Collection<Plot> plots = PS.get().getPlotsInWorld(worldname);
                 final int size = plots.size();
                 final int minimum_radius = (int) Math.ceil((Math.sqrt(size) / 2) + 1);
-                if (radius < minimum_radius) {
+                if (radius < minimum_radius)
+                {
                     MainUtil.sendMessage(plr, "RADIUS TOO SMALL");
                     return false;
                 }
@@ -189,10 +219,13 @@ public class Condense extends SubCommand {
         return false;
     }
 
-    public Set<PlotId> getPlots(final Collection<Plot> plots, final int radius) {
+    public Set<PlotId> getPlots(final Collection<Plot> plots, final int radius)
+    {
         final HashSet<PlotId> outside = new HashSet<>();
-        for (final Plot plot : plots) {
-            if ((plot.id.x > radius) || (plot.id.x < -radius) || (plot.id.y > radius) || (plot.id.y < -radius)) {
+        for (final Plot plot : plots)
+        {
+            if ((plot.id.x > radius) || (plot.id.x < -radius) || (plot.id.y > radius) || (plot.id.y < -radius))
+            {
                 outside.add(plot.id);
             }
         }
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Confirm.java b/src/main/java/com/intellectualcrafters/plot/commands/Confirm.java
index 46f523ba9..8d409a90e 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/Confirm.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/Confirm.java
@@ -20,7 +20,6 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 package com.intellectualcrafters.plot.commands;
 
-
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.object.CmdInstance;
 import com.intellectualcrafters.plot.object.PlotPlayer;
@@ -30,26 +29,29 @@ import com.intellectualcrafters.plot.util.TaskManager;
 import com.plotsquared.general.commands.CommandDeclaration;
 
 @CommandDeclaration(
-		command = "confirm",
-		permission = "plots.use",
-		description = "Confirm an action",
-		category = CommandCategory.ACTIONS
-)
-public class Confirm extends SubCommand {
+command = "confirm",
+permission = "plots.use",
+description = "Confirm an action",
+category = CommandCategory.ACTIONS)
+public class Confirm extends SubCommand
+{
 
-	@Override
-	public boolean onCommand(final PlotPlayer plr, final String ... args) {
-    	CmdInstance command = CmdConfirm.getPending(plr);
-    	if (command == null) {
-    		MainUtil.sendMessage(plr, C.FAILED_CONFIRM);
-    		return false;
-    	}
-    	CmdConfirm.removePending(plr);
-    	if (System.currentTimeMillis() - command.timestamp > 20000) {
-    	    MainUtil.sendMessage(plr, C.FAILED_CONFIRM);
-    	    return false;
-    	}
-    	TaskManager.runTask(command.command);
-    	return true;
+    @Override
+    public boolean onCommand(final PlotPlayer plr, final String... args)
+    {
+        final CmdInstance command = CmdConfirm.getPending(plr);
+        if (command == null)
+        {
+            MainUtil.sendMessage(plr, C.FAILED_CONFIRM);
+            return false;
+        }
+        CmdConfirm.removePending(plr);
+        if ((System.currentTimeMillis() - command.timestamp) > 20000)
+        {
+            MainUtil.sendMessage(plr, C.FAILED_CONFIRM);
+            return false;
+        }
+        TaskManager.runTask(command.command);
+        return true;
     }
 }
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Continue.java b/src/main/java/com/intellectualcrafters/plot/commands/Continue.java
index 51154579a..61fc281ee 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/Continue.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/Continue.java
@@ -22,49 +22,46 @@ package com.intellectualcrafters.plot.commands;
 
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.config.Settings;
-import com.intellectualcrafters.plot.flag.Flag;
 import com.intellectualcrafters.plot.flag.FlagManager;
-import com.intellectualcrafters.plot.generator.HybridUtils;
 import com.intellectualcrafters.plot.object.Location;
 import com.intellectualcrafters.plot.object.Plot;
-import com.intellectualcrafters.plot.object.PlotAnalysis;
 import com.intellectualcrafters.plot.object.PlotPlayer;
-import com.intellectualcrafters.plot.object.RunnableVal;
-import com.intellectualcrafters.plot.util.BlockManager;
 import com.intellectualcrafters.plot.util.MainUtil;
 import com.intellectualcrafters.plot.util.Permissions;
-import com.intellectualcrafters.plot.util.UUIDHandler;
 import com.plotsquared.general.commands.CommandDeclaration;
 
 @CommandDeclaration(
-        command = "continue",
-        description = "Continue a plot that was previously marked as done",
-        permission = "plots.continue",
-        category = CommandCategory.ACTIONS,
-        requiredType = RequiredType.NONE
-)
-public class Continue extends SubCommand {
+command = "continue",
+description = "Continue a plot that was previously marked as done",
+permission = "plots.continue",
+category = CommandCategory.ACTIONS,
+requiredType = RequiredType.NONE)
+public class Continue extends SubCommand
+{
 
     @Override
-    public boolean onCommand(final PlotPlayer plr, final String[] args) {
+    public boolean onCommand(final PlotPlayer plr, final String[] args)
+    {
         final Location loc = plr.getLocation();
         final Plot plot = MainUtil.getPlot(loc);
-        if (plot == null || !plot.hasOwner()) {
-            return !sendMessage(plr, C.NOT_IN_PLOT);
-        }
-        if ((!plot.isOwner(plr.getUUID())) && !Permissions.hasPermission(plr, "plots.admin.command.continue")) {
+        if ((plot == null) || !plot.hasOwner()) { return !sendMessage(plr, C.NOT_IN_PLOT); }
+        if ((!plot.isOwner(plr.getUUID())) && !Permissions.hasPermission(plr, "plots.admin.command.continue"))
+        {
             MainUtil.sendMessage(plr, C.NO_PLOT_PERMS);
             return false;
         }
-        if (!plot.getSettings().flags.containsKey("done")) {
+        if (!plot.getSettings().flags.containsKey("done"))
+        {
             MainUtil.sendMessage(plr, C.DONE_NOT_DONE);
             return false;
         }
-        if (Settings.DONE_COUNTS_TOWARDS_LIMIT && MainUtil.getAllowedPlots(plr) >= MainUtil.getPlayerPlotCount(plr)) {
+        if (Settings.DONE_COUNTS_TOWARDS_LIMIT && (MainUtil.getAllowedPlots(plr) >= MainUtil.getPlayerPlotCount(plr)))
+        {
             MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.admin.command.continue");
             return false;
         }
-        if (MainUtil.runners.containsKey(plot)) {
+        if (MainUtil.runners.containsKey(plot))
+        {
             MainUtil.sendMessage(plr, C.WAIT_FOR_TIMER);
             return false;
         }
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Copy.java b/src/main/java/com/intellectualcrafters/plot/commands/Copy.java
index b9781f14e..76314bf6b 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/Copy.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/Copy.java
@@ -31,53 +31,61 @@ import com.plotsquared.general.commands.Argument;
 import com.plotsquared.general.commands.CommandDeclaration;
 
 @CommandDeclaration(
-        command = "copy",
-        permission = "plots.copy",
-        aliases = {"copypaste"},
-        category = CommandCategory.ACTIONS,
-        description = "Copy a plot",
-        usage = "/plot copy <X;Z>",
-        requiredType = RequiredType.NONE
-)
-public class Copy extends SubCommand {
+command = "copy",
+permission = "plots.copy",
+aliases = { "copypaste" },
+category = CommandCategory.ACTIONS,
+description = "Copy a plot",
+usage = "/plot copy <X;Z>",
+requiredType = RequiredType.NONE)
+public class Copy extends SubCommand
+{
 
-    public Copy() {
+    public Copy()
+    {
         requiredArguments = new Argument[] {
-                Argument.PlotID
+        Argument.PlotID
         };
     }
 
     @Override
-    public boolean onCommand(final PlotPlayer plr, final String ... args) {
+    public boolean onCommand(final PlotPlayer plr, final String... args)
+    {
         final Location loc = plr.getLocation();
         final Plot plot1 = MainUtil.getPlot(loc);
-        if (plot1 == null) {
-            return !MainUtil.sendMessage(plr, C.NOT_IN_PLOT);
-        }
-        if (!plot1.isAdded(plr.getUUID()) && !Permissions.hasPermission(plr, C.PERMISSION_ADMIN.s()))  {
+        if (plot1 == null) { return !MainUtil.sendMessage(plr, C.NOT_IN_PLOT); }
+        if (!plot1.isAdded(plr.getUUID()) && !Permissions.hasPermission(plr, C.PERMISSION_ADMIN.s()))
+        {
             MainUtil.sendMessage(plr, C.NO_PLOT_PERMS);
             return false;
         }
         final String world = loc.getWorld();
         final PlotId plot2 = MainUtil.parseId(args[0]);
-        if ((plot2 == null)) {
+        if ((plot2 == null))
+        {
             MainUtil.sendMessage(plr, C.NOT_VALID_PLOT_ID);
             MainUtil.sendMessage(plr, C.COMMAND_SYNTAX, "/plot copy <X;Z>");
             return false;
         }
-        if (plot1.id.equals(plot2)) {
+        if (plot1.id.equals(plot2))
+        {
             MainUtil.sendMessage(plr, C.NOT_VALID_PLOT_ID);
             MainUtil.sendMessage(plr, C.COMMAND_SYNTAX, "/plot copy <X;Z>");
             return false;
         }
-        if (MainUtil.copy(world, plot1.id, plot2, new Runnable() {
+        if (MainUtil.copy(world, plot1.id, plot2, new Runnable()
+        {
             @Override
-            public void run() {
+            public void run()
+            {
                 MainUtil.sendMessage(plr, C.COPY_SUCCESS);
             }
-        })) {
+        }))
+        {
             return true;
-        } else {
+        }
+        else
+        {
             MainUtil.sendMessage(plr, C.REQUIRES_UNOWNED);
             return false;
         }
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/CreateRoadSchematic.java b/src/main/java/com/intellectualcrafters/plot/commands/CreateRoadSchematic.java
index 1f0937750..a3c5ea544 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/CreateRoadSchematic.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/CreateRoadSchematic.java
@@ -31,26 +31,23 @@ import com.intellectualcrafters.plot.util.MainUtil;
 import com.plotsquared.general.commands.CommandDeclaration;
 
 @CommandDeclaration(
-        command = "createroadschematic",
-        aliases = {"crs"},
-        category = CommandCategory.DEBUG,
-        requiredType = RequiredType.NONE,
-        permission = "plots.createroadschematic",
-        description = "Add a road schematic to your world using the roads around your current plot",
-        usage = "/plot createroadschematic"
-)
-public class CreateRoadSchematic extends SubCommand {
+command = "createroadschematic",
+aliases = { "crs" },
+category = CommandCategory.DEBUG,
+requiredType = RequiredType.NONE,
+permission = "plots.createroadschematic",
+description = "Add a road schematic to your world using the roads around your current plot",
+usage = "/plot createroadschematic")
+public class CreateRoadSchematic extends SubCommand
+{
 
     @Override
-    public boolean onCommand(final PlotPlayer player, final String ... args) {
+    public boolean onCommand(final PlotPlayer player, final String... args)
+    {
         final Location loc = player.getLocation();
         final Plot plot = MainUtil.getPlot(loc);
-        if (plot == null) {
-            return sendMessage(player, C.NOT_IN_PLOT);
-        }
-        if (!(PS.get().getPlotWorld(loc.getWorld()) instanceof HybridPlotWorld)) {
-            return sendMessage(player, C.NOT_IN_PLOT_WORLD);
-        }
+        if (plot == null) { return sendMessage(player, C.NOT_IN_PLOT); }
+        if (!(PS.get().getPlotWorld(loc.getWorld()) instanceof HybridPlotWorld)) { return sendMessage(player, C.NOT_IN_PLOT_WORLD); }
         HybridUtils.manager.setupRoadSchematic(plot);
         MainUtil.sendMessage(player, "&6Saved new road schematic. To test the road, fly to a few other plots and use /plot debugroadregen");
         return true;
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Database.java b/src/main/java/com/intellectualcrafters/plot/commands/Database.java
index 0a8109081..b3b669038 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/Database.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/Database.java
@@ -3,12 +3,10 @@ package com.intellectualcrafters.plot.commands;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.HashSet;
 import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
 
 import com.intellectualcrafters.plot.PS;
-import com.intellectualcrafters.plot.config.Settings;
 import com.intellectualcrafters.plot.database.DBFunc;
 import com.intellectualcrafters.plot.database.MySQL;
 import com.intellectualcrafters.plot.database.SQLManager;
@@ -21,35 +19,45 @@ import com.intellectualcrafters.plot.util.TaskManager;
 import com.plotsquared.general.commands.CommandDeclaration;
 
 @CommandDeclaration(
-        command = "database",
-        aliases = {"convert"},
-        category = CommandCategory.DEBUG,
-        permission = "plots.database",
-        description = "Convert/Backup Storage",
-        requiredType = RequiredType.CONSOLE,
-        usage = "/plots database [world] <sqlite|mysql|import>"
-        
-)
-public class Database extends SubCommand {
+command = "database",
+aliases = { "convert" },
+category = CommandCategory.DEBUG,
+permission = "plots.database",
+description = "Convert/Backup Storage",
+requiredType = RequiredType.CONSOLE,
+usage = "/plots database [world] <sqlite|mysql|import>"
 
-    public static void insertPlots(final SQLManager manager, final ArrayList<Plot> plots, final PlotPlayer player) {
-        TaskManager.runTaskAsync(new Runnable() {
+)
+public class Database extends SubCommand
+{
+
+    public static void insertPlots(final SQLManager manager, final ArrayList<Plot> plots, final PlotPlayer player)
+    {
+        TaskManager.runTaskAsync(new Runnable()
+        {
             @Override
-            public void run() {
-                try {
+            public void run()
+            {
+                try
+                {
                     final ArrayList<Plot> ps = new ArrayList<>();
-                    for (final Plot p : plots) {
+                    for (final Plot p : plots)
+                    {
                         ps.add(p);
                     }
                     MainUtil.sendMessage(player, "&6Starting...");
-                    manager.createPlotsAndData(ps, new Runnable() {
+                    manager.createPlotsAndData(ps, new Runnable()
+                    {
                         @Override
-                        public void run() {
+                        public void run()
+                        {
                             MainUtil.sendMessage(player, "&6Database conversion finished!");
                             manager.close();
                         }
                     });
-                } catch (final Exception e) {
+                }
+                catch (final Exception e)
+                {
                     MainUtil.sendMessage(player, "Failed to insert plot objects, see stacktrace for info");
                     e.printStackTrace();
                 }
@@ -58,42 +66,54 @@ public class Database extends SubCommand {
     }
 
     @Override
-    public boolean onCommand(final PlotPlayer player, String[] args) {
-        if (args.length < 1) {
+    public boolean onCommand(final PlotPlayer player, String[] args)
+    {
+        if (args.length < 1)
+        {
             MainUtil.sendMessage(player, "/plot database [world] <sqlite|mysql>");
             return false;
         }
         ArrayList<Plot> plots;
-        if (PS.get().isPlotWorld(args[0])) {
+        if (PS.get().isPlotWorld(args[0]))
+        {
             plots = PS.get().sortPlotsByTemp(PS.get().getPlotsInWorld(args[0]));
             args = Arrays.copyOfRange(args, 1, args.length);
         }
-        else {
+        else
+        {
             plots = PS.get().sortPlotsByTemp(PS.get().getPlotsRaw());
         }
-        if (args.length < 1) {
+        if (args.length < 1)
+        {
             MainUtil.sendMessage(player, "/plot database [world] <sqlite|mysql|import>");
             MainUtil.sendMessage(player, "[arg] indicates an optional argument");
             return false;
         }
-        try {
+        try
+        {
             com.intellectualcrafters.plot.database.Database implementation;
             String prefix = "";
-            switch (args[0].toLowerCase()) {
-                case "import": {
-                    if (args.length < 2) {
+            switch (args[0].toLowerCase())
+            {
+                case "import":
+                {
+                    if (args.length < 2)
+                    {
                         MainUtil.sendMessage(player, "/plot database import [sqlite file] [prefix]");
                         return false;
                     }
                     MainUtil.sendMessage(player, "&6Starting...");
                     implementation = new SQLite(PS.get().IMP.getDirectory() + File.separator + args[1] + ".db");
-                    SQLManager manager = new SQLManager(implementation, (args.length == 3) ? args[2] : "", true);
-                    ConcurrentHashMap<String, ConcurrentHashMap<PlotId, Plot>> map = manager.getPlots();
+                    final SQLManager manager = new SQLManager(implementation, (args.length == 3) ? args[2] : "", true);
+                    final ConcurrentHashMap<String, ConcurrentHashMap<PlotId, Plot>> map = manager.getPlots();
                     plots = new ArrayList<Plot>();
-                    for (Entry<String, ConcurrentHashMap<PlotId, Plot>> entry : map.entrySet()) {
-                        for (Entry<PlotId, Plot> entry2 : entry.getValue().entrySet()) {
-                            Plot plot = entry2.getValue();
-                            if (PS.get().getPlot(plot.world, plot.id) != null) {
+                    for (final Entry<String, ConcurrentHashMap<PlotId, Plot>> entry : map.entrySet())
+                    {
+                        for (final Entry<PlotId, Plot> entry2 : entry.getValue().entrySet())
+                        {
+                            final Plot plot = entry2.getValue();
+                            if (PS.get().getPlot(plot.world, plot.id) != null)
+                            {
                                 MainUtil.sendMessage(player, "Skipping duplicate plot: " + plot + " | id=" + plot.temp);
                                 continue;
                             }
@@ -101,43 +121,44 @@ public class Database extends SubCommand {
                             plots.add(entry2.getValue());
                         }
                     }
-                    DBFunc.createPlotsAndData(plots, new Runnable() {
+                    DBFunc.createPlotsAndData(plots, new Runnable()
+                    {
                         @Override
-                        public void run() {
+                        public void run()
+                        {
                             MainUtil.sendMessage(player, "&6Database conversion finished!");
                         }
                     });
                     return true;
                 }
                 case "mysql":
-                    if (args.length < 6) {
-                        return MainUtil.sendMessage(player, "/plot database mysql [host] [port] [username] [password] [database] {prefix}");
-                    }
+                    if (args.length < 6) { return MainUtil.sendMessage(player, "/plot database mysql [host] [port] [username] [password] [database] {prefix}"); }
                     final String host = args[1];
                     final String port = args[2];
                     final String username = args[3];
                     final String password = args[4];
                     final String database = args[5];
-                    if (args.length > 6) {
+                    if (args.length > 6)
+                    {
                         prefix = args[6];
                     }
                     implementation = new MySQL(host, port, database, username, password);
                     break;
                 case "sqlite":
-                    if (args.length < 2) {
-                        return MainUtil.sendMessage(player, "/plot database sqlite [file]");
-                    }
+                    if (args.length < 2) { return MainUtil.sendMessage(player, "/plot database sqlite [file]"); }
                     implementation = new SQLite(PS.get().IMP.getDirectory() + File.separator + args[1] + ".db");
                     break;
                 default:
                     return MainUtil.sendMessage(player, "/plot database [sqlite/mysql]");
             }
-            try {
+            try
+            {
                 final SQLManager manager = new SQLManager(implementation, prefix, true);
                 insertPlots(manager, plots, player);
                 return true;
             }
-            catch (Exception e) {
+            catch (final Exception e)
+            {
                 MainUtil.sendMessage(player, "$1Failed to save plots, read stacktrace for info");
                 MainUtil.sendMessage(player, "&d==== Here is an ugly stacktrace, if you are interested in those things ===");
                 e.printStackTrace();
@@ -146,7 +167,8 @@ public class Database extends SubCommand {
                 return false;
             }
         }
-        catch (Exception e) {
+        catch (final Exception e)
+        {
             MainUtil.sendMessage(player, "$1Failed to open connection, read stacktrace for info");
             MainUtil.sendMessage(player, "&d==== Here is an ugly stacktrace, if you are interested in those things ===");
             e.printStackTrace();
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Debug.java b/src/main/java/com/intellectualcrafters/plot/commands/Debug.java
index bb9de7836..7d7b107c9 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/Debug.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/Debug.java
@@ -28,19 +28,22 @@ import com.intellectualcrafters.plot.util.MainUtil;
 import com.plotsquared.general.commands.CommandDeclaration;
 
 @CommandDeclaration(
-        command = "debug",
-        category = CommandCategory.DEBUG,
-        description = "Show debug information",
-        usage = "/plot debug [msg]",
-        permission = "plots.admin"
-)
-public class Debug extends SubCommand {
+command = "debug",
+category = CommandCategory.DEBUG,
+description = "Show debug information",
+usage = "/plot debug [msg]",
+permission = "plots.admin")
+public class Debug extends SubCommand
+{
 
     @Override
-    public boolean onCommand(PlotPlayer plr, String[] args) {
-        if ((args.length > 0) && args[0].equalsIgnoreCase("msg")) {
+    public boolean onCommand(final PlotPlayer plr, final String[] args)
+    {
+        if ((args.length > 0) && args[0].equalsIgnoreCase("msg"))
+        {
             final StringBuilder msg = new StringBuilder();
-            for (final C c : C.values()) {
+            for (final C c : C.values())
+            {
                 msg.append(c.s()).append("\n");
             }
             MainUtil.sendMessage(plr, msg.toString());
@@ -56,7 +59,8 @@ public class Debug extends SubCommand {
         }
         {
             final StringBuilder worlds = new StringBuilder("");
-            for (final String world : PS.get().getPlotWorlds()) {
+            for (final String world : PS.get().getPlotWorlds())
+            {
                 worlds.append(world).append(" ");
             }
             information.append(header);
@@ -77,11 +81,13 @@ public class Debug extends SubCommand {
         return true;
     }
 
-    private String getSection(final String line, final String val) {
+    private String getSection(final String line, final String val)
+    {
         return line.replaceAll("%val%", val) + "\n";
     }
 
-    private String getLine(final String line, final String var, final Object val) {
+    private String getLine(final String line, final String var, final Object val)
+    {
         return line.replaceAll("%var%", var).replaceAll("%val%", "" + val) + "\n";
     }
 }
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/DebugAllowUnsafe.java b/src/main/java/com/intellectualcrafters/plot/commands/DebugAllowUnsafe.java
index 07138829d..ce2738892 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/DebugAllowUnsafe.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/DebugAllowUnsafe.java
@@ -9,24 +9,28 @@ import com.intellectualcrafters.plot.object.PlotPlayer;
 import com.plotsquared.general.commands.CommandDeclaration;
 
 @CommandDeclaration(
-        command = "debugallowunsafe",
-        description = "Allow unsafe actions until toggled off",
-        usage = "/plot debugallowunsafe",
-        category = CommandCategory.DEBUG,
-        requiredType = RequiredType.NONE,
-        permission = "plots.debugallowunsafe"
-)
-public class DebugAllowUnsafe extends SubCommand {
+command = "debugallowunsafe",
+description = "Allow unsafe actions until toggled off",
+usage = "/plot debugallowunsafe",
+category = CommandCategory.DEBUG,
+requiredType = RequiredType.NONE,
+permission = "plots.debugallowunsafe")
+public class DebugAllowUnsafe extends SubCommand
+{
 
     public static final List<UUID> unsafeAllowed = new ArrayList<>();
 
     @Override
-    public boolean onCommand(final PlotPlayer plr, final String ... args) {
-        
-        if (unsafeAllowed.contains(plr.getUUID())) {
+    public boolean onCommand(final PlotPlayer plr, final String... args)
+    {
+
+        if (unsafeAllowed.contains(plr.getUUID()))
+        {
             unsafeAllowed.remove(plr.getUUID());
             sendMessage(plr, C.DEBUGALLOWUNSAFE_OFF);
-        } else {
+        }
+        else
+        {
             unsafeAllowed.add(plr.getUUID());
             sendMessage(plr, C.DEBUGALLOWUNSAFE_ON);
         }
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/DebugClaimTest.java b/src/main/java/com/intellectualcrafters/plot/commands/DebugClaimTest.java
index 16b16c34e..3527ef53e 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/DebugClaimTest.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/DebugClaimTest.java
@@ -43,25 +43,29 @@ import com.intellectualcrafters.plot.util.UUIDHandler;
 import com.plotsquared.general.commands.CommandDeclaration;
 
 @CommandDeclaration(
-        command = "debugclaimtest",
-        description = "If you accidentally delete your database, this command will attempt to restore all plots based on the data from plot sighs. Execution time may vary",
-        category = CommandCategory.DEBUG,
-        requiredType = RequiredType.CONSOLE,
-        permission = "plots.debugclaimtest"
-)
-public class DebugClaimTest extends SubCommand {
+command = "debugclaimtest",
+description = "If you accidentally delete your database, this command will attempt to restore all plots based on the data from plot sighs. Execution time may vary",
+category = CommandCategory.DEBUG,
+requiredType = RequiredType.CONSOLE,
+permission = "plots.debugclaimtest")
+public class DebugClaimTest extends SubCommand
+{
 
-    public static boolean claimPlot(final PlotPlayer player, final Plot plot, final boolean teleport) {
+    public static boolean claimPlot(final PlotPlayer player, final Plot plot, final boolean teleport)
+    {
         return claimPlot(player, plot, teleport, "");
     }
 
-    public static boolean claimPlot(final PlotPlayer player, final Plot plot, final boolean teleport, final String schematic) {
+    public static boolean claimPlot(final PlotPlayer player, final Plot plot, final boolean teleport, final String schematic)
+    {
         final boolean result = EventUtil.manager.callClaim(player, plot, false);
-        if (result) {
+        if (result)
+        {
             MainUtil.createPlot(player.getUUID(), plot);
             MainUtil.setSign(player.getName(), plot);
             MainUtil.sendMessage(player, C.CLAIMED);
-            if (teleport) {
+            if (teleport)
+            {
                 MainUtil.teleportPlayer(player, player.getLocation(), plot);
             }
         }
@@ -69,81 +73,103 @@ public class DebugClaimTest extends SubCommand {
     }
 
     @Override
-    public boolean onCommand(PlotPlayer plr, String[] args) {
-        if (args.length < 3) {
-            return !MainUtil.sendMessage(null, "If you accidentally delete your database, this command will attempt to restore all plots based on the data from the plot signs. \n\n&cMissing world arg /plot debugclaimtest {world} {PlotId min} {PlotId max}");
-        }
+    public boolean onCommand(final PlotPlayer plr, final String[] args)
+    {
+        if (args.length < 3) { return !MainUtil
+        .sendMessage(
+        null,
+        "If you accidentally delete your database, this command will attempt to restore all plots based on the data from the plot signs. \n\n&cMissing world arg /plot debugclaimtest {world} {PlotId min} {PlotId max}"); }
         final String world = args[0];
-        if (!BlockManager.manager.isWorld(world) || !PS.get().isPlotWorld(world)) {
-            return !MainUtil.sendMessage(null, "&cInvalid plot world!");
-        }
+        if (!BlockManager.manager.isWorld(world) || !PS.get().isPlotWorld(world)) { return !MainUtil.sendMessage(null, "&cInvalid plot world!"); }
         PlotId min, max;
-        try {
-            final String[] split1 = args[1].split(";");
-            final String[] split2 = args[2].split(";");
+        try
+        {
+            args[1].split(";");
+            args[2].split(";");
             min = PlotId.fromString(args[1]);
             max = PlotId.fromString(args[2]);
-        } catch (final Exception e) {
-            return !MainUtil.sendMessage(null, "&cInvalid min/max values. &7The values are to Plot IDs in the format &cX;Y &7where X;Y are the plot coords\nThe conversion will only check the plots in the selected area.");
+        }
+        catch (final Exception e)
+        {
+            return !MainUtil.sendMessage(null,
+            "&cInvalid min/max values. &7The values are to Plot IDs in the format &cX;Y &7where X;Y are the plot coords\nThe conversion will only check the plots in the selected area.");
         }
         MainUtil.sendMessage(null, "&3Sign Block&8->&3PlotSquared&8: &7Beginning sign to plot conversion. This may take a while...");
         MainUtil.sendMessage(null, "&3Sign Block&8->&3PlotSquared&8: Found an excess of 250,000 chunks. Limiting search radius... (~3.8 min)");
         final PlotManager manager = PS.get().getPlotManager(world);
         final PlotWorld plotworld = PS.get().getPlotWorld(world);
         final ArrayList<Plot> plots = new ArrayList<>();
-        for (final PlotId id : MainUtil.getPlotSelectionIds(min, max)) {
+        for (final PlotId id : MainUtil.getPlotSelectionIds(min, max))
+        {
             final Plot plot = MainUtil.getPlot(world, id);
-            if (PS.get().getPlot(world, plot.id) != null) {
+            if (PS.get().getPlot(world, plot.id) != null)
+            {
                 MainUtil.sendMessage(null, " - &cDB Already contains: " + plot.id);
                 continue;
             }
             final Location loc = manager.getSignLoc(plotworld, plot);
             final ChunkLoc chunk = new ChunkLoc(loc.getX() >> 4, loc.getZ() >> 4);
             final boolean result = ChunkManager.manager.loadChunk(world, chunk, false);
-            if (!result) {
+            if (!result)
+            {
                 continue;
             }
             final String[] lines = BlockManager.manager.getSign(loc);
-            if (lines != null) {
+            if (lines != null)
+            {
                 String line = lines[2];
-                if ((line != null) && (line.length() > 2)) {
+                if ((line != null) && (line.length() > 2))
+                {
                     line = line.substring(2);
                     final BiMap<StringWrapper, UUID> map = UUIDHandler.getUuidMap();
                     UUID uuid = (map.get(new StringWrapper(line)));
-                    if (uuid == null) {
-                        for (final StringWrapper string : map.keySet()) {
-                            if (string.value.toLowerCase().startsWith(line.toLowerCase())) {
+                    if (uuid == null)
+                    {
+                        for (final StringWrapper string : map.keySet())
+                        {
+                            if (string.value.toLowerCase().startsWith(line.toLowerCase()))
+                            {
                                 uuid = map.get(string);
                                 break;
                             }
                         }
                     }
-                    if (uuid == null) {
+                    if (uuid == null)
+                    {
                         uuid = UUIDHandler.getUUID(line, null);
                     }
-                    if (uuid != null) {
+                    if (uuid != null)
+                    {
                         MainUtil.sendMessage(null, " - &aFound plot: " + plot.id + " : " + line);
                         plot.owner = uuid;
                         plots.add(plot);
-                    } else {
+                    }
+                    else
+                    {
                         MainUtil.sendMessage(null, " - &cInvalid playername: " + plot.id + " : " + line);
                     }
                 }
             }
         }
-        if (plots.size() > 0) {
+        if (plots.size() > 0)
+        {
             MainUtil.sendMessage(null, "&3Sign Block&8->&3PlotSquared&8: &7Updating '" + plots.size() + "' plots!");
-            DBFunc.createPlotsAndData(plots, new Runnable() {
+            DBFunc.createPlotsAndData(plots, new Runnable()
+            {
                 @Override
-                public void run() {
+                public void run()
+                {
                     MainUtil.sendMessage(null, "&6Database update finished!");
                 }
             });
-            for (final Plot plot : plots) {
+            for (final Plot plot : plots)
+            {
                 PS.get().updatePlot(plot);
             }
             MainUtil.sendMessage(null, "&3Sign Block&8->&3PlotSquared&8: &7Complete!");
-        } else {
+        }
+        else
+        {
             MainUtil.sendMessage(null, "No plots were found for the given search.");
         }
         return true;
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/DebugClear.java b/src/main/java/com/intellectualcrafters/plot/commands/DebugClear.java
index 5c1410c8f..f1b4df53d 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/DebugClear.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/DebugClear.java
@@ -33,36 +33,34 @@ import com.intellectualcrafters.plot.util.UUIDHandler;
 import com.plotsquared.general.commands.CommandDeclaration;
 
 @CommandDeclaration(
-        command = "debugclear",
-        aliases = {"fastclear"},
-        description = "Clear a plot using a fast experiment algorithm",
-        category = CommandCategory.DEBUG
-)
-public class DebugClear extends SubCommand {
+command = "debugclear",
+aliases = { "fastclear" },
+description = "Clear a plot using a fast experiment algorithm",
+category = CommandCategory.DEBUG)
+public class DebugClear extends SubCommand
+{
 
     @Override
-    public boolean onCommand(final PlotPlayer plr, String[] args) {
+    public boolean onCommand(final PlotPlayer plr, final String[] args)
+    {
         final Location loc = plr.getLocation();
         final Plot plot = MainUtil.getPlot(loc);
-        if ((plot == null) || !(PS.get().getPlotWorld(loc.getWorld()) instanceof SquarePlotWorld)) {
-            return sendMessage(plr, C.NOT_IN_PLOT);
-        }
-        if (!MainUtil.getTopPlot(plot).equals(MainUtil.getBottomPlot(plot))) {
-            return sendMessage(plr, C.UNLINK_REQUIRED);
-        }
-        if ((!plot.hasOwner() || !plot.isOwner(UUIDHandler.getUUID(plr))) && !Permissions.hasPermission(plr, "plots.admin.command.debugclear")) {
-            return sendMessage(plr, C.NO_PLOT_PERMS);
-        }
+        if ((plot == null) || !(PS.get().getPlotWorld(loc.getWorld()) instanceof SquarePlotWorld)) { return sendMessage(plr, C.NOT_IN_PLOT); }
+        if (!MainUtil.getTopPlot(plot).equals(MainUtil.getBottomPlot(plot))) { return sendMessage(plr, C.UNLINK_REQUIRED); }
+        if ((!plot.hasOwner() || !plot.isOwner(UUIDHandler.getUUID(plr))) && !Permissions.hasPermission(plr, "plots.admin.command.debugclear")) { return sendMessage(plr, C.NO_PLOT_PERMS); }
         final Location pos1 = MainUtil.getPlotBottomLoc(loc.getWorld(), plot.id).add(1, 0, 1);
         final Location pos2 = MainUtil.getPlotTopLoc(loc.getWorld(), plot.id);
-        if (MainUtil.runners.containsKey(plot)) {
+        if (MainUtil.runners.containsKey(plot))
+        {
             MainUtil.sendMessage(plr, C.WAIT_FOR_TIMER);
             return false;
         }
         MainUtil.runners.put(plot, 1);
-        ChunkManager.manager.regenerateRegion(pos1, pos2, new Runnable() {
+        ChunkManager.manager.regenerateRegion(pos1, pos2, new Runnable()
+        {
             @Override
-            public void run() {
+            public void run()
+            {
                 MainUtil.runners.remove(plot);
                 MainUtil.sendMessage(plr, "&aDone!");
             }
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/DebugExec.java b/src/main/java/com/intellectualcrafters/plot/commands/DebugExec.java
index ae99b81d2..b2a6af5b1 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/DebugExec.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/DebugExec.java
@@ -65,7 +65,6 @@ import com.intellectualcrafters.plot.util.EventUtil;
 import com.intellectualcrafters.plot.util.ExpireManager;
 import com.intellectualcrafters.plot.util.MainUtil;
 import com.intellectualcrafters.plot.util.MathMan;
-import com.intellectualcrafters.plot.util.Permissions;
 import com.intellectualcrafters.plot.util.SchematicHandler;
 import com.intellectualcrafters.plot.util.SetupUtils;
 import com.intellectualcrafters.plot.util.StringMan;
@@ -73,61 +72,67 @@ import com.intellectualcrafters.plot.util.TaskManager;
 import com.intellectualcrafters.plot.util.UUIDHandler;
 import com.plotsquared.bukkit.util.BukkitHybridUtils;
 import com.plotsquared.general.commands.Command;
-import com.plotsquared.general.commands.CommandCaller;
 import com.plotsquared.general.commands.CommandDeclaration;
 
 @CommandDeclaration(
-        command = "debugexec",
-        permission = "plots.admin",
-        description = "Mutli-purpose debug command",
-        aliases = {"exec"},
-        category = CommandCategory.DEBUG
-)
-public class DebugExec extends SubCommand {
+command = "debugexec",
+permission = "plots.admin",
+description = "Mutli-purpose debug command",
+aliases = { "exec" },
+category = CommandCategory.DEBUG)
+public class DebugExec extends SubCommand
+{
 
     private ScriptEngine engine;
     private Bindings scope;
-    
-    public DebugExec() {
-        try {
-            File file = new File(PS.get().IMP.getDirectory(), "scripts" + File.separator + "start.js");
-            if (file.exists()) {
+
+    public DebugExec()
+    {
+        try
+        {
+            final File file = new File(PS.get().IMP.getDirectory(), "scripts" + File.separator + "start.js");
+            if (file.exists())
+            {
                 init();
-                    String script = StringMan.join(Files.readLines(new File(new File(PS.get().IMP.getDirectory() + File.separator + "scripts"), "start.js"), StandardCharsets.UTF_8), System.getProperty("line.separator"));
-                    scope.put("THIS", this);
-                    scope.put("PlotPlayer", ConsolePlayer.getConsole());
-                    engine.eval(script, scope);
+                final String script = StringMan.join(Files.readLines(new File(new File(PS.get().IMP.getDirectory() + File.separator + "scripts"), "start.js"), StandardCharsets.UTF_8),
+                System.getProperty("line.separator"));
+                scope.put("THIS", this);
+                scope.put("PlotPlayer", ConsolePlayer.getConsole());
+                engine.eval(script, scope);
             }
-        } catch (Exception e) {
         }
+        catch (final Exception e)
+        {}
     }
-    
-    public ScriptEngine getEngine() {
+
+    public ScriptEngine getEngine()
+    {
         return engine;
     }
-    
-    public Bindings getScope() {
+
+    public Bindings getScope()
+    {
         return scope;
     }
-    
-    public void init() {
-        if (engine != null) {
-            return;
-        }
+
+    public void init()
+    {
+        if (engine != null) { return; }
         engine = (new ScriptEngineManager(null)).getEngineByName("nashorn");
-        if (engine == null) {
+        if (engine == null)
+        {
             engine = (new ScriptEngineManager(null)).getEngineByName("JavaScript");
         }
-        ScriptContext context = new SimpleScriptContext();
+        final ScriptContext context = new SimpleScriptContext();
         scope = context.getBindings(ScriptContext.ENGINE_SCOPE);
-        
+
         // stuff
         scope.put("MainUtil", new MainUtil());
         scope.put("Settings", new Settings());
         scope.put("StringMan", new StringMan());
         scope.put("MathMan", new MathMan());
         scope.put("FlagManager", new FlagManager());
-        
+
         // Classes
         scope.put("Location", Location.class);
         scope.put("PlotBlock", PlotBlock.class);
@@ -135,7 +140,7 @@ public class DebugExec extends SubCommand {
         scope.put("PlotId", PlotId.class);
         scope.put("Runnable", Runnable.class);
         scope.put("RunnableVal", RunnableVal.class);
-        
+
         // Instances
         scope.put("PS", PS.get());
         scope.put("TaskManager", PS.get().TASK);
@@ -152,112 +157,143 @@ public class DebugExec extends SubCommand {
         scope.put("HybridUtils", HybridUtils.manager);
         scope.put("IMP", PS.get().IMP);
         scope.put("MainCommand", MainCommand.getInstance());
-        
+
         // enums
-        for (Enum<?> value : C.values()) {
+        for (final Enum<?> value : C.values())
+        {
             scope.put("C_" + value.name(), value);
         }
     }
-    
+
     @Override
-    public boolean onCommand(final PlotPlayer player, String... args) {
+    public boolean onCommand(final PlotPlayer player, final String... args)
+    {
         final List<String> allowed_params = Arrays.asList("calibrate-analysis", "remove-flag", "stop-expire", "start-expire", "show-expired", "update-expired", "seen", "trim-check");
-        if (args.length > 0) {
+        if (args.length > 0)
+        {
             final String arg = args[0].toLowerCase();
             String script;
             boolean async = false;
-            switch (arg) {
-                case "analyze": {
-                    Plot plot = MainUtil.getPlot(player.getLocation());
-                    if (plot == null) {
+            switch (arg)
+            {
+                case "analyze":
+                {
+                    final Plot plot = MainUtil.getPlot(player.getLocation());
+                    if (plot == null)
+                    {
                         MainUtil.sendMessage(player, C.NOT_IN_PLOT);
                         return false;
                     }
-                    PlotAnalysis analysis = plot.getComplexity();
-                    if (analysis != null) {
-                        int complexity = analysis.getComplexity();
+                    final PlotAnalysis analysis = plot.getComplexity();
+                    if (analysis != null)
+                    {
+                        final int complexity = analysis.getComplexity();
                         MainUtil.sendMessage(player, "Changes: " + analysis.changes);
                         MainUtil.sendMessage(player, "Complexity: " + complexity);
                         return true;
                     }
                     MainUtil.sendMessage(player, "$1Starting task...");
-                    HybridUtils.manager.analyzePlot(plot, new RunnableVal<PlotAnalysis>() {
+                    HybridUtils.manager.analyzePlot(plot, new RunnableVal<PlotAnalysis>()
+                    {
                         @Override
-                        public void run() {
+                        public void run()
+                        {
                             MainUtil.sendMessage(player, "$1Done: $2use $3/plot debugexec analyze$2 for more information");
                         }
                     });
                     return true;
                 }
-                case "calibrate-analysis": {
-                    if (args.length != 2) {
+                case "calibrate-analysis":
+                {
+                    if (args.length != 2)
+                    {
                         MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot debugexec analyze <threshold>");
                         MainUtil.sendMessage(player, "$1<threshold> $2= $1The percentage of plots you want to clear (100 clears 100% of plots so no point calibrating it)");
                         return false;
                     }
                     double threshold;
-                    try {
+                    try
+                    {
                         threshold = Integer.parseInt(args[1]) / 100d;
                     }
-                    catch (NumberFormatException e) {
+                    catch (final NumberFormatException e)
+                    {
                         MainUtil.sendMessage(player, "$2Invalid threshold: " + args[1]);
                         MainUtil.sendMessage(player, "$1<threshold> $2= $1The percentage of plots you want to clear as a number between 0 - 100");
                         return false;
                     }
-                    PlotAnalysis.calcOptimalModifiers(new Runnable() {
+                    PlotAnalysis.calcOptimalModifiers(new Runnable()
+                    {
                         @Override
-                        public void run() {
+                        public void run()
+                        {
                             MainUtil.sendMessage(player, "$1Thank you for calibrating PlotSquared plot expiry");
                         }
                     }, threshold);
                     return true;
                 }
-                case "stop-expire": {
-                    if (ExpireManager.task != -1) {
+                case "stop-expire":
+                {
+                    if (ExpireManager.task != -1)
+                    {
                         PS.get().TASK.cancelTask(ExpireManager.task);
-                    } else {
+                    }
+                    else
+                    {
                         return MainUtil.sendMessage(player, "Task already halted");
                     }
                     ExpireManager.task = -1;
                     return MainUtil.sendMessage(player, "Cancelled task.");
                 }
-                case "remove-flag": {
-                    if (args.length != 2) {
+                case "remove-flag":
+                {
+                    if (args.length != 2)
+                    {
                         MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot debugexec remove-flag <flag>");
                         return false;
                     }
-                    String flag = args[1];
-                    for (Plot plot : PS.get().getPlots()) {
-                        if (FlagManager.getPlotFlag(plot, flag) != null) {
+                    final String flag = args[1];
+                    for (final Plot plot : PS.get().getPlots())
+                    {
+                        if (FlagManager.getPlotFlag(plot, flag) != null)
+                        {
                             FlagManager.removePlotFlag(plot, flag);
                         }
                     }
-                    return MainUtil.sendMessage(player, "Cleared flag: " + flag);    
+                    return MainUtil.sendMessage(player, "Cleared flag: " + flag);
                 }
-                case "start-rgar": {
-                    if (args.length != 2) {
+                case "start-rgar":
+                {
+                    if (args.length != 2)
+                    {
                         MainUtil.sendMessage(player, "&cInvalid syntax: /plot debugexec start-rgar <world>");
                         return false;
                     }
                     boolean result;
-                    if (!PS.get().isPlotWorld(args[1])) {
+                    if (!PS.get().isPlotWorld(args[1]))
+                    {
                         MainUtil.sendMessage(player, C.NOT_VALID_PLOT_WORLD, args[1]);
                         return false;
                     }
-                    if (BukkitHybridUtils.regions != null) {
-                        result = ((BukkitHybridUtils)(HybridUtils.manager)).scheduleRoadUpdate(args[1], BukkitHybridUtils.regions, 0);
+                    if (HybridUtils.regions != null)
+                    {
+                        result = ((BukkitHybridUtils) (HybridUtils.manager)).scheduleRoadUpdate(args[1], HybridUtils.regions, 0);
                     }
-                    else {
+                    else
+                    {
                         result = HybridUtils.manager.scheduleRoadUpdate(args[1], 0);
                     }
-                    if (!result) {
+                    if (!result)
+                    {
                         MainUtil.sendMessage(player, "&cCannot schedule mass schematic update! (Is one already in progress?)");
                         return false;
                     }
                     return true;
                 }
-                case "stop-rgar": {
-                    if (!HybridUtils.UPDATE) {
+                case "stop-rgar":
+                {
+                    if (!HybridUtils.UPDATE)
+                    {
                         MainUtil.sendMessage(player, "&cTASK NOT RUNNING!");
                         return false;
                     }
@@ -265,55 +301,53 @@ public class DebugExec extends SubCommand {
                     MainUtil.sendMessage(player, "&cCancelling task... (please wait)");
                     return true;
                 }
-                case "start-expire": {
-                    if (ExpireManager.task == -1) {
+                case "start-expire":
+                {
+                    if (ExpireManager.task == -1)
+                    {
                         ExpireManager.runTask();
-                    } else {
+                    }
+                    else
+                    {
                         return MainUtil.sendMessage(player, "Plot expiry task already started");
                     }
                     return MainUtil.sendMessage(player, "Started plot expiry task");
                 }
-                case "update-expired": {
-                    if (args.length > 1) {
+                case "update-expired":
+                {
+                    if (args.length > 1)
+                    {
                         final String world = args[1];
-                        if (!BlockManager.manager.isWorld(world)) {
-                            return MainUtil.sendMessage(player, "Invalid world: " + args[1]);
-                        }
+                        if (!BlockManager.manager.isWorld(world)) { return MainUtil.sendMessage(player, "Invalid world: " + args[1]); }
                         MainUtil.sendMessage(player, "Updating expired plot list");
                         ExpireManager.updateExpired(args[1]);
                         return true;
                     }
                     return MainUtil.sendMessage(player, "Use /plot debugexec update-expired <world>");
                 }
-                case "show-expired": {
-                    if (args.length > 1) {
+                case "show-expired":
+                {
+                    if (args.length > 1)
+                    {
                         final String world = args[1];
-                        if (!BlockManager.manager.isWorld(world)) {
-                            return MainUtil.sendMessage(player, "Invalid world: " + args[1]);
-                        }
-                        if (!ExpireManager.expiredPlots.containsKey(args[1])) {
-                            return MainUtil.sendMessage(player, "No task for world: " + args[1]);
-                        }
+                        if (!BlockManager.manager.isWorld(world)) { return MainUtil.sendMessage(player, "Invalid world: " + args[1]); }
+                        if (!ExpireManager.expiredPlots.containsKey(args[1])) { return MainUtil.sendMessage(player, "No task for world: " + args[1]); }
                         MainUtil.sendMessage(player, "Expired plots (" + ExpireManager.expiredPlots.get(args[1]).size() + "):");
-                        for (final Plot plot : ExpireManager.expiredPlots.get(args[1])) {
+                        for (final Plot plot : ExpireManager.expiredPlots.get(args[1]))
+                        {
                             MainUtil.sendMessage(player, " - " + plot.world + ";" + plot.id.x + ";" + plot.id.y + ";" + UUIDHandler.getName(plot.owner) + " : " + ExpireManager.dates.get(plot.owner));
                         }
                         return true;
                     }
                     return MainUtil.sendMessage(player, "Use /plot debugexec show-expired <world>");
                 }
-                case "seen": {
-                    if (args.length != 2) {
-                        return MainUtil.sendMessage(player, "Use /plot debugexec seen <player>");
-                    }
+                case "seen":
+                {
+                    if (args.length != 2) { return MainUtil.sendMessage(player, "Use /plot debugexec seen <player>"); }
                     final UUID uuid = UUIDHandler.getUUID(args[1], null);
-                    if (uuid == null) {
-                        return MainUtil.sendMessage(player, "player not found: " + args[1]);
-                    }
+                    if (uuid == null) { return MainUtil.sendMessage(player, "player not found: " + args[1]); }
                     final OfflinePlotPlayer op = UUIDHandler.getUUIDWrapper().getOfflinePlayer(uuid);
-                    if ((op == null) || (op.getLastPlayed() == 0)) {
-                        return MainUtil.sendMessage(player, "player hasn't connected before: " + args[1]);
-                    }
+                    if ((op == null) || (op.getLastPlayed() == 0)) { return MainUtil.sendMessage(player, "player hasn't connected before: " + args[1]); }
                     final Timestamp stamp = new Timestamp(op.getLastPlayed());
                     final Date date = new Date(stamp.getTime());
                     MainUtil.sendMessage(player, "PLAYER: " + args[1]);
@@ -323,34 +357,40 @@ public class DebugExec extends SubCommand {
                     MainUtil.sendMessage(player, "Local: " + date.toLocaleString());
                     return true;
                 }
-                case "trim-check": {
-                    if (args.length != 2) {
+                case "trim-check":
+                {
+                    if (args.length != 2)
+                    {
                         MainUtil.sendMessage(player, "Use /plot debugexec trim-check <world>");
                         MainUtil.sendMessage(player, "&7 - Generates a list of regions to trim");
                         return MainUtil.sendMessage(player, "&7 - Run after plot expiry has run");
                     }
                     final String world = args[1];
-                    if (!BlockManager.manager.isWorld(world) || !PS.get().isPlotWorld(args[1])) {
-                        return MainUtil.sendMessage(player, "Invalid world: " + args[1]);
-                    }
+                    if (!BlockManager.manager.isWorld(world) || !PS.get().isPlotWorld(args[1])) { return MainUtil.sendMessage(player, "Invalid world: " + args[1]); }
                     final ArrayList<ChunkLoc> empty = new ArrayList<>();
-                    final boolean result = Trim.getTrimRegions(empty, world, new Runnable() {
+                    final boolean result = Trim.getTrimRegions(empty, world, new Runnable()
+                    {
                         @Override
-                        public void run() {
+                        public void run()
+                        {
                             Trim.sendMessage("Processing is complete! Here's how many chunks would be deleted:");
                             Trim.sendMessage(" - MCA #: " + empty.size());
                             Trim.sendMessage(" - CHUNKS: " + (empty.size() * 1024) + " (max)");
                             Trim.sendMessage("Exporting log for manual approval...");
                             final File file = new File(PS.get().IMP.getDirectory() + File.separator + "trim.txt");
                             PrintWriter writer;
-                            try {
+                            try
+                            {
                                 writer = new PrintWriter(file);
-                                for (final ChunkLoc loc : empty) {
+                                for (final ChunkLoc loc : empty)
+                                {
                                     writer.println(world + "/region/r." + loc.x + "." + loc.z + ".mca");
                                 }
                                 writer.close();
                                 Trim.sendMessage("File saved to 'plugins/PlotSquared/trim.txt'");
-                            } catch (final FileNotFoundException e) {
+                            }
+                            catch (final FileNotFoundException e)
+                            {
                                 e.printStackTrace();
                                 Trim.sendMessage("File failed to save! :(");
                             }
@@ -360,7 +400,8 @@ public class DebugExec extends SubCommand {
                             Trim.sendMessage(" - Add 31 to each number to get the end position");
                         }
                     });
-                    if (!result) {
+                    if (!result)
+                    {
                         MainUtil.sendMessage(player, "Trim task already started!");
                     }
                     return result;
@@ -368,90 +409,120 @@ public class DebugExec extends SubCommand {
                 case "h":
                 case "he":
                 case "?":
-                case "help": {
+                case "help":
+                {
                     MainUtil.sendMessage(player, "Possible sub commands: /plot debugexec <" + StringMan.join(allowed_params, "|") + ">");
                     return false;
                 }
-                case "addcmd": {
-                    try {
-                    final String cmd = StringMan.join(Files.readLines(new File(new File(PS.get().IMP.getDirectory() + File.separator + "scripts"), args[1]), StandardCharsets.UTF_8), System.getProperty("line.separator"));
-                    Command<PlotPlayer> subcommand = new Command<PlotPlayer>(args[1].split("\\.")[0]) {
-                        @Override
-                        public boolean onCommand(PlotPlayer plr, String[] args) {
-                            try {
-                                scope.put("PlotPlayer", plr);
-                                scope.put("args", args);
-                                engine.eval(cmd, scope);
-                                return true;
-                            } catch (ScriptException e) {
-                                e.printStackTrace();
-                                MainUtil.sendMessage(player, C.COMMAND_WENT_WRONG);
-                                return false;
+                case "addcmd":
+                {
+                    try
+                    {
+                        final String cmd = StringMan.join(Files.readLines(new File(new File(PS.get().IMP.getDirectory() + File.separator + "scripts"), args[1]), StandardCharsets.UTF_8),
+                        System.getProperty("line.separator"));
+                        final Command<PlotPlayer> subcommand = new Command<PlotPlayer>(args[1].split("\\.")[0])
+                        {
+                            @Override
+                            public boolean onCommand(final PlotPlayer plr, final String[] args)
+                            {
+                                try
+                                {
+                                    scope.put("PlotPlayer", plr);
+                                    scope.put("args", args);
+                                    engine.eval(cmd, scope);
+                                    return true;
+                                }
+                                catch (final ScriptException e)
+                                {
+                                    e.printStackTrace();
+                                    MainUtil.sendMessage(player, C.COMMAND_WENT_WRONG);
+                                    return false;
+                                }
                             }
-                        }
-                    };
-                    MainCommand.getInstance().addCommand(subcommand);
-                    return true;
+                        };
+                        MainCommand.getInstance().addCommand(subcommand);
+                        return true;
                     }
-                    catch (Exception e) {
+                    catch (final Exception e)
+                    {
                         e.printStackTrace();
                         MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot debugexec addcmd <file>");
                         return false;
                     }
                 }
-                case "runasync": {
+                case "runasync":
+                {
                     async = true;
                 }
-                case "run": {
-                    try {
-                        script = StringMan.join(Files.readLines(new File(new File(PS.get().IMP.getDirectory() + File.separator + "scripts"), args[1]), StandardCharsets.UTF_8), System.getProperty("line.separator"));
-                        if (args.length > 2) {
-                            HashMap<String, String> replacements = new HashMap<>();
-                            for (int i = 2; i < args.length; i++) {
-                                replacements.put("%s" + (i-2), args[i]);
+                case "run":
+                {
+                    try
+                    {
+                        script = StringMan.join(Files.readLines(new File(new File(PS.get().IMP.getDirectory() + File.separator + "scripts"), args[1]), StandardCharsets.UTF_8),
+                        System.getProperty("line.separator"));
+                        if (args.length > 2)
+                        {
+                            final HashMap<String, String> replacements = new HashMap<>();
+                            for (int i = 2; i < args.length; i++)
+                            {
+                                replacements.put("%s" + (i - 2), args[i]);
                             }
                             script = StringMan.replaceFromMap(script, replacements);
                         }
-                    } catch (IOException e) {
+                    }
+                    catch (final IOException e)
+                    {
                         e.printStackTrace();
                         return false;
                     }
                     break;
                 }
-                default: {
+                default:
+                {
                     script = StringMan.join(args, " ");
                 }
             }
-            if (!ConsolePlayer.isConsole(player)) {
+            if (!ConsolePlayer.isConsole(player))
+            {
                 MainUtil.sendMessage(player, C.NOT_CONSOLE);
                 return false;
             }
             init();
             scope.put("PlotPlayer", player);
             PS.debug("> " + script);
-            try {
-                if (async) {
+            try
+            {
+                if (async)
+                {
                     final String toExec = script;
-                    TaskManager.runTaskAsync(new Runnable() {
+                    TaskManager.runTaskAsync(new Runnable()
+                    {
                         @Override
-                        public void run() {
-                            long start = System.currentTimeMillis();
-                            try {
+                        public void run()
+                        {
+                            final long start = System.currentTimeMillis();
+                            try
+                            {
                                 engine.eval(toExec, scope);
-                            } catch (ScriptException e) {
+                            }
+                            catch (final ScriptException e)
+                            {
                                 e.printStackTrace();
                             }
                             PS.log("> " + (System.currentTimeMillis() - start) + "ms");
                         }
                     });
                 }
-                else {
-                    long start = System.currentTimeMillis();
+                else
+                {
+                    final long start = System.currentTimeMillis();
                     engine.eval(script, scope);
                     PS.log("> " + (System.currentTimeMillis() - start) + "ms");
                 }
                 return true;
-            } catch (ScriptException e) {
+            }
+            catch (final ScriptException e)
+            {
                 e.printStackTrace();
                 return false;
             }
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/DebugFill.java b/src/main/java/com/intellectualcrafters/plot/commands/DebugFill.java
index f9c052f2f..6bc93fca5 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/DebugFill.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/DebugFill.java
@@ -32,36 +32,39 @@ import com.intellectualcrafters.plot.util.TaskManager;
 import com.plotsquared.general.commands.CommandDeclaration;
 
 @CommandDeclaration(
-        command = "fill",
-        permission = "plots.fill",
-        description = "Fill or surround a plot in bedrock",
-        usage = "/plot fill",
-        aliases = {"debugfill"},
-        category = CommandCategory.DEBUG,
-        requiredType = RequiredType.NONE
-)
-public class DebugFill extends SubCommand {
+command = "fill",
+permission = "plots.fill",
+description = "Fill or surround a plot in bedrock",
+usage = "/plot fill",
+aliases = { "debugfill" },
+category = CommandCategory.DEBUG,
+requiredType = RequiredType.NONE)
+public class DebugFill extends SubCommand
+{
 
     @Override
-    public boolean onCommand(final PlotPlayer player, final String ... args) {
-        if (args.length != 1 || (!args[0].equalsIgnoreCase("outline") && !args[0].equalsIgnoreCase("all"))) {
+    public boolean onCommand(final PlotPlayer player, final String... args)
+    {
+        if ((args.length != 1) || (!args[0].equalsIgnoreCase("outline") && !args[0].equalsIgnoreCase("all")))
+        {
             MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot fill <outline|all>");
             return true;
         }
         final Location loc = player.getLocation();
         final Plot plot = MainUtil.getPlot(loc);
-        if (plot == null) {
-            return !sendMessage(player, C.NOT_IN_PLOT);
-        }
-        if (!plot.hasOwner()) {
+        if (plot == null) { return !sendMessage(player, C.NOT_IN_PLOT); }
+        if (!plot.hasOwner())
+        {
             MainUtil.sendMessage(player, C.PLOT_UNOWNED);
             return false;
         }
-        if (!plot.isOwner(player.getUUID()) && !Permissions.hasPermission(player, "plots.admin.command.fill")) {
+        if (!plot.isOwner(player.getUUID()) && !Permissions.hasPermission(player, "plots.admin.command.fill"))
+        {
             MainUtil.sendMessage(player, C.NO_PLOT_PERMS);
             return true;
         }
-        if (MainUtil.runners.containsKey(plot)) {
+        if (MainUtil.runners.containsKey(plot))
+        {
             MainUtil.sendMessage(player, C.WAIT_FOR_TIMER);
             return false;
         }
@@ -69,89 +72,119 @@ public class DebugFill extends SubCommand {
         final Location top = MainUtil.getPlotTopLoc(plot.world, plot.id);
         MainUtil.sendMessage(player, "&cPreparing task");
         MainUtil.runners.put(plot, 1);
-        SetBlockQueue.addNotify(new Runnable() {
+        SetBlockQueue.addNotify(new Runnable()
+        {
             @Override
-            public void run() {
-                TaskManager.runTaskAsync(new Runnable() {
+            public void run()
+            {
+                TaskManager.runTaskAsync(new Runnable()
+                {
                     @Override
-                    public void run() {
+                    public void run()
+                    {
                         MainUtil.sendMessage(player, "&7 - Starting");
-                        if (args[0].equalsIgnoreCase("all")) {
+                        if (args[0].equalsIgnoreCase("all"))
+                        {
                             int height = 255;
                             PlotBlock block = new PlotBlock((short) 7, (byte) 0);
-                            PlotBlock air = new PlotBlock((short) 0, (byte) 0);
-                            if (args.length > 2) {
-                                try {
+                            final PlotBlock air = new PlotBlock((short) 0, (byte) 0);
+                            if (args.length > 2)
+                            {
+                                try
+                                {
                                     block = new PlotBlock(Short.parseShort(args[1]), (byte) 0);
-                                    if (args.length == 3) {
+                                    if (args.length == 3)
+                                    {
                                         height = Integer.parseInt(args[2]);
                                     }
                                 }
-                                catch (Exception e) {
+                                catch (final Exception e)
+                                {
                                     MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot fill all <id> <height>");
                                     MainUtil.runners.remove(plot);
                                     return;
                                 }
                             }
-                            for (int y = 0; y <= height; y++) {
-                                for (int x = bottom.getX(); x <= top.getX(); x++) {
-                                    for (int z = bottom.getZ(); z <= top.getZ(); z++) {
+                            for (int y = 0; y <= height; y++)
+                            {
+                                for (int x = bottom.getX(); x <= top.getX(); x++)
+                                {
+                                    for (int z = bottom.getZ(); z <= top.getZ(); z++)
+                                    {
                                         SetBlockQueue.setBlock(plot.world, x, y, z, block);
                                     }
                                 }
                             }
-                            for (int y = height + 1; y <= 255; y++) {
-                                for (int x = bottom.getX(); x <= top.getX(); x++) {
-                                    for (int z = bottom.getZ(); z <= top.getZ(); z++) {
+                            for (int y = height + 1; y <= 255; y++)
+                            {
+                                for (int x = bottom.getX(); x <= top.getX(); x++)
+                                {
+                                    for (int z = bottom.getZ(); z <= top.getZ(); z++)
+                                    {
                                         SetBlockQueue.setBlock(plot.world, x, y, z, air);
                                     }
                                 }
                             }
-                            SetBlockQueue.addNotify(new Runnable() {
+                            SetBlockQueue.addNotify(new Runnable()
+                            {
                                 @Override
-                                public void run() {
+                                public void run()
+                                {
                                     MainUtil.runners.remove(plot);
                                     MainUtil.sendMessage(player, "&aFill task complete!");
                                 }
                             });
                         }
-                        else if (args[0].equals("outline")) {
+                        else if (args[0].equals("outline"))
+                        {
                             int x, z;
                             z = bottom.getZ();
-                            for (x = bottom.getX(); x <= (top.getX() - 1); x++) {
-                                for (int y = 1; y <= 255; y++) {
+                            for (x = bottom.getX(); x <= (top.getX() - 1); x++)
+                            {
+                                for (int y = 1; y <= 255; y++)
+                                {
                                     SetBlockQueue.setBlock(plot.world, x, y, z, 7);
                                 }
                             }
                             x = top.getX();
-                            for (z = bottom.getZ(); z <= (top.getZ() - 1); z++) {
-                                for (int y = 1; y <= 255; y++) {
+                            for (z = bottom.getZ(); z <= (top.getZ() - 1); z++)
+                            {
+                                for (int y = 1; y <= 255; y++)
+                                {
                                     SetBlockQueue.setBlock(plot.world, x, y, z, 7);
                                 }
                             }
                             z = top.getZ();
-                            for (x = top.getX(); x >= (bottom.getX() + 1); x--) {
-                                for (int y = 1; y <= 255; y++) {
+                            for (x = top.getX(); x >= (bottom.getX() + 1); x--)
+                            {
+                                for (int y = 1; y <= 255; y++)
+                                {
                                     SetBlockQueue.setBlock(plot.world, x, y, z, 7);
                                 }
                             }
                             x = bottom.getX();
-                            for (z = top.getZ(); z >= (bottom.getZ() + 1); z--) {
-                                for (int y = 1; y <= 255; y++) {
+                            for (z = top.getZ(); z >= (bottom.getZ() + 1); z--)
+                            {
+                                for (int y = 1; y <= 255; y++)
+                                {
                                     SetBlockQueue.setBlock(plot.world, x, y, z, 7);
                                 }
                             }
-                            SetBlockQueue.addNotify(new Runnable() {
+                            SetBlockQueue.addNotify(new Runnable()
+                            {
                                 @Override
-                                public void run() {
+                                public void run()
+                                {
                                     MainUtil.sendMessage(player, "&aWalls complete! The ceiling will take a while :(");
                                     bottom.setY(255);
-                                    top.add(1,0,1);
+                                    top.add(1, 0, 1);
                                     SetBlockQueue.setSlow(true);
                                     MainUtil.setSimpleCuboidAsync(plot.world, bottom, top, new PlotBlock((short) 7, (byte) 0));
-                                    SetBlockQueue.addNotify(new Runnable() {
+                                    SetBlockQueue.addNotify(new Runnable()
+                                    {
                                         @Override
-                                        public void run() {
+                                        public void run()
+                                        {
                                             MainUtil.runners.remove(plot);
                                             MainUtil.sendMessage(player, "&aFill task complete!");
                                             SetBlockQueue.setSlow(false);
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/DebugFixFlags.java b/src/main/java/com/intellectualcrafters/plot/commands/DebugFixFlags.java
index 26daf282d..869d98724 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/DebugFixFlags.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/DebugFixFlags.java
@@ -37,40 +37,47 @@ import com.plotsquared.general.commands.Argument;
 import com.plotsquared.general.commands.CommandDeclaration;
 
 @CommandDeclaration(
-        command = "debugfixflags",
-        usage = "/plot debugfixflags <world>",
-        permission = "plots.debugfixflags",
-        description = "Attempt to fix all flags for a world",
-        requiredType = RequiredType.CONSOLE,
-        category = CommandCategory.DEBUG
-)
-public class DebugFixFlags extends SubCommand {
+command = "debugfixflags",
+usage = "/plot debugfixflags <world>",
+permission = "plots.debugfixflags",
+description = "Attempt to fix all flags for a world",
+requiredType = RequiredType.CONSOLE,
+category = CommandCategory.DEBUG)
+public class DebugFixFlags extends SubCommand
+{
 
-    public DebugFixFlags() {
+    public DebugFixFlags()
+    {
         requiredArguments = new Argument[] {
-                Argument.String
+        Argument.String
         };
     }
 
     @Override
-    public boolean onCommand(PlotPlayer plr, String[] args) {
+    public boolean onCommand(final PlotPlayer plr, final String[] args)
+    {
         final String world = args[0];
-        if (!BlockManager.manager.isWorld(world) || !PS.get().isPlotWorld(world)) {
+        if (!BlockManager.manager.isWorld(world) || !PS.get().isPlotWorld(world))
+        {
             MainUtil.sendMessage(plr, C.NOT_VALID_PLOT_WORLD, args[0]);
             return false;
         }
         MainUtil.sendMessage(plr, "&8--- &6Starting task &8 ---");
-        for (final Plot plot : PS.get().getPlotsInWorld(world)) {
+        for (final Plot plot : PS.get().getPlotsInWorld(world))
+        {
             final HashMap<String, Flag> flags = plot.getSettings().flags;
-            Iterator<Entry<String, Flag>> i = flags.entrySet().iterator();
+            final Iterator<Entry<String, Flag>> i = flags.entrySet().iterator();
             boolean changed = false;
-            while (i.hasNext()) {
-                if (FlagManager.getFlag(i.next().getKey()) == null) {
+            while (i.hasNext())
+            {
+                if (FlagManager.getFlag(i.next().getKey()) == null)
+                {
                     changed = true;
                     i.remove();
                 }
             }
-            if (changed) {
+            if (changed)
+            {
                 DBFunc.setFlags(plot, plot.getSettings().flags.values());
             }
         }
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/DebugLoadTest.java b/src/main/java/com/intellectualcrafters/plot/commands/DebugLoadTest.java
index 6a7f22ad4..f87573a7d 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/DebugLoadTest.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/DebugLoadTest.java
@@ -28,22 +28,26 @@ import com.intellectualcrafters.plot.object.PlotPlayer;
 import com.plotsquared.general.commands.CommandDeclaration;
 
 @CommandDeclaration(
-        command = "debugloadtest",
-        permission = "plots.debugloadtest",
-        description = "This debug command will force the reload of all plots in the DB",
-        usage = "/plot debugloadtest",
-        category = CommandCategory.DEBUG,
-        requiredType = RequiredType.CONSOLE
-)
-public class DebugLoadTest extends SubCommand {
+command = "debugloadtest",
+permission = "plots.debugloadtest",
+description = "This debug command will force the reload of all plots in the DB",
+usage = "/plot debugloadtest",
+category = CommandCategory.DEBUG,
+requiredType = RequiredType.CONSOLE)
+public class DebugLoadTest extends SubCommand
+{
 
     @Override
-    public boolean onCommand(PlotPlayer plr, String[] args) {
-        try {
+    public boolean onCommand(final PlotPlayer plr, final String[] args)
+    {
+        try
+        {
             final Field fPlots = PS.class.getDeclaredField("plots");
             fPlots.setAccessible(true);
             fPlots.set(null, DBFunc.getPlots());
-        } catch (final Exception e) {
+        }
+        catch (final Exception e)
+        {
             PS.debug("&3===FAILED&3===");
             e.printStackTrace();
             PS.debug("&3===END OF STACKTRACE===");
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/DebugPaste.java b/src/main/java/com/intellectualcrafters/plot/commands/DebugPaste.java
index 32593bcc5..cffb514dd 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/DebugPaste.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/DebugPaste.java
@@ -15,30 +15,37 @@ import com.plotsquared.bukkit.BukkitMain;
 import com.plotsquared.general.commands.CommandDeclaration;
 
 @CommandDeclaration(
-        command = "debugpaste",
-        aliases = {"dp"},
-        usage = "/plot debugpaste",
-        description = "Upload settings.yml & latest.log to hastebin",
-        permission = "plots.debugpaste",
-        category = CommandCategory.DEBUG
-)
-public class DebugPaste extends SubCommand {
+command = "debugpaste",
+aliases = { "dp" },
+usage = "/plot debugpaste",
+description = "Upload settings.yml & latest.log to hastebin",
+permission = "plots.debugpaste",
+category = CommandCategory.DEBUG)
+public class DebugPaste extends SubCommand
+{
 
     @Override
-    public boolean onCommand(final PlotPlayer plr, String[] args) {
-        TaskManager.runTaskAsync(new Runnable() {
+    public boolean onCommand(final PlotPlayer plr, final String[] args)
+    {
+        TaskManager.runTaskAsync(new Runnable()
+        {
             @Override
-            public void run() {
-                try {
-                    String settingsYML = HastebinUtility.upload(PS.get().configFile);
+            public void run()
+            {
+                try
+                {
+                    final String settingsYML = HastebinUtility.upload(PS.get().configFile);
                     String latestLOG;
-                    try {
+                    try
+                    {
                         latestLOG = HastebinUtility.upload(new File(BukkitMain.THIS.getDirectory(), "../../logs/latest.log"));
-                    } catch(final Exception e) {
+                    }
+                    catch (final Exception e)
+                    {
                         plr.sendMessage("&clatest.log is too big to be pasted, will ignore");
                         latestLOG = "too big :(";
                     }
-                    StringBuilder b = new StringBuilder();
+                    final StringBuilder b = new StringBuilder();
                     b.append("# Welcome to this paste\n# It is meant to provide us at IntellectualSites with better information about your problem\n\n# We will start with some informational files\n");
                     b.append("links.settings_yml: '").append(settingsYML).append("'\n");
                     b.append("links.latest_log: '").append(latestLOG).append("'\n");
@@ -47,11 +54,12 @@ public class DebugPaste extends SubCommand {
                     b.append("version.bukkit: '").append(Bukkit.getBukkitVersion()).append("'\n");
                     b.append("online_mode: ").append(Bukkit.getServer().getOnlineMode()).append("\n");
                     b.append("plugins:");
-                    for (final Plugin p : Bukkit.getPluginManager().getPlugins()) {
+                    for (final Plugin p : Bukkit.getPluginManager().getPlugins())
+                    {
                         b.append("\n  ").append(p.getName()).append(":\n    ").append("version: '").append(p.getDescription().getVersion()).append("'").append("\n    enabled: ").append(p.isEnabled());
                     }
                     b.append("\n\n# YAY! Now, let's see what we can find in your JVM\n");
-                    Runtime runtime = Runtime.getRuntime();
+                    final Runtime runtime = Runtime.getRuntime();
                     b.append("memory.free: ").append(runtime.freeMemory()).append("\n");
                     b.append("memory.max: ").append(runtime.maxMemory()).append("\n");
                     b.append("java.specification.version: '").append(System.getProperty("java.specification.version")).append("'\n");
@@ -63,9 +71,11 @@ public class DebugPaste extends SubCommand {
                     b.append("# Okay :D Great. You are now ready to create your bug report!");
                     b.append("\n# You can do so at https://github.com/IntellectualSites/PlotSquared/issues");
 
-                    String link = HastebinUtility.upload(b.toString());
+                    final String link = HastebinUtility.upload(b.toString());
                     plr.sendMessage(C.DEBUG_REPORT_CREATED.s().replace("%url%", link));
-                } catch (IOException e) {
+                }
+                catch (final IOException e)
+                {
                     e.printStackTrace();
                 }
             }
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/DebugRoadRegen.java b/src/main/java/com/intellectualcrafters/plot/commands/DebugRoadRegen.java
index bd919fc78..ff789ba9c 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/DebugRoadRegen.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/DebugRoadRegen.java
@@ -35,44 +35,49 @@ import com.intellectualcrafters.plot.util.MathMan;
 import com.plotsquared.general.commands.CommandDeclaration;
 
 @CommandDeclaration(
-        command = "debugroadregen",
-        usage = "/plot debugroadregen",
-        requiredType = RequiredType.NONE,
-        description = "Regenerate all roads based on the road schematic",
-        category = CommandCategory.DEBUG,
-        permission = "plots.debugroadregen"
-)
-public class DebugRoadRegen extends SubCommand {
+command = "debugroadregen",
+usage = "/plot debugroadregen",
+requiredType = RequiredType.NONE,
+description = "Regenerate all roads based on the road schematic",
+category = CommandCategory.DEBUG,
+permission = "plots.debugroadregen")
+public class DebugRoadRegen extends SubCommand
+{
 
     @Override
-    public boolean onCommand(final PlotPlayer player, final String ... args) {
+    public boolean onCommand(final PlotPlayer player, final String... args)
+    {
         final Location loc = player.getLocation();
         final String world = loc.getWorld();
-        PlotWorld plotworld = PS.get().getPlotWorld(world);
-        if (!(plotworld instanceof HybridPlotWorld)) {
-            return sendMessage(player, C.NOT_IN_PLOT_WORLD);
-        }
-        Plot plot = player.getCurrentPlot();
-        if (plot == null) {
+        final PlotWorld plotworld = PS.get().getPlotWorld(world);
+        if (!(plotworld instanceof HybridPlotWorld)) { return sendMessage(player, C.NOT_IN_PLOT_WORLD); }
+        final Plot plot = player.getCurrentPlot();
+        if (plot == null)
+        {
             final ChunkLoc chunk = new ChunkLoc(loc.getX() >> 4, loc.getZ() >> 4);
             int extend = 0;
-            if (args.length == 1) {
-                if (MathMan.isInteger(args[0])) {
-                    try {
+            if (args.length == 1)
+            {
+                if (MathMan.isInteger(args[0]))
+                {
+                    try
+                    {
                         extend = Integer.parseInt(args[0]);
                     }
-                    catch (Exception e) {
+                    catch (final Exception e)
+                    {
                         C.NOT_VALID_NUMBER.send(player, "(0, <EXTEND HEIGHT>)");
                         return false;
                     }
                 }
             }
-            boolean result = HybridUtils.manager.regenerateRoad(world, chunk, extend);
+            final boolean result = HybridUtils.manager.regenerateRoad(world, chunk, extend);
             MainUtil.sendMessage(player, "&6Regenerating chunk: " + chunk.x + "," + chunk.z + "\n&6 - Result: " + (result == true ? "&aSuccess" : "&cFailed"));
             MainUtil.sendMessage(player, "&cTo regenerate all roads: /plot regenallroads");
         }
-        else {
-            HybridPlotManager manager = (HybridPlotManager) PS.get().getPlotManager(world);
+        else
+        {
+            final HybridPlotManager manager = (HybridPlotManager) PS.get().getPlotManager(world);
             manager.createRoadEast(plotworld, plot);
             manager.createRoadSouth(plotworld, plot);
             manager.createRoadSouthEast(plotworld, plot);
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/DebugSaveTest.java b/src/main/java/com/intellectualcrafters/plot/commands/DebugSaveTest.java
index a645a6900..81cd03e2f 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/DebugSaveTest.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/DebugSaveTest.java
@@ -30,23 +30,26 @@ import com.intellectualcrafters.plot.util.MainUtil;
 import com.plotsquared.general.commands.CommandDeclaration;
 
 @CommandDeclaration(
-        command = "debugsavetest",
-        permission = "plots.debugsavetest",
-        category = CommandCategory.DEBUG,
-        requiredType = RequiredType.CONSOLE,
-        usage = "/plot debugsavetest",
-        description = "This command will force the recreation of all plots in the DB"
-)
-public class DebugSaveTest extends SubCommand {
+command = "debugsavetest",
+permission = "plots.debugsavetest",
+category = CommandCategory.DEBUG,
+requiredType = RequiredType.CONSOLE,
+usage = "/plot debugsavetest",
+description = "This command will force the recreation of all plots in the DB")
+public class DebugSaveTest extends SubCommand
+{
 
     @Override
-    public boolean onCommand(PlotPlayer plr, String[] args) {
+    public boolean onCommand(final PlotPlayer plr, final String[] args)
+    {
         final ArrayList<Plot> plots = new ArrayList<Plot>();
         plots.addAll(PS.get().getPlots());
         MainUtil.sendMessage(null, "&6Starting `DEBUGSAVETEST`");
-        DBFunc.createPlotsAndData(plots, new Runnable() {
+        DBFunc.createPlotsAndData(plots, new Runnable()
+        {
             @Override
-            public void run() {
+            public void run()
+            {
                 MainUtil.sendMessage(null, "&6Database sync finished!");
             }
         });
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/DebugUUID.java b/src/main/java/com/intellectualcrafters/plot/commands/DebugUUID.java
index bcff67c15..7ced00979 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/DebugUUID.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/DebugUUID.java
@@ -36,7 +36,6 @@ import org.bukkit.Bukkit;
 
 import com.intellectualcrafters.plot.PS;
 import com.intellectualcrafters.plot.config.C;
-import com.intellectualcrafters.plot.config.Settings;
 import com.intellectualcrafters.plot.database.AbstractDB;
 import com.intellectualcrafters.plot.database.DBFunc;
 import com.intellectualcrafters.plot.object.OfflinePlotPlayer;
@@ -55,54 +54,64 @@ import com.plotsquared.general.commands.Argument;
 import com.plotsquared.general.commands.CommandDeclaration;
 
 @CommandDeclaration(
-        command = "uuidconvert",
-        permission = "plots.admin",
-        description = "Debug UUID conversion",
-        usage = "/plot uuidconvert <lower|offline|online>",
-        requiredType = RequiredType.CONSOLE,
-        category = CommandCategory.DEBUG
-)
-public class DebugUUID extends SubCommand {
+command = "uuidconvert",
+permission = "plots.admin",
+description = "Debug UUID conversion",
+usage = "/plot uuidconvert <lower|offline|online>",
+requiredType = RequiredType.CONSOLE,
+category = CommandCategory.DEBUG)
+public class DebugUUID extends SubCommand
+{
 
-    public DebugUUID() {
+    public DebugUUID()
+    {
         requiredArguments = new Argument[] {
-                Argument.String
+        Argument.String
         };
     }
 
     @Override
-    public boolean onCommand(final PlotPlayer plr, final String[] args) {
-        PlotPlayer player = null;
+    public boolean onCommand(final PlotPlayer plr, final String[] args)
+    {
+        final PlotPlayer player = null;
 
         final UUIDWrapper currentUUIDWrapper = UUIDHandler.getUUIDWrapper();
         final UUIDWrapper newWrapper;
-        
-        switch (args[0].toLowerCase()) {
-            case "lower": {
+
+        switch (args[0].toLowerCase())
+        {
+            case "lower":
+            {
                 newWrapper = new LowerOfflineUUIDWrapper();
                 break;
             }
-            case "offline": {
+            case "offline":
+            {
                 newWrapper = new OfflineUUIDWrapper();
                 break;
             }
-            case "online": {
+            case "online":
+            {
                 newWrapper = new DefaultUUIDWrapper();
                 break;
             }
-            default: {
-                try {
-                    Class<?> clazz = Class.forName(args[0]);
+            default:
+            {
+                try
+                {
+                    final Class<?> clazz = Class.forName(args[0]);
                     newWrapper = (UUIDWrapper) clazz.newInstance();
                 }
-                catch (Exception e) {
+                catch (final Exception e)
+                {
                     MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot uuidconvert <lower|offline|online>");
                     return false;
                 }
             }
         }
-        
-        if (args.length != 2 || !args[1].equals("-o")) {
+
+        if ((args.length != 2) || !args[1].equals("-o"))
+        {
             MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot uuidconvert " + args[0] + " - o");
             MainUtil.sendMessage(player, "&cBe aware of the following!");
             MainUtil.sendMessage(player, "&8 - &cUse the database command or another method to backup your plots beforehand");
@@ -113,22 +122,24 @@ public class DebugUUID extends SubCommand {
             MainUtil.sendMessage(player, "&7Retype the command with the override parameter when ready :)");
             return false;
         }
-        
-        if (currentUUIDWrapper.getClass().getCanonicalName().equals(newWrapper.getClass().getCanonicalName())) {
+
+        if (currentUUIDWrapper.getClass().getCanonicalName().equals(newWrapper.getClass().getCanonicalName()))
+        {
             MainUtil.sendMessage(player, "&cUUID mode already in use!");
             return false;
         }
         MainUtil.sendConsoleMessage("&6Beginning UUID mode conversion");
         MainUtil.sendConsoleMessage("&7 - Disconnecting players");
-        for (PlotPlayer pp : UUIDHandler.getPlayers().values()) {
+        for (final PlotPlayer pp : UUIDHandler.getPlayers().values())
+        {
             pp.kick("PlotSquared UUID conversion has been initiated. You may reconnect when finished.");
         }
-        
+
         MainUtil.sendConsoleMessage("&7 - Initializing map");
-        
+
         final HashMap<UUID, UUID> uCMap = new HashMap<UUID, UUID>();
         final HashMap<UUID, UUID> uCReverse = new HashMap<UUID, UUID>();
-        
+
         MainUtil.sendConsoleMessage("&7 - Collecting playerdata");
 
         final HashSet<String> worlds = new HashSet<>();
@@ -136,212 +147,269 @@ public class DebugUUID extends SubCommand {
         worlds.add("world");
         final HashSet<UUID> uuids = new HashSet<>();
         final HashSet<String> names = new HashSet<>();
-        for (final String worldname : worlds) {
+        for (final String worldname : worlds)
+        {
             final File playerdataFolder = new File(worldname + File.separator + "playerdata");
-            String[] dat = playerdataFolder.list(new FilenameFilter() {
+            String[] dat = playerdataFolder.list(new FilenameFilter()
+            {
                 @Override
-                public boolean accept(final File f, final String s) {
+                public boolean accept(final File f, final String s)
+                {
                     return s.endsWith(".dat");
                 }
             });
-            if (dat != null) {
-                for (final String current : dat) {
+            if (dat != null)
+            {
+                for (final String current : dat)
+                {
                     final String s = current.replaceAll(".dat$", "");
-                    try {
+                    try
+                    {
                         final UUID uuid = UUID.fromString(s);
                         uuids.add(uuid);
-                    } catch (final Exception e) {
+                    }
+                    catch (final Exception e)
+                    {
                         MainUtil.sendMessage(plr, C.PREFIX.s() + "Invalid playerdata: " + current);
                     }
                 }
             }
             final File playersFolder = new File(worldname + File.separator + "players");
-            dat = playersFolder.list(new FilenameFilter() {
+            dat = playersFolder.list(new FilenameFilter()
+            {
                 @Override
-                public boolean accept(final File f, final String s) {
+                public boolean accept(final File f, final String s)
+                {
                     return s.endsWith(".dat");
                 }
             });
-            if (dat != null) {
-                for (final String current : dat) {
+            if (dat != null)
+            {
+                for (final String current : dat)
+                {
                     names.add(current.replaceAll(".dat$", ""));
                 }
             }
         }
-        
+
         MainUtil.sendConsoleMessage("&7 - Populating map");
         UUID uuid2;
         final UUIDWrapper wrapper = new DefaultUUIDWrapper();
-        for (UUID uuid : uuids) {
-            try {
+        for (UUID uuid : uuids)
+        {
+            try
+            {
                 final OfflinePlotPlayer op = wrapper.getOfflinePlayer(uuid);
                 uuid = currentUUIDWrapper.getUUID(op);
                 uuid2 = newWrapper.getUUID(op);
-                if (!uuid.equals(uuid2) && !uCMap.containsKey(uuid) && !uCReverse.containsKey(uuid2)) {
+                if (!uuid.equals(uuid2) && !uCMap.containsKey(uuid) && !uCReverse.containsKey(uuid2))
+                {
                     uCMap.put(uuid, uuid2);
                     uCReverse.put(uuid2, uuid);
                 }
-            } catch (final Throwable e) {
+            }
+            catch (final Throwable e)
+            {
                 MainUtil.sendMessage(plr, C.PREFIX.s() + "&6Invalid playerdata: " + uuid.toString() + ".dat");
             }
         }
-        for (final String name : names) {
+        for (final String name : names)
+        {
             final UUID uuid = currentUUIDWrapper.getUUID(name);
             uuid2 = newWrapper.getUUID(name);
-            if (!uuid.equals(uuid2)) {
+            if (!uuid.equals(uuid2))
+            {
                 uCMap.put(uuid, uuid2);
                 uCReverse.put(uuid2, uuid);
             }
         }
-        if (uCMap.size() == 0) {
+        if (uCMap.size() == 0)
+        {
             MainUtil.sendConsoleMessage("&c - Error! Attempting to repopulate");
-            for (OfflinePlotPlayer op : currentUUIDWrapper.getOfflinePlayers()) {
-                if (op.getLastPlayed() != 0) {
-//                    String name = op.getName();
-//                    StringWrapper wrap = new StringWrapper(name);
-                    UUID uuid = currentUUIDWrapper.getUUID(op);
+            for (final OfflinePlotPlayer op : currentUUIDWrapper.getOfflinePlayers())
+            {
+                if (op.getLastPlayed() != 0)
+                {
+                    //                    String name = op.getName();
+                    //                    StringWrapper wrap = new StringWrapper(name);
+                    final UUID uuid = currentUUIDWrapper.getUUID(op);
                     uuid2 = newWrapper.getUUID(op);
-                    if (!uuid.equals(uuid2)) {
+                    if (!uuid.equals(uuid2))
+                    {
                         uCMap.put(uuid, uuid2);
                         uCReverse.put(uuid2, uuid);
                     }
                 }
             }
-            if (uCMap.size() == 0) {
+            if (uCMap.size() == 0)
+            {
                 MainUtil.sendConsoleMessage("&cError. Failed to collect UUIDs!");
                 return false;
             }
-            else {
+            else
+            {
                 MainUtil.sendConsoleMessage("&a - Successfully repopulated");
             }
         }
-        
+
         MainUtil.sendConsoleMessage("&7 - Replacing cache");
-        TaskManager.runTaskAsync(new Runnable() {
+        TaskManager.runTaskAsync(new Runnable()
+        {
             @Override
-            public void run() {
-                for (Entry<UUID, UUID> entry : uCMap.entrySet()) {
-                    String name = UUIDHandler.getName(entry.getKey());
-                    if (name != null) {
+            public void run()
+            {
+                for (final Entry<UUID, UUID> entry : uCMap.entrySet())
+                {
+                    final String name = UUIDHandler.getName(entry.getKey());
+                    if (name != null)
+                    {
                         UUIDHandler.add(new StringWrapper(name), entry.getValue());
                     }
                 }
-                
+
                 MainUtil.sendConsoleMessage("&7 - Scanning for applicable files (uuids.txt)");
-                
-                File file = new File(PS.get().IMP.getDirectory(), "uuids.txt");
-                if (file.exists()) {
-                    try {
-                        List<String> lines = Files.readAllLines(file.toPath(), StandardCharsets.UTF_8);
-                        for (String line : lines) {
-                            try {
+
+                final File file = new File(PS.get().IMP.getDirectory(), "uuids.txt");
+                if (file.exists())
+                {
+                    try
+                    {
+                        final List<String> lines = Files.readAllLines(file.toPath(), StandardCharsets.UTF_8);
+                        for (String line : lines)
+                        {
+                            try
+                            {
                                 line = line.trim();
-                                if (line.length() == 0) {
+                                if (line.length() == 0)
+                                {
                                     continue;
                                 }
                                 line = line.replaceAll("[\\|][0-9]+[\\|][0-9]+[\\|]", "");
-                                String[] split = line.split("\\|");
-                                String name = split[0];
-                                if (name.length() == 0 || name.length() > 16 || !StringMan.isAlphanumericUnd(name)) {
+                                final String[] split = line.split("\\|");
+                                final String name = split[0];
+                                if ((name.length() == 0) || (name.length() > 16) || !StringMan.isAlphanumericUnd(name))
+                                {
                                     continue;
                                 }
-                                UUID old = currentUUIDWrapper.getUUID(name);
-                                if (old == null) {
+                                final UUID old = currentUUIDWrapper.getUUID(name);
+                                if (old == null)
+                                {
                                     continue;
                                 }
-                                UUID now = newWrapper.getUUID(name);
+                                final UUID now = newWrapper.getUUID(name);
                                 UUIDHandler.add(new StringWrapper(name), now);
                                 uCMap.put(old, now);
                                 uCReverse.put(now, old);
                             }
-                            catch (Exception e2) {
+                            catch (final Exception e2)
+                            {
                                 e2.printStackTrace();
                             }
                         }
-                    } catch (IOException e) {
+                    }
+                    catch (final IOException e)
+                    {
                         e.printStackTrace();
                     }
                 }
-                
+
                 MainUtil.sendConsoleMessage("&7 - Replacing wrapper");
                 UUIDHandler.setUUIDWrapper(newWrapper);
-                
+
                 MainUtil.sendConsoleMessage("&7 - Updating plot objects");
 
-                for (Plot plot : PS.get().getPlotsRaw()) {
-                    UUID value = uCMap.get(plot.owner);
-                    if (value != null) {
+                for (final Plot plot : PS.get().getPlotsRaw())
+                {
+                    final UUID value = uCMap.get(plot.owner);
+                    if (value != null)
+                    {
                         plot.owner = value;
                     }
                     plot.getTrusted().clear();
                     plot.getMembers().clear();
                     plot.getDenied().clear();
                 }
-                
+
                 MainUtil.sendConsoleMessage("&7 - Deleting database");
                 final AbstractDB database = DBFunc.dbManager;
-                boolean result = database.deleteTables();
+                final boolean result = database.deleteTables();
 
                 MainUtil.sendConsoleMessage("&7 - Creating tables");
-                
-                try {
+
+                try
+                {
                     database.createTables();
-                    if (!result) {
+                    if (!result)
+                    {
                         MainUtil.sendConsoleMessage("&cConversion failed! Attempting recovery");
-                        for (Plot plot : PS.get().getPlots()) {
-                            UUID value = uCReverse.get(plot.owner);
-                            if (value != null) {
+                        for (final Plot plot : PS.get().getPlots())
+                        {
+                            final UUID value = uCReverse.get(plot.owner);
+                            if (value != null)
+                            {
                                 plot.owner = value;
                             }
                         }
-                        database.createPlotsAndData(new ArrayList<>(PS.get().getPlots()), new Runnable() {
+                        database.createPlotsAndData(new ArrayList<>(PS.get().getPlots()), new Runnable()
+                        {
                             @Override
-                            public void run() {
+                            public void run()
+                            {
                                 MainUtil.sendMessage(null, "&6Recovery was successful!");
                             }
                         });
                         return;
                     }
                 }
-                catch (Exception e) {
+                catch (final Exception e)
+                {
                     e.printStackTrace();
                     return;
                 }
-                
-                if (newWrapper instanceof OfflineUUIDWrapper) {
+
+                if (newWrapper instanceof OfflineUUIDWrapper)
+                {
                     PS.get().config.set("UUID.force-lowercase", false);
                     PS.get().config.set("UUID.offline", true);
                 }
-                else if (newWrapper instanceof LowerOfflineUUIDWrapper) {
+                else if (newWrapper instanceof LowerOfflineUUIDWrapper)
+                {
                     PS.get().config.set("UUID.force-lowercase", true);
                     PS.get().config.set("UUID.offline", true);
                 }
-                else if (newWrapper instanceof DefaultUUIDWrapper) {
+                else if (newWrapper instanceof DefaultUUIDWrapper)
+                {
                     PS.get().config.set("UUID.force-lowercase", false);
                     PS.get().config.set("UUID.offline", false);
                 }
-                try {
+                try
+                {
                     PS.get().config.save(PS.get().configFile);
                 }
-                catch (Exception e) {
+                catch (final Exception e)
+                {
                     MainUtil.sendConsoleMessage("Could not save configuration. It will need to be manuall set!");
                 }
-                
+
                 MainUtil.sendConsoleMessage("&7 - Populating tables");
-                
-                TaskManager.runTaskAsync(new Runnable() {
+
+                TaskManager.runTaskAsync(new Runnable()
+                {
                     @Override
-                    public void run() {
-                        ArrayList<Plot> plots = new ArrayList<>(PS.get().getPlots());
-                        database.createPlotsAndData(plots, new Runnable() {
+                    public void run()
+                    {
+                        final ArrayList<Plot> plots = new ArrayList<>(PS.get().getPlots());
+                        database.createPlotsAndData(plots, new Runnable()
+                        {
                             @Override
-                            public void run() {
+                            public void run()
+                            {
                                 MainUtil.sendConsoleMessage("&aConversion complete!");
                             }
                         });
                     }
                 });
-                
+
                 MainUtil.sendConsoleMessage("&aIt is now safe for players to join");
                 MainUtil.sendConsoleMessage("&cConversion is still in progress, you will be notified when it is complete");
             }
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Delete.java b/src/main/java/com/intellectualcrafters/plot/commands/Delete.java
index 0498af26c..a2fc99a94 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/Delete.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/Delete.java
@@ -36,66 +36,73 @@ import com.intellectualcrafters.plot.util.UUIDHandler;
 import com.plotsquared.general.commands.CommandDeclaration;
 
 @CommandDeclaration(
-        command = "delete",
-        permission = "plots.delete",
-        description = "Delete a plot",
-        usage = "/plot delete",
-        aliases = {"dispose", "del"},
-        category = CommandCategory.ACTIONS,
-        requiredType = RequiredType.NONE
-)
-public class Delete extends SubCommand {
+command = "delete",
+permission = "plots.delete",
+description = "Delete a plot",
+usage = "/plot delete",
+aliases = { "dispose", "del" },
+category = CommandCategory.ACTIONS,
+requiredType = RequiredType.NONE)
+public class Delete extends SubCommand
+{
 
     @Override
-    public boolean onCommand(final PlotPlayer plr, final String[] args) {
-        
+    public boolean onCommand(final PlotPlayer plr, final String[] args)
+    {
+
         final Location loc = plr.getLocation();
         final Plot plot = MainUtil.getPlot(loc);
-        if (plot == null) {
-            return !sendMessage(plr, C.NOT_IN_PLOT);
-        }
-        if (!MainUtil.getTopPlot(plot).equals(MainUtil.getBottomPlot(plot))) {
-            return !sendMessage(plr, C.UNLINK_REQUIRED);
-        }
-        if (((!plot.hasOwner() || !plot.isOwner(plr.getUUID()))) && !Permissions.hasPermission(plr, "plots.admin.command.delete")) {
-            return !sendMessage(plr, C.NO_PLOT_PERMS);
-        }
+        if (plot == null) { return !sendMessage(plr, C.NOT_IN_PLOT); }
+        if (!MainUtil.getTopPlot(plot).equals(MainUtil.getBottomPlot(plot))) { return !sendMessage(plr, C.UNLINK_REQUIRED); }
+        if (((!plot.hasOwner() || !plot.isOwner(plr.getUUID()))) && !Permissions.hasPermission(plr, "plots.admin.command.delete")) { return !sendMessage(plr, C.NO_PLOT_PERMS); }
         final PlotWorld pWorld = PS.get().getPlotWorld(plot.world);
-        if (MainUtil.runners.containsKey(plot)) {
+        if (MainUtil.runners.containsKey(plot))
+        {
             MainUtil.sendMessage(plr, C.WAIT_FOR_TIMER);
             return false;
         }
-        Runnable runnable = new Runnable() {
+        final Runnable runnable = new Runnable()
+        {
             @Override
-            public void run() {
-                if ((EconHandler.manager != null) && pWorld.USE_ECONOMY && plot.hasOwner() && plot.isOwner(UUIDHandler.getUUID(plr))) {
+            public void run()
+            {
+                if ((EconHandler.manager != null) && pWorld.USE_ECONOMY && plot.hasOwner() && plot.isOwner(UUIDHandler.getUUID(plr)))
+                {
                     final double c = pWorld.SELL_PRICE;
-                    if (c > 0d) {
+                    if (c > 0d)
+                    {
                         EconHandler.manager.depositMoney(plr, c);
                         sendMessage(plr, C.ADDED_BALANCE, c + "");
                     }
                 }
-                if (plot.unclaim()) {
+                if (plot.unclaim())
+                {
                     final long start = System.currentTimeMillis();
-                    final boolean result = MainUtil.clearAsPlayer(plot, true, new Runnable() {
+                    final boolean result = MainUtil.clearAsPlayer(plot, true, new Runnable()
+                    {
                         @Override
-                        public void run() {
+                        public void run()
+                        {
                             MainUtil.sendMessage(plr, C.CLEARING_DONE, "" + (System.currentTimeMillis() - start));
                         }
                     });
-                    if (!result) {
+                    if (!result)
+                    {
                         MainUtil.sendMessage(plr, C.WAIT_FOR_TIMER);
                     }
                 }
-                else {
+                else
+                {
                     MainUtil.sendMessage(plr, C.UNCLAIM_FAILED);
                 }
             }
         };
-        if (Settings.CONFIRM_DELETE && !(Permissions.hasPermission(plr, "plots.confirm.bypass"))) {
+        if (Settings.CONFIRM_DELETE && !(Permissions.hasPermission(plr, "plots.confirm.bypass")))
+        {
             CmdConfirm.addPending(plr, "/plot delete " + plot.id, runnable);
         }
-        else {
+        else
+        {
             TaskManager.runTask(runnable);
         }
         return true;
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Deny.java b/src/main/java/com/intellectualcrafters/plot/commands/Deny.java
index 4d84b6649..5f033a543 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/Deny.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/Deny.java
@@ -37,57 +37,68 @@ import com.plotsquared.general.commands.Argument;
 import com.plotsquared.general.commands.CommandDeclaration;
 
 @CommandDeclaration(
-        command = "deny",
-        aliases = {"d"},
-        description = "Deny a user from a plot",
-        usage = "/plot deny <player>",
-        category = CommandCategory.ACTIONS,
-        requiredType = RequiredType.NONE
-)
-public class Deny extends SubCommand {
+command = "deny",
+aliases = { "d" },
+description = "Deny a user from a plot",
+usage = "/plot deny <player>",
+category = CommandCategory.ACTIONS,
+requiredType = RequiredType.NONE)
+public class Deny extends SubCommand
+{
 
-    public Deny() {
+    public Deny()
+    {
         requiredArguments = new Argument[] {
-                Argument.PlayerName
+        Argument.PlayerName
         };
     }
 
     @Override
-    public boolean onCommand(final PlotPlayer plr, final String[] args) {
-        
+    public boolean onCommand(final PlotPlayer plr, final String[] args)
+    {
+
         final Location loc = plr.getLocation();
         final Plot plot = MainUtil.getPlot(loc);
-        if (plot == null) {
-            return !sendMessage(plr, C.NOT_IN_PLOT);
-        }
-        if ((plot == null) || !plot.hasOwner()) {
+        if (plot == null) { return !sendMessage(plr, C.NOT_IN_PLOT); }
+        if ((plot == null) || !plot.hasOwner())
+        {
             MainUtil.sendMessage(plr, C.PLOT_UNOWNED);
             return false;
         }
-        if (!plot.isOwner(plr.getUUID()) && !Permissions.hasPermission(plr, "plots.admin.command.deny")) {
+        if (!plot.isOwner(plr.getUUID()) && !Permissions.hasPermission(plr, "plots.admin.command.deny"))
+        {
             MainUtil.sendMessage(plr, C.NO_PLOT_PERMS);
             return true;
         }
         UUID uuid;
-        if (args[0].equalsIgnoreCase("*")) {
+        if (args[0].equalsIgnoreCase("*"))
+        {
             uuid = DBFunc.everyone;
-        } else {
+        }
+        else
+        {
             uuid = UUIDHandler.getUUID(args[0], null);
         }
-        if (uuid == null) {
-            if (UUIDHandler.implementation instanceof SQLUUIDHandler) {
+        if (uuid == null)
+        {
+            if (UUIDHandler.implementation instanceof SQLUUIDHandler)
+            {
                 MainUtil.sendMessage(plr, C.INVALID_PLAYER_WAIT, args[0]);
-            } else {
+            }
+            else
+            {
                 MainUtil.sendMessage(plr, C.INVALID_PLAYER, args[0]);
             }
             return false;
         }
-        if (plot.isOwner(uuid)) {
+        if (plot.isOwner(uuid))
+        {
             MainUtil.sendMessage(plr, C.ALREADY_OWNER);
             return false;
         }
-        
-        if (plot.getDenied().contains(uuid)) {
+
+        if (plot.getDenied().contains(uuid))
+        {
             MainUtil.sendMessage(plr, C.ALREADY_ADDED);
             return false;
         }
@@ -96,15 +107,18 @@ public class Deny extends SubCommand {
         plot.addDenied(uuid);
         EventUtil.manager.callDenied(plr, plot, uuid, true);
         MainUtil.sendMessage(plr, C.DENIED_ADDED);
-        if (!uuid.equals(DBFunc.everyone)) {
+        if (!uuid.equals(DBFunc.everyone))
+        {
             handleKick(uuid, plot);
         }
         return true;
     }
 
-    private void handleKick(final UUID uuid, final Plot plot) {
-        PlotPlayer pp = UUIDHandler.getPlayer(uuid);
-        if (pp != null && plot.equals(MainUtil.getPlot(pp.getLocation()))) {
+    private void handleKick(final UUID uuid, final Plot plot)
+    {
+        final PlotPlayer pp = UUIDHandler.getPlayer(uuid);
+        if ((pp != null) && plot.equals(MainUtil.getPlot(pp.getLocation())))
+        {
             pp.teleport(BlockManager.manager.getSpawn(pp.getLocation().getWorld()));
             MainUtil.sendMessage(pp, C.YOU_GOT_DENIED);
         }
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Done.java b/src/main/java/com/intellectualcrafters/plot/commands/Done.java
index 42ea960bd..6cdf7ae22 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/Done.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/Done.java
@@ -30,53 +30,57 @@ import com.intellectualcrafters.plot.object.Plot;
 import com.intellectualcrafters.plot.object.PlotAnalysis;
 import com.intellectualcrafters.plot.object.PlotPlayer;
 import com.intellectualcrafters.plot.object.RunnableVal;
-import com.intellectualcrafters.plot.util.BlockManager;
 import com.intellectualcrafters.plot.util.MainUtil;
 import com.intellectualcrafters.plot.util.Permissions;
-import com.intellectualcrafters.plot.util.UUIDHandler;
 import com.plotsquared.general.commands.CommandDeclaration;
 
 @CommandDeclaration(
-        command = "done",
-        aliases = {"submit"},
-        description = "Mark a plot as done",
-        permission = "plots.done",
-        category = CommandCategory.ACTIONS,
-        requiredType = RequiredType.NONE
-)
-public class Done extends SubCommand {
+command = "done",
+aliases = { "submit" },
+description = "Mark a plot as done",
+permission = "plots.done",
+category = CommandCategory.ACTIONS,
+requiredType = RequiredType.NONE)
+public class Done extends SubCommand
+{
 
     @Override
-    public boolean onCommand(final PlotPlayer plr, final String[] args) {
+    public boolean onCommand(final PlotPlayer plr, final String[] args)
+    {
         final Location loc = plr.getLocation();
         final Plot plot = MainUtil.getPlot(loc);
-        if (plot == null || !plot.hasOwner()) {
-            return !sendMessage(plr, C.NOT_IN_PLOT);
-        }
-        if ((!plot.isOwner(plr.getUUID())) && !Permissions.hasPermission(plr, "plots.admin.command.done")) {
+        if ((plot == null) || !plot.hasOwner()) { return !sendMessage(plr, C.NOT_IN_PLOT); }
+        if ((!plot.isOwner(plr.getUUID())) && !Permissions.hasPermission(plr, "plots.admin.command.done"))
+        {
             MainUtil.sendMessage(plr, C.NO_PLOT_PERMS);
             return false;
         }
-        if (plot.getSettings().flags.containsKey("done")) {
+        if (plot.getSettings().flags.containsKey("done"))
+        {
             MainUtil.sendMessage(plr, C.DONE_ALREADY_DONE);
             return false;
         }
-        if (MainUtil.runners.containsKey(plot)) {
+        if (MainUtil.runners.containsKey(plot))
+        {
             MainUtil.sendMessage(plr, C.WAIT_FOR_TIMER);
             return false;
         }
         MainUtil.runners.put(plot, 1);
         MainUtil.sendMessage(plr, C.GENERATING_LINK);
-        HybridUtils.manager.analyzePlot(plot, new RunnableVal<PlotAnalysis>() {
+        HybridUtils.manager.analyzePlot(plot, new RunnableVal<PlotAnalysis>()
+        {
             @Override
-            public void run() {
+            public void run()
+            {
                 MainUtil.runners.remove(plot);
-                if (value == null || value.getComplexity() >= Settings.CLEAR_THRESHOLD) {
-                    Flag flag = new Flag(FlagManager.getFlag("done"), (System.currentTimeMillis() / 1000));
+                if ((value == null) || (value.getComplexity() >= Settings.CLEAR_THRESHOLD))
+                {
+                    final Flag flag = new Flag(FlagManager.getFlag("done"), (System.currentTimeMillis() / 1000));
                     FlagManager.addPlotFlag(plot, flag);
                     MainUtil.sendMessage(plr, C.DONE_SUCCESS);
                 }
-                else {
+                else
+                {
                     MainUtil.sendMessage(plr, C.DONE_INSUFFICIENT_COMPLEXITY);
                 }
             }
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Download.java b/src/main/java/com/intellectualcrafters/plot/commands/Download.java
index fcd16bdbe..c9f0f8db3 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/Download.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/Download.java
@@ -17,52 +17,58 @@ import com.intellectualcrafters.plot.util.TaskManager;
 import com.plotsquared.general.commands.CommandDeclaration;
 
 @CommandDeclaration(
-        command = "download",
-        aliases = {"dl"},
-        category = CommandCategory.ACTIONS,
-        requiredType = RequiredType.NONE,
-        description = "Download your plot",
-        permission = "plots.download"
-)
-public class Download extends SubCommand {
+command = "download",
+aliases = { "dl" },
+category = CommandCategory.ACTIONS,
+requiredType = RequiredType.NONE,
+description = "Download your plot",
+permission = "plots.download")
+public class Download extends SubCommand
+{
 
     @Override
-    public boolean onCommand(final PlotPlayer plr, final String[] args) {
-        
-        if (!Settings.METRICS) {
+    public boolean onCommand(final PlotPlayer plr, final String[] args)
+    {
+
+        if (!Settings.METRICS)
+        {
             MainUtil.sendMessage(plr, "&cPlease enable metrics in order to use this command.\n&7 - Or host it yourself if you don't like the free service");
             return false;
         }
         final String world = plr.getLocation().getWorld();
-        if (!PS.get().isPlotWorld(world)) {
-            return !sendMessage(plr, C.NOT_IN_PLOT_WORLD);
-        }
+        if (!PS.get().isPlotWorld(world)) { return !sendMessage(plr, C.NOT_IN_PLOT_WORLD); }
         final Plot plot = MainUtil.getPlot(plr.getLocation());
-        if (plot == null) {
-            return !sendMessage(plr, C.NOT_IN_PLOT);
-        }
-        if (!plot.hasOwner()) {
+        if (plot == null) { return !sendMessage(plr, C.NOT_IN_PLOT); }
+        if (!plot.hasOwner())
+        {
             MainUtil.sendMessage(plr, C.PLOT_UNOWNED);
             return false;
         }
-        if ((!plot.isOwner(plr.getUUID()) || (Settings.DOWNLOAD_REQUIRES_DONE && FlagManager.getPlotFlag(plot, "done") != null)) && !Permissions.hasPermission(plr, "plots.admin.command.download")) {
+        if ((!plot.isOwner(plr.getUUID()) || (Settings.DOWNLOAD_REQUIRES_DONE && (FlagManager.getPlotFlag(plot, "done") != null))) && !Permissions.hasPermission(plr, "plots.admin.command.download"))
+        {
             MainUtil.sendMessage(plr, C.NO_PLOT_PERMS);
             return false;
         }
-        if (MainUtil.runners.containsKey(plot)) {
+        if (MainUtil.runners.containsKey(plot))
+        {
             MainUtil.sendMessage(plr, C.WAIT_FOR_TIMER);
             return false;
         }
         MainUtil.runners.put(plot, 1);
         MainUtil.sendMessage(plr, C.GENERATING_LINK);
-        SchematicHandler.manager.getCompoundTag(plot.world, plot.id, new RunnableVal<CompoundTag>() {
+        SchematicHandler.manager.getCompoundTag(plot.world, plot.id, new RunnableVal<CompoundTag>()
+        {
             @Override
-            public void run() {
-                TaskManager.runTaskAsync(new Runnable() {
+            public void run()
+            {
+                TaskManager.runTaskAsync(new Runnable()
+                {
                     @Override
-                    public void run() {
-                        URL url = SchematicHandler.manager.upload(value, null, null);
-                        if (url == null) {
+                    public void run()
+                    {
+                        final URL url = SchematicHandler.manager.upload(value, null, null);
+                        if (url == null)
+                        {
                             MainUtil.sendMessage(plr, C.GENERATING_LINK_FAILED);
                             MainUtil.runners.remove(plot);
                             return;
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/FlagCmd.java b/src/main/java/com/intellectualcrafters/plot/commands/FlagCmd.java
index 58520793a..70d1df41a 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/FlagCmd.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/FlagCmd.java
@@ -39,24 +39,26 @@ import com.intellectualcrafters.plot.util.StringMan;
 import com.plotsquared.general.commands.CommandDeclaration;
 
 @CommandDeclaration(
-        command = "flag",
-        aliases = {"f"},
-        usage = "/plot flag <set|remove|add|list|info> <flag> <value>",
-        description = "Manage plot flags",
-        category = CommandCategory.ACTIONS,
-        requiredType = RequiredType.NONE,
-        permission = "plots.flag"
-)
-public class FlagCmd extends SubCommand {
+command = "flag",
+aliases = { "f" },
+usage = "/plot flag <set|remove|add|list|info> <flag> <value>",
+description = "Manage plot flags",
+category = CommandCategory.ACTIONS,
+requiredType = RequiredType.NONE,
+permission = "plots.flag")
+public class FlagCmd extends SubCommand
+{
 
     @Override
-    public String getUsage() {
+    public String getUsage()
+    {
         return super.getUsage().replaceAll("<flag>", StringMan.join(FlagManager.getFlags(), "|"));
     }
-    
+
     @Override
-    public boolean onCommand(final PlotPlayer player, final String ... args) {
-        
+    public boolean onCommand(final PlotPlayer player, final String... args)
+    {
+
         /*
          *  plot flag set fly true
          *  plot flag remove fly
@@ -64,40 +66,50 @@ public class FlagCmd extends SubCommand {
          *  plot flag add use 2,4
          *  plot flag list
          */
-        if (args.length == 0) {
+        if (args.length == 0)
+        {
             MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot flag <set|remove|add|list|info>");
             return false;
         }
         final Location loc = player.getLocation();
         final Plot plot = MainUtil.getPlot(loc);
-        if (plot == null) {
+        if (plot == null)
+        {
             MainUtil.sendMessage(player, C.NOT_IN_PLOT);
             return false;
         }
-        if (!plot.hasOwner()) {
+        if (!plot.hasOwner())
+        {
             sendMessage(player, C.PLOT_NOT_CLAIMED);
             return false;
         }
-        if (!plot.isOwner(player.getUUID()) && !Permissions.hasPermission(player, "plots.set.flag.other")) {
+        if (!plot.isOwner(player.getUUID()) && !Permissions.hasPermission(player, "plots.set.flag.other"))
+        {
             MainUtil.sendMessage(player, C.NO_PERMISSION, "plots.set.flag.other");
             return false;
         }
-        if (args.length > 1 && FlagManager.isReserved(args[1])) {
+        if ((args.length > 1) && FlagManager.isReserved(args[1]))
+        {
             MainUtil.sendMessage(player, C.NOT_VALID_FLAG);
             return false;
         }
-        switch (args[0].toLowerCase()) {
-            case "info": {
-                if (!Permissions.hasPermission(player, "plots.set.flag")) {
+        switch (args[0].toLowerCase())
+        {
+            case "info":
+            {
+                if (!Permissions.hasPermission(player, "plots.set.flag"))
+                {
                     MainUtil.sendMessage(player, C.NO_PERMISSION, "plots.flag.info");
                     return false;
                 }
-                if (args.length != 2) {
+                if (args.length != 2)
+                {
                     MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot flag info <flag>");
                     return false;
                 }
                 final AbstractFlag af = FlagManager.getFlag(args[1]);
-                if (af == null) {
+                if (af == null)
+                {
                     MainUtil.sendMessage(player, C.NOT_VALID_FLAG);
                     MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot flag info <flag>");
                     return false;
@@ -110,73 +122,92 @@ public class FlagCmd extends SubCommand {
                 MainUtil.sendMessage(player, C.FLAG_DESC, af.getValueDesc());
                 return true;
             }
-            case "set": {
-                if (!Permissions.hasPermission(player, "plots.set.flag")) {
+            case "set":
+            {
+                if (!Permissions.hasPermission(player, "plots.set.flag"))
+                {
                     MainUtil.sendMessage(player, C.NO_PERMISSION, "plots.set.flag");
                     return false;
                 }
-                if (args.length < 3) {
+                if (args.length < 3)
+                {
                     MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot flag set <flag> <value>");
                     return false;
                 }
                 final AbstractFlag af = FlagManager.getFlag(args[1].toLowerCase());
-                if (af == null) {
+                if (af == null)
+                {
                     MainUtil.sendMessage(player, C.NOT_VALID_FLAG);
                     return false;
                 }
                 final String value = StringMan.join(Arrays.copyOfRange(args, 2, args.length), " ");
-                if (!Permissions.hasPermission(player, "plots.set.flag." + args[1].toLowerCase() + "." + value.toLowerCase())) {
+                if (!Permissions.hasPermission(player, "plots.set.flag." + args[1].toLowerCase() + "." + value.toLowerCase()))
+                {
                     MainUtil.sendMessage(player, C.NO_PERMISSION, "plots.set.flag." + args[1].toLowerCase() + "." + value.toLowerCase());
                     return false;
                 }
                 final Object parsed = af.parseValueRaw(value);
-                if (parsed == null) {
+                if (parsed == null)
+                {
                     MainUtil.sendMessage(player, "&c" + af.getValueDesc());
                     return false;
                 }
                 final Flag flag = new Flag(FlagManager.getFlag(args[1].toLowerCase(), true), parsed);
                 final boolean result = FlagManager.addPlotFlag(plot, flag);
-                if (!result) {
+                if (!result)
+                {
                     MainUtil.sendMessage(player, C.FLAG_NOT_ADDED);
                     return false;
                 }
                 MainUtil.sendMessage(player, C.FLAG_ADDED);
                 return true;
             }
-            case "remove": {
-                if (!Permissions.hasPermission(player, "plots.flag.remove")) {
+            case "remove":
+            {
+                if (!Permissions.hasPermission(player, "plots.flag.remove"))
+                {
                     MainUtil.sendMessage(player, C.NO_PERMISSION, "plots.flag.remove");
                     return false;
                 }
-                if ((args.length != 2) && (args.length != 3)) {
+                if ((args.length != 2) && (args.length != 3))
+                {
                     MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot flag remove <flag> [values]");
                     return false;
                 }
                 final AbstractFlag af = FlagManager.getFlag(args[1].toLowerCase());
-                if (af == null) {
+                if (af == null)
+                {
                     MainUtil.sendMessage(player, C.NOT_VALID_FLAG);
                     return false;
                 }
                 final Flag flag = FlagManager.getPlotFlagAbs(plot, args[1].toLowerCase());
-                if (!Permissions.hasPermission(player, "plots.set.flag." + args[1].toLowerCase())) {
-                    for (String entry : args[2].split(",")) {
-                        if (!Permissions.hasPermission(player, "plots.set.flag." + args[1].toLowerCase() + "." + entry)) {
+                if (!Permissions.hasPermission(player, "plots.set.flag." + args[1].toLowerCase()))
+                {
+                    for (final String entry : args[2].split(","))
+                    {
+                        if (!Permissions.hasPermission(player, "plots.set.flag." + args[1].toLowerCase() + "." + entry))
+                        {
                             MainUtil.sendMessage(player, C.NO_PERMISSION, "plots.set.flag." + args[1].toLowerCase() + "." + entry);
                             return false;
                         }
                     }
                 }
-                if (flag == null) {
+                if (flag == null)
+                {
                     MainUtil.sendMessage(player, C.FLAG_NOT_IN_PLOT);
                     return false;
                 }
-                if ((args.length == 3) && flag.getAbstractFlag().isList()) {
+                if ((args.length == 3) && flag.getAbstractFlag().isList())
+                {
                     final String value = StringMan.join(Arrays.copyOfRange(args, 2, args.length), " ");
                     ((FlagValue.ListValue) flag.getAbstractFlag().value).remove(flag.getValue(), value);
                     DBFunc.setFlags(plot, plot.getSettings().flags.values());
-                } else {
+                }
+                else
+                {
                     final boolean result = FlagManager.removePlotFlag(plot, flag.getKey());
-                    if (!result) {
+                    if (!result)
+                    {
                         MainUtil.sendMessage(player, C.FLAG_NOT_REMOVED);
                         return false;
                     }
@@ -184,23 +215,30 @@ public class FlagCmd extends SubCommand {
                 MainUtil.sendMessage(player, C.FLAG_REMOVED);
                 return true;
             }
-            case "add": {
-                if (!Permissions.hasPermission(player, "plots.flag.add")) {
+            case "add":
+            {
+                if (!Permissions.hasPermission(player, "plots.flag.add"))
+                {
                     MainUtil.sendMessage(player, C.NO_PERMISSION, "plots.flag.add");
                     return false;
                 }
-                if (args.length < 3) {
+                if (args.length < 3)
+                {
                     MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot flag add <flag> <values>");
                     return false;
                 }
                 final AbstractFlag af = FlagManager.getFlag(args[1].toLowerCase());
-                if (af == null) {
+                if (af == null)
+                {
                     MainUtil.sendMessage(player, C.NOT_VALID_FLAG);
                     return false;
                 }
-                if (!Permissions.hasPermission(player, "plots.set.flag." + args[1].toLowerCase())) {
-                    for (String entry : args[2].split(",")) {
-                        if (!Permissions.hasPermission(player, "plots.set.flag." + args[1].toLowerCase() + "." + entry)) {
+                if (!Permissions.hasPermission(player, "plots.set.flag." + args[1].toLowerCase()))
+                {
+                    for (final String entry : args[2].split(","))
+                    {
+                        if (!Permissions.hasPermission(player, "plots.set.flag." + args[1].toLowerCase() + "." + entry))
+                        {
                             MainUtil.sendMessage(player, C.NO_PERMISSION, "plots.set.flag." + args[1].toLowerCase() + "." + entry);
                             return false;
                         }
@@ -208,18 +246,23 @@ public class FlagCmd extends SubCommand {
                 }
                 final String value = StringMan.join(Arrays.copyOfRange(args, 2, args.length), " ");
                 final Object parsed = af.parseValueRaw(value);
-                if (parsed == null) {
+                if (parsed == null)
+                {
                     MainUtil.sendMessage(player, "&c" + af.getValueDesc());
                     return false;
                 }
                 Flag flag = FlagManager.getPlotFlag(plot, args[1].toLowerCase());
-                if ((flag == null) || !flag.getAbstractFlag().isList()) {
+                if ((flag == null) || !flag.getAbstractFlag().isList())
+                {
                     flag = new Flag(FlagManager.getFlag(args[1].toLowerCase(), true), parsed);
-                } else {
+                }
+                else
+                {
                     ((FlagValue.ListValue) flag.getAbstractFlag().value).add(flag.getValue(), value);
                 }
                 final boolean result = FlagManager.addPlotFlag(plot, flag);
-                if (!result) {
+                if (!result)
+                {
                     MainUtil.sendMessage(player, C.FLAG_NOT_ADDED);
                     return false;
                 }
@@ -227,26 +270,32 @@ public class FlagCmd extends SubCommand {
                 MainUtil.sendMessage(player, C.FLAG_ADDED);
                 return true;
             }
-            case "list": {
-                if (!Permissions.hasPermission(player, "plots.flag.list")) {
+            case "list":
+            {
+                if (!Permissions.hasPermission(player, "plots.flag.list"))
+                {
                     MainUtil.sendMessage(player, C.NO_PERMISSION, "plots.flag.list");
                     return false;
                 }
-                if (args.length != 1) {
+                if (args.length != 1)
+                {
                     MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot flag list");
                     return false;
                 }
                 final HashMap<String, ArrayList<String>> flags = new HashMap<>();
-                for (final AbstractFlag af : FlagManager.getFlags()) {
+                for (final AbstractFlag af : FlagManager.getFlags())
+                {
                     final String type = af.value.getClass().getSimpleName().replaceAll("Value", "");
-                    if (!flags.containsKey(type)) {
+                    if (!flags.containsKey(type))
+                    {
                         flags.put(type, new ArrayList<String>());
                     }
                     flags.get(type).add(af.getKey());
                 }
                 String message = "";
                 String prefix = "";
-                for (final String flag : flags.keySet()) {
+                for (final String flag : flags.keySet())
+                {
                     message += prefix + "&6" + flag + ": &7" + StringMan.join(flags.get(flag), ", ");
                     prefix = "\n";
                 }
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/GenerateDocs.java b/src/main/java/com/intellectualcrafters/plot/commands/GenerateDocs.java
index 04e6c0860..a4cc8b2d6 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/GenerateDocs.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/GenerateDocs.java
@@ -9,79 +9,86 @@ import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import com.intellectualcrafters.plot.PS;
-import com.intellectualcrafters.plot.object.ConsolePlayer;
 import com.intellectualcrafters.plot.object.PlotPlayer;
-import com.intellectualcrafters.plot.util.Permissions;
 import com.intellectualcrafters.plot.util.StringMan;
 import com.plotsquared.general.commands.Command;
 
-public class GenerateDocs {
-    public static void main(String[] args) {
+public class GenerateDocs
+{
+    public static void main(final String[] args)
+    {
         MainCommand.getInstance().addCommand(new WE_Anywhere());
         MainCommand.getInstance().addCommand(new Cluster());
-        ArrayList<Command<PlotPlayer>> commands = MainCommand.getInstance().getCommands();
+        final ArrayList<Command<PlotPlayer>> commands = MainCommand.getInstance().getCommands();
         log("### Want to document some commands?");
         log(" - This page is automatically generated");
         log(" - Fork the project and add a javadoc comment to one of the command classes");
         log(" - Then do a pull request and it will be added to this page");
         log("");
         log("# Contents");
-        for (CommandCategory category : CommandCategory.values()) {
+        for (final CommandCategory category : CommandCategory.values())
+        {
             log("###### " + category.name());
-            for (Command<PlotPlayer> command : MainCommand.getCommands(category, null)) {
-                log(" - [/plot " + command.getCommand() + "](https://github.com/IntellectualSites/PlotSquared/wiki/Commands#" + command.getCommand() +")    ");
+            for (final Command<PlotPlayer> command : MainCommand.getCommands(category, null))
+            {
+                log(" - [/plot " + command.getCommand() + "](https://github.com/IntellectualSites/PlotSquared/wiki/Commands#" + command.getCommand() + ")    ");
             }
             log("");
         }
         log("# Commands");
-        for (Command<PlotPlayer> command : commands) {
+        for (final Command<PlotPlayer> command : commands)
+        {
             printCommand(command);
         }
     }
-    
-    public static void printCommand(Command<PlotPlayer> command) {
-        try {
-            String clazz = command.getClass().getSimpleName();
-            String name = command.getCommand();
-            
+
+    public static void printCommand(final Command<PlotPlayer> command)
+    {
+        try
+        {
+            final String clazz = command.getClass().getSimpleName();
+            final String name = command.getCommand();
+
             // Header
-            String source = "https://github.com/IntellectualSites/PlotSquared/tree/master/src/main/java/com/intellectualcrafters/plot/commands/" + clazz + ".java";
+            final String source = "https://github.com/IntellectualSites/PlotSquared/tree/master/src/main/java/com/intellectualcrafters/plot/commands/" + clazz + ".java";
             log("## [" + name.toUpperCase() + "](" + source + ")    ");
-            
-            File file = new File("src/main/java/com/intellectualcrafters/plot/commands/" + clazz + ".java");
-            List<String> lines = Files.readAllLines(file.toPath(), StandardCharsets.UTF_8);
-            List<String> perms = getPerms(name, lines);
-            String comment = getComments(lines);
-            
+
+            final File file = new File("src/main/java/com/intellectualcrafters/plot/commands/" + clazz + ".java");
+            final List<String> lines = Files.readAllLines(file.toPath(), StandardCharsets.UTF_8);
+            final List<String> perms = getPerms(name, lines);
+            final String comment = getComments(lines);
+
             log("#### Description");
             log("`" + command.getDescription() + "`");
-            if (comment.length() > 0) {
+            if (comment.length() > 0)
+            {
                 log("##### Comments");
                 log("``` java");
                 log(comment);
                 log("```");
             }
-            
+
             log("#### Usage");
             log("`" + command.getUsage().replaceAll("\\{label\\}", "plot") + "`");
-            
-            
-            if (command.getRequiredType() != RequiredType.NONE) {
+
+            if (command.getRequiredType() != RequiredType.NONE)
+            {
                 log("#### Required callers");
                 log("`" + command.getRequiredType().name() + "`");
             }
-            
-            Set<String> aliases = command.getAliases();
-            if (aliases.size() > 0) {
+
+            final Set<String> aliases = command.getAliases();
+            if (aliases.size() > 0)
+            {
                 log("#### Aliases");
                 log("`" + StringMan.getString(command.getAliases()) + "`");
             }
-            
+
             log("#### Permissions");
             log("##### Primary");
             log(" - `" + command.getPermission() + "`    ");
-            if (perms.size() > 0) {
+            if (perms.size() > 0)
+            {
                 log("");
                 log("##### Other");
                 log(" - `" + StringMan.join(perms, "`\n - `") + "`");
@@ -90,54 +97,68 @@ public class GenerateDocs {
             log("***");
             log("");
         }
-        catch (Exception e) {
+        catch (final Exception e)
+        {
             e.printStackTrace();
         }
     }
-    
-    public static List<String> getPerms(String cmd, List<String> lines) {
-        ArrayList<String> perms = new ArrayList<String>();
-        Pattern p = Pattern.compile("\"([^\"]*)\"");
-        for (String line : lines) {
-            if (line.contains("Permissions.hasPermission(")) {
-                Matcher m = p.matcher(line);
-                while (m.find()) {
+
+    public static List<String> getPerms(final String cmd, final List<String> lines)
+    {
+        final ArrayList<String> perms = new ArrayList<String>();
+        final Pattern p = Pattern.compile("\"([^\"]*)\"");
+        for (final String line : lines)
+        {
+            if (line.contains("Permissions.hasPermission("))
+            {
+                final Matcher m = p.matcher(line);
+                while (m.find())
+                {
                     String perm = m.group(1);
-                    if (perm.endsWith(".")) {
+                    if (perm.endsWith("."))
+                    {
                         perm += "<arg>";
                     }
-                    if (perm.startsWith(".")) {
+                    if (perm.startsWith("."))
+                    {
                         perms.set(perms.size() - 1, perms.get(perms.size() - 1) + perm);
                     }
-                    else if (perm.contains(".")) {
+                    else if (perm.contains("."))
+                    {
                         perms.add(perm);
                     }
                 }
             }
         }
-        switch (cmd.toLowerCase()) {
+        switch (cmd.toLowerCase())
+        {
             case "auto":
-            case "claim": {
+            case "claim":
+            {
                 perms.add("plots.plot.#");
                 break;
             }
         }
         return perms;
     }
-    
-    public static String getComments(List<String> lines) {
-        StringBuilder result = new StringBuilder();
-        for (String line : lines) {
+
+    public static String getComments(final List<String> lines)
+    {
+        final StringBuilder result = new StringBuilder();
+        for (String line : lines)
+        {
             line = line.trim();
-            if (line.startsWith("/** ") || line.startsWith("*/ ") || line.startsWith("* ")) {
+            if (line.startsWith("/** ") || line.startsWith("*/ ") || line.startsWith("* "))
+            {
                 line = (line.replaceAll("/[*][*] ", "").replaceAll("[*]/ ", "").replaceAll("[*] ", "")).trim();
                 result.append(line + "\n");
             }
         }
         return result.toString().trim();
     }
-    
-    public static void log(String s) {
+
+    public static void log(final String s)
+    {
         System.out.println(s);
     }
 }
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Help.java b/src/main/java/com/intellectualcrafters/plot/commands/Help.java
index 4ce7611b7..5cac2dcb8 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/Help.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/Help.java
@@ -4,15 +4,16 @@ import com.intellectualcrafters.plot.object.PlotPlayer;
 import com.plotsquared.general.commands.CommandDeclaration;
 
 @CommandDeclaration(
-        command = "help",
-        description = "Get this help menu",
-        aliases = {"he"},
-        category = CommandCategory.INFO
-)
-public class Help extends SubCommand {
+command = "help",
+description = "Get this help menu",
+aliases = { "he" },
+category = CommandCategory.INFO)
+public class Help extends SubCommand
+{
 
     @Override
-    public boolean onCommand(final PlotPlayer plr, final String[] args) {
+    public boolean onCommand(final PlotPlayer plr, final String[] args)
+    {
         return true;
     }
 }
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Home.java b/src/main/java/com/intellectualcrafters/plot/commands/Home.java
index 99013162b..a2e509fe0 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/Home.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/Home.java
@@ -23,7 +23,6 @@ package com.intellectualcrafters.plot.commands;
 import java.util.ArrayList;
 
 import com.intellectualcrafters.plot.PS;
-import com.intellectualcrafters.plot.PS.SortType;
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.object.Plot;
 import com.intellectualcrafters.plot.object.PlotPlayer;
@@ -31,42 +30,53 @@ import com.intellectualcrafters.plot.util.MainUtil;
 import com.plotsquared.general.commands.CommandDeclaration;
 
 @CommandDeclaration(
-        command = "home",
-        aliases = {"h"},
-        description = "Go to your plot",
-        usage = "/plot home [id|alias]",
-        category = CommandCategory.TELEPORT,
-        requiredType = RequiredType.NONE
-)
-public class Home extends SubCommand {
+command = "home",
+aliases = { "h" },
+description = "Go to your plot",
+usage = "/plot home [id|alias]",
+category = CommandCategory.TELEPORT,
+requiredType = RequiredType.NONE)
+public class Home extends SubCommand
+{
 
-    private Plot isAlias(final String a) {
-        for (final Plot p : PS.get().getPlots()) {
-            if ((p.getSettings().getAlias().length() > 0) && p.getSettings().getAlias().equalsIgnoreCase(a)) {
-                return p;
-            }
+    private Plot isAlias(final String a)
+    {
+        for (final Plot p : PS.get().getPlots())
+        {
+            if ((p.getSettings().getAlias().length() > 0) && p.getSettings().getAlias().equalsIgnoreCase(a)) { return p; }
         }
         return null;
     }
 
     @Override
-    public boolean onCommand(final PlotPlayer plr, String[] args) {
+    public boolean onCommand(final PlotPlayer plr, String[] args)
+    {
         final ArrayList<Plot> plots = PS.get().sortPlotsByTemp(PS.get().getPlots(plr));//PS.get().sortPlots(PS.get().getPlots(plr), SortType.CREATION_DATE, null);
-        if (plots.size() == 1) {
+        if (plots.size() == 1)
+        {
             MainUtil.teleportPlayer(plr, plr.getLocation(), plots.get(0));
             return true;
-        } else if (plots.size() > 1) {
-            if (args.length < 1) {
+        }
+        else if (plots.size() > 1)
+        {
+            if (args.length < 1)
+            {
                 args = new String[] { "1" };
             }
             int id = 0;
-            try {
+            try
+            {
                 id = Integer.parseInt(args[0]);
-            } catch (final Exception e) {
+            }
+            catch (final Exception e)
+            {
                 Plot temp;
-                if ((temp = isAlias(args[0])) != null) {
-                    if (temp.hasOwner()) {
-                        if (temp.isOwner(plr.getUUID())) {
+                if ((temp = isAlias(args[0])) != null)
+                {
+                    if (temp.hasOwner())
+                    {
+                        if (temp.isOwner(plr.getUUID()))
+                        {
                             MainUtil.teleportPlayer(plr, plr.getLocation(), temp);
                             return true;
                         }
@@ -77,19 +87,23 @@ public class Home extends SubCommand {
                 MainUtil.sendMessage(plr, C.NOT_VALID_NUMBER, "(1, " + plots.size() + ")");
                 return true;
             }
-            if ((id > (plots.size())) || (id < 1)) {
+            if ((id > (plots.size())) || (id < 1))
+            {
                 MainUtil.sendMessage(plr, C.NOT_VALID_NUMBER, "(1, " + plots.size() + ")");
                 return false;
             }
             MainUtil.teleportPlayer(plr, plr.getLocation(), plots.get(id - 1));
             return true;
-        } else {
+        }
+        else
+        {
             MainUtil.sendMessage(plr, C.FOUND_NO_PLOTS);
             return true;
         }
     }
 
-    public void teleportPlayer(final PlotPlayer player, final Plot plot) {
+    public void teleportPlayer(final PlotPlayer player, final Plot plot)
+    {
         MainUtil.teleportPlayer(player, player.getLocation(), plot);
     }
 }
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Inbox.java b/src/main/java/com/intellectualcrafters/plot/commands/Inbox.java
index 6017b43d7..560fa5414 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/Inbox.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/Inbox.java
@@ -35,46 +35,54 @@ import com.intellectualcrafters.plot.util.StringMan;
 import com.plotsquared.general.commands.CommandDeclaration;
 
 @CommandDeclaration(
-        command = "inbox",
-        description = "Review the comments for a plot",
-        usage = "/plot inbox [inbox] [delete <index>|clear|page]",
-        permission = "plots.inbox",
-        category = CommandCategory.ACTIONS,
-        requiredType = RequiredType.NONE
-)
-public class Inbox extends SubCommand {
-    
-    public void displayComments(PlotPlayer player, List<PlotComment> oldComments, int page) {
-        if (oldComments == null || oldComments.size() == 0) {
+command = "inbox",
+description = "Review the comments for a plot",
+usage = "/plot inbox [inbox] [delete <index>|clear|page]",
+permission = "plots.inbox",
+category = CommandCategory.ACTIONS,
+requiredType = RequiredType.NONE)
+public class Inbox extends SubCommand
+{
+
+    public void displayComments(final PlotPlayer player, final List<PlotComment> oldComments, int page)
+    {
+        if ((oldComments == null) || (oldComments.size() == 0))
+        {
             MainUtil.sendMessage(player, C.INBOX_EMPTY);
             return;
         }
-        PlotComment[] comments = oldComments.toArray(new PlotComment[oldComments.size()]);
-        if (page < 0) {
+        final PlotComment[] comments = oldComments.toArray(new PlotComment[oldComments.size()]);
+        if (page < 0)
+        {
             page = 0;
         }
         // Get the total pages
         // int totalPages = ((int) Math.ceil(12 *
         final int totalPages = (int) Math.ceil(comments.length / 12);
-        if (page > totalPages) {
+        if (page > totalPages)
+        {
             page = totalPages;
         }
         // Only display 12 per page
         int max = (page * 12) + 12;
-        if (max > comments.length) {
+        if (max > comments.length)
+        {
             max = comments.length;
         }
         final StringBuilder string = new StringBuilder();
         string.append(StringMan.replaceAll(C.COMMENT_LIST_HEADER_PAGED.s(), "%amount%", comments.length, "%cur", page + 1, "%max", totalPages + 1, "%word", "all") + "\n");
         PlotComment c;
         // This might work xD
-        for (int x = (page * 12); x < max; x++) {
+        for (int x = (page * 12); x < max; x++)
+        {
             c = comments[x];
             String color;
-            if (player.getName().equals(c.senderName)) {
+            if (player.getName().equals(c.senderName))
+            {
                 color = "&a";
             }
-            else {
+            else
+            {
                 color = "&7";
             }
             string.append("&8[&7#" + x + "&8][&7" + c.world + ";" + c.id + "&8][&6" + c.senderName + "&8]" + color + c.comment + "\n");
@@ -83,32 +91,43 @@ public class Inbox extends SubCommand {
     }
 
     @Override
-    public boolean onCommand(final PlotPlayer player, final String[] args) {
-        
+    public boolean onCommand(final PlotPlayer player, final String[] args)
+    {
 
         final Plot plot = MainUtil.getPlot(player.getLocation());
-        if (args.length == 0) {
+        if (args.length == 0)
+        {
             sendMessage(player, C.COMMAND_SYNTAX, "/plot inbox [inbox] [delete <index>|clear|page]");
-            for (final CommentInbox inbox : CommentManager.inboxes.values()) {
-                if (inbox.canRead(plot, player)) {
-                    if (!inbox.getComments(plot, new RunnableVal() {
+            for (final CommentInbox inbox : CommentManager.inboxes.values())
+            {
+                if (inbox.canRead(plot, player))
+                {
+                    if (!inbox.getComments(plot, new RunnableVal()
+                    {
                         @Override
-                        public void run() {
-                            if (value != null) {
+                        public void run()
+                        {
+                            if (value != null)
+                            {
                                 int total = 0;
                                 int unread = 0;
-                                for (PlotComment comment : (ArrayList<PlotComment>) value) {
+                                for (final PlotComment comment : (ArrayList<PlotComment>) value)
+                                {
                                     total++;
-                                    if (comment.timestamp > CommentManager.getTimestamp(player, inbox.toString())) {
+                                    if (comment.timestamp > CommentManager.getTimestamp(player, inbox.toString()))
+                                    {
                                         unread++;
                                     }
                                 }
-                                if (total != 0) {
+                                if (total != 0)
+                                {
                                     String color;
-                                    if (unread > 0) {
+                                    if (unread > 0)
+                                    {
                                         color = "&c";
                                     }
-                                    else {
+                                    else
+                                    {
                                         color = "";
                                     }
                                     sendMessage(player, C.INBOX_ITEM, color + inbox.toString() + " (" + total + "/" + unread + ")");
@@ -117,7 +136,8 @@ public class Inbox extends SubCommand {
                             }
                             sendMessage(player, C.INBOX_ITEM, inbox.toString());
                         }
-                    })) {
+                    }))
+                    {
                         sendMessage(player, C.INBOX_ITEM, inbox.toString());
                     }
                 }
@@ -125,94 +145,120 @@ public class Inbox extends SubCommand {
             return false;
         }
         final CommentInbox inbox = CommentManager.inboxes.get(args[0].toLowerCase());
-        if (inbox == null) {
-            sendMessage(player, C.INVALID_INBOX, StringMan.join(CommentManager.inboxes.keySet(),", "));
+        if (inbox == null)
+        {
+            sendMessage(player, C.INVALID_INBOX, StringMan.join(CommentManager.inboxes.keySet(), ", "));
             return false;
         }
         player.setMeta("inbox:" + inbox.toString(), System.currentTimeMillis());
         final int page;
-        if (args.length > 1) {
-            switch (args[1].toLowerCase()) {
-                case "delete": {
-                    if (!inbox.canModify(plot, player)) {
+        if (args.length > 1)
+        {
+            switch (args[1].toLowerCase())
+            {
+                case "delete":
+                {
+                    if (!inbox.canModify(plot, player))
+                    {
                         sendMessage(player, C.NO_PERM_INBOX_MODIFY);
                         return false;
                     }
-                    if (args.length != 3) {
+                    if (args.length != 3)
+                    {
                         sendMessage(player, C.COMMAND_SYNTAX, "/plot inbox " + inbox.toString() + " delete <index>");
                     }
                     final int index;
-                    try {
+                    try
+                    {
                         index = Integer.parseInt(args[2]);
-                        if (index < 1) {
+                        if (index < 1)
+                        {
                             sendMessage(player, C.NOT_VALID_INBOX_INDEX, index + "");
                             return false;
                         }
                     }
-                    catch (NumberFormatException e) {
+                    catch (final NumberFormatException e)
+                    {
                         sendMessage(player, C.COMMAND_SYNTAX, "/plot inbox " + inbox.toString() + " delete <index>");
                         return false;
                     }
-                    
-                    if (!inbox.getComments(plot, new RunnableVal() {
+
+                    if (!inbox.getComments(plot, new RunnableVal()
+                    {
                         @Override
-                        public void run() {
-                            List<PlotComment> comments = (List<PlotComment>) value;
-                            if (index > comments.size()) {
+                        public void run()
+                        {
+                            final List<PlotComment> comments = (List<PlotComment>) value;
+                            if (index > comments.size())
+                            {
                                 sendMessage(player, C.NOT_VALID_INBOX_INDEX, index + "");
                             }
-                            PlotComment comment = comments.get(index - 1);
+                            final PlotComment comment = comments.get(index - 1);
                             inbox.removeComment(plot, comment);
                             plot.getSettings().removeComment(comment);
                             MainUtil.sendMessage(player, C.COMMENT_REMOVED, comment.comment);
                         }
-                    })) {
+                    }))
+                    {
                         sendMessage(player, C.NOT_IN_PLOT);
                         return false;
                     }
                     return true;
                 }
-                case "clear": {
-                    if (!inbox.canModify(plot, player)) {
+                case "clear":
+                {
+                    if (!inbox.canModify(plot, player))
+                    {
                         sendMessage(player, C.NO_PERM_INBOX_MODIFY);
                     }
                     inbox.clearInbox(plot);
-                    ArrayList<PlotComment> comments = plot.getSettings().getComments(inbox.toString());
-                    if (comments != null) {
+                    final ArrayList<PlotComment> comments = plot.getSettings().getComments(inbox.toString());
+                    if (comments != null)
+                    {
                         plot.getSettings().removeComments(comments);
                     }
                     MainUtil.sendMessage(player, C.COMMENT_REMOVED, "*");
                     return true;
                 }
-                default: {
-                    try {
-                        page = Integer.parseInt(args[1]) ;
+                default:
+                {
+                    try
+                    {
+                        page = Integer.parseInt(args[1]);
                     }
-                    catch (NumberFormatException e) {
+                    catch (final NumberFormatException e)
+                    {
                         sendMessage(player, C.COMMAND_SYNTAX, "/plot inbox [inbox] [delete <index>|clear|page]");
                         return false;
                     }
                 }
             }
         }
-        else {
+        else
+        {
             page = 1;
         }
-        if (!inbox.canRead(plot, player)) {
+        if (!inbox.canRead(plot, player))
+        {
             sendMessage(player, C.NO_PERM_INBOX);
             return false;
         }
-        if (!inbox.getComments(plot, new RunnableVal() {
+        if (!inbox.getComments(plot, new RunnableVal()
+        {
             @Override
-            public void run() {
-                List<PlotComment> comments = (List<PlotComment>) value;
+            public void run()
+            {
+                final List<PlotComment> comments = (List<PlotComment>) value;
                 displayComments(player, comments, page);
             }
-        })) {
-            if (plot == null) {
+        }))
+        {
+            if (plot == null)
+            {
                 sendMessage(player, C.NOT_IN_PLOT);
             }
-            else {
+            else
+            {
                 sendMessage(player, C.PLOT_UNOWNED);
             }
             return false;
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Info.java b/src/main/java/com/intellectualcrafters/plot/commands/Info.java
index 7665a3e52..516b8de2f 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/Info.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/Info.java
@@ -25,7 +25,6 @@ import java.util.Collection;
 import java.util.UUID;
 import java.util.regex.Matcher;
 
-import com.intellectualcrafters.plot.PS;
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.config.Settings;
 import com.intellectualcrafters.plot.database.DBFunc;
@@ -37,7 +36,6 @@ import com.intellectualcrafters.plot.object.PlotId;
 import com.intellectualcrafters.plot.object.PlotInventory;
 import com.intellectualcrafters.plot.object.PlotItemStack;
 import com.intellectualcrafters.plot.object.PlotPlayer;
-import com.intellectualcrafters.plot.object.PlotWorld;
 import com.intellectualcrafters.plot.util.BlockManager;
 import com.intellectualcrafters.plot.util.MainUtil;
 import com.intellectualcrafters.plot.util.StringMan;
@@ -46,52 +44,56 @@ import com.intellectualcrafters.plot.util.UUIDHandler;
 import com.plotsquared.general.commands.CommandDeclaration;
 
 @CommandDeclaration(
-        command = "info",
-        aliases = {"i"},
-        description = "Display plot info",
-        usage = "/plot info <id>",
-        category = CommandCategory.INFO
-)
-public class Info extends SubCommand {
+command = "info",
+aliases = { "i" },
+description = "Display plot info",
+usage = "/plot info <id>",
+category = CommandCategory.INFO)
+public class Info extends SubCommand
+{
 
-    public static String getPlayerList(final Collection<UUID> uuids) {
-        ArrayList<UUID> l = new ArrayList<>(uuids);
-        if ((l == null) || (l.size() < 1)) {
-            return C.NONE.s();
-        }
+    public static String getPlayerList(final Collection<UUID> uuids)
+    {
+        final ArrayList<UUID> l = new ArrayList<>(uuids);
+        if ((l == null) || (l.size() < 1)) { return C.NONE.s(); }
         final String c = C.PLOT_USER_LIST.s();
         final StringBuilder list = new StringBuilder();
-        for (int x = 0; x < l.size(); x++) {
-            if ((x + 1) == l.size()) {
+        for (int x = 0; x < l.size(); x++)
+        {
+            if ((x + 1) == l.size())
+            {
                 list.append(c.replace("%user%", getPlayerName(l.get(x))).replace(",", ""));
-            } else {
+            }
+            else
+            {
                 list.append(c.replace("%user%", getPlayerName(l.get(x))));
             }
         }
         return list.toString();
     }
 
-    public static String getPlayerName(final UUID uuid) {
-        if (uuid == null) {
-            return C.UNKNOWN.s();
-        }
-        if (uuid.equals(DBFunc.everyone) || uuid.toString().equalsIgnoreCase(DBFunc.everyone.toString())) {
-            return "everyone";
-        }
+    public static String getPlayerName(final UUID uuid)
+    {
+        if (uuid == null) { return C.UNKNOWN.s(); }
+        if (uuid.equals(DBFunc.everyone) || uuid.toString().equalsIgnoreCase(DBFunc.everyone.toString())) { return "everyone"; }
         final String name = UUIDHandler.getName(uuid);
-        if (name == null) {
-            return "unknown";
-        }
+        if (name == null) { return "unknown"; }
         return name;
     }
 
     @Override
-    public boolean onCommand(final PlotPlayer player, String[] args) {
+    public boolean onCommand(final PlotPlayer player, String[] args)
+    {
         String arg = null;
         Plot plot;
-        if (args.length > 0) arg = args[0] + "";
-        if (arg != null) {
-            switch (arg) {
+        if (args.length > 0)
+        {
+            arg = args[0] + "";
+        }
+        if (arg != null)
+        {
+            switch (arg)
+            {
                 case "trusted":
                 case "alias":
                 case "inv":
@@ -107,49 +109,66 @@ public class Info extends SubCommand {
                     break;
                 default:
                     plot = MainUtil.getPlotFromString(player, arg, false);
-                    if (args.length == 2) {
+                    if (args.length == 2)
+                    {
                         arg = args[1];
                     }
-                    else {
+                    else
+                    {
                         arg = null;
                     }
                     break;
             }
         }
-        else {
+        else
+        {
             plot = MainUtil.getPlotFromString(player, null, false);
         }
-        if (plot == null && arg != null) {
+        if ((plot == null) && (arg != null))
+        {
             plot = MainUtil.getPlotFromString(player, null, false);
         }
-        if (plot == null) {
+        if (plot == null)
+        {
             MainUtil.sendMessage(player, C.NOT_IN_PLOT);
             return false;
         }
-        if (arg != null) {
-            if (args.length == 1) {
+        if (arg != null)
+        {
+            if (args.length == 1)
+            {
                 args = new String[0];
             }
-            else {
+            else
+            {
                 args = new String[] { args[1] };
             }
         }
-        if ((args.length == 1) && args[0].equalsIgnoreCase("inv")) {
-            PlotInventory inv = new PlotInventory(player) {
+        if ((args.length == 1) && args[0].equalsIgnoreCase("inv"))
+        {
+            final PlotInventory inv = new PlotInventory(player)
+            {
                 @Override
-                public boolean onClick(int index) {
+                public boolean onClick(final int index)
+                {
                     // TODO InfoInventory not implemented yet!!!!!!!!
                     // See plot rating or musicsubcommand on examples
                     return false;
                 }
             };
-            UUID uuid = player.getUUID();
-            String name = MainUtil.getName(plot.owner);
-            inv.setItem(1, new PlotItemStack(388, (short) 0, 1, "&cPlot Info", new String[] { "&cID: &6" + plot.getId().toString(), "&cOwner: &6" + name, "&cAlias: &6" + plot.getSettings().getAlias(), "&cBiome: &6" + plot.getBiome().toString().replaceAll("_", "").toLowerCase(), "&cCan Build: &6" + plot.isAdded(uuid), "&cIs Denied: &6" + plot.isDenied(uuid)}));
-            inv.setItem(1, new PlotItemStack(388, (short) 0, 1, "&cTrusted", new String[] {"&cAmount: &6" + plot.getTrusted().size(), "&8Click to view a list of the trusted users"}));
-            inv.setItem(1, new PlotItemStack(388, (short) 0, 1, "&cMembers", new String[] {"&cAmount: &6" + plot.getMembers().size(), "&8Click to view a list of plot members"}));
-            inv.setItem(1, new PlotItemStack(388, (short) 0, 1, "&cDenied", new String[] {"&cDenied", "&cAmount: &6" + plot.getDenied().size(), "&8Click to view a list of denied players"}));
-            inv.setItem(1, new PlotItemStack(388, (short) 0, 1, "&cFlags", new String[] {"&cFlags", "&cAmount: &6" + plot.getSettings().flags.size(), "&8Click to view a list of plot flags"}));
+            final UUID uuid = player.getUUID();
+            final String name = MainUtil.getName(plot.owner);
+            inv.setItem(1, new PlotItemStack(388, (short) 0, 1, "&cPlot Info", new String[] {
+            "&cID: &6" + plot.getId().toString(),
+            "&cOwner: &6" + name,
+            "&cAlias: &6" + plot.getSettings().getAlias(),
+            "&cBiome: &6" + plot.getBiome().toString().replaceAll("_", "").toLowerCase(),
+            "&cCan Build: &6" + plot.isAdded(uuid),
+            "&cIs Denied: &6" + plot.isDenied(uuid) }));
+            inv.setItem(1, new PlotItemStack(388, (short) 0, 1, "&cTrusted", new String[] { "&cAmount: &6" + plot.getTrusted().size(), "&8Click to view a list of the trusted users" }));
+            inv.setItem(1, new PlotItemStack(388, (short) 0, 1, "&cMembers", new String[] { "&cAmount: &6" + plot.getMembers().size(), "&8Click to view a list of plot members" }));
+            inv.setItem(1, new PlotItemStack(388, (short) 0, 1, "&cDenied", new String[] { "&cDenied", "&cAmount: &6" + plot.getDenied().size(), "&8Click to view a list of denied players" }));
+            inv.setItem(1, new PlotItemStack(388, (short) 0, 1, "&cFlags", new String[] { "&cFlags", "&cAmount: &6" + plot.getSettings().flags.size(), "&8Click to view a list of plot flags" }));
             inv.openInventory();
             return true;
         }
@@ -162,27 +181,33 @@ public class Info extends SubCommand {
             trustedEveryone = (plot.getMembers() != null) && plot.getMembers().contains(DBFunc.everyone);
         }
         // Unclaimed?
-        if (!hasOwner && !containsEveryone && !trustedEveryone) {
+        if (!hasOwner && !containsEveryone && !trustedEveryone)
+        {
             MainUtil.sendMessage(player, C.PLOT_INFO_UNCLAIMED, (plot.id.x + ";" + plot.id.y));
             return true;
         }
         String info = C.PLOT_INFO.s();
-        if (arg != null) {
+        if (arg != null)
+        {
             info = getCaption(arg);
-            if (info == null) {
+            if (info == null)
+            {
                 MainUtil.sendMessage(player, "&6Categories&7: &amembers&7, &aalias&7, &abiome&7, &adenied&7, &aflags&7, &aid&7, &asize&7, &atrusted&7, &aowner&7, &arating");
                 return false;
             }
             formatAndSend(info, plot.world, plot, player, true);
         }
-        else {
+        else
+        {
             formatAndSend(info, plot.world, plot, player, false);
         }
         return true;
     }
 
-    private String getCaption(final String string) {
-        switch (string) {
+    private String getCaption(final String string)
+    {
+        switch (string)
+        {
             case "trusted":
                 return C.PLOT_INFO_TRUSTED.s();
             case "alias":
@@ -208,25 +233,29 @@ public class Info extends SubCommand {
         }
     }
 
-    private void formatAndSend(String info, final String world, final Plot plot, final PlotPlayer player, final boolean full) {
+    private void formatAndSend(String info, final String world, final Plot plot, final PlotPlayer player, final boolean full)
+    {
         final PlotId id = plot.id;
         final PlotId id2 = MainUtil.getTopPlot(plot).id;
         final int num = MainUtil.getPlotSelectionIds(id, id2).size();
         final String alias = plot.getSettings().getAlias().length() > 0 ? plot.getSettings().getAlias() : C.NONE.s();
-        Location top = MainUtil.getPlotTopLoc(world, plot.id);
-        Location bot = MainUtil.getPlotBottomLoc(world, plot.id).add(1, 0, 1);
+        final Location top = MainUtil.getPlotTopLoc(world, plot.id);
+        final Location bot = MainUtil.getPlotBottomLoc(world, plot.id).add(1, 0, 1);
         final String biome = BlockManager.manager.getBiome(plot.world, bot.getX() + ((top.getX() - bot.getX()) / 2), bot.getZ() + ((top.getZ() - bot.getZ()) / 2));
         final String trusted = getPlayerList(plot.getTrusted());
         final String members = getPlayerList(plot.getMembers());
         final String denied = getPlayerList(plot.getDenied());
 
-        Flag descriptionFlag = FlagManager.getPlotFlag(plot, "description");
+        final Flag descriptionFlag = FlagManager.getPlotFlag(plot, "description");
         final String description = descriptionFlag == null ? C.NONE.s() : descriptionFlag.getValueString();
 
-        final String flags = StringMan.replaceFromMap("$2" + (StringMan.join(FlagManager.getPlotFlags(plot.world, plot.getSettings(), true).values(), "").length() > 0 ? StringMan.join(FlagManager.getPlotFlags(plot.world, plot.getSettings(), true).values(), "$1, $2") : C.NONE.s()), C.replacements);
+        final String flags = StringMan.replaceFromMap(
+        "$2"
+        + (StringMan.join(FlagManager.getPlotFlags(plot.world, plot.getSettings(), true).values(), "").length() > 0 ? StringMan.join(FlagManager.getPlotFlags(plot.world, plot.getSettings(), true)
+        .values(), "$1, $2") : C.NONE.s()), C.replacements);
         final boolean build = plot.isAdded(player.getUUID());
 
-        String owner = plot.owner == null ? "unowned" : getPlayerList(plot.getOwners());
+        final String owner = plot.owner == null ? "unowned" : getPlayerList(plot.getOwners());
 
         info = info.replaceAll("%alias%", alias);
         info = info.replaceAll("%id%", id.toString());
@@ -242,27 +271,34 @@ public class Info extends SubCommand {
         info = info.replaceAll("%flags%", Matcher.quoteReplacement(flags));
         info = info.replaceAll("%build%", build + "");
         info = info.replaceAll("%desc%", "No description set.");
-        if (info.contains("%rating%")) {
+        if (info.contains("%rating%"))
+        {
             final String newInfo = info;
-            TaskManager.runTaskAsync(new Runnable() {
+            TaskManager.runTaskAsync(new Runnable()
+            {
                 @Override
-                public void run() {
+                public void run()
+                {
                     int max = 10;
-                    if (Settings.RATING_CATEGORIES != null && Settings.RATING_CATEGORIES.size() > 0) {
+                    if ((Settings.RATING_CATEGORIES != null) && (Settings.RATING_CATEGORIES.size() > 0))
+                    {
                         max = 8;
                     }
                     String info;
-                    if (full && Settings.RATING_CATEGORIES != null && Settings.RATING_CATEGORIES.size() > 1) {
+                    if (full && (Settings.RATING_CATEGORIES != null) && (Settings.RATING_CATEGORIES.size() > 1))
+                    {
                         String rating = "";
                         String prefix = "";
-                        double[] ratings = MainUtil.getAverageRatings(plot);
-                        for (int i = 0; i < ratings.length; i++) {
+                        final double[] ratings = MainUtil.getAverageRatings(plot);
+                        for (int i = 0; i < ratings.length; i++)
+                        {
                             rating += prefix + Settings.RATING_CATEGORIES.get(i) + "=" + String.format("%.1f", ratings[i]);
                             prefix = ",";
                         }
                         info = newInfo.replaceAll("%rating%", rating);
                     }
-                    else {
+                    else
+                    {
                         info = newInfo.replaceAll("%rating%", String.format("%.1f", MainUtil.getAverageRating(plot)) + "/" + max);
                     }
                     MainUtil.sendMessage(player, C.PLOT_INFO_HEADER);
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Kick.java b/src/main/java/com/intellectualcrafters/plot/commands/Kick.java
index 4157384c2..661598522 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/Kick.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/Kick.java
@@ -31,38 +31,41 @@ import com.intellectualcrafters.plot.util.UUIDHandler;
 import com.plotsquared.general.commands.CommandDeclaration;
 
 @CommandDeclaration(
-        command = "kick",
-        aliases = {"k"},
-        description = "Kick a player from your plot",
-        permission = "plots.kick",
-        category = CommandCategory.ACTIONS,
-        requiredType = RequiredType.NONE
-)
-public class Kick extends SubCommand {
+command = "kick",
+aliases = { "k" },
+description = "Kick a player from your plot",
+permission = "plots.kick",
+category = CommandCategory.ACTIONS,
+requiredType = RequiredType.NONE)
+public class Kick extends SubCommand
+{
 
     @Override
-    public boolean onCommand(final PlotPlayer plr, final String[] args) {
-        
+    public boolean onCommand(final PlotPlayer plr, final String[] args)
+    {
+
         final Location loc = plr.getLocation();
         final Plot plot = MainUtil.getPlot(loc);
-        if (plot == null) {
-            return !sendMessage(plr, C.NOT_IN_PLOT);
-        }
-        if (plot == null || ((!plot.hasOwner() || !plot.isOwner(plr.getUUID())) && !Permissions.hasPermission(plr, "plots.admin.command.kick"))) {
+        if (plot == null) { return !sendMessage(plr, C.NOT_IN_PLOT); }
+        if ((plot == null) || ((!plot.hasOwner() || !plot.isOwner(plr.getUUID())) && !Permissions.hasPermission(plr, "plots.admin.command.kick")))
+        {
             MainUtil.sendMessage(plr, C.NO_PLOT_PERMS);
             return false;
         }
-        if (args.length != 1) {
+        if (args.length != 1)
+        {
             MainUtil.sendMessage(plr, "&c/plot kick <player>");
             return false;
         }
         final PlotPlayer player = UUIDHandler.getPlayer(args[0]);
-        if (player == null) {
+        if (player == null)
+        {
             MainUtil.sendMessage(plr, C.INVALID_PLAYER, args[0]);
             return false;
         }
-        Location otherLoc = player.getLocation();
-        if (!plr.getLocation().getWorld().equals(otherLoc.getWorld()) || !plot.equals(MainUtil.getPlot(otherLoc))) {
+        final Location otherLoc = player.getLocation();
+        if (!plr.getLocation().getWorld().equals(otherLoc.getWorld()) || !plot.equals(MainUtil.getPlot(otherLoc)))
+        {
             MainUtil.sendMessage(plr, C.INVALID_PLAYER, args[0]);
             return false;
         }
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Limit.java b/src/main/java/com/intellectualcrafters/plot/commands/Limit.java
index 583844575..47c949c97 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/Limit.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/Limit.java
@@ -23,7 +23,6 @@ package com.intellectualcrafters.plot.commands;
 import java.util.UUID;
 
 import com.intellectualcrafters.plot.config.C;
-import com.intellectualcrafters.plot.object.OfflinePlotPlayer;
 import com.intellectualcrafters.plot.object.PlotPlayer;
 import com.intellectualcrafters.plot.util.MainUtil;
 import com.intellectualcrafters.plot.util.UUIDHandler;
@@ -31,38 +30,40 @@ import com.plotsquared.general.commands.Argument;
 import com.plotsquared.general.commands.CommandDeclaration;
 
 @CommandDeclaration(
-        command = "limit",
-        permission = "plots.limit",
-        description = "Set or increment player plot claim limits",
-        aliases = {"setlimit"},
-        usage = "/plot limit <player> <expression>",
-        category = CommandCategory.DEBUG
-)
-public class Limit extends SubCommand {
+command = "limit",
+permission = "plots.limit",
+description = "Set or increment player plot claim limits",
+aliases = { "setlimit" },
+usage = "/plot limit <player> <expression>",
+category = CommandCategory.DEBUG)
+public class Limit extends SubCommand
+{
 
-    public Limit() {
+    public Limit()
+    {
         requiredArguments = new Argument[] {
-                Argument.String,
-                Argument.String
+        Argument.String,
+        Argument.String
         };
     }
-    
+
     @Override
-    public boolean onCommand(final PlotPlayer plr, final String[] args) {
-        UUID uuid = UUIDHandler.getUUID(args[0], null);
-        if (uuid == null) {
+    public boolean onCommand(final PlotPlayer plr, final String[] args)
+    {
+        final UUID uuid = UUIDHandler.getUUID(args[0], null);
+        if (uuid == null)
+        {
             MainUtil.sendMessage(plr, C.INVALID_PLAYER, args[0]);
             return false;
         }
-        OfflinePlotPlayer op = UUIDHandler.getUUIDWrapper().getOfflinePlayer(uuid);
-        
+        UUIDHandler.getUUIDWrapper().getOfflinePlayer(uuid);
+
         // get current plot limit
         // increase
-        
-//        EconHandler.manager.setPermission(op, perm, value);
+
+        //        EconHandler.manager.setPermission(op, perm, value);
         plr.sendMessage("TODO");
-        
-        
+
         return true;
     }
 }
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Load.java b/src/main/java/com/intellectualcrafters/plot/commands/Load.java
index d2bb74401..73c066e6e 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/Load.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/Load.java
@@ -19,90 +19,106 @@ import com.intellectualcrafters.plot.util.TaskManager;
 import com.plotsquared.general.commands.CommandDeclaration;
 
 @CommandDeclaration(
-        command = "load",
-        aliases = {"restore"},
-        category = CommandCategory.ACTIONS,
-        requiredType = RequiredType.NONE,
-        description = "Load your plot",
-        permission = "plots.load",
-        usage = "/plot restore"
-)
-public class Load extends SubCommand {
+command = "load",
+aliases = { "restore" },
+category = CommandCategory.ACTIONS,
+requiredType = RequiredType.NONE,
+description = "Load your plot",
+permission = "plots.load",
+usage = "/plot restore")
+public class Load extends SubCommand
+{
 
     @Override
-    public boolean onCommand(final PlotPlayer plr, final String[] args) {
-        
-        if (!Settings.METRICS) {
+    public boolean onCommand(final PlotPlayer plr, final String[] args)
+    {
+
+        if (!Settings.METRICS)
+        {
             MainUtil.sendMessage(plr, "&cPlease enable metrics in order to use this command.\n&7 - Or host it yourself if you don't like the free service");
             return false;
         }
         final String world = plr.getLocation().getWorld();
-        if (!PS.get().isPlotWorld(world)) {
-            return !sendMessage(plr, C.NOT_IN_PLOT_WORLD);
-        }
+        if (!PS.get().isPlotWorld(world)) { return !sendMessage(plr, C.NOT_IN_PLOT_WORLD); }
         final Plot plot = MainUtil.getPlot(plr.getLocation());
-        if (plot == null) {
-            return !sendMessage(plr, C.NOT_IN_PLOT);
-        }
-        if (!plot.hasOwner()) {
+        if (plot == null) { return !sendMessage(plr, C.NOT_IN_PLOT); }
+        if (!plot.hasOwner())
+        {
             MainUtil.sendMessage(plr, C.PLOT_UNOWNED);
             return false;
         }
-        if (!plot.isOwner(plr.getUUID()) && !Permissions.hasPermission(plr, "plots.admin.command.load")) {
+        if (!plot.isOwner(plr.getUUID()) && !Permissions.hasPermission(plr, "plots.admin.command.load"))
+        {
             MainUtil.sendMessage(plr, C.NO_PLOT_PERMS);
             return false;
         }
-        if (MainUtil.runners.containsKey(plot)) {
+        if (MainUtil.runners.containsKey(plot))
+        {
             MainUtil.sendMessage(plr, C.WAIT_FOR_TIMER);
             return false;
         }
-        
-        if (args.length != 0) {
-            if (args.length == 1) {
+
+        if (args.length != 0)
+        {
+            if (args.length == 1)
+            {
                 // TODO load save here
-                List<String> schematics = (List<String>) plr.getMeta("plot_schematics");
-                if (schematics == null) {
+                final List<String> schematics = (List<String>) plr.getMeta("plot_schematics");
+                if (schematics == null)
+                {
                     // No schematics found:
                     MainUtil.sendMessage(plr, C.LOAD_NULL);
                     return false;
                 }
                 String schem;
-                try {
+                try
+                {
                     schem = schematics.get(Integer.parseInt(args[0]) - 1);
                 }
-                catch (Exception e) {
+                catch (final Exception e)
+                {
                     // use /plot load <index>
                     MainUtil.sendMessage(plr, C.NOT_VALID_NUMBER, "(1, " + schematics.size() + ")");
                     return false;
                 }
                 final URL url;
-                try {
+                try
+                {
                     url = new URL(Settings.WEB_URL + "saves/" + plr.getUUID() + "/" + schem + ".schematic");
-                } catch (MalformedURLException e) {
+                }
+                catch (final MalformedURLException e)
+                {
                     e.printStackTrace();
                     MainUtil.sendMessage(plr, C.LOAD_FAILED);
                     return false;
                 }
-                
+
                 MainUtil.runners.put(plot, 1);
                 MainUtil.sendMessage(plr, C.GENERATING_COMPONENT);
-                TaskManager.runTaskAsync(new Runnable() {
+                TaskManager.runTaskAsync(new Runnable()
+                {
                     @Override
-                    public void run() {
-                        Schematic schematic = SchematicHandler.manager.getSchematic(url);
-                        if (schematic == null) {
+                    public void run()
+                    {
+                        final Schematic schematic = SchematicHandler.manager.getSchematic(url);
+                        if (schematic == null)
+                        {
                             MainUtil.runners.remove(plot);
                             sendMessage(plr, C.SCHEMATIC_INVALID, "non-existent or not in gzip format");
                             return;
                         }
-                        SchematicHandler.manager.paste(schematic, plot, 0, 0, new RunnableVal<Boolean>() {
+                        SchematicHandler.manager.paste(schematic, plot, 0, 0, new RunnableVal<Boolean>()
+                        {
                             @Override
-                            public void run() {
+                            public void run()
+                            {
                                 MainUtil.runners.remove(plot);
-                                if (this.value) {
+                                if (value)
+                                {
                                     sendMessage(plr, C.SCHEMATIC_PASTE_SUCCESS);
                                 }
-                                else {
+                                else
+                                {
                                     sendMessage(plr, C.SCHEMATIC_PASTE_FAILED);
                                 }
                             }
@@ -115,18 +131,22 @@ public class Load extends SubCommand {
             MainUtil.sendMessage(plr, C.COMMAND_SYNTAX, "/plot load <index>");
             return false;
         }
-        
+
         // list schematics
-        
-        List<String> schematics = (List<String>) plr.getMeta("plot_schematics");
-        if (schematics == null) {
+
+        final List<String> schematics = (List<String>) plr.getMeta("plot_schematics");
+        if (schematics == null)
+        {
             MainUtil.runners.put(plot, 1);
-            TaskManager.runTaskAsync(new Runnable() {
+            TaskManager.runTaskAsync(new Runnable()
+            {
                 @Override
-                public void run() {
-                    List<String> schematics = SchematicHandler.manager.getSaves(plr.getUUID());
+                public void run()
+                {
+                    final List<String> schematics = SchematicHandler.manager.getSaves(plr.getUUID());
                     MainUtil.runners.remove(plot);
-                    if (schematics == null || schematics.size() == 0) {
+                    if ((schematics == null) || (schematics.size() == 0))
+                    {
                         MainUtil.sendMessage(plr, C.LOAD_FAILED);
                         return;
                     }
@@ -135,76 +155,91 @@ public class Load extends SubCommand {
                 }
             });
         }
-        else {
+        else
+        {
             displaySaves(plr, 0);
         }
         return true;
     }
-    
-    public void displaySaves(PlotPlayer player, int page) {
-        List<String> schematics = (List<String>) player.getMeta("plot_schematics");
-        for (int i = 0; i < Math.min(schematics.size(), 32); i++) {
-            try {
-                String schem = schematics.get(i);
-                String[] split = schem.split("_");
-                if (split.length != 6) {
+
+    public void displaySaves(final PlotPlayer player, final int page)
+    {
+        final List<String> schematics = (List<String>) player.getMeta("plot_schematics");
+        for (int i = 0; i < Math.min(schematics.size(), 32); i++)
+        {
+            try
+            {
+                final String schem = schematics.get(i);
+                final String[] split = schem.split("_");
+                if (split.length != 6)
+                {
                     continue;
                 }
-                String time = secToTime((System.currentTimeMillis() / 1000) - (Long.parseLong(split[0])));
-                String world = split[1];
-                PlotId id = PlotId.fromString(split[2] + ";" + split[3]);
-                String size = split[4];
-                String server = split[5].replaceAll(".schematic", "");
+                final String time = secToTime((System.currentTimeMillis() / 1000) - (Long.parseLong(split[0])));
+                final String world = split[1];
+                final PlotId id = PlotId.fromString(split[2] + ";" + split[3]);
+                final String size = split[4];
+                final String server = split[5].replaceAll(".schematic", "");
                 String color;
-                if (PS.get().IMP.getServerName().replaceAll("[^A-Za-z0-9]", "").equals(server)) {
+                if (PS.get().IMP.getServerName().replaceAll("[^A-Za-z0-9]", "").equals(server))
+                {
                     color = "$4";
                 }
-                else {
+                else
+                {
                     color = "$1";
                 }
                 MainUtil.sendMessage(player, "$3[$2" + (i + 1) + "$3] " + color + time + "$3 | " + color + world + ";" + id + "$3 | " + color + size + "x" + size);
             }
-            catch (Exception e) {
+            catch (final Exception e)
+            {
                 e.printStackTrace();
             }
         }
         MainUtil.sendMessage(player, C.LOAD_LIST);
     }
-    
-    public String secToTime(long time) {
-        StringBuilder toreturn = new StringBuilder();
+
+    public String secToTime(long time)
+    {
+        final StringBuilder toreturn = new StringBuilder();
         int years = 0;
         int weeks = 0;
         int days = 0;
         int hours = 0;
         int minutes = 0;
-        if (time>=33868800) {
-            years = (int) (time/33868800);
-            time-=years*33868800;
-            toreturn.append(years+"y ");
+        if (time >= 33868800)
+        {
+            years = (int) (time / 33868800);
+            time -= years * 33868800;
+            toreturn.append(years + "y ");
         }
-        if (time>=604800) {
-            weeks = (int) (time/604800);
-            time-=weeks*604800;
-            toreturn.append(weeks+"w ");
+        if (time >= 604800)
+        {
+            weeks = (int) (time / 604800);
+            time -= weeks * 604800;
+            toreturn.append(weeks + "w ");
         }
-        if (time>=86400) {
-            days = (int) (time/86400);
-            time-=days*86400;
-            toreturn.append(days+"d ");
+        if (time >= 86400)
+        {
+            days = (int) (time / 86400);
+            time -= days * 86400;
+            toreturn.append(days + "d ");
         }
-        if (time>=3600) {
-            hours = (int) (time/3600);
-            time-=hours*3600;
-            toreturn.append(hours+"h ");
+        if (time >= 3600)
+        {
+            hours = (int) (time / 3600);
+            time -= hours * 3600;
+            toreturn.append(hours + "h ");
         }
-        if (time>=60) {
-            minutes = (int) (time/60);
-            time-=minutes*60;
-            toreturn.append(minutes+"m ");
+        if (time >= 60)
+        {
+            minutes = (int) (time / 60);
+            time -= minutes * 60;
+            toreturn.append(minutes + "m ");
         }
-        if (toreturn.equals("")||time>0){
-            toreturn.append((time)+"s ");
+        if (toreturn.equals("") || (time > 0))
+        {
+            toreturn.append((time) + "s ");
         }
         return toreturn.toString().trim();
     }
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/MainCommand.java b/src/main/java/com/intellectualcrafters/plot/commands/MainCommand.java
index 69940baac..52b664fca 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/MainCommand.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/MainCommand.java
@@ -1,462 +1,552 @@
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// PlotSquared - A plot manager and world generator for the Bukkit API                             /
-// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
-//                                                                                                 /
-// This program is free software; you can redistribute it and/or modify                            /
-// it under the terms of the GNU General Public License as published by                            /
-// the Free Software Foundation; either version 3 of the License, or                               /
-// (at your option) any later version.                                                             /
-//                                                                                                 /
-// This program is distributed in the hope that it will be useful,                                 /
-// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
-// GNU General Public License for more details.                                                    /
-//                                                                                                 /
-// You should have received a copy of the GNU General Public License                               /
-// along with this program; if not, write to the Free Software Foundation,                         /
-// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
-//                                                                                                 /
-// You can contact us via: support@intellectualsites.com                                           /
-////////////////////////////////////////////////////////////////////////////////////////////////////
-package com.intellectualcrafters.plot.commands;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-
-import com.intellectualcrafters.plot.PS;
-import com.intellectualcrafters.plot.config.C;
-import com.intellectualcrafters.plot.config.Settings;
-import com.intellectualcrafters.plot.object.ConsolePlayer;
-import com.intellectualcrafters.plot.object.Plot;
-import com.intellectualcrafters.plot.object.PlotId;
-import com.intellectualcrafters.plot.object.PlotPlayer;
-import com.intellectualcrafters.plot.object.RunnableVal;
-import com.intellectualcrafters.plot.util.MainUtil;
-import com.intellectualcrafters.plot.util.MathMan;
-import com.intellectualcrafters.plot.util.Permissions;
-import com.intellectualcrafters.plot.util.StringComparison;
-import com.intellectualcrafters.plot.util.StringMan;
-import com.intellectualcrafters.plot.util.helpmenu.HelpMenu;
-import com.plotsquared.general.commands.Argument;
-import com.plotsquared.general.commands.Command;
-import com.plotsquared.general.commands.CommandHandlingOutput;
-import com.plotsquared.general.commands.CommandManager;
-
-/**
- * PlotSquared command class
- *
- * @author Citymonstret
- */
-public class MainCommand extends CommandManager<PlotPlayer> {
-
-    private static MainCommand instance;
-    
-    public static MainCommand getInstance() {
-        if (instance == null) {
-            instance = new MainCommand();
-        }
-        return instance;
-    }
-
-    private MainCommand() {
-        super(null, new ArrayList<Command<PlotPlayer>>());
-        instance = this;
-        createCommand(new Buy());
-        createCommand(new Save());
-        createCommand(new Load());
-        createCommand(new Unclaim());
-        createCommand(new Confirm());
-        createCommand(new Template());
-        createCommand(new Download());
-        createCommand(new Update());
-        createCommand(new Template());
-        createCommand(new Setup());
-        createCommand(new DebugFill());
-        createCommand(new DebugSaveTest());
-        createCommand(new DebugLoadTest());
-        createCommand(new CreateRoadSchematic());
-        createCommand(new DebugAllowUnsafe());
-        createCommand(new RegenAllRoads());
-        createCommand(new DebugClear());
-        createCommand(new Claim());
-        createCommand(new Auto());
-        createCommand(new Home());
-        createCommand(new Visit());
-        createCommand(new TP());
-        createCommand(new Set());
-        createCommand(new Toggle());
-        createCommand(new Clear());
-        createCommand(new Delete());
-        createCommand(new SetOwner());
-        createCommand(new Trust());
-        createCommand(new Add());
-        createCommand(new Deny());
-        createCommand(new Untrust());
-        createCommand(new Remove());
-        createCommand(new Undeny());
-        createCommand(new Info());
-        createCommand(new list());
-        createCommand(new Help());
-        createCommand(new Debug());
-        createCommand(new SchematicCmd());
-        createCommand(new plugin());
-        createCommand(new Purge());
-        createCommand(new Reload());
-        createCommand(new Merge());
-        createCommand(new DebugPaste());
-        createCommand(new Unlink());
-        createCommand(new Kick());
-        createCommand(new Rate());
-        createCommand(new DebugClaimTest());
-        createCommand(new Inbox());
-        createCommand(new Comment());
-        createCommand(new Database());
-        createCommand(new Swap());
-        createCommand(new MusicSubcommand());
-        createCommand(new DebugRoadRegen());
-        createCommand(new Trust());
-        createCommand(new DebugExec());
-        createCommand(new FlagCmd());
-        createCommand(new Target());
-        createCommand(new DebugFixFlags());
-        createCommand(new Move());
-        createCommand(new Condense());
-        createCommand(new Condense());
-        createCommand(new Copy());
-        createCommand(new Chat());
-        createCommand(new Trim());
-        createCommand(new Done());
-        createCommand(new Continue());
-        createCommand(new BO3());
-        if (Settings.ENABLE_CLUSTERS) {
-            MainCommand.getInstance().addCommand(new Cluster());
-        }
-    }
-
-    public static boolean no_permission(final PlotPlayer player, final String permission) {
-        MainUtil.sendMessage(player, C.NO_PERMISSION, permission);
-        return false;
-    }
-    
-    public static List<Command<PlotPlayer>> getCommandAndAliases(final CommandCategory category, final PlotPlayer player) {
-        List<Command<PlotPlayer>> commands = new ArrayList<>();
-        for (Command<PlotPlayer> command : getInstance().getCommands()) {
-            if (category != null && !command.getCategory().equals(category)) {
-                continue;
-            }
-            if (player != null && !Permissions.hasPermission(player, command.getPermission())) {
-                continue;
-            }
-            commands.add(command);
-        }
-        return commands;
-    }
-    
-    public static List<Command<PlotPlayer>> getCommands(final CommandCategory category, final PlotPlayer player) {
-        List<Command<PlotPlayer>> commands = new ArrayList<>();
-        for (Command<PlotPlayer> command : new HashSet<>(getInstance().getCommands())) {
-            if (category != null && !command.getCategory().equals(category)) {
-                continue;
-            }
-            if (player != null && !Permissions.hasPermission(player, command.getPermission())) {
-                continue;
-            }
-            commands.add(command);
-        }
-        return commands;
-    }
-    
-////    public static List<String> helpMenu(final PlotPlayer player, final CommandCategory category, int page) {
-//        List<Command<PlotPlayer>> commands;
-//       //  commands = getCommands(category, player);
-//        // final int totalPages = ((int) Math.ceil(12 * (commands.size()) /
-//        // 100));
-//        final int perPage = 5;
-//        // final int totalPages = (commands.size() / perPage) + (commands.size() % perPage == 0 ? 0 : 1);
-//        // if (page > totalPages) {
-//        //     page = totalPages;
-//        // }
-//        int max = (page * perPage) + perPage;
-//        // if (max > commands.size()) {
-//        //    max = commands.size();
-//        // }
-//        final List<String> help = new ArrayList<>();
-//        help.add(C.HELP_HEADER.s());
-//        // HELP_PAGE_HEADER("&cCategory: &6%category%&c, Page: %current%&c/&6%max%&c, Displaying: &6%dis%&c/&6%total%"),
-//        // help.add(C.HELP_PAGE_HEADER.s().replace("%category%", category == null ? "All" : category.toString()).replace("%current%", "" + (page + 1)).replace("%max%", "" + (totalPages)).replace("%dis%", "" + perPage).replace("%total%", "" + commands.size()));
-//        Command cmd;
-//        // HELP_CATEGORY("&cCategory: &6%category%&c, Page: %current%&c/&6%max%&c, Displaying: &6%dis%&c/&6%total%"),
-//        // help.add(C.HELP_CATEGORY.s().replace("%category%", category == null ? "All" : category.toString()).replace("%current%", "" + (page + 1)).replace("%max%", "" + (totalPages)).replace("%dis%", "" + perPage).replace("%total%", "" + commands.size()));
-//        // Command<PlotPlayer> cmd;
-//        final int start = page * perPage;
-//        for (int x = start; x < max; x++) {
-//            // cmd = commands.get(x);
-//            String s = C.HELP_ITEM.s();
-//            if (cmd.getAliases().size() > 0) {
-//                s = s.replace("%alias%", StringMan.join(cmd.getAliases(), "|"));
-//            }
-//            else {
-//                s = s.replace("%alias%", "");
-//            }
-//            s = s.replace("%usage%", cmd.getUsage().contains("plot") ? cmd.getUsage() : "/plot " + cmd.getUsage()).replace("%cmd%", cmd.getCommand()).replace("%desc%", cmd.getDescription()).replace("[]", "");
-//            help.add(s);
-//        }
-//        if (help.size() < 2) {
-//            help.add(C.NO_COMMANDS.s());
-//        }
-//        return help;
-//    }
-//
-    public static void displayHelp(PlotPlayer player, String cat, int page, String label) {
-        CommandCategory catEnum = null;
-        if (cat != null) {
-            if (StringMan.isEqualIgnoreCase(cat, "all")) {
-                catEnum = null;
-            }
-            else {
-                for (CommandCategory c : CommandCategory.values()) {
-                    if (StringMan.isEqualIgnoreCaseToAny(cat, c.name(), c.toString())) {
-                        catEnum = c;
-                        cat = c.name();
-                        break;
-                    }
-                }
-                if (catEnum == null) {
-                    cat = null;
-                }
-            }
-        }
-        if (cat == null && page == 0) {
-            final StringBuilder builder = new StringBuilder();
-            builder.append(C.HELP_HEADER.s());
-            for (final CommandCategory c : CommandCategory.values()) {
-                builder.append("\n" + StringMan.replaceAll(C.HELP_INFO_ITEM.s(), "%category%", c.toString().toLowerCase(), "%category_desc%", c.toString()));
-            }
-            builder.append("\n").append(C.HELP_INFO_ITEM.s().replaceAll("%category%", "all").replaceAll("%category_desc%", "Display all commands"));
-            builder.append("\n" + C.HELP_FOOTER.s());
-            MainUtil.sendMessage(player, builder.toString(), false);
-            return;
-        }
-        page--;
-        new HelpMenu(player)
-                .setCategory(catEnum)
-                .getCommands()
-                .generateMaxPages()
-                .generatePage(page, label)
-                .render();
-    }
-    
-    public static boolean onCommand(final PlotPlayer player, final String cmd, String... args) {
-        int help_index = -1;
-        String category = null;
-        if (args.length == 0) {
-            help_index = 0;
-        }
-        else if (StringMan.isEqualIgnoreCaseToAny(args[0], "he", "help", "?")) {
-            help_index = 0;
-            switch (args.length) {
-                case 3: {
-                    category = args[1];
-                    if (MathMan.isInteger(args[2])) {
-                        try {
-                            help_index = Integer.parseInt(args[2]);
-                        }
-                        catch (NumberFormatException e) {
-                            help_index = 1;
-                        }
-                    }
-                    break;
-                }
-                case 2: {
-                    if (MathMan.isInteger(args[1])) {
-                        category = null;
-                        try {
-                            help_index = Integer.parseInt(args[1]);
-                        } catch(NumberFormatException e) {
-                            help_index = 1;
-                        }
-                    } else {
-                        help_index = 1;
-                        category = args[1];
-                    }
-                    break;
-                }
-            }
-        }
-        else if (args.length == 1 && MathMan.isInteger(args[args.length - 1])) {
-            try {
-                help_index = Integer.parseInt(args[args.length - 1]);
-            }
-            catch (NumberFormatException e) {}
-        }
-        else if (ConsolePlayer.isConsole(player) && args.length >= 2) {
-            String[] split = args[0].split(";");
-            String world;
-            PlotId id;
-            if (split.length == 2) {
-                world = player.getLocation().getWorld();
-                id = PlotId.fromString(split[0] + ";" + split[1]);
-            }
-            else if (split.length == 3) {
-                world = split[0];
-                id = PlotId.fromString(split[1] + ";" + split[2]); 
-            }
-            else {
-                id = null;
-                world = null;
-            }
-            if (id != null && PS.get().isPlotWorld(world)) {
-                Plot plot = MainUtil.getPlot(world, id);
-                if (plot != null) {
-                    player.teleport(MainUtil.getPlotCenter(plot));
-                    args = Arrays.copyOfRange(args, 1, args.length);
-                }
-            }
-            
-        }
-        if (help_index != -1) {
-            displayHelp(player, category, help_index, cmd);
-            return true;
-        }
-        StringBuilder builder = new StringBuilder(cmd).append(" ");
-        Iterator<String> iterator = Arrays.asList(args).iterator();
-        while (iterator.hasNext()) {
-            builder.append(iterator.next());
-            if (iterator.hasNext()) {
-                builder.append(" ");
-            }
-        }
-        getInstance().handle(player, builder.toString());
-        return true;
-    }
-
-    @Override
-    public int handle(PlotPlayer plr, String input) {
-        String[] parts = input.split(" ");
-        String[] args;
-        String label;
-        if (parts.length == 1) {
-            label = null;
-            args = new String[0];
-        } else {
-            label = parts[1];
-            args = new String[parts.length - 2];
-            System.arraycopy(parts, 2, args, 0, args.length);
-        }
-        Command<PlotPlayer> cmd;
-        if (label != null) {
-            cmd = getInstance().commands.get(label);
-        }
-        else {
-            cmd = null;
-        }
-        if (cmd == null) {
-            MainUtil.sendMessage(plr, C.NOT_VALID_SUBCOMMAND);
-            {
-                List<Command<PlotPlayer>> cmds = getCommands(null, plr);
-                if (label == null || cmds.size() == 0) {
-                    MainUtil.sendMessage(plr, C.DID_YOU_MEAN, "/plot help");
-                }
-                else {
-                    HashSet<String> setargs = new HashSet<>(args.length + 1);
-                    for (String arg : args) {
-                        setargs.add(arg.toLowerCase());
-                    }
-                    setargs.add(label.toLowerCase());
-                    String[] allargs = setargs.toArray(new String[setargs.size()]);
-                    int best = 0;
-                    for (Command<PlotPlayer> current : cmds) {
-                        if (current.getUsage() != null) {
-                            int count = 0;
-                            for (String word : new HashSet<String>(Arrays.asList((current.getUsage() + " " + current.getPermission() + " " + current.getCategory().name()).toLowerCase().replaceAll("\\||\\>|\\<|\\[|\\]|\\{|\\}|\\_|\\/", " ").trim().replaceAll("\\s+", " ").split(" ")))) {
-                                for (int i = 0; i < allargs.length; i++) {
-                                    String arg = allargs[i];
-                                    if (best - count - (allargs.length - i) * 3 >= 0) {
-                                        continue;
-                                    }
-                                    if (StringMan.isEqual(arg, word)) {
-                                        count+=3;
-                                    }
-                                    else if (word.length() > arg.length() && word.contains(arg)) {
-                                        count+=2;
-                                    }
-                                }
-                            }
-                            for (String word : new HashSet<String>(Arrays.asList((current.getDescription()).toLowerCase().replaceAll("\\||\\>|\\<|\\[|\\]|\\{|\\}|\\_|\\/", " ").trim().replaceAll("\\s+", " ").split(" ")))) {
-                                for (int i = 0; i < allargs.length; i++) {
-                                    String arg = allargs[i];
-                                    if (best - count - (allargs.length - i) * 2 >= 0) {
-                                        continue;
-                                    }
-                                    if (StringMan.isEqual(arg, word)) {
-                                        count+=2;
-                                    }
-                                    else if (word.length() > arg.length() && word.contains(arg)) {
-                                        count++;
-                                    }
-                                }
-                            }
-                            if (count > best) {
-                                best = count;
-                                cmd = current;
-                            }
-                        }
-                    }
-                    if (cmd == null) {
-                        cmd = new StringComparison<>(label, getCommandAndAliases(null, plr)).getMatchObject();
-                    }
-                    MainUtil.sendMessage(plr, C.DID_YOU_MEAN, cmd.getUsage().replaceAll("\\{label\\}", parts[0]));
-                }
-            }
-            return CommandHandlingOutput.NOT_FOUND;
-        }
-        if (!cmd.getRequiredType().allows(plr)) {
-            if (ConsolePlayer.isConsole(plr)) {
-                MainUtil.sendMessage(plr, C.IS_CONSOLE);
-            } else {
-                MainUtil.sendMessage(plr, C.NOT_CONSOLE);
-            }
-            return CommandHandlingOutput.CALLER_OF_WRONG_TYPE;
-        }
-        if (!Permissions.hasPermission(plr, cmd.getPermission())) {
-            MainUtil.sendMessage(plr, C.NO_PERMISSION, cmd.getPermission());
-            return CommandHandlingOutput.NOT_PERMITTED;
-        }
-        Argument<?>[] requiredArguments = cmd.getRequiredArguments();
-        if (requiredArguments != null && requiredArguments.length > 0) {
-            boolean success = true;
-            if (args.length < requiredArguments.length) {
-                success = false;
-            } else {
-                for (int i = 0; i < requiredArguments.length; i++) {
-                    if (requiredArguments[i].parse(args[i]) == null) {
-                        success = false;
-                        break;
-                    }
-                }
-            }
-            if (!success) {
-                C.COMMAND_SYNTAX.send(plr, cmd.getUsage());
-                return CommandHandlingOutput.WRONG_USAGE;
-            }
-        }
-        try {
-            boolean result = cmd.onCommand(plr, args);
-            if (!result) {
-                String usage = cmd.getUsage();
-                // Unecessary!
-//                if (usage != null && !usage.isEmpty()) {
-//                    MainUtil.sendMessage(plr, usage);
-//                }
-                return CommandHandlingOutput.WRONG_USAGE;
-            }
-        } catch (final Throwable t) {
-            t.printStackTrace();
-            return CommandHandlingOutput.ERROR;
-        }
-        return CommandHandlingOutput.SUCCESS;
-    }
-}
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// PlotSquared - A plot manager and world generator for the Bukkit API                             /
+// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
+//                                                                                                 /
+// This program is free software; you can redistribute it and/or modify                            /
+// it under the terms of the GNU General Public License as published by                            /
+// the Free Software Foundation; either version 3 of the License, or                               /
+// (at your option) any later version.                                                             /
+//                                                                                                 /
+// This program is distributed in the hope that it will be useful,                                 /
+// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
+// GNU General Public License for more details.                                                    /
+//                                                                                                 /
+// You should have received a copy of the GNU General Public License                               /
+// along with this program; if not, write to the Free Software Foundation,                         /
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
+//                                                                                                 /
+// You can contact us via: support@intellectualsites.com                                           /
+////////////////////////////////////////////////////////////////////////////////////////////////////
+package com.intellectualcrafters.plot.commands;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+
+import com.intellectualcrafters.plot.PS;
+import com.intellectualcrafters.plot.config.C;
+import com.intellectualcrafters.plot.config.Settings;
+import com.intellectualcrafters.plot.object.ConsolePlayer;
+import com.intellectualcrafters.plot.object.Plot;
+import com.intellectualcrafters.plot.object.PlotId;
+import com.intellectualcrafters.plot.object.PlotPlayer;
+import com.intellectualcrafters.plot.util.MainUtil;
+import com.intellectualcrafters.plot.util.MathMan;
+import com.intellectualcrafters.plot.util.Permissions;
+import com.intellectualcrafters.plot.util.StringComparison;
+import com.intellectualcrafters.plot.util.StringMan;
+import com.intellectualcrafters.plot.util.helpmenu.HelpMenu;
+import com.plotsquared.general.commands.Argument;
+import com.plotsquared.general.commands.Command;
+import com.plotsquared.general.commands.CommandHandlingOutput;
+import com.plotsquared.general.commands.CommandManager;
+
+/**
+ * PlotSquared command class
+ *

+ */
+public class MainCommand extends CommandManager<PlotPlayer>
+{
+
+    private static MainCommand instance;
+
+    public static MainCommand getInstance()
+    {
+        if (instance == null)
+        {
+            instance = new MainCommand();
+        }
+        return instance;
+    }
+
+    private MainCommand()
+    {
+        super(null, new ArrayList<Command<PlotPlayer>>());
+        instance = this;
+        createCommand(new Buy());
+        createCommand(new Save());
+        createCommand(new Load());
+        createCommand(new Unclaim());
+        createCommand(new Confirm());
+        createCommand(new Template());
+        createCommand(new Download());
+        createCommand(new Update());
+        createCommand(new Template());
+        createCommand(new Setup());
+        createCommand(new DebugFill());
+        createCommand(new DebugSaveTest());
+        createCommand(new DebugLoadTest());
+        createCommand(new CreateRoadSchematic());
+        createCommand(new DebugAllowUnsafe());
+        createCommand(new RegenAllRoads());
+        createCommand(new DebugClear());
+        createCommand(new Claim());
+        createCommand(new Auto());
+        createCommand(new Home());
+        createCommand(new Visit());
+        createCommand(new TP());
+        createCommand(new Set());
+        createCommand(new Toggle());
+        createCommand(new Clear());
+        createCommand(new Delete());
+        createCommand(new SetOwner());
+        createCommand(new Trust());
+        createCommand(new Add());
+        createCommand(new Deny());
+        createCommand(new Untrust());
+        createCommand(new Remove());
+        createCommand(new Undeny());
+        createCommand(new Info());
+        createCommand(new list());
+        createCommand(new Help());
+        createCommand(new Debug());
+        createCommand(new SchematicCmd());
+        createCommand(new plugin());
+        createCommand(new Purge());
+        createCommand(new Reload());
+        createCommand(new Merge());
+        createCommand(new DebugPaste());
+        createCommand(new Unlink());
+        createCommand(new Kick());
+        createCommand(new Rate());
+        createCommand(new DebugClaimTest());
+        createCommand(new Inbox());
+        createCommand(new Comment());
+        createCommand(new Database());
+        createCommand(new Swap());
+        createCommand(new MusicSubcommand());
+        createCommand(new DebugRoadRegen());
+        createCommand(new Trust());
+        createCommand(new DebugExec());
+        createCommand(new FlagCmd());
+        createCommand(new Target());
+        createCommand(new DebugFixFlags());
+        createCommand(new Move());
+        createCommand(new Condense());
+        createCommand(new Condense());
+        createCommand(new Copy());
+        createCommand(new Chat());
+        createCommand(new Trim());
+        createCommand(new Done());
+        createCommand(new Continue());
+        createCommand(new BO3());
+        if (Settings.ENABLE_CLUSTERS)
+        {
+            MainCommand.getInstance().addCommand(new Cluster());
+        }
+    }
+
+    public static boolean no_permission(final PlotPlayer player, final String permission)
+    {
+        MainUtil.sendMessage(player, C.NO_PERMISSION, permission);
+        return false;
+    }
+
+    public static List<Command<PlotPlayer>> getCommandAndAliases(final CommandCategory category, final PlotPlayer player)
+    {
+        final List<Command<PlotPlayer>> commands = new ArrayList<>();
+        for (final Command<PlotPlayer> command : getInstance().getCommands())
+        {
+            if ((category != null) && !command.getCategory().equals(category))
+            {
+                continue;
+            }
+            if ((player != null) && !Permissions.hasPermission(player, command.getPermission()))
+            {
+                continue;
+            }
+            commands.add(command);
+        }
+        return commands;
+    }
+
+    public static List<Command<PlotPlayer>> getCommands(final CommandCategory category, final PlotPlayer player)
+    {
+        final List<Command<PlotPlayer>> commands = new ArrayList<>();
+        for (final Command<PlotPlayer> command : new HashSet<>(getInstance().getCommands()))
+        {
+            if ((category != null) && !command.getCategory().equals(category))
+            {
+                continue;
+            }
+            if ((player != null) && !Permissions.hasPermission(player, command.getPermission()))
+            {
+                continue;
+            }
+            commands.add(command);
+        }
+        return commands;
+    }
+
+    ////    public static List<String> helpMenu(final PlotPlayer player, final CommandCategory category, int page) {
+    //        List<Command<PlotPlayer>> commands;
+    //       //  commands = getCommands(category, player);
+    //        // final int totalPages = ((int) Math.ceil(12 * (commands.size()) /
+    //        // 100));
+    //        final int perPage = 5;
+    //        // final int totalPages = (commands.size() / perPage) + (commands.size() % perPage == 0 ? 0 : 1);
+    //        // if (page > totalPages) {
+    //        //     page = totalPages;
+    //        // }
+    //        int max = (page * perPage) + perPage;
+    //        // if (max > commands.size()) {
+    //        //    max = commands.size();
+    //        // }
+    //        final List<String> help = new ArrayList<>();
+    //        help.add(C.HELP_HEADER.s());
+    //        // HELP_PAGE_HEADER("&cCategory: &6%category%&c, Page: %current%&c/&6%max%&c, Displaying: &6%dis%&c/&6%total%"),
+    //        // help.add(C.HELP_PAGE_HEADER.s().replace("%category%", category == null ? "All" : category.toString()).replace("%current%", "" + (page + 1)).replace("%max%", "" + (totalPages)).replace("%dis%", "" + perPage).replace("%total%", "" + commands.size()));
+    //        Command cmd;
+    //        // HELP_CATEGORY("&cCategory: &6%category%&c, Page: %current%&c/&6%max%&c, Displaying: &6%dis%&c/&6%total%"),
+    //        // help.add(C.HELP_CATEGORY.s().replace("%category%", category == null ? "All" : category.toString()).replace("%current%", "" + (page + 1)).replace("%max%", "" + (totalPages)).replace("%dis%", "" + perPage).replace("%total%", "" + commands.size()));
+    //        // Command<PlotPlayer> cmd;
+    //        final int start = page * perPage;
+    //        for (int x = start; x < max; x++) {
+    //            // cmd = commands.get(x);
+    //            String s = C.HELP_ITEM.s();
+    //            if (cmd.getAliases().size() > 0) {
+    //                s = s.replace("%alias%", StringMan.join(cmd.getAliases(), "|"));
+    //            }
+    //            else {
+    //                s = s.replace("%alias%", "");
+    //            }
+    //            s = s.replace("%usage%", cmd.getUsage().contains("plot") ? cmd.getUsage() : "/plot " + cmd.getUsage()).replace("%cmd%", cmd.getCommand()).replace("%desc%", cmd.getDescription()).replace("[]", "");
+    //            help.add(s);
+    //        }
+    //        if (help.size() < 2) {
+    //            help.add(C.NO_COMMANDS.s());
+    //        }
+    //        return help;
+    //    }
+    //
+    public static void displayHelp(final PlotPlayer player, String cat, int page, final String label)
+    {
+        CommandCategory catEnum = null;
+        if (cat != null)
+        {
+            if (StringMan.isEqualIgnoreCase(cat, "all"))
+            {
+                catEnum = null;
+            }
+            else
+            {
+                for (final CommandCategory c : CommandCategory.values())
+                {
+                    if (StringMan.isEqualIgnoreCaseToAny(cat, c.name(), c.toString()))
+                    {
+                        catEnum = c;
+                        cat = c.name();
+                        break;
+                    }
+                }
+                if (catEnum == null)
+                {
+                    cat = null;
+                }
+            }
+        }
+        if ((cat == null) && (page == 0))
+        {
+            final StringBuilder builder = new StringBuilder();
+            builder.append(C.HELP_HEADER.s());
+            for (final CommandCategory c : CommandCategory.values())
+            {
+                builder.append("\n" + StringMan.replaceAll(C.HELP_INFO_ITEM.s(), "%category%", c.toString().toLowerCase(), "%category_desc%", c.toString()));
+            }
+            builder.append("\n").append(C.HELP_INFO_ITEM.s().replaceAll("%category%", "all").replaceAll("%category_desc%", "Display all commands"));
+            builder.append("\n" + C.HELP_FOOTER.s());
+            MainUtil.sendMessage(player, builder.toString(), false);
+            return;
+        }
+        page--;
+        new HelpMenu(player)
+        .setCategory(catEnum)
+        .getCommands()
+        .generateMaxPages()
+        .generatePage(page, label)
+        .render();
+    }
+
+    public static boolean onCommand(final PlotPlayer player, final String cmd, String... args)
+    {
+        int help_index = -1;
+        String category = null;
+        if (args.length == 0)
+        {
+            help_index = 0;
+        }
+        else if (StringMan.isEqualIgnoreCaseToAny(args[0], "he", "help", "?"))
+        {
+            help_index = 0;
+            switch (args.length)
+            {
+                case 3:
+                {
+                    category = args[1];
+                    if (MathMan.isInteger(args[2]))
+                    {
+                        try
+                        {
+                            help_index = Integer.parseInt(args[2]);
+                        }
+                        catch (final NumberFormatException e)
+                        {
+                            help_index = 1;
+                        }
+                    }
+                    break;
+                }
+                case 2:
+                {
+                    if (MathMan.isInteger(args[1]))
+                    {
+                        category = null;
+                        try
+                        {
+                            help_index = Integer.parseInt(args[1]);
+                        }
+                        catch (final NumberFormatException e)
+                        {
+                            help_index = 1;
+                        }
+                    }
+                    else
+                    {
+                        help_index = 1;
+                        category = args[1];
+                    }
+                    break;
+                }
+            }
+        }
+        else if ((args.length == 1) && MathMan.isInteger(args[args.length - 1]))
+        {
+            try
+            {
+                help_index = Integer.parseInt(args[args.length - 1]);
+            }
+            catch (final NumberFormatException e)
+            {}
+        }
+        else if (ConsolePlayer.isConsole(player) && (args.length >= 2))
+        {
+            final String[] split = args[0].split(";");
+            String world;
+            PlotId id;
+            if (split.length == 2)
+            {
+                world = player.getLocation().getWorld();
+                id = PlotId.fromString(split[0] + ";" + split[1]);
+            }
+            else if (split.length == 3)
+            {
+                world = split[0];
+                id = PlotId.fromString(split[1] + ";" + split[2]);
+            }
+            else
+            {
+                id = null;
+                world = null;
+            }
+            if ((id != null) && PS.get().isPlotWorld(world))
+            {
+                final Plot plot = MainUtil.getPlot(world, id);
+                if (plot != null)
+                {
+                    player.teleport(MainUtil.getPlotCenter(plot));
+                    args = Arrays.copyOfRange(args, 1, args.length);
+                }
+            }
+
+        }
+        if (help_index != -1)
+        {
+            displayHelp(player, category, help_index, cmd);
+            return true;
+        }
+        final StringBuilder builder = new StringBuilder(cmd).append(" ");
+        final Iterator<String> iterator = Arrays.asList(args).iterator();
+        while (iterator.hasNext())
+        {
+            builder.append(iterator.next());
+            if (iterator.hasNext())
+            {
+                builder.append(" ");
+            }
+        }
+        getInstance().handle(player, builder.toString());
+        return true;
+    }
+
+    @Override
+    public int handle(final PlotPlayer plr, final String input)
+    {
+        final String[] parts = input.split(" ");
+        String[] args;
+        String label;
+        if (parts.length == 1)
+        {
+            label = null;
+            args = new String[0];
+        }
+        else
+        {
+            label = parts[1];
+            args = new String[parts.length - 2];
+            System.arraycopy(parts, 2, args, 0, args.length);
+        }
+        Command<PlotPlayer> cmd;
+        if (label != null)
+        {
+            cmd = getInstance().commands.get(label);
+        }
+        else
+        {
+            cmd = null;
+        }
+        if (cmd == null)
+        {
+            MainUtil.sendMessage(plr, C.NOT_VALID_SUBCOMMAND);
+            {
+                final List<Command<PlotPlayer>> cmds = getCommands(null, plr);
+                if ((label == null) || (cmds.size() == 0))
+                {
+                    MainUtil.sendMessage(plr, C.DID_YOU_MEAN, "/plot help");
+                }
+                else
+                {
+                    final HashSet<String> setargs = new HashSet<>(args.length + 1);
+                    for (final String arg : args)
+                    {
+                        setargs.add(arg.toLowerCase());
+                    }
+                    setargs.add(label.toLowerCase());
+                    final String[] allargs = setargs.toArray(new String[setargs.size()]);
+                    int best = 0;
+                    for (final Command<PlotPlayer> current : cmds)
+                    {
+                        if (current.getUsage() != null)
+                        {
+                            int count = 0;
+                            for (final String word : new HashSet<String>(Arrays.asList((current.getUsage() + " " + current.getPermission() + " " + current.getCategory().name()).toLowerCase()
+                            .replaceAll("\\||\\>|\\<|\\[|\\]|\\{|\\}|\\_|\\/", " ").trim().replaceAll("\\s+", " ").split(" "))))
+                            {
+                                for (int i = 0; i < allargs.length; i++)
+                                {
+                                    final String arg = allargs[i];
+                                    if ((best - count - ((allargs.length - i) * 3)) >= 0)
+                                    {
+                                        continue;
+                                    }
+                                    if (StringMan.isEqual(arg, word))
+                                    {
+                                        count += 3;
+                                    }
+                                    else if ((word.length() > arg.length()) && word.contains(arg))
+                                    {
+                                        count += 2;
+                                    }
+                                }
+                            }
+                            for (final String word : new HashSet<String>(Arrays.asList((current.getDescription()).toLowerCase().replaceAll("\\||\\>|\\<|\\[|\\]|\\{|\\}|\\_|\\/", " ").trim()
+                            .replaceAll("\\s+", " ").split(" "))))
+                            {
+                                for (int i = 0; i < allargs.length; i++)
+                                {
+                                    final String arg = allargs[i];
+                                    if ((best - count - ((allargs.length - i) * 2)) >= 0)
+                                    {
+                                        continue;
+                                    }
+                                    if (StringMan.isEqual(arg, word))
+                                    {
+                                        count += 2;
+                                    }
+                                    else if ((word.length() > arg.length()) && word.contains(arg))
+                                    {
+                                        count++;
+                                    }
+                                }
+                            }
+                            if (count > best)
+                            {
+                                best = count;
+                                cmd = current;
+                            }
+                        }
+                    }
+                    if (cmd == null)
+                    {
+                        cmd = new StringComparison<>(label, getCommandAndAliases(null, plr)).getMatchObject();
+                    }
+                    MainUtil.sendMessage(plr, C.DID_YOU_MEAN, cmd.getUsage().replaceAll("\\{label\\}", parts[0]));
+                }
+            }
+            return CommandHandlingOutput.NOT_FOUND;
+        }
+        if (!cmd.getRequiredType().allows(plr))
+        {
+            if (ConsolePlayer.isConsole(plr))
+            {
+                MainUtil.sendMessage(plr, C.IS_CONSOLE);
+            }
+            else
+            {
+                MainUtil.sendMessage(plr, C.NOT_CONSOLE);
+            }
+            return CommandHandlingOutput.CALLER_OF_WRONG_TYPE;
+        }
+        if (!Permissions.hasPermission(plr, cmd.getPermission()))
+        {
+            MainUtil.sendMessage(plr, C.NO_PERMISSION, cmd.getPermission());
+            return CommandHandlingOutput.NOT_PERMITTED;
+        }
+        final Argument<?>[] requiredArguments = cmd.getRequiredArguments();
+        if ((requiredArguments != null) && (requiredArguments.length > 0))
+        {
+            boolean success = true;
+            if (args.length < requiredArguments.length)
+            {
+                success = false;
+            }
+            else
+            {
+                for (int i = 0; i < requiredArguments.length; i++)
+                {
+                    if (requiredArguments[i].parse(args[i]) == null)
+                    {
+                        success = false;
+                        break;
+                    }
+                }
+            }
+            if (!success)
+            {
+                C.COMMAND_SYNTAX.send(plr, cmd.getUsage());
+                return CommandHandlingOutput.WRONG_USAGE;
+            }
+        }
+        try
+        {
+            final boolean result = cmd.onCommand(plr, args);
+            if (!result)
+            {
+                cmd.getUsage();
+                // Unecessary!
+                //                if (usage != null && !usage.isEmpty()) {
+                //                    MainUtil.sendMessage(plr, usage);
+                //                }
+                return CommandHandlingOutput.WRONG_USAGE;
+            }
+        }
+        catch (final Throwable t)
+        {
+            t.printStackTrace();
+            return CommandHandlingOutput.ERROR;
+        }
+        return CommandHandlingOutput.SUCCESS;
+    }
+}
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Merge.java b/src/main/java/com/intellectualcrafters/plot/commands/Merge.java
index 64c8b655c..839f2b4fb 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/Merge.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/Merge.java
@@ -42,22 +42,24 @@ import com.intellectualcrafters.plot.util.UUIDHandler;
 import com.plotsquared.general.commands.CommandDeclaration;
 
 @CommandDeclaration(
-        command = "merge",
-        aliases = {"m"},
-        description = "Merge the plot you are standing on, with another plot",
-        permission = "plots.merge",
-        usage = "/plot merge [direction]",
-        category = CommandCategory.ACTIONS,
-        requiredType = RequiredType.NONE
-)
-public class Merge extends SubCommand {
+command = "merge",
+aliases = { "m" },
+description = "Merge the plot you are standing on, with another plot",
+permission = "plots.merge",
+usage = "/plot merge [direction]",
+category = CommandCategory.ACTIONS,
+requiredType = RequiredType.NONE)
+public class Merge extends SubCommand
+{
     public final static String[] values = new String[] { "north", "east", "south", "west" };
     public final static String[] aliases = new String[] { "n", "e", "s", "w" };
 
-    public static String direction(float yaw) {
+    public static String direction(float yaw)
+    {
         yaw = yaw / 90;
         final int i = Math.round(yaw);
-        switch (i) {
+        switch (i)
+        {
             case -4:
             case 0:
             case 4:
@@ -77,25 +79,28 @@ public class Merge extends SubCommand {
     }
 
     @Override
-    public boolean onCommand(final PlotPlayer plr, final String[] args) {
-        
+    public boolean onCommand(final PlotPlayer plr, final String[] args)
+    {
+
         final Location loc = plr.getLocationFull();
         final Plot plot = MainUtil.getPlot(loc);
-        if (plot == null) {
-            return !sendMessage(plr, C.NOT_IN_PLOT);
-        }
-        if ((plot == null) || !plot.hasOwner()) {
+        if (plot == null) { return !sendMessage(plr, C.NOT_IN_PLOT); }
+        if ((plot == null) || !plot.hasOwner())
+        {
             MainUtil.sendMessage(plr, C.PLOT_UNOWNED);
             return false;
         }
         final boolean admin = Permissions.hasPermission(plr, "plots.admin.command.merge");
-        if (!plot.isOwner(plr.getUUID()) && !admin) {
+        if (!plot.isOwner(plr.getUUID()) && !admin)
+        {
             MainUtil.sendMessage(plr, C.NO_PLOT_PERMS);
             return false;
         }
         int direction = -1;
-        if (args.length == 0) {
-            switch (direction(plr.getLocationFull().getYaw())) {
+        if (args.length == 0)
+        {
+            switch (direction(plr.getLocationFull().getYaw()))
+            {
                 case "NORTH":
                     direction = 0;
                     break;
@@ -110,20 +115,25 @@ public class Merge extends SubCommand {
                     break;
             }
         }
-        else {
-            if (args[0].equalsIgnoreCase("all")) {
-                plot.autoMerge(args.length != 2 || !args[1].equalsIgnoreCase("false"));
+        else
+        {
+            if (args[0].equalsIgnoreCase("all"))
+            {
+                plot.autoMerge((args.length != 2) || !args[1].equalsIgnoreCase("false"));
                 MainUtil.sendMessage(plr, C.SUCCESS_MERGE);
                 return true;
             }
-            for (int i = 0; i < values.length; i++) {
-                if (args[0].equalsIgnoreCase(values[i]) || args[0].equalsIgnoreCase(aliases[i])) {
+            for (int i = 0; i < values.length; i++)
+            {
+                if (args[0].equalsIgnoreCase(values[i]) || args[0].equalsIgnoreCase(aliases[i]))
+                {
                     direction = i;
                     break;
                 }
             }
         }
-        if (direction == -1) {
+        if (direction == -1)
+        {
             MainUtil.sendMessage(plr, C.SUBCOMMAND_SET_OPTIONS_HEADER.s() + StringMan.join(values, C.BLOCK_LIST_SEPARATER.s()));
             MainUtil.sendMessage(plr, C.DIRECTION.s().replaceAll("%dir%", direction(loc.getYaw())));
             return false;
@@ -132,7 +142,8 @@ public class Merge extends SubCommand {
         PlotId top = MainUtil.getTopPlot(plot).id;
         ArrayList<PlotId> selPlots;
         final String world = loc.getWorld();
-        switch (direction) {
+        switch (direction)
+        {
             case 0: // north = -y
                 selPlots = MainUtil.getMaxPlotSelectionIds(world, new PlotId(bot.x, bot.y - 1), new PlotId(top.x, top.y));
                 break;
@@ -148,8 +159,9 @@ public class Merge extends SubCommand {
             default:
                 return false;
         }
-        int size = selPlots.size();
-        if (Permissions.hasPermissionRange(plr, "plots.merge", Settings.MAX_PLOTS) < size) {
+        final int size = selPlots.size();
+        if (Permissions.hasPermissionRange(plr, "plots.merge", Settings.MAX_PLOTS) < size)
+        {
             MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.merge." + size);
             return false;
         }
@@ -164,20 +176,24 @@ public class Merge extends SubCommand {
         final ArrayList<PlotId> plots = MainUtil.getMaxPlotSelectionIds(world, bot, top);
         boolean multiMerge = false;
         final HashSet<UUID> multiUUID = new HashSet<UUID>();
-        HashSet<PlotId> multiPlots = new HashSet<>();
+        final HashSet<PlotId> multiPlots = new HashSet<>();
         final UUID u1 = plot.owner;
-        for (final PlotId myid : plots) {
+        for (final PlotId myid : plots)
+        {
             final Plot myplot = PS.get().getPlot(world, myid);
-            if (myplot == null || myplot.owner == null) {
+            if ((myplot == null) || (myplot.owner == null))
+            {
                 MainUtil.sendMessage(plr, C.NO_PERM_MERGE.s().replaceAll("%plot%", myid.toString()));
                 return false;
             }
-            UUID u2 = myplot.owner;
-            if (u2.equals(u1)) {
+            final UUID u2 = myplot.owner;
+            if (u2.equals(u1))
+            {
                 continue;
             }
-            PlotPlayer p2 = UUIDHandler.getPlayer(u2);
-            if (p2 == null) {
+            final PlotPlayer p2 = UUIDHandler.getPlayer(u2);
+            if (p2 == null)
+            {
                 MainUtil.sendMessage(plr, C.NO_PERM_MERGE.s().replaceAll("%plot%", myid.toString()));
                 return false;
             }
@@ -185,30 +201,40 @@ public class Merge extends SubCommand {
             multiPlots.add(myid);
             multiUUID.add(u2);
         }
-        if (multiMerge) {
-            if (!Permissions.hasPermission(plr, C.PERMISSION_MERGE_OTHER)) {
+        if (multiMerge)
+        {
+            if (!Permissions.hasPermission(plr, C.PERMISSION_MERGE_OTHER))
+            {
                 MainUtil.sendMessage(plr, C.NO_PERMISSION, C.PERMISSION_MERGE_OTHER.s());
                 return false;
             }
-            for (final UUID uuid : multiUUID) {
-                PlotPlayer accepter = UUIDHandler.getPlayer(uuid);
-                CmdConfirm.addPending(accepter, C.MERGE_REQUEST_CONFIRM.s().replaceAll("%s", plr.getName()), new Runnable() {
+            for (final UUID uuid : multiUUID)
+            {
+                final PlotPlayer accepter = UUIDHandler.getPlayer(uuid);
+                CmdConfirm.addPending(accepter, C.MERGE_REQUEST_CONFIRM.s().replaceAll("%s", plr.getName()), new Runnable()
+                {
                     @Override
-                    public void run() {
-                        PlotPlayer accepter = UUIDHandler.getPlayer(uuid);
+                    public void run()
+                    {
+                        final PlotPlayer accepter = UUIDHandler.getPlayer(uuid);
                         multiUUID.remove(uuid);
-                        if (multiUUID.size() == 0) {
-                            PlotPlayer pp = UUIDHandler.getPlayer(u1);
-                            if (pp == null) {
+                        if (multiUUID.size() == 0)
+                        {
+                            final PlotPlayer pp = UUIDHandler.getPlayer(u1);
+                            if (pp == null)
+                            {
                                 sendMessage(accepter, C.MERGE_NOT_VALID);
                                 return;
                             }
                             final PlotWorld plotWorld = PS.get().getPlotWorld(world);
-                            if ((EconHandler.manager != null) && plotWorld.USE_ECONOMY) {
+                            if ((EconHandler.manager != null) && plotWorld.USE_ECONOMY)
+                            {
                                 double cost = plotWorld.MERGE_PRICE;
                                 cost = plots.size() * cost;
-                                if (cost > 0d) {
-                                    if (EconHandler.manager.getMoney(plr) < cost) {
+                                if (cost > 0d)
+                                {
+                                    if (EconHandler.manager.getMoney(plr) < cost)
+                                    {
                                         sendMessage(plr, C.CANNOT_AFFORD_MERGE, cost + "");
                                         return;
                                     }
@@ -217,7 +243,8 @@ public class Merge extends SubCommand {
                                 }
                             }
                             final boolean result = EventUtil.manager.callMerge(world, plot, plots);
-                            if (!result) {
+                            if (!result)
+                            {
                                 MainUtil.sendMessage(plr, "&cMerge has been cancelled");
                                 return;
                             }
@@ -233,11 +260,14 @@ public class Merge extends SubCommand {
             return true;
         }
         final PlotWorld plotWorld = PS.get().getPlotWorld(world);
-        if ((EconHandler.manager != null) && plotWorld.USE_ECONOMY) {
+        if ((EconHandler.manager != null) && plotWorld.USE_ECONOMY)
+        {
             double cost = plotWorld.MERGE_PRICE;
             cost = plots.size() * cost;
-            if (cost > 0d) {
-                if (EconHandler.manager.getMoney(plr) < cost) {
+            if (cost > 0d)
+            {
+                if (EconHandler.manager.getMoney(plr) < cost)
+                {
                     sendMessage(plr, C.CANNOT_AFFORD_MERGE, cost + "");
                     return false;
                 }
@@ -246,7 +276,8 @@ public class Merge extends SubCommand {
             }
         }
         final boolean result = EventUtil.manager.callMerge(world, plot, plots);
-        if (!result) {
+        if (!result)
+        {
             MainUtil.sendMessage(plr, "&cMerge has been cancelled");
             return false;
         }
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Move.java b/src/main/java/com/intellectualcrafters/plot/commands/Move.java
index e735472a0..db03a384e 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/Move.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/Move.java
@@ -33,68 +33,79 @@ import com.plotsquared.general.commands.Argument;
 import com.plotsquared.general.commands.CommandDeclaration;
 
 @CommandDeclaration(
-        command = "move",
-        description = "Move a plot",
-        aliases = {"debugmove"},
-        permission = "plots.move",
-        category = CommandCategory.ACTIONS,
-        requiredType = RequiredType.NONE
-)
-public class Move extends SubCommand {
+command = "move",
+description = "Move a plot",
+aliases = { "debugmove" },
+permission = "plots.move",
+category = CommandCategory.ACTIONS,
+requiredType = RequiredType.NONE)
+public class Move extends SubCommand
+{
 
-    public Move() {
+    public Move()
+    {
         requiredArguments = new Argument[] {
-                Argument.PlotID
+        Argument.PlotID
         };
     }
 
     @Override
-    public boolean onCommand(final PlotPlayer plr, final String[] args) {
-        
+    public boolean onCommand(final PlotPlayer plr, final String[] args)
+    {
+
         final Location loc = plr.getLocation();
         final Plot plot1 = MainUtil.getPlot(loc);
-        if (plot1 == null) {
-            return !sendMessage(plr, C.NOT_IN_PLOT);
-        }
-        if (!plot1.isAdded(plr.getUUID()) && !Permissions.hasPermission(plr, C.PERMISSION_ADMIN.s()))  {
+        if (plot1 == null) { return !sendMessage(plr, C.NOT_IN_PLOT); }
+        if (!plot1.isAdded(plr.getUUID()) && !Permissions.hasPermission(plr, C.PERMISSION_ADMIN.s()))
+        {
             MainUtil.sendMessage(plr, C.NO_PLOT_PERMS);
             return false;
         }
         final String world = loc.getWorld();
         final PlotId plot2id = MainUtil.parseId(args[0]);
-        if ((plot2id == null)) {
+        if ((plot2id == null))
+        {
             MainUtil.sendMessage(plr, C.NOT_VALID_PLOT_ID);
             MainUtil.sendMessage(plr, C.COMMAND_SYNTAX, "/plot move <X;Z>");
             return false;
         }
         String world2;
-        if (args.length == 2) {
-            PlotWorld other = PS.get().getPlotWorld(args[1]);
-            PlotWorld current = PS.get().getPlotWorld(loc.getWorld());
-            if (other == null || current == null || !other.equals(current)) {
+        if (args.length == 2)
+        {
+            final PlotWorld other = PS.get().getPlotWorld(args[1]);
+            final PlotWorld current = PS.get().getPlotWorld(loc.getWorld());
+            if ((other == null) || (current == null) || !other.equals(current))
+            {
                 MainUtil.sendMessage(plr, C.PLOTWORLD_INCOMPATIBLE);
                 return false;
             }
-        	world2 = other.worldname;
+            world2 = other.worldname;
         }
-        else {
-        	world2 = world;
+        else
+        {
+            world2 = world;
         }
-        Plot plot2 = MainUtil.getPlot(world2, plot2id);
-        
-        if (plot1.equals(plot2)) {
+        final Plot plot2 = MainUtil.getPlot(world2, plot2id);
+
+        if (plot1.equals(plot2))
+        {
             MainUtil.sendMessage(plr, C.NOT_VALID_PLOT_ID);
             MainUtil.sendMessage(plr, C.COMMAND_SYNTAX, "/plot move <X;Z>");
             return false;
         }
-        if (MainUtil.move(plot1, plot2, new Runnable() {
+        if (MainUtil.move(plot1, plot2, new Runnable()
+        {
             @Override
-            public void run() {
+            public void run()
+            {
                 MainUtil.sendMessage(plr, C.MOVE_SUCCESS);
             }
-        })) {
+        }))
+        {
             return true;
-        } else {
+        }
+        else
+        {
             MainUtil.sendMessage(plr, C.REQUIRES_UNOWNED);
             return false;
         }
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/MusicSubcommand.java b/src/main/java/com/intellectualcrafters/plot/commands/MusicSubcommand.java
index 5a03c8f6d..574e3c282 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/MusicSubcommand.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/MusicSubcommand.java
@@ -34,53 +34,60 @@ import com.intellectualcrafters.plot.util.MainUtil;
 import com.plotsquared.general.commands.CommandDeclaration;
 
 @CommandDeclaration(
-        command = "music",
-        permission = "plots.music",
-        description = "Player music in a plot",
-        usage = "/plot music",
-        category = CommandCategory.ACTIONS,
-        requiredType = RequiredType.NONE
-)
-public class MusicSubcommand extends SubCommand {
+command = "music",
+permission = "plots.music",
+description = "Player music in a plot",
+usage = "/plot music",
+category = CommandCategory.ACTIONS,
+requiredType = RequiredType.NONE)
+public class MusicSubcommand extends SubCommand
+{
 
     @Override
-    public boolean onCommand(final PlotPlayer player, final String[] args) {
+    public boolean onCommand(final PlotPlayer player, final String[] args)
+    {
         final Location loc = player.getLocation();
         final Plot plot = MainUtil.getPlot(loc);
-        if (plot == null) {
-            return !sendMessage(player, C.NOT_IN_PLOT);
-        }
-        if (!plot.isAdded(player.getUUID())) {
+        if (plot == null) { return !sendMessage(player, C.NOT_IN_PLOT); }
+        if (!plot.isAdded(player.getUUID()))
+        {
             sendMessage(player, C.NO_PLOT_PERMS);
             return true;
         }
-        PlotInventory inv = new PlotInventory(player, 2, "Plot Jukebox") {
-            public boolean onClick(int index) {
-                PlotItemStack item = getItem(index);
+        final PlotInventory inv = new PlotInventory(player, 2, "Plot Jukebox")
+        {
+            @Override
+            public boolean onClick(final int index)
+            {
+                final PlotItemStack item = getItem(index);
                 if (item == null) {
-                    return true;
+                return true;
                 }
-                int id = item.id == 7 ? 0 : item.id;
-                if (id == 0) {
+                final int id = item.id == 7 ? 0 : item.id;
+                if (id == 0)
+                {
                     FlagManager.removePlotFlag(plot, "music");
                 }
-                else {
+                else
+                {
                     FlagManager.addPlotFlag(plot, new Flag(FlagManager.getFlag("music"), id));
                 }
                 return false;
             }
         };
         int index = 0;
-        for (int i = 2256; i < 2268; i++) {
-            String name = "&r&6" + BlockManager.manager.getClosestMatchingName(new PlotBlock((short) i, (byte) 0));
-            String[] lore = {"&r&aClick to play!"};
-            PlotItemStack item = new PlotItemStack(i, (byte) 0, 1, name, lore);
+        for (int i = 2256; i < 2268; i++)
+        {
+            final String name = "&r&6" + BlockManager.manager.getClosestMatchingName(new PlotBlock((short) i, (byte) 0));
+            final String[] lore = { "&r&aClick to play!" };
+            final PlotItemStack item = new PlotItemStack(i, (byte) 0, 1, name, lore);
             inv.setItem(index, item);
             index++;
         }
-        if (player.getMeta("music") != null) {
-            String name = "&r&6Cancel music";
-            String[] lore = {"&r&cClick to cancel!"};
+        if (player.getMeta("music") != null)
+        {
+            final String name = "&r&6Cancel music";
+            final String[] lore = { "&r&cClick to cancel!" };
             inv.setItem(index, new PlotItemStack(7, (short) 0, 1, name, lore));
         }
         inv.openInventory();
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Purge.java b/src/main/java/com/intellectualcrafters/plot/commands/Purge.java
index 0ec980357..5343af9f6 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/Purge.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/Purge.java
@@ -35,128 +35,147 @@ import com.intellectualcrafters.plot.util.MainUtil;
 import com.intellectualcrafters.plot.util.UUIDHandler;
 import com.plotsquared.general.commands.CommandDeclaration;
 
-
 @CommandDeclaration(
-        command = "purge",
-        permission = "plots.admin",
-        description = "Purge all plots for a world",
-        category = CommandCategory.ACTIONS,
-        requiredType = RequiredType.CONSOLE
-)
-public class Purge extends SubCommand {
-    
-    public PlotId getId(final String id) {
-        try {
+command = "purge",
+permission = "plots.admin",
+description = "Purge all plots for a world",
+category = CommandCategory.ACTIONS,
+requiredType = RequiredType.CONSOLE)
+public class Purge extends SubCommand
+{
+
+    public PlotId getId(final String id)
+    {
+        try
+        {
             final String[] split = id.split(";");
             return new PlotId(Integer.parseInt(split[0]), Integer.parseInt(split[1]));
-        } catch (final Exception e) {
+        }
+        catch (final Exception e)
+        {
             return null;
         }
     }
 
     @Override
-    public boolean onCommand(final PlotPlayer plr, final String[] args) {
-        if (args.length == 1) {
+    public boolean onCommand(final PlotPlayer plr, final String[] args)
+    {
+        if (args.length == 1)
+        {
             final String arg = args[0].toLowerCase();
             final PlotId id = getId(arg);
-            if (id != null) {
+            if (id != null)
+            {
                 MainUtil.sendMessage(plr, "/plot purxe x;z &l<world>");
                 return false;
             }
             final UUID uuid = UUIDHandler.getUUID(args[0], null);
-            if (uuid != null) {
+            if (uuid != null)
+            {
                 MainUtil.sendMessage(plr, "/plot purge " + args[0] + " &l<world>");
                 return false;
             }
-            if (arg.equals("player")) {
+            if (arg.equals("player"))
+            {
                 MainUtil.sendMessage(plr, "/plot purge &l<player> <world>");
                 return false;
             }
-            if (arg.equals("unowned")) {
+            if (arg.equals("unowned"))
+            {
                 MainUtil.sendMessage(plr, "/plot purge unowned &l<world>");
                 return false;
             }
-            if (arg.equals("unknown")) {
+            if (arg.equals("unknown"))
+            {
                 MainUtil.sendMessage(plr, "/plot purge unknown &l<world>");
                 return false;
             }
-            if (arg.equals("all")) {
+            if (arg.equals("all"))
+            {
                 MainUtil.sendMessage(plr, "/plot purge all &l<world>");
                 return false;
             }
             MainUtil.sendMessage(plr, C.PURGE_SYNTAX);
             return false;
         }
-        if (args.length != 2) {
+        if (args.length != 2)
+        {
             MainUtil.sendMessage(plr, C.PURGE_SYNTAX);
             return false;
         }
         final String worldname = args[1];
-        if (!PS.get().getAllPlotsRaw().containsKey(worldname)) {
+        if (!PS.get().getAllPlotsRaw().containsKey(worldname))
+        {
             MainUtil.sendMessage(plr, "INVALID WORLD");
             return false;
         }
         final String arg = args[0].toLowerCase();
         final PlotId id = getId(arg);
-        if (id != null) {
+        if (id != null)
+        {
             final HashSet<Integer> ids = new HashSet<Integer>();
             final int DBid = DBFunc.getId(MainUtil.getPlot(worldname, id));
-            if (DBid != Integer.MAX_VALUE) {
+            if (DBid != Integer.MAX_VALUE)
+            {
                 ids.add(DBid);
             }
             DBFunc.purgeIds(worldname, ids);
             return finishPurge(DBid == Integer.MAX_VALUE ? 1 : 0);
         }
-        if (arg.equals("all")) {
+        if (arg.equals("all"))
+        {
             final Set<PlotId> ids = PS.get().getPlots(worldname).keySet();
-            int length = ids.size();
-            if (length == 0) {
-                return MainUtil.sendMessage(null, "&cNo plots found");
-            }
+            final int length = ids.size();
+            if (length == 0) { return MainUtil.sendMessage(null, "&cNo plots found"); }
             DBFunc.purge(worldname, ids);
             return finishPurge(length);
         }
-        if (arg.equals("unknown")) {
+        if (arg.equals("unknown"))
+        {
             final Collection<Plot> plots = PS.get().getPlotsInWorld(worldname);
             final Set<PlotId> ids = new HashSet<>();
-            for (final Plot plot : plots) {
-                if (plot.owner != null) {
+            for (final Plot plot : plots)
+            {
+                if (plot.owner != null)
+                {
                     final String name = UUIDHandler.getName(plot.owner);
-                    if (name == null) {
+                    if (name == null)
+                    {
                         ids.add(plot.id);
                     }
                 }
             }
-            int length = ids.size();
-            if (length == 0) {
-                return MainUtil.sendMessage(null, "&cNo plots found");
-            }
+            final int length = ids.size();
+            if (length == 0) { return MainUtil.sendMessage(null, "&cNo plots found"); }
             DBFunc.purge(worldname, ids);
             return finishPurge(length);
         }
-        if (arg.equals("unowned")) {
+        if (arg.equals("unowned"))
+        {
             final Collection<Plot> plots = PS.get().getPlotsInWorld(worldname);
             final Set<PlotId> ids = new HashSet<>();
-            for (final Plot plot : plots) {
-                if (plot.owner == null) {
+            for (final Plot plot : plots)
+            {
+                if (plot.owner == null)
+                {
                     ids.add(plot.id);
                 }
             }
-            int length = ids.size();
-            if (length == 0) {
-                return MainUtil.sendMessage(null, "&cNo plots found");
-            }
+            final int length = ids.size();
+            if (length == 0) { return MainUtil.sendMessage(null, "&cNo plots found"); }
             DBFunc.purge(worldname, ids);
             return finishPurge(length);
         }
         final UUID uuid = UUIDHandler.getUUID(args[0], null);
-        if (uuid != null) {
+        if (uuid != null)
+        {
             final Set<Plot> plots = PS.get().getPlots(worldname, uuid);
             final Set<PlotId> ids = new HashSet<>();
-            for (final Plot plot : plots) {
+            for (final Plot plot : plots)
+            {
                 ids.add(plot.id);
             }
-            int length = ids.size();
+            final int length = ids.size();
             DBFunc.purge(worldname, ids);
             return finishPurge(length);
         }
@@ -164,7 +183,8 @@ public class Purge extends SubCommand {
         return false;
     }
 
-    private boolean finishPurge(final int amount) {
+    private boolean finishPurge(final int amount)
+    {
         MainUtil.sendMessage(null, C.PURGE_SUCCESS, amount + "");
         return false;
     }
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Rate.java b/src/main/java/com/intellectualcrafters/plot/commands/Rate.java
index bc0331fd1..d679dbf58 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/Rate.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/Rate.java
@@ -28,13 +28,11 @@ import java.util.Map.Entry;
 import java.util.UUID;
 
 import org.apache.commons.lang.mutable.MutableInt;
-import org.bukkit.Bukkit;
 
 import com.intellectualcrafters.plot.PS;
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.config.Settings;
 import com.intellectualcrafters.plot.database.DBFunc;
-import com.intellectualcrafters.plot.flag.FlagManager;
 import com.intellectualcrafters.plot.object.Location;
 import com.intellectualcrafters.plot.object.Plot;
 import com.intellectualcrafters.plot.object.PlotInventory;
@@ -46,47 +44,60 @@ import com.intellectualcrafters.plot.util.MainUtil;
 import com.intellectualcrafters.plot.util.MathMan;
 import com.intellectualcrafters.plot.util.Permissions;
 import com.intellectualcrafters.plot.util.TaskManager;
-import com.plotsquared.bukkit.events.PlotRateEvent;
 import com.plotsquared.general.commands.Command;
 import com.plotsquared.general.commands.CommandDeclaration;
 
 @CommandDeclaration(
-        command = "rate",
-        permission = "plots.rate",
-        description = "Rate the plot",
-        usage = "/plot rate [#|next]",
-        aliases = {"rt"},
-        category = CommandCategory.ACTIONS,
-        requiredType = RequiredType.NONE
-)
-public class Rate extends SubCommand {
+command = "rate",
+permission = "plots.rate",
+description = "Rate the plot",
+usage = "/plot rate [#|next]",
+aliases = { "rt" },
+category = CommandCategory.ACTIONS,
+requiredType = RequiredType.NONE)
+public class Rate extends SubCommand
+{
 
     @Override
-    public boolean onCommand(final PlotPlayer player, final String[] args) {
-        if (args.length == 1) {
-            if (args[0].equalsIgnoreCase("next")) {
-                ArrayList<Plot> plots = new ArrayList<>(PS.get().getPlots());
-                Collections.sort(plots, new Comparator<Plot>() {
+    public boolean onCommand(final PlotPlayer player, final String[] args)
+    {
+        if (args.length == 1)
+        {
+            if (args[0].equalsIgnoreCase("next"))
+            {
+                final ArrayList<Plot> plots = new ArrayList<>(PS.get().getPlots());
+                Collections.sort(plots, new Comparator<Plot>()
+                {
                     @Override
-                    public int compare(Plot p1, Plot p2) {
+                    public int compare(final Plot p1, final Plot p2)
+                    {
                         double v1 = 0;
                         double v2 = 0;
-                        if (p1.getSettings().ratings != null) {
-                            for (Entry<UUID, Rating> entry : p1.getRatings().entrySet()) {
+                        if (p1.getSettings().ratings != null)
+                        {
+                            for (final Entry<UUID, Rating> entry : p1.getRatings().entrySet())
+                            {
                                 v1 -= 11 - entry.getValue().getAverageRating();
                             }
                         }
-                        if (p2.getSettings().ratings != null) {
-                            for (Entry<UUID, Rating> entry : p2.getRatings().entrySet()) {
+                        if (p2.getSettings().ratings != null)
+                        {
+                            for (final Entry<UUID, Rating> entry : p2.getRatings().entrySet())
+                            {
                                 v2 -= 11 - entry.getValue().getAverageRating();
                             }
                         }
                         return v2 > v1 ? 1 : -1;
                     }
                 });
-                UUID uuid = player.getUUID();
-                for (Plot p : plots) {
-                    if ((!Settings.REQUIRE_DONE || p.getSettings().flags.containsKey("done")) && p.isBasePlot() && (p.getSettings().ratings == null || !p.getSettings().ratings.containsKey(uuid)) && !p.isAdded(uuid)) {
+                final UUID uuid = player.getUUID();
+                for (final Plot p : plots)
+                {
+                    if ((!Settings.REQUIRE_DONE || p.getSettings().flags.containsKey("done"))
+                    && p.isBasePlot()
+                    && ((p.getSettings().ratings == null) || !p.getSettings().ratings.containsKey(uuid))
+                    && !p.isAdded(uuid))
+                    {
                         MainUtil.teleportPlayer(player, player.getLocation(), p);
                         MainUtil.sendMessage(player, C.RATE_THIS);
                         return true;
@@ -98,40 +109,49 @@ public class Rate extends SubCommand {
         }
         final Location loc = player.getLocation();
         final Plot plot = MainUtil.getPlot(loc);
-        if (plot == null) {
-            return !sendMessage(player, C.NOT_IN_PLOT);
-        }
-        if (!plot.hasOwner()) {
+        if (plot == null) { return !sendMessage(player, C.NOT_IN_PLOT); }
+        if (!plot.hasOwner())
+        {
             sendMessage(player, C.RATING_NOT_OWNED);
             return false;
         }
-        if (plot.isOwner(player.getUUID())) {
+        if (plot.isOwner(player.getUUID()))
+        {
             sendMessage(player, C.RATING_NOT_YOUR_OWN);
             return false;
         }
-        if (Settings.REQUIRE_DONE && !plot.getSettings().flags.containsKey("done")) {
+        if (Settings.REQUIRE_DONE && !plot.getSettings().flags.containsKey("done"))
+        {
             sendMessage(player, C.RATING_NOT_DONE);
             return false;
         }
-        if (Settings.RATING_CATEGORIES != null && Settings.RATING_CATEGORIES.size() != 0) {
-            final Runnable run = new Runnable() {
+        if ((Settings.RATING_CATEGORIES != null) && (Settings.RATING_CATEGORIES.size() != 0))
+        {
+            final Runnable run = new Runnable()
+            {
                 @Override
-                public void run() {
-                    if (plot.getSettings().ratings.containsKey(player.getUUID())) {
+                public void run()
+                {
+                    if (plot.getSettings().ratings.containsKey(player.getUUID()))
+                    {
                         sendMessage(player, C.RATING_ALREADY_EXISTS, plot.getId().toString());
                         return;
                     }
                     final MutableInt index = new MutableInt(0);
                     final MutableInt rating = new MutableInt(0);
-                    String title = Settings.RATING_CATEGORIES.get(0);
-                    PlotInventory inventory = new PlotInventory(player, 1, title) {
-                        public boolean onClick(int i) {
+                    final String title = Settings.RATING_CATEGORIES.get(0);
+                    final PlotInventory inventory = new PlotInventory(player, 1, title)
+                    {
+                        @Override
+                        public boolean onClick(final int i)
+                        {
                             rating.add((i + 1) * Math.pow(10, index.intValue()));
                             index.increment();
-                            if (index.intValue() >= Settings.RATING_CATEGORIES.size()) {
+                            if (index.intValue() >= Settings.RATING_CATEGORIES.size())
+                            {
                                 close();
-                                int rV = rating.intValue();
-                                Rating result = EventUtil.manager.callRating(player, plot, new Rating(rV));
+                                final int rV = rating.intValue();
+                                final Rating result = EventUtil.manager.callRating(player, plot, new Rating(rV));
                                 plot.getSettings().ratings.put(player.getUUID(), result.getAggregate());
                                 DBFunc.setRating(plot, player.getUUID(), rV);
                                 sendMessage(player, C.RATING_APPLIED, plot.getId().toString());
@@ -139,9 +159,11 @@ public class Rate extends SubCommand {
                                 return false;
                             }
                             setTitle(Settings.RATING_CATEGORIES.get(index.intValue()));
-                            if (Permissions.hasPermission(player, "plots.comment")) {
-                                Command<PlotPlayer> command = MainCommand.getInstance().getCommand("comment");
-                                if (command != null) {
+                            if (Permissions.hasPermission(player, "plots.comment"))
+                            {
+                                final Command<PlotPlayer> command = MainCommand.getInstance().getCommand("comment");
+                                if (command != null)
+                                {
                                     MainUtil.sendMessage(player, C.COMMENT_THIS, command.getUsage().replaceAll("{label}", "plot"));
                                 }
                             }
@@ -160,11 +182,15 @@ public class Rate extends SubCommand {
                     inventory.openInventory();
                 }
             };
-            if (plot.getSettings().ratings == null) {
-                if (!Settings.CACHE_RATINGS) {
-                    TaskManager.runTaskAsync(new Runnable() {
+            if (plot.getSettings().ratings == null)
+            {
+                if (!Settings.CACHE_RATINGS)
+                {
+                    TaskManager.runTaskAsync(new Runnable()
+                    {
                         @Override
-                        public void run() {
+                        public void run()
+                        {
                             plot.getSettings().ratings = DBFunc.getRatings(plot);
                             run.run();
                         }
@@ -176,43 +202,54 @@ public class Rate extends SubCommand {
             run.run();
             return true;
         }
-        if (args.length < 1) {
+        if (args.length < 1)
+        {
             sendMessage(player, C.RATING_NOT_VALID);
             return true;
         }
         final String arg = args[0];
         final int rating;
-        if (MathMan.isInteger(arg) && arg.length() < 3 && arg.length() > 0) {
+        if (MathMan.isInteger(arg) && (arg.length() < 3) && (arg.length() > 0))
+        {
             rating = Integer.parseInt(arg);
-            if (rating > 10) {
+            if (rating > 10)
+            {
                 sendMessage(player, C.RATING_NOT_VALID);
                 return false;
             }
         }
-        else {
+        else
+        {
             sendMessage(player, C.RATING_NOT_VALID);
             return false;
         }
         final UUID uuid = player.getUUID();
-        final Runnable run = new Runnable() {
+        final Runnable run = new Runnable()
+        {
             @Override
-            public void run() {
-                if (plot.getSettings().ratings.containsKey(uuid)) {
+            public void run()
+            {
+                if (plot.getSettings().ratings.containsKey(uuid))
+                {
                     sendMessage(player, C.RATING_ALREADY_EXISTS, plot.getId().toString());
                     return;
                 }
-                Rating result = EventUtil.manager.callRating(player, plot, new Rating(rating));
-                int resultVal = result.getAggregate();
+                final Rating result = EventUtil.manager.callRating(player, plot, new Rating(rating));
+                final int resultVal = result.getAggregate();
                 plot.getSettings().ratings.put(uuid, resultVal);
                 DBFunc.setRating(plot, uuid, resultVal);
                 sendMessage(player, C.RATING_APPLIED, plot.getId().toString());
             }
         };
-        if (plot.getSettings().ratings == null) {
-            if (!Settings.CACHE_RATINGS) {
-                TaskManager.runTaskAsync(new Runnable() {
+        if (plot.getSettings().ratings == null)
+        {
+            if (!Settings.CACHE_RATINGS)
+            {
+                TaskManager.runTaskAsync(new Runnable()
+                {
                     @Override
-                    public void run() {
+                    public void run()
+                    {
                         plot.getSettings().ratings = DBFunc.getRatings(plot);
                         run.run();
                     }
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/RegenAllRoads.java b/src/main/java/com/intellectualcrafters/plot/commands/RegenAllRoads.java
index 03e514ae9..5bc0d318e 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/RegenAllRoads.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/RegenAllRoads.java
@@ -35,30 +35,35 @@ import com.plotsquared.general.commands.Argument;
 import com.plotsquared.general.commands.CommandDeclaration;
 
 @CommandDeclaration(
-        command = "regenallroads",
-        description = "Regenerate all roads in the map using the set road schematic",
-        aliases = {"rgar"},
-        usage = "/plot regenallroads <world>",
-        category = CommandCategory.DEBUG,
-        requiredType = RequiredType.CONSOLE,
-        permission = "plots.regenallroads"
-)
-public class RegenAllRoads extends SubCommand {
+command = "regenallroads",
+description = "Regenerate all roads in the map using the set road schematic",
+aliases = { "rgar" },
+usage = "/plot regenallroads <world>",
+category = CommandCategory.DEBUG,
+requiredType = RequiredType.CONSOLE,
+permission = "plots.regenallroads")
+public class RegenAllRoads extends SubCommand
+{
 
-    public RegenAllRoads() {
+    public RegenAllRoads()
+    {
         requiredArguments = new Argument[] {
-                Argument.String
+        Argument.String
         };
     }
 
     @Override
-    public boolean onCommand(final PlotPlayer plr, final String[] args) {
+    public boolean onCommand(final PlotPlayer plr, final String[] args)
+    {
         int height = 0;
-        if (args.length == 2) {
-            try {
+        if (args.length == 2)
+        {
+            try
+            {
                 height = Integer.parseInt(args[1]);
             }
-            catch (NumberFormatException e) {
+            catch (final NumberFormatException e)
+            {
                 MainUtil.sendMessage(plr, C.NOT_VALID_NUMBER, "(0, 256)");
                 MainUtil.sendMessage(plr, C.COMMAND_SYNTAX, "/plot regenallroads <world> [height]");
                 return false;
@@ -66,7 +71,8 @@ public class RegenAllRoads extends SubCommand {
         }
         final String name = args[0];
         final PlotManager manager = PS.get().getPlotManager(name);
-        if ((manager == null) || !(manager instanceof HybridPlotManager)) {
+        if ((manager == null) || !(manager instanceof HybridPlotManager))
+        {
             MainUtil.sendMessage(plr, C.NOT_VALID_PLOT_WORLD);
             return false;
         }
@@ -76,7 +82,8 @@ public class RegenAllRoads extends SubCommand {
         MainUtil.sendMessage(plr, "&6Potential chunks to update: &7" + (chunks.size() * 1024));
         MainUtil.sendMessage(plr, "&6Estimated time: &7" + (chunks.size()) + " seconds");
         final boolean result = HybridUtils.manager.scheduleRoadUpdate(name, height);
-        if (!result) {
+        if (!result)
+        {
             MainUtil.sendMessage(plr, "&cCannot schedule mass schematic update! (Is one already in progress?)");
             return false;
         }
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Reload.java b/src/main/java/com/intellectualcrafters/plot/commands/Reload.java
index 9bcf3c49a..59b6b01a9 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/Reload.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/Reload.java
@@ -29,30 +29,35 @@ import com.intellectualcrafters.plot.util.MainUtil;
 import com.plotsquared.general.commands.CommandDeclaration;
 
 @CommandDeclaration(
-        command = "reload",
-        permission = "plots.admin.command.reload",
-        description = "Reload configurations",
-        usage = "/plot reload",
-        category = CommandCategory.INFO
-)
-public class Reload extends SubCommand {
+command = "reload",
+permission = "plots.admin.command.reload",
+description = "Reload configurations",
+usage = "/plot reload",
+category = CommandCategory.INFO)
+public class Reload extends SubCommand
+{
 
     @Override
-    public boolean onCommand(final PlotPlayer plr, final String[] args) {
-        try {
+    public boolean onCommand(final PlotPlayer plr, final String[] args)
+    {
+        try
+        {
             // The following won't affect world generation, as that has to be
             // loaded during startup unfortunately.
             PS.get().config.load(PS.get().configFile);
             PS.get().setupConfig();
             C.load(PS.get().translationFile);
-            for (final String pw : PS.get().getPlotWorlds()) {
+            for (final String pw : PS.get().getPlotWorlds())
+            {
                 final PlotWorld plotworld = PS.get().getPlotWorld(pw);
-                ConfigurationSection section = PS.get().config.getConfigurationSection("worlds." + pw);
+                final ConfigurationSection section = PS.get().config.getConfigurationSection("worlds." + pw);
                 plotworld.saveConfiguration(section);
                 plotworld.loadDefaultConfiguration(section);
             }
             MainUtil.sendMessage(plr, C.RELOADED_CONFIGS);
-        } catch (final Exception e) {
+        }
+        catch (final Exception e)
+        {
             e.printStackTrace();
             MainUtil.sendMessage(plr, C.RELOAD_FAILED);
         }
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Remove.java b/src/main/java/com/intellectualcrafters/plot/commands/Remove.java
index 22519b91e..b581fdd22 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/Remove.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/Remove.java
@@ -36,73 +36,84 @@ import com.plotsquared.general.commands.Argument;
 import com.plotsquared.general.commands.CommandDeclaration;
 
 @CommandDeclaration(
-        command = "remove",
-        aliases = {"r"},
-        description = "Remove a player from a plot",
-        usage = "/plot remove <player>",
-        category = CommandCategory.ACTIONS,
-        requiredType = RequiredType.NONE,
-        permission = "plots.remove"
-)
-public class Remove extends SubCommand {
+command = "remove",
+aliases = { "r" },
+description = "Remove a player from a plot",
+usage = "/plot remove <player>",
+category = CommandCategory.ACTIONS,
+requiredType = RequiredType.NONE,
+permission = "plots.remove")
+public class Remove extends SubCommand
+{
 
-    public Remove() {
+    public Remove()
+    {
         requiredArguments = new Argument[] {
-                Argument.PlayerName
+        Argument.PlayerName
         };
     }
 
     @Override
-    public boolean onCommand(final PlotPlayer plr, final String[] args) {
-        if (args.length != 1) {
+    public boolean onCommand(final PlotPlayer plr, final String[] args)
+    {
+        if (args.length != 1)
+        {
             MainUtil.sendMessage(plr, C.COMMAND_SYNTAX, "/plot remove <player>");
             return true;
         }
         final Location loc = plr.getLocation();
         final Plot plot = MainUtil.getPlot(loc);
-        if (plot == null) {
-            return !sendMessage(plr, C.NOT_IN_PLOT);
-        }
-        if ((plot == null) || !plot.hasOwner()) {
+        if (plot == null) { return !sendMessage(plr, C.NOT_IN_PLOT); }
+        if ((plot == null) || !plot.hasOwner())
+        {
             MainUtil.sendMessage(plr, C.PLOT_UNOWNED);
             return false;
         }
-        if (!plot.isOwner(plr.getUUID()) && !Permissions.hasPermission(plr, "plots.admin.command.remove")) {
+        if (!plot.isOwner(plr.getUUID()) && !Permissions.hasPermission(plr, "plots.admin.command.remove"))
+        {
             MainUtil.sendMessage(plr, C.NO_PLOT_PERMS);
             return true;
         }
         int count = 0;
-        switch (args[0]) {
-            case "unknown": {
-                ArrayList<UUID> toRemove = new ArrayList<>();
-                HashSet<UUID> all = new HashSet<>();
+        switch (args[0])
+        {
+            case "unknown":
+            {
+                final ArrayList<UUID> toRemove = new ArrayList<>();
+                final HashSet<UUID> all = new HashSet<>();
                 all.addAll(plot.getMembers());
                 all.addAll(plot.getTrusted());
                 all.addAll(plot.getDenied());
-                for (UUID uuid : all) {
-                    if (UUIDHandler.getName(uuid) == null) {
+                for (final UUID uuid : all)
+                {
+                    if (UUIDHandler.getName(uuid) == null)
+                    {
                         toRemove.add(uuid);
                         count++;
                     }
                 }
-                for (UUID uuid : toRemove) {
+                for (final UUID uuid : toRemove)
+                {
                     plot.removeDenied(uuid);
                     plot.removeTrusted(uuid);
                     plot.removeMember(uuid);
                 }
                 break;
             }
-            case "*": {
-                ArrayList<UUID> toRemove = new ArrayList<>();
-                HashSet<UUID> all = new HashSet<>();
+            case "*":
+            {
+                final ArrayList<UUID> toRemove = new ArrayList<>();
+                final HashSet<UUID> all = new HashSet<>();
                 all.addAll(plot.getMembers());
                 all.addAll(plot.getTrusted());
                 all.addAll(plot.getDenied());
-                for (UUID uuid : all) {
+                for (final UUID uuid : all)
+                {
                     toRemove.add(uuid);
                     count++;
                 }
-                for (UUID uuid : toRemove) {
+                for (final UUID uuid : toRemove)
+                {
                     plot.removeDenied(uuid);
                     plot.removeTrusted(uuid);
                     plot.removeMember(uuid);
@@ -110,33 +121,47 @@ public class Remove extends SubCommand {
                 break;
             }
             default:
-                UUID uuid = UUIDHandler.getUUID(args[0], null);
-                if (uuid != null) {
-                    if (plot.getTrusted().contains(uuid)) {
-                        if (plot.removeTrusted(uuid)) {
+                final UUID uuid = UUIDHandler.getUUID(args[0], null);
+                if (uuid != null)
+                {
+                    if (plot.getTrusted().contains(uuid))
+                    {
+                        if (plot.removeTrusted(uuid))
+                        {
                             count++;
                         }
-                    } else if (plot.getMembers().contains(uuid)) {
-                        if (plot.removeMember(uuid)) {
+                    }
+                    else if (plot.getMembers().contains(uuid))
+                    {
+                        if (plot.removeMember(uuid))
+                        {
                             count++;
                         }
-                    } else if (plot.getDenied().contains(uuid)) {
-                        if (plot.removeDenied(uuid)) {
+                    }
+                    else if (plot.getDenied().contains(uuid))
+                    {
+                        if (plot.removeDenied(uuid))
+                        {
                             count++;
                         }
                     }
                 }
                 break;
         }
-        if (count == 0) {
-            if (UUIDHandler.implementation instanceof SQLUUIDHandler) {
+        if (count == 0)
+        {
+            if (UUIDHandler.implementation instanceof SQLUUIDHandler)
+            {
                 MainUtil.sendMessage(plr, C.INVALID_PLAYER_WAIT, args[0]);
-            } else {
+            }
+            else
+            {
                 MainUtil.sendMessage(plr, C.INVALID_PLAYER, args[0]);
             }
             return false;
         }
-        else {
+        else
+        {
             MainUtil.sendMessage(plr, C.REMOVED_PLAYERS, count + "");
         }
         return true;
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/RequiredType.java b/src/main/java/com/intellectualcrafters/plot/commands/RequiredType.java
index 30b9a4e44..fe8c90e07 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/RequiredType.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/RequiredType.java
@@ -2,13 +2,16 @@ package com.intellectualcrafters.plot.commands;
 
 import com.plotsquared.general.commands.CommandCaller;
 
-public enum RequiredType {
+public enum RequiredType
+{
     CONSOLE,
     PLAYER,
     NONE;
-    
-    public boolean allows(CommandCaller player) {
-        switch (this) {
+
+    public boolean allows(final CommandCaller player)
+    {
+        switch (this)
+        {
             case NONE:
                 return true;
             default:
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Save.java b/src/main/java/com/intellectualcrafters/plot/commands/Save.java
index fc10a75f4..a3486088b 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/Save.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/Save.java
@@ -19,66 +19,73 @@ import com.intellectualcrafters.plot.util.TaskManager;
 import com.plotsquared.general.commands.CommandDeclaration;
 
 @CommandDeclaration(
-        command = "save",
-        aliases = {"backup"},
-        description = "Save your plot",
-        category = CommandCategory.ACTIONS,
-        requiredType = RequiredType.NONE,
-        permission = "plots.save"
-)
-public class Save extends SubCommand {
+command = "save",
+aliases = { "backup" },
+description = "Save your plot",
+category = CommandCategory.ACTIONS,
+requiredType = RequiredType.NONE,
+permission = "plots.save")
+public class Save extends SubCommand
+{
 
     @Override
-    public boolean onCommand(final PlotPlayer plr, final String[] args) {
-        
-        if (!Settings.METRICS) {
+    public boolean onCommand(final PlotPlayer plr, final String[] args)
+    {
+
+        if (!Settings.METRICS)
+        {
             MainUtil.sendMessage(plr, "&cPlease enable metrics in order to use this command.\n&7 - Or host it yourself if you don't like the free service");
             return false;
         }
         final String world = plr.getLocation().getWorld();
-        if (!PS.get().isPlotWorld(world)) {
-            return !sendMessage(plr, C.NOT_IN_PLOT_WORLD);
-        }
+        if (!PS.get().isPlotWorld(world)) { return !sendMessage(plr, C.NOT_IN_PLOT_WORLD); }
         final Plot plot = MainUtil.getPlot(plr.getLocation());
-        if (plot == null) {
-            return !sendMessage(plr, C.NOT_IN_PLOT);
-        }
-        if (!plot.hasOwner()) {
+        if (plot == null) { return !sendMessage(plr, C.NOT_IN_PLOT); }
+        if (!plot.hasOwner())
+        {
             MainUtil.sendMessage(plr, C.PLOT_UNOWNED);
             return false;
         }
-        if (!plot.isOwner(plr.getUUID()) && !Permissions.hasPermission(plr, "plots.admin.command.save")) {
+        if (!plot.isOwner(plr.getUUID()) && !Permissions.hasPermission(plr, "plots.admin.command.save"))
+        {
             MainUtil.sendMessage(plr, C.NO_PLOT_PERMS);
             return false;
         }
-        if (MainUtil.runners.containsKey(plot)) {
+        if (MainUtil.runners.containsKey(plot))
+        {
             MainUtil.sendMessage(plr, C.WAIT_FOR_TIMER);
             return false;
         }
         MainUtil.runners.put(plot, 1);
-        SchematicHandler.manager.getCompoundTag(plot.world, plot.id, new RunnableVal<CompoundTag>() {
+        SchematicHandler.manager.getCompoundTag(plot.world, plot.id, new RunnableVal<CompoundTag>()
+        {
             @Override
-            public void run() {
-                TaskManager.runTaskAsync(new Runnable() {
+            public void run()
+            {
+                TaskManager.runTaskAsync(new Runnable()
+                {
                     @Override
-                    public void run() {
-                        String time = (System.currentTimeMillis() / 1000) + "";
-                        String name = PS.get().IMP.getServerName().replaceAll("[^A-Za-z0-9]", "");
-                        int size = plot.getTop().getX() - plot.getBottom().getX() + 1;
-                        PlotId id = plot.id;
-                        String world = plot.world.replaceAll("[^A-Za-z0-9]", "");
-                        String file = time + "_" + world + "_" + id.x + "_" + id.y + "_" + size + "_" + name;
-                        UUID uuid = plr.getUUID();
-                        
-                        URL url = SchematicHandler.manager.upload(value, uuid, file);
-                        if (url == null) {
+                    public void run()
+                    {
+                        final String time = (System.currentTimeMillis() / 1000) + "";
+                        final String name = PS.get().IMP.getServerName().replaceAll("[^A-Za-z0-9]", "");
+                        final int size = (plot.getTop().getX() - plot.getBottom().getX()) + 1;
+                        final PlotId id = plot.id;
+                        final String world = plot.world.replaceAll("[^A-Za-z0-9]", "");
+                        final String file = time + "_" + world + "_" + id.x + "_" + id.y + "_" + size + "_" + name;
+                        final UUID uuid = plr.getUUID();
+
+                        final URL url = SchematicHandler.manager.upload(value, uuid, file);
+                        if (url == null)
+                        {
                             MainUtil.sendMessage(plr, C.SAVE_FAILED);
                             MainUtil.runners.remove(plot);
                             return;
                         }
                         MainUtil.sendMessage(plr, C.SAVE_SUCCESS);
-                        List<String> schematics = (List<String>) plr.getMeta("plot_schematics");
-                        if (schematics != null) {
+                        final List<String> schematics = (List<String>) plr.getMeta("plot_schematics");
+                        if (schematics != null)
+                        {
                             schematics.add(file);
                         }
                         MainUtil.runners.remove(plot);
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/SchematicCmd.java b/src/main/java/com/intellectualcrafters/plot/commands/SchematicCmd.java
index 1e17c68f9..9d577c2a3 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/SchematicCmd.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/SchematicCmd.java
@@ -23,7 +23,6 @@ package com.intellectualcrafters.plot.commands;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Map;
 import java.util.UUID;
 
 import com.intellectualcrafters.plot.PS;
@@ -32,7 +31,6 @@ import com.intellectualcrafters.plot.config.Settings;
 import com.intellectualcrafters.plot.object.ConsolePlayer;
 import com.intellectualcrafters.plot.object.Location;
 import com.intellectualcrafters.plot.object.Plot;
-import com.intellectualcrafters.plot.object.PlotId;
 import com.intellectualcrafters.plot.object.PlotPlayer;
 import com.intellectualcrafters.plot.object.RunnableVal;
 import com.intellectualcrafters.plot.util.MainUtil;
@@ -45,93 +43,107 @@ import com.plotsquared.general.commands.CommandDeclaration;
 // TODO Add sub-subcommands
 
 @CommandDeclaration(
-        command = "schematic",
-        permission = "plots.schematic",
-        description = "Schematic command",
-        aliases = {"sch"},
-        category = CommandCategory.ACTIONS,
-        usage = "/plot schematic <arg...>"
-)
-public class SchematicCmd extends SubCommand {
+command = "schematic",
+permission = "plots.schematic",
+description = "Schematic command",
+aliases = { "sch" },
+category = CommandCategory.ACTIONS,
+usage = "/plot schematic <arg...>")
+public class SchematicCmd extends SubCommand
+{
 
-    private int counter = 0;
     private boolean running = false;
-    private int task;
-
 
     @Override
-    public boolean onCommand(final PlotPlayer plr, final String ... args) {
-        if (args.length < 1) {
+    public boolean onCommand(final PlotPlayer plr, final String... args)
+    {
+        if (args.length < 1)
+        {
             sendMessage(plr, C.SCHEMATIC_MISSING_ARG);
             return true;
         }
         final String arg = args[0].toLowerCase();
         final String file;
         final Schematic schematic;
-        switch (arg) {
-            case "paste": {
-                if (!Permissions.hasPermission(plr, "plots.schematic.paste")) {
+        switch (arg)
+        {
+            case "paste":
+            {
+                if (!Permissions.hasPermission(plr, "plots.schematic.paste"))
+                {
                     MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.schematic.paste");
                     return false;
                 }
-                if (args.length < 2) {
+                if (args.length < 2)
+                {
                     sendMessage(plr, C.SCHEMATIC_MISSING_ARG);
                     break;
                 }
                 final Location loc = plr.getLocation();
                 final Plot plot = MainUtil.getPlot(loc);
-                if (plot == null) {
-                    return !sendMessage(plr, C.NOT_IN_PLOT);
-                }
-                if (!plot.hasOwner()) {
+                if (plot == null) { return !sendMessage(plr, C.NOT_IN_PLOT); }
+                if (!plot.hasOwner())
+                {
                     MainUtil.sendMessage(plr, C.PLOT_UNOWNED);
                     return false;
                 }
-                if (!plot.isOwner(plr.getUUID()) && !Permissions.hasPermission(plr, "plots.admin.command.schematic.paste")) {
+                if (!plot.isOwner(plr.getUUID()) && !Permissions.hasPermission(plr, "plots.admin.command.schematic.paste"))
+                {
                     MainUtil.sendMessage(plr, C.NO_PLOT_PERMS);
                     return false;
                 }
-                if (this.running) {
+                if (running)
+                {
                     MainUtil.sendMessage(plr, "&cTask is already running.");
                     return false;
                 }
                 final String location = args[1];
-                this.running = true;
-                this.counter = 0;
-                TaskManager.runTaskAsync(new Runnable() {
+                running = true;
+                TaskManager.runTaskAsync(new Runnable()
+                {
                     @Override
-                    public void run() {
+                    public void run()
+                    {
                         Schematic schematic;
-                        if (location.startsWith("url:")) {
-                            try {
-                                UUID uuid = UUID.fromString(location.substring(4));
-                                URL base = new URL(Settings.WEB_URL);
-                                URL url = new URL(base, "uploads/" + uuid + ".schematic");
+                        if (location.startsWith("url:"))
+                        {
+                            try
+                            {
+                                final UUID uuid = UUID.fromString(location.substring(4));
+                                final URL base = new URL(Settings.WEB_URL);
+                                final URL url = new URL(base, "uploads/" + uuid + ".schematic");
                                 schematic = SchematicHandler.manager.getSchematic(url);
                             }
-                            catch (Exception e) {
+                            catch (final Exception e)
+                            {
                                 e.printStackTrace();
                                 sendMessage(plr, C.SCHEMATIC_INVALID, "non-existent url: " + location);
-                                SchematicCmd.this.running = false;
+                                running = false;
                                 return;
                             }
                         }
-                        else {
+                        else
+                        {
                             schematic = SchematicHandler.manager.getSchematic(location);
                         }
-                        if (schematic == null) {
-                            SchematicCmd.this.running = false;
+                        if (schematic == null)
+                        {
+                            running = false;
                             sendMessage(plr, C.SCHEMATIC_INVALID, "non-existent or not in gzip format");
                             return;
                         }
-                        SchematicHandler.manager.paste(schematic, plot, 0, 0, new RunnableVal<Boolean>() {
+                        SchematicHandler.manager.paste(schematic, plot, 0, 0, new RunnableVal<Boolean>()
+                        {
                             @Override
-                            public void run() {
-                                SchematicCmd.this.running = false;
-                                if (this.value) {
+                            public void run()
+                            {
+                                running = false;
+                                if (value)
+                                {
                                     sendMessage(plr, C.SCHEMATIC_PASTE_SUCCESS);
                                 }
-                                else {
+                                else
+                                {
                                     sendMessage(plr, C.SCHEMATIC_PASTE_FAILED);
                                 }
                             }
@@ -140,31 +152,37 @@ public class SchematicCmd extends SubCommand {
                 });
                 break;
             }
-            case "test": {
-                if (!Permissions.hasPermission(plr, "plots.schematic.test")) {
+            case "test":
+            {
+                if (!Permissions.hasPermission(plr, "plots.schematic.test"))
+                {
                     MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.schematic.test");
                     return false;
                 }
-                if (args.length < 2) {
+                if (args.length < 2)
+                {
                     sendMessage(plr, C.SCHEMATIC_MISSING_ARG);
                     return false;
                 }
                 final Location loc = plr.getLocation();
                 final Plot plot = MainUtil.getPlot(loc);
-                if (plot == null) {
+                if (plot == null)
+                {
                     sendMessage(plr, C.NOT_IN_PLOT);
                     return false;
                 }
                 file = args[1];
                 schematic = SchematicHandler.manager.getSchematic(file);
-                if (schematic == null) {
+                if (schematic == null)
+                {
                     sendMessage(plr, C.SCHEMATIC_INVALID, "non-existent");
                     return false;
                 }
                 final int l1 = schematic.getSchematicDimension().getX();
                 final int l2 = schematic.getSchematicDimension().getZ();
                 final int length = MainUtil.getPlotWidth(loc.getWorld(), plot.id);
-                if ((l1 < length) || (l2 < length)) {
+                if ((l1 < length) || (l2 < length))
+                {
                     sendMessage(plr, C.SCHEMATIC_INVALID, String.format("Wrong size (x: %s, z: %d) vs %d ", l1, l2, length));
                     break;
                 }
@@ -172,82 +190,97 @@ public class SchematicCmd extends SubCommand {
                 break;
             }
             case "saveall":
-            case "exportall": {
-                if (!ConsolePlayer.isConsole(plr)) {
+            case "exportall":
+            {
+                if (!ConsolePlayer.isConsole(plr))
+                {
                     MainUtil.sendMessage(plr, C.NOT_CONSOLE);
                     return false;
                 }
-                if (args.length != 2) {
+                if (args.length != 2)
+                {
                     MainUtil.sendMessage(null, "&cNeed world arg. Use &7/plots sch exportall <world>");
                     return false;
                 }
-                Collection<Plot> plots = PS.get().getPlotsInWorld(args[1]);
-                if ((plots.size() == 0)) {
+                final Collection<Plot> plots = PS.get().getPlotsInWorld(args[1]);
+                if ((plots.size() == 0))
+                {
                     MainUtil.sendMessage(plr, "&cInvalid world. Use &7/plots sch exportall <world>");
                     return false;
                 }
-                boolean result = SchematicHandler.manager.exportAll(plots, null, null, new Runnable() {
-					@Override
-					public void run() {
-						MainUtil.sendMessage(plr, "&aFinished mass export");
-					}
-				});
-                if (!result) {
-                	MainUtil.sendMessage(plr, "&cTask is already running.");
+                final boolean result = SchematicHandler.manager.exportAll(plots, null, null, new Runnable()
+                {
+                    @Override
+                    public void run()
+                    {
+                        MainUtil.sendMessage(plr, "&aFinished mass export");
+                    }
+                });
+                if (!result)
+                {
+                    MainUtil.sendMessage(plr, "&cTask is already running.");
                     return false;
                 }
-                else {
-                	MainUtil.sendMessage(plr, "&3PlotSquared&8->&3Schemaitc&8: &7Mass export has started. This may take a while.");
-                	MainUtil.sendMessage(plr, "&3PlotSquared&8->&3Schemaitc&8: &7Found &c" + plots.size() + "&7 plots...");
+                else
+                {
+                    MainUtil.sendMessage(plr, "&3PlotSquared&8->&3Schemaitc&8: &7Mass export has started. This may take a while.");
+                    MainUtil.sendMessage(plr, "&3PlotSquared&8->&3Schemaitc&8: &7Found &c" + plots.size() + "&7 plots...");
                 }
                 break;
             }
             case "export":
-            case "save": {
-                if (!Permissions.hasPermission(plr, "plots.schematic.save")) {
+            case "save":
+            {
+                if (!Permissions.hasPermission(plr, "plots.schematic.save"))
+                {
                     MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.schematic.save");
                     return false;
                 }
-                if (this.running) {
+                if (running)
+                {
                     MainUtil.sendMessage(plr, "&cTask is already running.");
                     return false;
                 }
-                final String world;
                 final Plot p2;
                 final Location loc = plr.getLocation();
                 final Plot plot = MainUtil.getPlot(loc);
-                if (plot == null) {
-                    return !sendMessage(plr, C.NOT_IN_PLOT);
-                }
-                if (!plot.hasOwner()) {
+                if (plot == null) { return !sendMessage(plr, C.NOT_IN_PLOT); }
+                if (!plot.hasOwner())
+                {
                     MainUtil.sendMessage(plr, C.PLOT_UNOWNED);
                     return false;
                 }
-                if (!plot.isOwner(plr.getUUID()) && !Permissions.hasPermission(plr, "plots.admin.command.schematic.save")) {
+                if (!plot.isOwner(plr.getUUID()) && !Permissions.hasPermission(plr, "plots.admin.command.schematic.save"))
+                {
                     MainUtil.sendMessage(plr, C.NO_PLOT_PERMS);
                     return false;
                 }
                 p2 = plot;
-                world = loc.getWorld();
-                Collection<Plot> plots = new ArrayList<Plot>();
+                loc.getWorld();
+                final Collection<Plot> plots = new ArrayList<Plot>();
                 plots.add(p2);
-                boolean result = SchematicHandler.manager.exportAll(plots, null, null, new Runnable() {
-					@Override
-					public void run() {
-						MainUtil.sendMessage(plr, "&aFinished export");
-						SchematicCmd.this.running = false;
-					}
-				});
-                if (!result) {
-                	MainUtil.sendMessage(plr, "&cTask is already running.");
+                final boolean result = SchematicHandler.manager.exportAll(plots, null, null, new Runnable()
+                {
+                    @Override
+                    public void run()
+                    {
+                        MainUtil.sendMessage(plr, "&aFinished export");
+                        running = false;
+                    }
+                });
+                if (!result)
+                {
+                    MainUtil.sendMessage(plr, "&cTask is already running.");
                     return false;
                 }
-                else {
-                	MainUtil.sendMessage(plr, "&7Starting export...");
+                else
+                {
+                    MainUtil.sendMessage(plr, "&7Starting export...");
                 }
                 break;
             }
-            default: {
+            default:
+            {
                 sendMessage(plr, C.SCHEMATIC_MISSING_ARG);
                 break;
             }
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Set.java b/src/main/java/com/intellectualcrafters/plot/commands/Set.java
index f53bce8cd..bd306c469 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/Set.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/Set.java
@@ -48,81 +48,95 @@ import com.intellectualcrafters.plot.util.UUIDHandler;
 import com.plotsquared.general.commands.CommandDeclaration;
 import com.plotsquared.listener.PlotListener;
 
-
 // TODO Make sub-subcommands
 @CommandDeclaration(
-        command = "set",
-        description = "Set a plot value",
-        aliases = {"s"},
-        usage = "/plot set <biome|alias|home|flag> <value...>",
-        permission = "plots.set",
-        category = CommandCategory.ACTIONS,
-        requiredType = RequiredType.NONE
-)
-public class Set extends SubCommand {
+command = "set",
+description = "Set a plot value",
+aliases = { "s" },
+usage = "/plot set <biome|alias|home|flag> <value...>",
+permission = "plots.set",
+category = CommandCategory.ACTIONS,
+requiredType = RequiredType.NONE)
+public class Set extends SubCommand
+{
     public final static String[] values = new String[] { "biome", "alias", "home", "flag" };
     public final static String[] aliases = new String[] { "b", "w", "wf", "f", "a", "h", "fl" };
 
     @Override
-    public boolean onCommand(final PlotPlayer plr, final String ... args) {
-        
+    public boolean onCommand(final PlotPlayer plr, final String... args)
+    {
+
         final Location loc = plr.getLocation();
         final Plot plot = MainUtil.getPlot(loc);
-        if (plot == null) {
-            return !sendMessage(plr, C.NOT_IN_PLOT);
-        }
-        if (!plot.hasOwner()) {
+        if (plot == null) { return !sendMessage(plr, C.NOT_IN_PLOT); }
+        if (!plot.hasOwner())
+        {
             sendMessage(plr, C.PLOT_NOT_CLAIMED);
             return false;
         }
-        if (!plot.isOwner(plr.getUUID())) {
-            if (!Permissions.hasPermission(plr, "plots.set.other")) {
+        if (!plot.isOwner(plr.getUUID()))
+        {
+            if (!Permissions.hasPermission(plr, "plots.set.other"))
+            {
                 MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.set.other");
                 return false;
             }
         }
-        if (args.length < 1) {
-            PlotManager manager = PS.get().getPlotManager(loc.getWorld());
-            ArrayList<String> newValues = new ArrayList<String>();
+        if (args.length < 1)
+        {
+            final PlotManager manager = PS.get().getPlotManager(loc.getWorld());
+            final ArrayList<String> newValues = new ArrayList<String>();
             newValues.addAll(Arrays.asList(values));
             newValues.addAll(Arrays.asList(manager.getPlotComponents(PS.get().getPlotWorld(loc.getWorld()), plot.id)));
             MainUtil.sendMessage(plr, C.SUBCOMMAND_SET_OPTIONS_HEADER.s() + getArgumentList(newValues));
             return false;
         }
-        for (int i = 0; i < aliases.length; i++) {
-            if (aliases[i].equalsIgnoreCase(args[0])) {
+        for (int i = 0; i < aliases.length; i++)
+        {
+            if (aliases[i].equalsIgnoreCase(args[0]))
+            {
                 args[0] = values[i];
                 break;
             }
         }
-        if (args[0].equalsIgnoreCase("flag")) {
-            if (args.length < 2) {
+        if (args[0].equalsIgnoreCase("flag"))
+        {
+            if (args.length < 2)
+            {
                 final String message = StringMan.replaceFromMap("$2" + (StringMan.join(FlagManager.getFlags(plr), "$1, $2")), C.replacements);
                 // final String message = StringMan.join(FlagManager.getFlags(plr), "&c, &6");
                 MainUtil.sendMessage(plr, C.NEED_KEY.s().replaceAll("%values%", message));
                 return false;
             }
             AbstractFlag af;
-            try {
+            try
+            {
                 af = FlagManager.getFlag(args[1].toLowerCase());
-            } catch (final Exception e) {
+            }
+            catch (final Exception e)
+            {
                 af = new AbstractFlag(args[1].toLowerCase());
             }
-            if (!FlagManager.getFlags().contains(af) || FlagManager.isReserved(af.getKey())) {
+            if (!FlagManager.getFlags().contains(af) || FlagManager.isReserved(af.getKey()))
+            {
                 MainUtil.sendMessage(plr, C.NOT_VALID_FLAG);
                 return false;
             }
-            if (!Permissions.hasPermission(plr, "plots.set.flag." + args[1].toLowerCase())) {
+            if (!Permissions.hasPermission(plr, "plots.set.flag." + args[1].toLowerCase()))
+            {
                 MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.set.flag." + args[1].toLowerCase());
                 return false;
             }
-            if (args.length == 2) {
-                if (FlagManager.getPlotFlagAbs(plot, args[1].toLowerCase()) == null) {
+            if (args.length == 2)
+            {
+                if (FlagManager.getPlotFlagAbs(plot, args[1].toLowerCase()) == null)
+                {
                     MainUtil.sendMessage(plr, C.FLAG_NOT_IN_PLOT);
                     return false;
                 }
                 final boolean result = FlagManager.removePlotFlag(plot, args[1].toLowerCase());
-                if (!result) {
+                if (!result)
+                {
                     MainUtil.sendMessage(plr, C.FLAG_NOT_REMOVED);
                     return false;
                 }
@@ -130,34 +144,43 @@ public class Set extends SubCommand {
                 PlotListener.plotEntry(plr, plot);
                 return true;
             }
-            try {
+            try
+            {
                 final String value = StringMan.join(Arrays.copyOfRange(args, 2, args.length), " ");
                 final Object parsed_value = af.parseValueRaw(value);
-                if (parsed_value == null) {
+                if (parsed_value == null)
+                {
                     MainUtil.sendMessage(plr, af.getValueDesc());
                     return false;
                 }
                 final Flag flag = new Flag(FlagManager.getFlag(args[1].toLowerCase(), true), parsed_value);
                 final boolean result = FlagManager.addPlotFlag(plot, flag);
-                if (!result) {
+                if (!result)
+                {
                     MainUtil.sendMessage(plr, C.FLAG_NOT_ADDED);
                     return false;
                 }
                 MainUtil.sendMessage(plr, C.FLAG_ADDED);
                 PlotListener.plotEntry(plr, plot);
                 return true;
-            } catch (final Exception e) {
+            }
+            catch (final Exception e)
+            {
                 MainUtil.sendMessage(plr, "&c" + e.getMessage());
                 return false;
             }
         }
-        if (args[0].equalsIgnoreCase("home")) {
-            if (!Permissions.hasPermission(plr, "plots.set.home")) {
+        if (args[0].equalsIgnoreCase("home"))
+        {
+            if (!Permissions.hasPermission(plr, "plots.set.home"))
+            {
                 MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.set.home");
                 return false;
             }
-            if (args.length > 1) {
-                if (args[1].equalsIgnoreCase("none")) {
+            if (args.length > 1)
+            {
+                if (args[1].equalsIgnoreCase("none"))
+                {
                     plot.setHome(null);
                     return true;
                 }
@@ -172,50 +195,62 @@ public class Set extends SubCommand {
             plot.setHome(blockloc);
             return MainUtil.sendMessage(plr, C.POSITION_SET);
         }
-        if (args[0].equalsIgnoreCase("desc")) {
-            if (!Permissions.hasPermission(plr, "plots.set.desc")) {
+        if (args[0].equalsIgnoreCase("desc"))
+        {
+            if (!Permissions.hasPermission(plr, "plots.set.desc"))
+            {
                 MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.set.desc");
                 return false;
             }
-            if (args.length < 2) {
+            if (args.length < 2)
+            {
                 MainUtil.sendMessage(plr, C.MISSING_DESC);
                 return false;
             }
             final StringBuilder desc = new StringBuilder();
-            for (int i = 1; i < args.length; i++) {
+            for (int i = 1; i < args.length; i++)
+            {
                 desc.append(args[i]).append(" ");
             }
-            String descValue = desc.substring(0, desc.length() - 1);
+            final String descValue = desc.substring(0, desc.length() - 1);
 
-            Flag flag = new Flag(FlagManager.getFlag("description"), descValue);
+            final Flag flag = new Flag(FlagManager.getFlag("description"), descValue);
             final boolean result = FlagManager.addPlotFlag(plot, flag);
-            if (!result) {
+            if (!result)
+            {
                 MainUtil.sendMessage(plr, C.FLAG_NOT_ADDED);
                 return false;
             }
             MainUtil.sendMessage(plr, C.DESC_SET);
             return true;
         }
-        if (args[0].equalsIgnoreCase("alias")) {
-            if (!Permissions.hasPermission(plr, "plots.set.alias")) {
+        if (args[0].equalsIgnoreCase("alias"))
+        {
+            if (!Permissions.hasPermission(plr, "plots.set.alias"))
+            {
                 MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.set.alias");
                 return false;
             }
-            if (args.length < 2) {
+            if (args.length < 2)
+            {
                 MainUtil.sendMessage(plr, C.MISSING_ALIAS);
                 return false;
             }
             final String alias = args[1];
-            if (alias.length() >= 50) {
+            if (alias.length() >= 50)
+            {
                 MainUtil.sendMessage(plr, C.ALIAS_TOO_LONG);
                 return false;
             }
-            for (final Plot p : PS.get().getPlotsInWorld(plr.getLocation().getWorld())) {
-                if (p.getSettings().getAlias().equalsIgnoreCase(alias)) {
+            for (final Plot p : PS.get().getPlotsInWorld(plr.getLocation().getWorld()))
+            {
+                if (p.getSettings().getAlias().equalsIgnoreCase(alias))
+                {
                     MainUtil.sendMessage(plr, C.ALIAS_IS_TAKEN);
                     return false;
                 }
-                if (UUIDHandler.nameExists(new StringWrapper(alias))) {
+                if (UUIDHandler.nameExists(new StringWrapper(alias)))
+                {
                     MainUtil.sendMessage(plr, C.ALIAS_IS_TAKEN);
                     return false;
                 }
@@ -224,39 +259,48 @@ public class Set extends SubCommand {
             MainUtil.sendMessage(plr, C.ALIAS_SET_TO.s().replaceAll("%alias%", alias));
             return true;
         }
-        if (args[0].equalsIgnoreCase("biome")) {
-            if (!Permissions.hasPermission(plr, "plots.set.biome")) {
+        if (args[0].equalsIgnoreCase("biome"))
+        {
+            if (!Permissions.hasPermission(plr, "plots.set.biome"))
+            {
                 MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.set.biome");
                 return false;
             }
-            if (args.length < 2) {
+            if (args.length < 2)
+            {
                 MainUtil.sendMessage(plr, C.NEED_BIOME);
                 return true;
             }
-            if (args[1].length() < 2) {
+            if (args[1].length() < 2)
+            {
                 sendMessage(plr, C.NAME_LITTLE, "Biome", args[1].length() + "", "2");
                 return true;
             }
             final int biome = BlockManager.manager.getBiomeFromString(args[1]);
-            if (biome == -1) {
+            if (biome == -1)
+            {
                 MainUtil.sendMessage(plr, getBiomeList(BlockManager.manager.getBiomeList()));
                 return true;
             }
-            if (MainUtil.runners.containsKey(plot)) {
+            if (MainUtil.runners.containsKey(plot))
+            {
                 MainUtil.sendMessage(plr, C.WAIT_FOR_TIMER);
                 return false;
             }
             MainUtil.runners.put(plot, 1);
-            plot.setBiome(args[1].toUpperCase(), new Runnable() {
+            plot.setBiome(args[1].toUpperCase(), new Runnable()
+            {
                 @Override
-                public void run() {
+                public void run()
+                {
                     MainUtil.runners.remove(plot);
                     MainUtil.sendMessage(plr, C.BIOME_SET_TO.s() + args[1].toLowerCase());
                 }
             });
             return true;
         }
-        if (args[0].equalsIgnoreCase("limit")) {
+        if (args[0].equalsIgnoreCase("limit"))
+        {
             // /plot set limit Empire92 +1
             return true;
         }
@@ -266,69 +310,89 @@ public class Set extends SubCommand {
         final PlotManager manager = PS.get().getPlotManager(world);
         final String[] components = manager.getPlotComponents(plotworld, plot.id);
 
-        boolean allowUnsafe = DebugAllowUnsafe.unsafeAllowed.contains(plr.getUUID());
+        final boolean allowUnsafe = DebugAllowUnsafe.unsafeAllowed.contains(plr.getUUID());
 
-        for (final String component : components) {
-            if (component.equalsIgnoreCase(args[0])) {
-                if (!Permissions.hasPermission(plr, "plots.set." + component)) {
+        for (final String component : components)
+        {
+            if (component.equalsIgnoreCase(args[0]))
+            {
+                if (!Permissions.hasPermission(plr, "plots.set." + component))
+                {
                     MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.set." + component);
                     return false;
                 }
                 PlotBlock[] blocks;
-                try {
-                    if (args.length < 2) {
+                try
+                {
+                    if (args.length < 2)
+                    {
                         MainUtil.sendMessage(plr, C.NEED_BLOCK);
                         return true;
                     }
-                    String[] split = args[1].split(",");
+                    final String[] split = args[1].split(",");
                     blocks = Configuration.BLOCKLIST.parseString(args[1]);
-                    for (int i = 0; i < blocks.length; i++) {
-                        PlotBlock block = blocks[i];
-                        if (block == null) {
+                    for (int i = 0; i < blocks.length; i++)
+                    {
+                        final PlotBlock block = blocks[i];
+                        if (block == null)
+                        {
                             MainUtil.sendMessage(plr, C.NOT_VALID_BLOCK, split[i]);
                             String name;
-                            if (split[i].contains("%")) {
+                            if (split[i].contains("%"))
+                            {
                                 name = split[i].split("%")[1];
                             }
-                            else {
+                            else
+                            {
                                 name = split[i];
                             }
-                            StringComparison<PlotBlock>.ComparisonResult match = BlockManager.manager.getClosestBlock(name);
-                            if (match != null) {
+                            final StringComparison<PlotBlock>.ComparisonResult match = BlockManager.manager.getClosestBlock(name);
+                            if (match != null)
+                            {
                                 name = BlockManager.manager.getClosestMatchingName(match.best);
-                                if (name != null) {
+                                if (name != null)
+                                {
                                     MainUtil.sendMessage(plr, C.DID_YOU_MEAN, name.toLowerCase());
                                 }
                             }
                             return false;
                         }
-                        else if (!allowUnsafe && !BlockManager.manager.isBlockSolid(block)) {
+                        else if (!allowUnsafe && !BlockManager.manager.isBlockSolid(block))
+                        {
                             MainUtil.sendMessage(plr, C.NOT_ALLOWED_BLOCK, block.toString());
                             return false;
                         }
                     }
-                    if (!allowUnsafe) {
-                        for (PlotBlock block : blocks) {
-                            if (!BlockManager.manager.isBlockSolid(block)) {
+                    if (!allowUnsafe)
+                    {
+                        for (final PlotBlock block : blocks)
+                        {
+                            if (!BlockManager.manager.isBlockSolid(block))
+                            {
                                 MainUtil.sendMessage(plr, C.NOT_ALLOWED_BLOCK, block.toString());
                                 return false;
                             }
                         }
                     }
-                } catch (final Exception e2) {
+                }
+                catch (final Exception e2)
+                {
                     MainUtil.sendMessage(plr, C.NOT_VALID_BLOCK, args[1]);
                     return false;
                 }
-                if (MainUtil.runners.containsKey(plot)) {
+                if (MainUtil.runners.containsKey(plot))
+                {
                     MainUtil.sendMessage(plr, C.WAIT_FOR_TIMER);
                     return false;
                 }
                 MainUtil.runners.put(plot, 1);
                 manager.setComponent(plotworld, plot.id, component, blocks);
                 MainUtil.sendMessage(plr, C.GENERATING_COMPONENT);
-                SetBlockQueue.addNotify(new Runnable() {
+                SetBlockQueue.addNotify(new Runnable()
+                {
                     @Override
-                    public void run() {
+                    public void run()
+                    {
                         MainUtil.runners.remove(plot);
                     }
                 });
@@ -337,15 +401,21 @@ public class Set extends SubCommand {
         }
         {
             AbstractFlag af;
-            try {
+            try
+            {
                 af = new AbstractFlag(args[0].toLowerCase());
-            } catch (final Exception e) {
+            }
+            catch (final Exception e)
+            {
                 af = new AbstractFlag("");
             }
-            if (FlagManager.getFlags().contains(af)) {
+            if (FlagManager.getFlags().contains(af))
+            {
                 final StringBuilder a = new StringBuilder();
-                if (args.length > 1) {
-                    for (int x = 1; x < args.length; x++) {
+                if (args.length > 1)
+                {
+                    for (int x = 1; x < args.length; x++)
+                    {
                         a.append(" ").append(args[x]);
                     }
                 }
@@ -353,29 +423,34 @@ public class Set extends SubCommand {
                 return true;
             }
         }
-        ArrayList<String> newValues = new ArrayList<String>();
+        final ArrayList<String> newValues = new ArrayList<String>();
         newValues.addAll(Arrays.asList(values));
         newValues.addAll(Arrays.asList(manager.getPlotComponents(PS.get().getPlotWorld(loc.getWorld()), plot.id)));
         MainUtil.sendMessage(plr, C.SUBCOMMAND_SET_OPTIONS_HEADER.s() + getArgumentList(newValues));
         return false;
     }
 
-    private String getString(final String s) {
+    private String getString(final String s)
+    {
         return StringMan.replaceAll(C.BLOCK_LIST_ITEM.s(), "%mat%", s);
     }
 
-    private String getArgumentList(final List<String> newValues) {
+    private String getArgumentList(final List<String> newValues)
+    {
         final StringBuilder builder = new StringBuilder();
-        for (final String s : newValues) {
+        for (final String s : newValues)
+        {
             builder.append(getString(s));
         }
         return builder.toString().substring(1, builder.toString().length() - 1);
     }
 
-    private String getBiomeList(final String[] biomes) {
+    private String getBiomeList(final String[] biomes)
+    {
         final StringBuilder builder = new StringBuilder();
         builder.append(C.NEED_BIOME.s());
-        for (final String b : biomes) {
+        for (final String b : biomes)
+        {
             builder.append(getString(b));
         }
         return builder.toString().substring(1, builder.toString().length() - 1);
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/SetOwner.java b/src/main/java/com/intellectualcrafters/plot/commands/SetOwner.java
index b6fb89ecd..0d0bbd781 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/SetOwner.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/SetOwner.java
@@ -38,82 +38,98 @@ import com.plotsquared.general.commands.Argument;
 import com.plotsquared.general.commands.CommandDeclaration;
 
 @CommandDeclaration(
-        command = "setowner",
-        permission = "plots.set.owner",
-        description = "Set the plot owner",
-        usage = "/plot setowner <player>",
-        aliases = {"so"},
-        category = CommandCategory.ACTIONS,
-        requiredType = RequiredType.NONE
-)
-public class SetOwner extends SubCommand {
+command = "setowner",
+permission = "plots.set.owner",
+description = "Set the plot owner",
+usage = "/plot setowner <player>",
+aliases = { "so" },
+category = CommandCategory.ACTIONS,
+requiredType = RequiredType.NONE)
+public class SetOwner extends SubCommand
+{
 
-    public SetOwner() {
+    public SetOwner()
+    {
         requiredArguments = new Argument[] {
-                Argument.PlayerName
+        Argument.PlayerName
         };
     }
 
-    private UUID getUUID(final String string) {
+    private UUID getUUID(final String string)
+    {
         return UUIDHandler.getUUID(string, null);
     }
 
     @Override
-    public boolean onCommand(final PlotPlayer plr, final String[] args) {
+    public boolean onCommand(final PlotPlayer plr, final String[] args)
+    {
         final Location loc = plr.getLocation();
         final Plot plot = MainUtil.getPlot(loc);
-        if ((plot == null) || (plot.owner == null && !Permissions.hasPermission(plr, "plots.admin.command.setowner"))) {
+        if ((plot == null) || ((plot.owner == null) && !Permissions.hasPermission(plr, "plots.admin.command.setowner")))
+        {
             MainUtil.sendMessage(plr, C.NOT_IN_PLOT);
             return false;
         }
-        if (args.length < 1) {
+        if (args.length < 1)
+        {
             MainUtil.sendMessage(plr, C.NEED_USER);
             return false;
         }
-        
+
         final PlotId bot = MainUtil.getBottomPlot(plot).id;
         final PlotId top = MainUtil.getTopPlot(plot).id;
         final ArrayList<PlotId> plots = MainUtil.getPlotSelectionIds(bot, top);
-        
-        PlotPlayer other = UUIDHandler.getPlayer(args[0]);
-        if (other == null) {
-        	if (!Permissions.hasPermission(plr, "plots.admin.command.setowner")) {
-        		MainUtil.sendMessage(plr, C.INVALID_PLAYER, args[0]);
-        		return false;
-        	}
+
+        final PlotPlayer other = UUIDHandler.getPlayer(args[0]);
+        if (other == null)
+        {
+            if (!Permissions.hasPermission(plr, "plots.admin.command.setowner"))
+            {
+                MainUtil.sendMessage(plr, C.INVALID_PLAYER, args[0]);
+                return false;
+            }
         }
-        else {
-        	if (!Permissions.hasPermission(plr, "plots.admin.command.setowner")) {
-        		int size = plots.size();
+        else
+        {
+            if (!Permissions.hasPermission(plr, "plots.admin.command.setowner"))
+            {
+                final int size = plots.size();
                 final int currentPlots = (Settings.GLOBAL_LIMIT ? MainUtil.getPlayerPlotCount(other) : MainUtil.getPlayerPlotCount(loc.getWorld(), other)) + size;
-        		if (currentPlots > MainUtil.getAllowedPlots(other)) {
+                if (currentPlots > MainUtil.getAllowedPlots(other))
+                {
                     sendMessage(plr, C.CANT_TRANSFER_MORE_PLOTS);
                     return false;
                 }
-        	}
+            }
         }
-        
-        if (!plot.isOwner(plr.getUUID())) {
-        	if (!Permissions.hasPermission(plr, "plots.admin.command.setowner")) {
-        		MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.admin.command.setowner");
-        		return false;
-        	}
+
+        if (!plot.isOwner(plr.getUUID()))
+        {
+            if (!Permissions.hasPermission(plr, "plots.admin.command.setowner"))
+            {
+                MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.admin.command.setowner");
+                return false;
+            }
         }
-        
+
         final String world = loc.getWorld();
         final UUID uuid = getUUID(args[0]);
-        if (uuid == null) {
+        if (uuid == null)
+        {
             MainUtil.sendMessage(plr, C.INVALID_PLAYER, args[0]);
             return false;
         }
-        for (final PlotId id : plots) {
+        for (final PlotId id : plots)
+        {
             Plot current = PS.get().getPlot(world, id);
-            if (current == null) {
+            if (current == null)
+            {
                 current = MainUtil.getPlot(world, id);
                 current.owner = uuid;
                 current.create();
             }
-            else {
+            else
+            {
                 current.owner = uuid;
                 DBFunc.setOwner(current, current.owner);
             }
@@ -121,8 +137,9 @@ public class SetOwner extends SubCommand {
         }
         MainUtil.setSign(args[0], plot);
         MainUtil.sendMessage(plr, C.SET_OWNER);
-        if (other != null) {
-        	MainUtil.sendMessage(other, C.NOW_OWNER, plot.world + ";" + plot.id);
+        if (other != null)
+        {
+            MainUtil.sendMessage(other, C.NOW_OWNER, plot.world + ";" + plot.id);
         }
         return true;
     }
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Setup.java b/src/main/java/com/intellectualcrafters/plot/commands/Setup.java
index 502d53491..e18b84d0b 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/Setup.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/Setup.java
@@ -39,26 +39,31 @@ import com.intellectualcrafters.plot.util.StringMan;
 import com.plotsquared.general.commands.CommandDeclaration;
 
 @CommandDeclaration(
-        command = "setup",
-        permission = "plots.admin.command.setup",
-        description = "Setup wizard for plot worlds",
-        usage = "/plot setup",
-        aliases = {"create"},
-        category = CommandCategory.ACTIONS
-)
-public class Setup extends SubCommand {
+command = "setup",
+permission = "plots.admin.command.setup",
+description = "Setup wizard for plot worlds",
+usage = "/plot setup",
+aliases = { "create" },
+category = CommandCategory.ACTIONS)
+public class Setup extends SubCommand
+{
 
-    public void displayGenerators(PlotPlayer plr) {
-        StringBuffer message = new StringBuffer();
+    public void displayGenerators(final PlotPlayer plr)
+    {
+        final StringBuffer message = new StringBuffer();
         message.append("&6What generator do you want?");
-        for (Entry<String, PlotGenerator<?>> entry : SetupUtils.generators.entrySet()) {
-            if (entry.getKey().equals("PlotSquared")) {
+        for (final Entry<String, PlotGenerator<?>> entry : SetupUtils.generators.entrySet())
+        {
+            if (entry.getKey().equals("PlotSquared"))
+            {
                 message.append("\n&8 - &2" + entry.getKey() + " (Default Generator)");
             }
-            else if (entry.getValue().isFull()) {
+            else if (entry.getValue().isFull())
+            {
                 message.append("\n&8 - &7" + entry.getKey() + " (Plot Generator)");
             }
-            else {
+            else
+            {
                 message.append("\n&8 - &7" + entry.getKey() + " (Unknown structure)");
             }
         }
@@ -66,10 +71,12 @@ public class Setup extends SubCommand {
     }
 
     @Override
-    public boolean onCommand(final PlotPlayer plr, final String[] args) {
+    public boolean onCommand(final PlotPlayer plr, final String[] args)
+    {
         // going through setup
-        String name = plr.getName();
-        if (!SetupUtils.setupMap.containsKey(name)) {
+        final String name = plr.getName();
+        if (!SetupUtils.setupMap.containsKey(name))
+        {
             final SetupObject object = new SetupObject();
             SetupUtils.setupMap.put(name, object);
             SetupUtils.manager.updateGenerators();
@@ -77,29 +84,38 @@ public class Setup extends SubCommand {
             displayGenerators(plr);
             return false;
         }
-        if (args.length == 1) {
-            if (args[0].equalsIgnoreCase("cancel")) {
+        if (args.length == 1)
+        {
+            if (args[0].equalsIgnoreCase("cancel"))
+            {
                 SetupUtils.setupMap.remove(name);
                 MainUtil.sendMessage(plr, "&aCancelled setup");
                 return false;
             }
-            if (args[0].equalsIgnoreCase("back")) {
+            if (args[0].equalsIgnoreCase("back"))
+            {
                 final SetupObject object = SetupUtils.setupMap.get(name);
-                if (object.setup_index > 0) {
+                if (object.setup_index > 0)
+                {
                     object.setup_index--;
                     final ConfigurationNode node = object.step[object.setup_index];
                     sendMessage(plr, C.SETUP_STEP, object.setup_index + 1 + "", node.getDescription(), node.getType().getType(), node.getDefaultValue() + "");
                     return false;
-                } else if (object.current > 0) {
+                }
+                else if (object.current > 0)
+                {
                     object.current--;
                 }
             }
         }
         final SetupObject object = SetupUtils.setupMap.get(name);
         final int index = object.current;
-        switch (index) {
-            case 0: { // choose generator
-                if ((args.length != 1) || !SetupUtils.generators.containsKey(args[0])) {
+        switch (index)
+        {
+            case 0:
+            { // choose generator
+                if ((args.length != 1) || !SetupUtils.generators.containsKey(args[0]))
+                {
                     final String prefix = "\n&8 - &7";
                     MainUtil.sendMessage(plr, "&cYou must choose a generator!" + prefix + StringMan.join(SetupUtils.generators.keySet(), prefix).replaceAll("PlotSquared", "&2PlotSquared"));
                     sendMessage(plr, C.SETUP_INIT);
@@ -111,40 +127,50 @@ public class Setup extends SubCommand {
                 MainUtil.sendMessage(plr, "&6What world type do you want?" + "\n&8 - &2DEFAULT&8 - &7Standard plot generation" + "\n&8 - &7AUGMENTED&8 - &7Plot generation with terrain" + partial);
                 break;
             }
-            case 1: { // choose world type
-                List<String> allTypes = Arrays.asList(new String[] { "default", "augmented", "partial"});
-                List<String> allDesc = Arrays.asList(new String[] { "Standard plot generation", "Plot generation with vanilla terrain", "Vanilla with clusters of plots"});
-                ArrayList<String> types = new ArrayList<>();
-                if (SetupUtils.generators.get(object.setupGenerator).isFull()) {
+            case 1:
+            { // choose world type
+                final List<String> allTypes = Arrays.asList(new String[] { "default", "augmented", "partial" });
+                final List<String> allDesc = Arrays.asList(new String[] { "Standard plot generation", "Plot generation with vanilla terrain", "Vanilla with clusters of plots" });
+                final ArrayList<String> types = new ArrayList<>();
+                if (SetupUtils.generators.get(object.setupGenerator).isFull())
+                {
                     types.add("default");
                 }
                 types.add("augmented");
-                if (Settings.ENABLE_CLUSTERS) {
+                if (Settings.ENABLE_CLUSTERS)
+                {
                     types.add("partial");
                 }
-                if ((args.length != 1) || !types.contains(args[0].toLowerCase())) {
+                if ((args.length != 1) || !types.contains(args[0].toLowerCase()))
+                {
                     MainUtil.sendMessage(plr, "&cYou must choose a world type!");
-                    for (String type : types) {
-                        int i = allTypes.indexOf(type);
-                        if (type.equals("default")) {
+                    for (final String type : types)
+                    {
+                        final int i = allTypes.indexOf(type);
+                        if (type.equals("default"))
+                        {
                             MainUtil.sendMessage(plr, "&8 - &2" + type + " &8-&7 " + allDesc.get(i));
                         }
-                        else {
+                        else
+                        {
                             MainUtil.sendMessage(plr, "&8 - &7" + type + " &8-&7 " + allDesc.get(i));
                         }
                     }
                     return false;
                 }
                 object.type = allTypes.indexOf(args[0].toLowerCase());
-                PlotGenerator<?> gen = SetupUtils.generators.get(object.setupGenerator);
-                if (object.type == 0) {
+                final PlotGenerator<?> gen = SetupUtils.generators.get(object.setupGenerator);
+                if (object.type == 0)
+                {
                     object.current++;
-                    if (object.step == null) {
+                    if (object.step == null)
+                    {
                         object.plotManager = object.setupGenerator;
                         object.step = SetupUtils.generators.get(object.plotManager).getNewPlotWorld(null).getSettingNodes();
                         SetupUtils.generators.get(object.plotManager).processSetup(object);
                     }
-                    if (object.step.length == 0) {
+                    if (object.step.length == 0)
+                    {
                         object.current = 4;
                         MainUtil.sendMessage(plr, "&6What do you want your world to be called?");
                         object.setup_index = 0;
@@ -152,93 +178,125 @@ public class Setup extends SubCommand {
                     }
                     final ConfigurationNode step = object.step[object.setup_index];
                     sendMessage(plr, C.SETUP_STEP, object.setup_index + 1 + "", step.getDescription(), step.getType().getType(), step.getDefaultValue() + "");
-                } else {
-                    if (gen.isFull()) {
+                }
+                else
+                {
+                    if (gen.isFull())
+                    {
                         object.plotManager = object.setupGenerator;
                         object.setupGenerator = null;
                         object.step = SetupUtils.generators.get(object.plotManager).getNewPlotWorld(null).getSettingNodes();
                         SetupUtils.generators.get(object.plotManager).processSetup(object);
                     }
-                    else {
+                    else
+                    {
                         object.plotManager = "PlotSquared";
                         MainUtil.sendMessage(plr, "&c[WARNING] The specified generator does not identify as BukkitPlotGenerator");
                         MainUtil.sendMessage(plr, "&7 - You may need to manually configure the other plugin");
                         object.step = SetupUtils.generators.get(object.plotManager).getNewPlotWorld(null).getSettingNodes();
                     }
-                    MainUtil.sendMessage(plr, "&6What terrain would you like in plots?" + "\n&8 - &2NONE&8 - &7No terrain at all" + "\n&8 - &7ORE&8 - &7Just some ore veins and trees" + "\n&8 - &7ROAD&8 - &7Terrain seperated by roads" + "\n&8 - &7ALL&8 - &7Entirely vanilla generation");
+                    MainUtil.sendMessage(plr, "&6What terrain would you like in plots?"
+                    + "\n&8 - &2NONE&8 - &7No terrain at all"
+                    + "\n&8 - &7ORE&8 - &7Just some ore veins and trees"
+                    + "\n&8 - &7ROAD&8 - &7Terrain seperated by roads"
+                    + "\n&8 - &7ALL&8 - &7Entirely vanilla generation");
                 }
                 object.current++;
                 break;
             }
-            case 2: { // Choose terrain
+            case 2:
+            { // Choose terrain
                 final List<String> terrain = Arrays.asList(new String[] { "none", "ore", "road", "all" });
-                if ((args.length != 1) || !terrain.contains(args[0].toLowerCase())) {
-                    MainUtil.sendMessage(plr, "&cYou must choose the terrain!" + "\n&8 - &2NONE&8 - &7No terrain at all" + "\n&8 - &7ORE&8 - &7Just some ore veins and trees" + "\n&8 - &7ROAD&8 - &7Terrain seperated by roads" + "\n&8 - &7ALL&8 - &7Entirely vanilla generation");
+                if ((args.length != 1) || !terrain.contains(args[0].toLowerCase()))
+                {
+                    MainUtil.sendMessage(plr, "&cYou must choose the terrain!"
+                    + "\n&8 - &2NONE&8 - &7No terrain at all"
+                    + "\n&8 - &7ORE&8 - &7Just some ore veins and trees"
+                    + "\n&8 - &7ROAD&8 - &7Terrain seperated by roads"
+                    + "\n&8 - &7ALL&8 - &7Entirely vanilla generation");
                     return false;
                 }
                 object.terrain = terrain.indexOf(args[0].toLowerCase());
                 object.current++;
-                if (object.step == null) {
+                if (object.step == null)
+                {
                     object.step = SetupUtils.generators.get(object.plotManager).getNewPlotWorld(null).getSettingNodes();
                 }
                 final ConfigurationNode step = object.step[object.setup_index];
                 sendMessage(plr, C.SETUP_STEP, object.setup_index + 1 + "", step.getDescription(), step.getType().getType(), step.getDefaultValue() + "");
                 break;
             }
-            case 3: { // world setup
-                if (object.setup_index == object.step.length) {
+            case 3:
+            { // world setup
+                if (object.setup_index == object.step.length)
+                {
                     MainUtil.sendMessage(plr, "&6What do you want your world to be called?");
                     object.setup_index = 0;
                     object.current++;
                     return true;
                 }
                 ConfigurationNode step = object.step[object.setup_index];
-                if (args.length < 1) {
+                if (args.length < 1)
+                {
                     sendMessage(plr, C.SETUP_STEP, object.setup_index + 1 + "", step.getDescription(), step.getType().getType(), step.getDefaultValue() + "");
                     return false;
                 }
                 final boolean valid = step.isValid(args[0]);
-                if (valid) {
+                if (valid)
+                {
                     sendMessage(plr, C.SETUP_VALID_ARG, step.getConstant(), args[0]);
                     step.setValue(args[0]);
                     object.setup_index++;
-                    if (object.setup_index == object.step.length) {
+                    if (object.setup_index == object.step.length)
+                    {
                         onCommand(plr, args);
                         return false;
                     }
                     step = object.step[object.setup_index];
                     sendMessage(plr, C.SETUP_STEP, object.setup_index + 1 + "", step.getDescription(), step.getType().getType(), step.getDefaultValue() + "");
                     return false;
-                } else {
+                }
+                else
+                {
                     sendMessage(plr, C.SETUP_INVALID_ARG, args[0], step.getConstant());
                     sendMessage(plr, C.SETUP_STEP, object.setup_index + 1 + "", step.getDescription(), step.getType().getType(), step.getDefaultValue() + "");
                     return false;
                 }
             }
-            case 4: {
-                if (args.length != 1) {
+            case 4:
+            {
+                if (args.length != 1)
+                {
                     MainUtil.sendMessage(plr, "&cYou need to choose a world name!");
                     return false;
                 }
-                if (BlockManager.manager.isWorld(args[0])) {
-                    if (PS.get().isPlotWorld(args[0])) {
+                if (BlockManager.manager.isWorld(args[0]))
+                {
+                    if (PS.get().isPlotWorld(args[0]))
+                    {
                         MainUtil.sendMessage(plr, "&cThat world name is already taken!");
                         return false;
                     }
-                    MainUtil.sendMessage(plr, "&cThe world you specified already exists. After restarting, new terrain will use PlotSquared, however you may need to reset the world for it to generate correctly!");
+                    MainUtil.sendMessage(plr,
+                    "&cThe world you specified already exists. After restarting, new terrain will use PlotSquared, however you may need to reset the world for it to generate correctly!");
                 }
                 object.world = args[0];
                 SetupUtils.setupMap.remove(name);
                 final String world;
-                if (object.setupManager == null) {
+                if (object.setupManager == null)
+                {
                     world = SetupUtils.manager.setupWorld(object);
                 }
-                else {
+                else
+                {
                     world = object.setupManager.setupWorld(object);
                 }
-                try {
+                try
+                {
                     plr.teleport(BlockManager.manager.getSpawn(world));
-                } catch (final Exception e) {
+                }
+                catch (final Exception e)
+                {
                     plr.sendMessage("&cAn error occured. See console for more information");
                     e.printStackTrace();
                 }
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/SubCommand.java b/src/main/java/com/intellectualcrafters/plot/commands/SubCommand.java
index 3ea1ca413..6311e5e95 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/SubCommand.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/SubCommand.java
@@ -1,52 +1,53 @@
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// PlotSquared - A plot manager and world generator for the Bukkit API                             /
-// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
-//                                                                                                 /
-// This program is free software; you can redistribute it and/or modify                            /
-// it under the terms of the GNU General Public License as published by                            /
-// the Free Software Foundation; either version 3 of the License, or                               /
-// (at your option) any later version.                                                             /
-//                                                                                                 /
-// This program is distributed in the hope that it will be useful,                                 /
-// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
-// GNU General Public License for more details.                                                    /
-//                                                                                                 /
-// You should have received a copy of the GNU General Public License                               /
-// along with this program; if not, write to the Free Software Foundation,                         /
-// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
-//                                                                                                 /
-// You can contact us via: support@intellectualsites.com                                           /
-////////////////////////////////////////////////////////////////////////////////////////////////////
-package com.intellectualcrafters.plot.commands;
-
-import com.intellectualcrafters.plot.config.C;
-import com.intellectualcrafters.plot.object.PlotPlayer;
-
-/**
- * SubCommand class
- *
- * @author Citymonstret
- */
-@SuppressWarnings({ "deprecation", "unused" })
-public abstract class SubCommand extends com.plotsquared.general.commands.Command<PlotPlayer> {
-
-    /**
-     * The category
-     */
-    public CommandCategory category;
-
-    /**
-     * Send a message
-     *
-     * @param plr  Player who will receive the mssage
-     * @param c    Caption
-     * @param args Arguments (%s's)
-     *
-     * @see com.intellectualcrafters.plot.util.MainUtil#sendMessage(PlotPlayer, C, String...)
-     */
-    public boolean sendMessage(PlotPlayer plr, final C c, final String... args) {
-        c.send(plr, args);
-        return true;
-    }
-}
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// PlotSquared - A plot manager and world generator for the Bukkit API                             /
+// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
+//                                                                                                 /
+// This program is free software; you can redistribute it and/or modify                            /
+// it under the terms of the GNU General Public License as published by                            /
+// the Free Software Foundation; either version 3 of the License, or                               /
+// (at your option) any later version.                                                             /
+//                                                                                                 /
+// This program is distributed in the hope that it will be useful,                                 /
+// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
+// GNU General Public License for more details.                                                    /
+//                                                                                                 /
+// You should have received a copy of the GNU General Public License                               /
+// along with this program; if not, write to the Free Software Foundation,                         /
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
+//                                                                                                 /
+// You can contact us via: support@intellectualsites.com                                           /
+////////////////////////////////////////////////////////////////////////////////////////////////////
+package com.intellectualcrafters.plot.commands;
+
+import com.intellectualcrafters.plot.config.C;
+import com.intellectualcrafters.plot.object.PlotPlayer;
+
+/**
+ * SubCommand class
+ *

+ */
+@SuppressWarnings({ "deprecation", "unused" })
+public abstract class SubCommand extends com.plotsquared.general.commands.Command<PlotPlayer>
+{
+
+    /**
+     * The category
+     */
+    public CommandCategory category;
+
+    /**
+     * Send a message
+     *
+     * @param plr  Player who will receive the mssage
+     * @param c    Caption
+     * @param args Arguments (%s's)
+     *
+     * @see com.intellectualcrafters.plot.util.MainUtil#sendMessage(PlotPlayer, C, String...)
+     */
+    public boolean sendMessage(final PlotPlayer plr, final C c, final String... args)
+    {
+        c.send(plr, args);
+        return true;
+    }
+}
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Swap.java b/src/main/java/com/intellectualcrafters/plot/commands/Swap.java
index edcdbbd70..d7abf8d07 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/Swap.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/Swap.java
@@ -36,95 +36,104 @@ import com.intellectualcrafters.plot.util.Permissions;
 import com.plotsquared.general.commands.CommandDeclaration;
 
 @CommandDeclaration(
-        command = "swap",
-        description = "Swap two plots",
-        aliases = {"switch"},
-        category = CommandCategory.ACTIONS,
-        requiredType = RequiredType.NONE
-)
-public class Swap extends SubCommand {
+command = "swap",
+description = "Swap two plots",
+aliases = { "switch" },
+category = CommandCategory.ACTIONS,
+requiredType = RequiredType.NONE)
+public class Swap extends SubCommand
+{
 
     @Override
-    public boolean onCommand(final PlotPlayer plr, final String[] args) {
-        
+    public boolean onCommand(final PlotPlayer plr, final String[] args)
+    {
+
         MainUtil.sendMessage(plr, "&cThis command has not been optimized for large selections yet. Please bug me if this becomes an issue.");
-        if (args.length < 1) {
+        if (args.length < 1)
+        {
             MainUtil.sendMessage(plr, C.NEED_PLOT_ID);
             MainUtil.sendMessage(plr, C.SWAP_SYNTAX);
             return false;
         }
         final Location loc = plr.getLocation();
         final Plot plot = MainUtil.getPlot(loc);
-        if (plot == null) {
-            return !sendMessage(plr, C.NOT_IN_PLOT);
-        }
-        if ((!plot.hasOwner() || !plot.isOwner(plr.getUUID())) && !Permissions.hasPermission(plr, "plots.admin.command.swap")) {
+        if (plot == null) { return !sendMessage(plr, C.NOT_IN_PLOT); }
+        if ((!plot.hasOwner() || !plot.isOwner(plr.getUUID())) && !Permissions.hasPermission(plr, "plots.admin.command.swap"))
+        {
             MainUtil.sendMessage(plr, C.NO_PLOT_PERMS);
             return false;
         }
-        
-        Plot bot1 = MainUtil.getBottomPlot(plot);
-        Plot top1 = MainUtil.getTopPlot(plot);
-        
-        PlotId id2 = PlotId.fromString(args[0]);
-        if (id2 == null) {
+
+        final Plot bot1 = MainUtil.getBottomPlot(plot);
+        final Plot top1 = MainUtil.getTopPlot(plot);
+
+        final PlotId id2 = PlotId.fromString(args[0]);
+        if (id2 == null)
+        {
             MainUtil.sendMessage(plr, C.NOT_VALID_PLOT_ID);
             MainUtil.sendMessage(plr, C.SWAP_SYNTAX);
             return false;
         }
         final String world = loc.getWorld();
-        Plot plot2 = MainUtil.getPlot(world, id2);
-        PlotId id3 = new PlotId(id2.x + top1.id.x - bot1.id.x, id2.y + top1.id.y - bot1.id.y);
-        Plot plot3 = MainUtil.getPlot(world, id3);
-        
+        final Plot plot2 = MainUtil.getPlot(world, id2);
+        final PlotId id3 = new PlotId((id2.x + top1.id.x) - bot1.id.x, (id2.y + top1.id.y) - bot1.id.y);
+        final Plot plot3 = MainUtil.getPlot(world, id3);
+
         // Getting secon selection
-        Plot bot2 = MainUtil.getBottomPlot(plot2);
-        Plot top2 = MainUtil.getTopPlot(plot3);
+        final Plot bot2 = MainUtil.getBottomPlot(plot2);
+        final Plot top2 = MainUtil.getTopPlot(plot3);
 
         // cancel swap if intersection
-        PlotCluster cluster1 = new PlotCluster(world, bot1.id, top1.id, null);
-        PlotClusterId cluster2id = new PlotClusterId(bot2.id, top2.id);
-        if (ClusterManager.intersects(cluster1, cluster2id)) {
+        final PlotCluster cluster1 = new PlotCluster(world, bot1.id, top1.id, null);
+        final PlotClusterId cluster2id = new PlotClusterId(bot2.id, top2.id);
+        if (ClusterManager.intersects(cluster1, cluster2id))
+        {
             MainUtil.sendMessage(plr, C.SWAP_OVERLAP);
             return false;
         }
-        
+
         // Check dimensions
-        if (top1.id.x - bot1.id.x != top2.id.x - bot2.id.x || top1.id.y - bot1.id.y != top2.id.y - bot2.id.y ) {
+        if (((top1.id.x - bot1.id.x) != (top2.id.x - bot2.id.x)) || ((top1.id.y - bot1.id.y) != (top2.id.y - bot2.id.y)))
+        {
             MainUtil.sendMessage(plr, C.SWAP_DIMENSIONS, "1");
             MainUtil.sendMessage(plr, C.SWAP_SYNTAX);
             return false;
         }
-        
+
         // Getting selections as ids
         final ArrayList<PlotId> selection1 = MainUtil.getPlotSelectionIds(bot1.id, top1.id);
         final ArrayList<PlotId> selection2 = MainUtil.getPlotSelectionIds(bot2.id, top2.id);
 
         // Getting selections as location coordinates
-        Location pos1 = MainUtil.getPlotBottomLocAbs(world, bot1.id);
-        Location pos2 = MainUtil.getPlotTopLocAbs(world, top1.id).subtract(1, 0, 1);
-        Location pos3 = MainUtil.getPlotBottomLocAbs(world, bot2.id);
-        Location pos4 = MainUtil.getPlotTopLocAbs(world, top2.id).subtract(1, 0, 1);
-        
-        if (MainUtil.getPlot(pos2) != null) {
+        final Location pos1 = MainUtil.getPlotBottomLocAbs(world, bot1.id);
+        final Location pos2 = MainUtil.getPlotTopLocAbs(world, top1.id).subtract(1, 0, 1);
+        final Location pos3 = MainUtil.getPlotBottomLocAbs(world, bot2.id);
+        final Location pos4 = MainUtil.getPlotTopLocAbs(world, top2.id).subtract(1, 0, 1);
+
+        if (MainUtil.getPlot(pos2) != null)
+        {
             pos1.add(1, 0, 1);
             pos2.add(1, 0, 1);
             pos3.add(1, 0, 1);
             pos4.add(1, 0, 1);
         }
-        
+
         // Swapping the blocks, states and entites
         ChunkManager.manager.swap(world, pos1, pos2, pos3, pos4);
-        
+
         // Swapping the plot data
-        for (int i = 0; i < selection1.size(); i++) {
-            final boolean last = i == selection1.size() - 1;
-            PlotId swaper = selection1.get(i);
-            PlotId swapee = selection2.get(i);
-            MainUtil.swapData(world, swaper, swapee, new Runnable() {
+        for (int i = 0; i < selection1.size(); i++)
+        {
+            final boolean last = i == (selection1.size() - 1);
+            final PlotId swaper = selection1.get(i);
+            final PlotId swapee = selection2.get(i);
+            MainUtil.swapData(world, swaper, swapee, new Runnable()
+            {
                 @Override
-                public void run() {
-                    if (last) {
+                public void run()
+                {
+                    if (last)
+                    {
                         MainUtil.sendMessage(plr, C.SWAP_SUCCESS);
                     }
                 }
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/TP.java b/src/main/java/com/intellectualcrafters/plot/commands/TP.java
index f0337a99f..d414a2d66 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/TP.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/TP.java
@@ -34,74 +34,84 @@ import com.plotsquared.general.commands.Argument;
 import com.plotsquared.general.commands.CommandDeclaration;
 
 @CommandDeclaration(
-        command = "tp",
-        description = "Teleport to a plot",
-        permission = "plots.tp",
-        usage = "/plot tp <alias|id>",
-        requiredType = RequiredType.NONE,
-        category = CommandCategory.TELEPORT
-)
-public class TP extends SubCommand {
+command = "tp",
+description = "Teleport to a plot",
+permission = "plots.tp",
+usage = "/plot tp <alias|id>",
+requiredType = RequiredType.NONE,
+category = CommandCategory.TELEPORT)
+public class TP extends SubCommand
+{
 
-    public TP() {
+    public TP()
+    {
         requiredArguments = new Argument[] {
-                Argument.String
+        Argument.String
         };
     }
 
     @Override
-    public boolean onCommand(final PlotPlayer plr, final String[] args) {
+    public boolean onCommand(final PlotPlayer plr, final String[] args)
+    {
         final String id = args[0];
         PlotId plotid;
         final Location loc = plr.getLocation();
         final String pworld = loc.getWorld();
         String world = pworld;
-        if (args.length == 2) {
-            if (BlockManager.manager.isWorld(args[1])) {
+        if (args.length == 2)
+        {
+            if (BlockManager.manager.isWorld(args[1]))
+            {
                 world = args[1];
             }
         }
-        if (!PS.get().isPlotWorld(world)) {
+        if (!PS.get().isPlotWorld(world))
+        {
             MainUtil.sendMessage(plr, C.NOT_IN_PLOT_WORLD);
             return false;
         }
         Plot temp;
-        if ((temp = isAlias(world, id)) != null) {
+        if ((temp = isAlias(world, id)) != null)
+        {
             MainUtil.teleportPlayer(plr, plr.getLocation(), temp);
             return true;
         }
-        try {
+        try
+        {
             plotid = new PlotId(Integer.parseInt(id.split(";")[0]), Integer.parseInt(id.split(";")[1]));
             MainUtil.teleportPlayer(plr, plr.getLocation(), MainUtil.getPlot(world, plotid));
             return true;
-        } catch (final Exception e) {
+        }
+        catch (final Exception e)
+        {
             MainUtil.sendMessage(plr, C.NOT_VALID_PLOT_ID);
         }
         return false;
     }
 
-    private Plot isAlias(final String world, String a) {
+    private Plot isAlias(final String world, String a)
+    {
         int index = 0;
-        if (a.contains(";")) {
+        if (a.contains(";"))
+        {
             final String[] split = a.split(";");
-            if ((split[1].length() > 0) && MathMan.isInteger(split[1])) {
+            if ((split[1].length() > 0) && MathMan.isInteger(split[1]))
+            {
                 index = Integer.parseInt(split[1]);
             }
             a = split[0];
         }
         final PlotPlayer player = UUIDHandler.getPlayer(a);
-        if (player != null) {
+        if (player != null)
+        {
             final java.util.Set<Plot> plotMainPlots = PS.get().getPlots(world, player);
             final Plot[] plots = plotMainPlots.toArray(new Plot[plotMainPlots.size()]);
-            if (plots.length > index) {
-                return plots[index];
-            }
+            if (plots.length > index) { return plots[index]; }
             return null;
         }
-        for (final Plot p : PS.get().getPlotsInWorld(world)) {
-            if ((p.getSettings().getAlias().length() > 0) && p.getSettings().getAlias().equalsIgnoreCase(a)) {
-                return p;
-            }
+        for (final Plot p : PS.get().getPlotsInWorld(world))
+        {
+            if ((p.getSettings().getAlias().length() > 0) && p.getSettings().getAlias().equalsIgnoreCase(a)) { return p; }
         }
         return null;
     }
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Target.java b/src/main/java/com/intellectualcrafters/plot/commands/Target.java
index 1d4926053..e4716a6b9 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/Target.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/Target.java
@@ -28,41 +28,47 @@ import com.intellectualcrafters.plot.object.PlotId;
 import com.intellectualcrafters.plot.object.PlotPlayer;
 import com.intellectualcrafters.plot.util.MainUtil;
 import com.intellectualcrafters.plot.util.StringMan;
-import com.plotsquared.general.commands.Argument;
 import com.plotsquared.general.commands.CommandDeclaration;
 
 @CommandDeclaration(
-        command = "target",
-        usage = "/plot target <X;Z|nearest>",
-        description = "Target a plot with your compass",
-        permission = "plots.target",
-        requiredType = RequiredType.NONE,
-        category = CommandCategory.ACTIONS
-)
-public class Target extends SubCommand {
+command = "target",
+usage = "/plot target <X;Z|nearest>",
+description = "Target a plot with your compass",
+permission = "plots.target",
+requiredType = RequiredType.NONE,
+category = CommandCategory.ACTIONS)
+public class Target extends SubCommand
+{
 
     @Override
-    public boolean onCommand(final PlotPlayer plr, final String[] args) {
+    public boolean onCommand(final PlotPlayer plr, final String[] args)
+    {
         final Location ploc = plr.getLocation();
-        if (!PS.get().isPlotWorld(ploc.getWorld())) {
+        if (!PS.get().isPlotWorld(ploc.getWorld()))
+        {
             MainUtil.sendMessage(plr, C.NOT_IN_PLOT_WORLD);
             return false;
         }
         PlotId id = MainUtil.parseId(args[0]);
-        if (id == null) {
-            if (StringMan.isEqualIgnoreCaseToAny(args[0], "near", "nearest")) {
+        if (id == null)
+        {
+            if (StringMan.isEqualIgnoreCaseToAny(args[0], "near", "nearest"))
+            {
                 Plot closest = null;
                 int distance = Integer.MAX_VALUE;
-                for (Plot plot : PS.get().getPlotsInWorld(ploc.getWorld())) {
-                    double current = plot.getBottom().getEuclideanDistanceSquared(ploc); 
-                    if (current < distance) {
+                for (final Plot plot : PS.get().getPlotsInWorld(ploc.getWorld()))
+                {
+                    final double current = plot.getBottom().getEuclideanDistanceSquared(ploc);
+                    if (current < distance)
+                    {
                         distance = (int) current;
                         closest = plot;
                     }
                 }
                 id = closest.id;
             }
-            else {
+            else
+            {
                 MainUtil.sendMessage(plr, C.NOT_VALID_PLOT_ID);
                 return false;
             }
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Template.java b/src/main/java/com/intellectualcrafters/plot/commands/Template.java
index b73eecb22..a5f72d2f0 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/Template.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/Template.java
@@ -47,35 +47,38 @@ import com.intellectualcrafters.plot.util.TaskManager;
 import com.plotsquared.general.commands.CommandDeclaration;
 
 @CommandDeclaration(
-        command = "template",
-        permission = "plots.admin",
-        description = "Create or use a world template",
-        usage = "/plot template [import|export] <world> <template>",
-        category = CommandCategory.DEBUG
-)
-public class Template extends SubCommand {
+command = "template",
+permission = "plots.admin",
+description = "Create or use a world template",
+usage = "/plot template [import|export] <world> <template>",
+category = CommandCategory.DEBUG)
+public class Template extends SubCommand
+{
 
-    public static boolean extractAllFiles(String world, String template) {
-        byte[] buffer = new byte[2048];
-        try {
-            File folder = new File(PS.get().IMP.getDirectory() + File.separator + "templates");
-            if (!folder.exists()) {
-                return false;
-            }
-            File input = new File(folder + File.separator + template + ".template");
-            File output = PS.get().IMP.getDirectory();
-            if (!output.exists()) {
+    public static boolean extractAllFiles(final String world, final String template)
+    {
+        final byte[] buffer = new byte[2048];
+        try
+        {
+            final File folder = new File(PS.get().IMP.getDirectory() + File.separator + "templates");
+            if (!folder.exists()) { return false; }
+            final File input = new File(folder + File.separator + template + ".template");
+            final File output = PS.get().IMP.getDirectory();
+            if (!output.exists())
+            {
                 output.mkdirs();
             }
-            ZipInputStream zis = new ZipInputStream(new FileInputStream(input));
+            final ZipInputStream zis = new ZipInputStream(new FileInputStream(input));
             ZipEntry ze = zis.getNextEntry();
-            while (ze != null) {
-                String name = ze.getName();
-                File newFile = new File((output + File.separator + name).replaceAll("__TEMP_DIR__", world));
+            while (ze != null)
+            {
+                final String name = ze.getName();
+                final File newFile = new File((output + File.separator + name).replaceAll("__TEMP_DIR__", world));
                 new File(newFile.getParent()).mkdirs();
-                FileOutputStream fos = new FileOutputStream(newFile);
+                final FileOutputStream fos = new FileOutputStream(newFile);
                 int len;
-                while ((len = zis.read(buffer)) > 0) {
+                while ((len = zis.read(buffer)) > 0)
+                {
                     fos.write(buffer, 0, len);
                 }
                 fos.close();
@@ -84,33 +87,40 @@ public class Template extends SubCommand {
             zis.closeEntry();
             zis.close();
             return true;
-        } catch (Exception e) {
+        }
+        catch (final Exception e)
+        {
             e.printStackTrace();
             return false;
         }
     }
 
-    public static byte[] getBytes(PlotWorld plotworld) {
-        ConfigurationSection section = PS.get().config.getConfigurationSection("worlds." + plotworld.worldname);
-        YamlConfiguration config = new YamlConfiguration();
-        String generator = SetupUtils.manager.getGenerator(plotworld);
-        if (generator != null) {
+    public static byte[] getBytes(final PlotWorld plotworld)
+    {
+        final ConfigurationSection section = PS.get().config.getConfigurationSection("worlds." + plotworld.worldname);
+        final YamlConfiguration config = new YamlConfiguration();
+        final String generator = SetupUtils.manager.getGenerator(plotworld);
+        if (generator != null)
+        {
             config.set("generator.plugin", generator);
         }
-        for (String key : section.getKeys(true)) {
+        for (final String key : section.getKeys(true))
+        {
             config.set(key, section.get(key));
         }
         return config.saveToString().getBytes();
     }
 
-    public static void zipAll(final String world, Set<FileBytes> files) throws IOException {
-        File output = new File(PS.get().IMP.getDirectory() + File.separator + "templates");
+    public static void zipAll(final String world, final Set<FileBytes> files) throws IOException
+    {
+        final File output = new File(PS.get().IMP.getDirectory() + File.separator + "templates");
         output.mkdirs();
-        FileOutputStream fos = new FileOutputStream(output + File.separator + world + ".template");
-        ZipOutputStream zos = new ZipOutputStream(fos);
+        final FileOutputStream fos = new FileOutputStream(output + File.separator + world + ".template");
+        final ZipOutputStream zos = new ZipOutputStream(fos);
 
-        for (FileBytes file : files) {
-            ZipEntry ze = new ZipEntry(file.path);
+        for (final FileBytes file : files)
+        {
+            final ZipEntry ze = new ZipEntry(file.path);
             zos.putNextEntry(ze);
             zos.write(file.data);
         }
@@ -119,14 +129,19 @@ public class Template extends SubCommand {
     }
 
     @Override
-    public boolean onCommand(final PlotPlayer plr, final String[] args) {
-        if (args.length != 2 && args.length != 3) {
-            if (args.length == 1) {
-                if (args[0].equalsIgnoreCase("export")) {
+    public boolean onCommand(final PlotPlayer plr, final String[] args)
+    {
+        if ((args.length != 2) && (args.length != 3))
+        {
+            if (args.length == 1)
+            {
+                if (args[0].equalsIgnoreCase("export"))
+                {
                     MainUtil.sendMessage(plr, C.COMMAND_SYNTAX, "/plot template export <world>");
                     return true;
                 }
-                else if (args[0].equalsIgnoreCase("import")) {
+                else if (args[0].equalsIgnoreCase("import"))
+                {
                     MainUtil.sendMessage(plr, C.COMMAND_SYNTAX, "/plot template import <world> <template>");
                     return true;
                 }
@@ -135,43 +150,53 @@ public class Template extends SubCommand {
             return true;
         }
         final String world = args[1];
-        switch (args[0].toLowerCase()) {
-            case "import": {
-                if (args.length != 3) {
+        switch (args[0].toLowerCase())
+        {
+            case "import":
+            {
+                if (args.length != 3)
+                {
                     MainUtil.sendMessage(plr, C.COMMAND_SYNTAX, "/plot template import <world> <template>");
                     return false;
                 }
-                if (PS.get().isPlotWorld(world)) {
+                if (PS.get().isPlotWorld(world))
+                {
                     MainUtil.sendMessage(plr, C.SETUP_WORLD_TAKEN, world);
                     return false;
                 }
-                boolean result = extractAllFiles(world, args[2]);
-                if (!result) {
-                    MainUtil.sendMessage(plr, "&cInvalid template file: " + args[2] +".template");
+                final boolean result = extractAllFiles(world, args[2]);
+                if (!result)
+                {
+                    MainUtil.sendMessage(plr, "&cInvalid template file: " + args[2] + ".template");
                     return false;
                 }
-                File worldFile = new File(PS.get().IMP.getDirectory() + File.separator + "templates" + File.separator + "tmp-data.yml");
-                YamlConfiguration worldConfig = YamlConfiguration.loadConfiguration(worldFile);
+                final File worldFile = new File(PS.get().IMP.getDirectory() + File.separator + "templates" + File.separator + "tmp-data.yml");
+                final YamlConfiguration worldConfig = YamlConfiguration.loadConfiguration(worldFile);
                 PS.get().config.set("worlds." + world, worldConfig.get(""));
-                try {
+                try
+                {
                     PS.get().config.save(PS.get().configFile);
                     PS.get().config.load(PS.get().configFile);
-                } catch (Exception e) {
+                }
+                catch (final Exception e)
+                {
                     e.printStackTrace();
                 }
                 String manager = worldConfig.getString("generator.plugin");
-                if (manager == null) {
+                if (manager == null)
+                {
                     manager = "PlotSquared";
                 }
                 String generator = worldConfig.getString("generator.init");
-                if (generator == null) {
+                if (generator == null)
+                {
                     generator = manager;
                 }
 
-                int type = worldConfig.getInt("generator.type");
-                int terrain = worldConfig.getInt("generator.terrain");
+                final int type = worldConfig.getInt("generator.type");
+                final int terrain = worldConfig.getInt("generator.terrain");
 
-                SetupObject setup = new SetupObject();
+                final SetupObject setup = new SetupObject();
                 setup.plotManager = manager;
                 setup.setupGenerator = generator;
                 setup.type = type;
@@ -179,34 +204,43 @@ public class Template extends SubCommand {
                 setup.step = new ConfigurationNode[0];
                 setup.world = world;
                 SetupUtils.manager.setupWorld(setup);
-                SetBlockQueue.addNotify(new Runnable() {
+                SetBlockQueue.addNotify(new Runnable()
+                {
                     @Override
-                    public void run() {
+                    public void run()
+                    {
                         MainUtil.sendMessage(plr, "Done!");
                         plr.teleport(BlockManager.manager.getSpawn(world));
                     }
                 });
                 return true;
             }
-            case "export": {
-                if (args.length != 2) {
+            case "export":
+            {
+                if (args.length != 2)
+                {
                     MainUtil.sendMessage(plr, C.COMMAND_SYNTAX, "/plot template export <world>");
                     return false;
                 }
                 final PlotWorld plotworld = PS.get().getPlotWorld(world);
-                if (!BlockManager.manager.isWorld(world) || (plotworld == null)) {
+                if (!BlockManager.manager.isWorld(world) || (plotworld == null))
+                {
                     MainUtil.sendMessage(plr, C.NOT_VALID_PLOT_WORLD);
                     return false;
                 }
                 final PlotManager manager = PS.get().getPlotManager(world);
                 final PlotPlayer finalPlr = plr;
-                TaskManager.runTaskAsync(new Runnable() {
+                TaskManager.runTaskAsync(new Runnable()
+                {
                     @Override
-                    public void run() {
-                        try {
+                    public void run()
+                    {
+                        try
+                        {
                             manager.exportTemplate(plotworld);
                         }
-                        catch (Exception e) {
+                        catch (final Exception e)
+                        {
                             e.printStackTrace();
                             MainUtil.sendMessage(finalPlr, "Failed: " + e.getMessage());
                             return;
@@ -216,8 +250,9 @@ public class Template extends SubCommand {
                 });
                 return true;
             }
-            default: {
-                C.COMMAND_SYNTAX.send(plr, this.getUsage());
+            default:
+            {
+                C.COMMAND_SYNTAX.send(plr, getUsage());
             }
         }
         return false;
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Toggle.java b/src/main/java/com/intellectualcrafters/plot/commands/Toggle.java
index e1c041326..d3723bbfd 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/Toggle.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/Toggle.java
@@ -31,124 +31,151 @@ import com.intellectualcrafters.plot.object.PlotPlayer;
 import com.intellectualcrafters.plot.util.MainUtil;
 import com.intellectualcrafters.plot.util.Permissions;
 import com.intellectualcrafters.plot.util.StringMan;
-import com.plotsquared.bukkit.BukkitMain;
 import com.plotsquared.general.commands.Command;
-import com.plotsquared.general.commands.CommandCaller;
 import com.plotsquared.general.commands.CommandDeclaration;
 
 @CommandDeclaration(
-        command = "toggle",
-        aliases = {"attribute"},
-        permission = "plots.use",
-        description = "Toggle per user settings",
-        usage = "/plot toggle <setting>",
-        requiredType = RequiredType.NONE,
-        category = CommandCategory.ACTIONS
-)
-public class Toggle extends SubCommand {
+command = "toggle",
+aliases = { "attribute" },
+permission = "plots.use",
+description = "Toggle per user settings",
+usage = "/plot toggle <setting>",
+requiredType = RequiredType.NONE,
+category = CommandCategory.ACTIONS)
+public class Toggle extends SubCommand
+{
 
-    public void noArgs(PlotPlayer plr) {
+    public void noArgs(final PlotPlayer plr)
+    {
         MainUtil.sendMessage(plr, C.COMMAND_SYNTAX, "/plot toggle <setting>");
-        ArrayList<String> options = new ArrayList<>();
-        for (Entry<String, Command<PlotPlayer>> entry : toggles.entrySet()) {
-            if (Permissions.hasPermission(plr, entry.getValue().getPermission())) {
+        final ArrayList<String> options = new ArrayList<>();
+        for (final Entry<String, Command<PlotPlayer>> entry : toggles.entrySet())
+        {
+            if (Permissions.hasPermission(plr, entry.getValue().getPermission()))
+            {
                 options.add(entry.getKey());
             }
         }
-        if (options.size() > 0) {
+        if (options.size() > 0)
+        {
             MainUtil.sendMessage(plr, C.SUBCOMMAND_SET_OPTIONS_HEADER.s() + StringMan.join(options, ","));
         }
     }
-    
+
     private HashMap<String, Command<PlotPlayer>> toggles;
-    
-    public Toggle() {
+
+    public Toggle()
+    {
         toggles = new HashMap<>();
-        toggles.put("titles", 
-                new Command<PlotPlayer>("titles", "/plot toggle titles", "Toggle titles for yourself", C.PERMISSION_PLOT_TOGGLE_TITLES.s()) {
-                
-                @Override
-                public boolean onCommand(PlotPlayer player, String[] args) {
-                    if (toggle(player, "disabletitles")) {
-                        MainUtil.sendMessage(player, C.TOGGLE_ENABLED, getCommand());
-                    }
-                    else {
-                        MainUtil.sendMessage(player, C.TOGGLE_DISABLED, getCommand());
-                    }
-                    return true;
-                }
-        });
-        toggles.put("chatspy", 
-                new Command<PlotPlayer>("chatspy", "/plot toggle chatspy", "Toggle chat spying", C.PERMISSION_COMMANDS_CHAT.s()) {
-                
-                @Override
-                public boolean onCommand(PlotPlayer player, String[] args) {
-                    if (toggle(player, "chatspy")) {
-                        MainUtil.sendMessage(player, C.TOGGLE_DISABLED, getCommand());
-                    }
-                    else {
-                        MainUtil.sendMessage(player, C.TOGGLE_ENABLED, getCommand());
-                    }
-                    return true;
-                }
-        });
-        toggles.put("chat", 
-            new Command<PlotPlayer>("chat", "/plot toggle chat", "Toggle plot chat for yourself", C.PERMISSION_PLOT_TOGGLE_CHAT.s()) {
-            
+        toggles.put("titles",
+        new Command<PlotPlayer>("titles", "/plot toggle titles", "Toggle titles for yourself", C.PERMISSION_PLOT_TOGGLE_TITLES.s())
+        {
+
             @Override
-            public boolean onCommand(PlotPlayer player, String[] args) {
-                if (toggle(player, "chat")) {
+            public boolean onCommand(final PlotPlayer player, final String[] args)
+            {
+                if (toggle(player, "disabletitles"))
+                {
+                    MainUtil.sendMessage(player, C.TOGGLE_ENABLED, getCommand());
+                }
+                else
+                {
+                    MainUtil.sendMessage(player, C.TOGGLE_DISABLED, getCommand());
+                }
+                return true;
+            }
+        });
+        toggles.put("chatspy",
+        new Command<PlotPlayer>("chatspy", "/plot toggle chatspy", "Toggle chat spying", C.PERMISSION_COMMANDS_CHAT.s())
+        {
+
+            @Override
+            public boolean onCommand(final PlotPlayer player, final String[] args)
+            {
+                if (toggle(player, "chatspy"))
+                {
+                    MainUtil.sendMessage(player, C.TOGGLE_DISABLED, getCommand());
+                }
+                else
+                {
+                    MainUtil.sendMessage(player, C.TOGGLE_ENABLED, getCommand());
+                }
+                return true;
+            }
+        });
+        toggles.put("chat",
+        new Command<PlotPlayer>("chat", "/plot toggle chat", "Toggle plot chat for yourself", C.PERMISSION_PLOT_TOGGLE_CHAT.s())
+        {
+
+            @Override
+            public boolean onCommand(final PlotPlayer player, final String[] args)
+            {
+                if (toggle(player, "chat"))
+                {
                     MainUtil.sendMessage(player, C.PLOT_CHAT_OFF);
                 }
-                else {
+                else
+                {
                     MainUtil.sendMessage(player, C.PLOT_CHAT_ON);
                 }
                 return true;
             }
         });
-        if (PS.get().worldedit != null) {
-            toggles.put("worldedit", 
-                new Command<PlotPlayer>("worldedit", "/plot toggle worldedit", "Toggle worldedit bypass", C.PERMISSION_WORLDEDIT_BYPASS.s()) {
-                
+        if (PS.get().worldedit != null)
+        {
+            toggles.put("worldedit",
+            new Command<PlotPlayer>("worldedit", "/plot toggle worldedit", "Toggle worldedit bypass", C.PERMISSION_WORLDEDIT_BYPASS.s())
+            {
+
                 @Override
-                public boolean onCommand(PlotPlayer player, String[] args) {
-                    if (toggle(player, "worldedit")) {
+                public boolean onCommand(final PlotPlayer player, final String[] args)
+                {
+                    if (toggle(player, "worldedit"))
+                    {
                         MainUtil.sendMessage(player, C.WORLDEDIT_RESTRICTED);
                     }
-                    else {
+                    else
+                    {
                         MainUtil.sendMessage(player, C.WORLDEDIT_UNMASKED);
                     }
                     return true;
                 }
             });
         }
-        
+
     }
 
     @Override
-    public boolean onCommand(final PlotPlayer player, final String[] args) {
-        if (args.length == 0) {
+    public boolean onCommand(final PlotPlayer player, final String[] args)
+    {
+        if (args.length == 0)
+        {
             noArgs(player);
             return false;
         }
-        Command<PlotPlayer> cmd = toggles.get(args[0].toLowerCase());
-        if (cmd == null) {
+        final Command<PlotPlayer> cmd = toggles.get(args[0].toLowerCase());
+        if (cmd == null)
+        {
             noArgs(player);
             return false;
         }
-        if (!Permissions.hasPermission(player, cmd.getPermission())) {
+        if (!Permissions.hasPermission(player, cmd.getPermission()))
+        {
             C.NO_PERMISSION.send(player, cmd.getPermission());
             return false;
         }
         return cmd.onCommand(player, Arrays.copyOfRange(args, 1, args.length));
     }
-    
-    public boolean toggle(PlotPlayer player, String key) {
-        if (player.getAttribute(key)) {
+
+    public boolean toggle(final PlotPlayer player, final String key)
+    {
+        if (player.getAttribute(key))
+        {
             player.removeAttribute(key);
             return true;
         }
-        else {
+        else
+        {
             player.setAttribute(key);
             return false;
         }
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Trim.java b/src/main/java/com/intellectualcrafters/plot/commands/Trim.java
index d7894974d..2f2a2d8cc 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/Trim.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/Trim.java
@@ -42,62 +42,77 @@ import com.intellectualcrafters.plot.util.TaskManager;
 import com.plotsquared.general.commands.CommandDeclaration;
 
 @CommandDeclaration(
-        command = "trim",
-        permission = "plots.admin",
-        description = "Delete unmodified portions of your plotworld",
-        usage = "/plot trim",
-        requiredType = RequiredType.CONSOLE,
-        category = CommandCategory.DEBUG
-)
-public class Trim extends SubCommand {
+command = "trim",
+permission = "plots.admin",
+description = "Delete unmodified portions of your plotworld",
+usage = "/plot trim",
+requiredType = RequiredType.CONSOLE,
+category = CommandCategory.DEBUG)
+public class Trim extends SubCommand
+{
 
     public static boolean TASK = false;
     public static ArrayList<Plot> expired = null;
     private static int TASK_ID = 0;
 
-    public static boolean getBulkRegions(final ArrayList<ChunkLoc> empty, final String world, final Runnable whenDone) {
-        if (Trim.TASK) {
-            return false;
-        }
-        TaskManager.runTaskAsync(new Runnable() {
+    public static boolean getBulkRegions(final ArrayList<ChunkLoc> empty, final String world, final Runnable whenDone)
+    {
+        if (Trim.TASK) { return false; }
+        TaskManager.runTaskAsync(new Runnable()
+        {
             @Override
-            public void run() {
+            public void run()
+            {
                 final String directory = world + File.separator + "region";
                 final File folder = new File(directory);
                 final File[] regionFiles = folder.listFiles();
-                for (final File file : regionFiles) {
+                for (final File file : regionFiles)
+                {
                     final String name = file.getName();
-                    if (name.endsWith("mca")) {
-                        if (file.getTotalSpace() <= 8192) {
-                            try {
+                    if (name.endsWith("mca"))
+                    {
+                        if (file.getTotalSpace() <= 8192)
+                        {
+                            try
+                            {
                                 final String[] split = name.split("\\.");
                                 final int x = Integer.parseInt(split[1]);
                                 final int z = Integer.parseInt(split[2]);
                                 final ChunkLoc loc = new ChunkLoc(x, z);
                                 empty.add(loc);
-                            } catch (final Exception e) {
+                            }
+                            catch (final Exception e)
+                            {
                                 PS.debug("INVALID MCA: " + name);
                             }
-                        } else {
+                        }
+                        else
+                        {
                             final Path path = Paths.get(file.getPath());
-                            try {
+                            try
+                            {
                                 final BasicFileAttributes attr = Files.readAttributes(path, BasicFileAttributes.class);
                                 final long creation = attr.creationTime().toMillis();
                                 final long modification = file.lastModified();
                                 final long diff = Math.abs(creation - modification);
-                                if (diff < 10000) {
-                                    try {
+                                if (diff < 10000)
+                                {
+                                    try
+                                    {
                                         final String[] split = name.split("\\.");
                                         final int x = Integer.parseInt(split[1]);
                                         final int z = Integer.parseInt(split[2]);
                                         final ChunkLoc loc = new ChunkLoc(x, z);
                                         empty.add(loc);
-                                    } catch (final Exception e) {
+                                    }
+                                    catch (final Exception e)
+                                    {
                                         PS.debug("INVALID MCA: " + name);
                                     }
                                 }
-                            } catch (final Exception e) {
                             }
+                            catch (final Exception e)
+                            {}
                         }
                     }
                 }
@@ -109,10 +124,9 @@ public class Trim extends SubCommand {
         return true;
     }
 
-    public static boolean getTrimRegions(final ArrayList<ChunkLoc> empty, final String world, final Runnable whenDone) {
-        if (Trim.TASK) {
-            return false;
-        }
+    public static boolean getTrimRegions(final ArrayList<ChunkLoc> empty, final String world, final Runnable whenDone)
+    {
+        if (Trim.TASK) { return false; }
         System.currentTimeMillis();
         sendMessage("Collecting region data...");
         final ArrayList<Plot> plots = new ArrayList<>();
@@ -121,12 +135,16 @@ public class Trim extends SubCommand {
         sendMessage(" - MCA #: " + chunks.size());
         sendMessage(" - CHUNKS: " + (chunks.size() * 1024) + " (max)");
         sendMessage(" - TIME ESTIMATE: " + (chunks.size() / 1200) + " minutes");
-        Trim.TASK_ID = TaskManager.runTaskRepeat(new Runnable() {
+        Trim.TASK_ID = TaskManager.runTaskRepeat(new Runnable()
+        {
             @Override
-            public void run() {
+            public void run()
+            {
                 final long start = System.currentTimeMillis();
-                while ((System.currentTimeMillis() - start) < 50) {
-                    if (plots.size() == 0) {
+                while ((System.currentTimeMillis() - start) < 50)
+                {
+                    if (plots.size() == 0)
+                    {
                         empty.addAll(chunks);
                         Trim.TASK = false;
                         TaskManager.runTaskAsync(whenDone);
@@ -137,14 +155,16 @@ public class Trim extends SubCommand {
 
                     final Location pos1 = MainUtil.getPlotBottomLoc(world, plot.id);
                     final Location pos2 = MainUtil.getPlotTopLoc(world, plot.id);
-                    
-                    int ccx1 = (pos1.getX() >> 9);
-                    int ccz1 = (pos1.getZ() >> 9);
-                    int ccx2 = (pos2.getX() >> 9);
-                    int ccz2 = (pos2.getZ() >> 9);
-                    
-                    for(int x = ccx1; x <= ccx2; x++) {
-                        for(int z = ccz1; z <= ccz2; z++) {
+
+                    final int ccx1 = (pos1.getX() >> 9);
+                    final int ccz1 = (pos1.getZ() >> 9);
+                    final int ccx2 = (pos2.getX() >> 9);
+                    final int ccz2 = (pos2.getZ() >> 9);
+
+                    for (int x = ccx1; x <= ccx2; x++)
+                    {
+                        for (int z = ccz1; z <= ccz2; z++)
+                        {
                             chunks.remove(new ChunkLoc(x, z));
                         }
                     }
@@ -155,62 +175,78 @@ public class Trim extends SubCommand {
         return true;
     }
 
-    public static void deleteChunks(final String world, final ArrayList<ChunkLoc> chunks) {
+    public static void deleteChunks(final String world, final ArrayList<ChunkLoc> chunks)
+    {
         ChunkManager.manager.deleteRegionFiles(world, chunks);
     }
 
-    public static void sendMessage(final String message) {
+    public static void sendMessage(final String message)
+    {
         PS.debug("&3PlotSquared -> World trim&8: &7" + message);
     }
 
-    public PlotId getId(final String id) {
-        try {
+    public PlotId getId(final String id)
+    {
+        try
+        {
             final String[] split = id.split(";");
             return new PlotId(Integer.parseInt(split[0]), Integer.parseInt(split[1]));
-        } catch (final Exception e) {
+        }
+        catch (final Exception e)
+        {
             return null;
         }
     }
 
     @Override
-    public boolean onCommand(final PlotPlayer plr, final String[] args) {
-        if (args.length == 1) {
+    public boolean onCommand(final PlotPlayer plr, final String[] args)
+    {
+        if (args.length == 1)
+        {
             final String arg = args[0].toLowerCase();
             final PlotId id = getId(arg);
-            if (id != null) {
+            if (id != null)
+            {
                 MainUtil.sendMessage(plr, "/plot trim x;z &l<world>");
                 return false;
             }
-            if (arg.equals("all")) {
+            if (arg.equals("all"))
+            {
                 MainUtil.sendMessage(plr, "/plot trim all &l<world>");
                 return false;
             }
             MainUtil.sendMessage(plr, C.TRIM_SYNTAX);
             return false;
         }
-        if (args.length != 2) {
+        if (args.length != 2)
+        {
             MainUtil.sendMessage(plr, C.TRIM_SYNTAX);
             return false;
         }
         final String arg = args[0].toLowerCase();
-        if (!arg.equals("all")) {
+        if (!arg.equals("all"))
+        {
             MainUtil.sendMessage(plr, C.TRIM_SYNTAX);
             return false;
         }
         final String world = args[1];
-        if (!BlockManager.manager.isWorld(world) || (PS.get().getPlotWorld(world) == null)) {
+        if (!BlockManager.manager.isWorld(world) || (PS.get().getPlotWorld(world) == null))
+        {
             MainUtil.sendMessage(plr, C.NOT_VALID_WORLD);
             return false;
         }
-        if (Trim.TASK) {
+        if (Trim.TASK)
+        {
             sendMessage(C.TRIM_IN_PROGRESS.s());
             return false;
         }
         sendMessage(C.TRIM_START.s());
         final ArrayList<ChunkLoc> empty = new ArrayList<>();
-        getTrimRegions(empty, world, new Runnable() {
+        getTrimRegions(empty, world, new Runnable()
+        {
             @Override
-            public void run() {
+            public void run()
+            {
                 deleteChunks(world, empty);
                 PS.log("$1Trim task complete!");
             }
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Trust.java b/src/main/java/com/intellectualcrafters/plot/commands/Trust.java
index 3dd3c23e3..89c4f7c55 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/Trust.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/Trust.java
@@ -37,69 +37,84 @@ import com.plotsquared.general.commands.Argument;
 import com.plotsquared.general.commands.CommandDeclaration;
 
 @CommandDeclaration(
-        command = "trust",
-        aliases = {"t"},
-        requiredType = RequiredType.NONE,
-        usage = "/plot trust <player>",
-        description = "Allow a player to build in a plot",
-        category = CommandCategory.ACTIONS
-)
-public class Trust extends SubCommand {
+command = "trust",
+aliases = { "t" },
+requiredType = RequiredType.NONE,
+usage = "/plot trust <player>",
+description = "Allow a player to build in a plot",
+category = CommandCategory.ACTIONS)
+public class Trust extends SubCommand
+{
 
-    public Trust() {
+    public Trust()
+    {
         requiredArguments = new Argument[] {
-                Argument.PlayerName
+        Argument.PlayerName
         };
     }
 
     @Override
-    public boolean onCommand(final PlotPlayer plr, final String[] args) {
-        
+    public boolean onCommand(final PlotPlayer plr, final String[] args)
+    {
+
         final Location loc = plr.getLocation();
         final Plot plot = MainUtil.getPlot(loc);
-        if (plot == null) {
-            return !sendMessage(plr, C.NOT_IN_PLOT);
-        }
-        if (!plot.hasOwner()) {
+        if (plot == null) { return !sendMessage(plr, C.NOT_IN_PLOT); }
+        if (!plot.hasOwner())
+        {
             MainUtil.sendMessage(plr, C.PLOT_UNOWNED);
             return false;
         }
-        if (!plot.isOwner(plr.getUUID()) && !Permissions.hasPermission(plr, "plots.admin.command.trust")) {
+        if (!plot.isOwner(plr.getUUID()) && !Permissions.hasPermission(plr, "plots.admin.command.trust"))
+        {
             MainUtil.sendMessage(plr, C.NO_PLOT_PERMS);
             return true;
         }
         UUID uuid;
-        if (args[0].equalsIgnoreCase("*")) {
+        if (args[0].equalsIgnoreCase("*"))
+        {
             uuid = DBFunc.everyone;
-        } else {
+        }
+        else
+        {
             uuid = UUIDHandler.getUUID(args[0], null);
         }
-        if (uuid == null) {
-            if (UUIDHandler.implementation instanceof SQLUUIDHandler) {
+        if (uuid == null)
+        {
+            if (UUIDHandler.implementation instanceof SQLUUIDHandler)
+            {
                 MainUtil.sendMessage(plr, C.INVALID_PLAYER_WAIT, args[0]);
-            } else {
+            }
+            else
+            {
                 MainUtil.sendMessage(plr, C.INVALID_PLAYER, args[0]);
             }
             return false;
         }
-        if (plot.isOwner(uuid)) {
+        if (plot.isOwner(uuid))
+        {
             MainUtil.sendMessage(plr, C.ALREADY_OWNER);
             return false;
         }
-        
-        if (plot.getTrusted().contains(uuid)) {
+
+        if (plot.getTrusted().contains(uuid))
+        {
             MainUtil.sendMessage(plr, C.ALREADY_ADDED);
             return false;
         }
-        if (plot.removeMember(uuid)) {
+        if (plot.removeMember(uuid))
+        {
             plot.addTrusted(uuid);
         }
-        else {
-            if (plot.getMembers().size() + plot.getTrusted().size() >= PS.get().getPlotWorld(plot.world).MAX_PLOT_MEMBERS) {
+        else
+        {
+            if ((plot.getMembers().size() + plot.getTrusted().size()) >= PS.get().getPlotWorld(plot.world).MAX_PLOT_MEMBERS)
+            {
                 MainUtil.sendMessage(plr, C.PLOT_MAX_MEMBERS);
                 return false;
             }
-            if (plot.getDenied().contains(uuid)) {
+            if (plot.getDenied().contains(uuid))
+            {
                 plot.removeDenied(uuid);
             }
             plot.addTrusted(uuid);
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Unclaim.java b/src/main/java/com/intellectualcrafters/plot/commands/Unclaim.java
index e105ff408..eacead0b8 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/Unclaim.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/Unclaim.java
@@ -32,42 +32,39 @@ import com.intellectualcrafters.plot.util.Permissions;
 import com.plotsquared.general.commands.CommandDeclaration;
 
 @CommandDeclaration(
-        command = "unclaim",
-        usage = "/plot unclaim",
-        requiredType = RequiredType.NONE,
-        description = "Unclaim a plot",
-        category = CommandCategory.ACTIONS
-)
-public class Unclaim extends SubCommand {
+command = "unclaim",
+usage = "/plot unclaim",
+requiredType = RequiredType.NONE,
+description = "Unclaim a plot",
+category = CommandCategory.ACTIONS)
+public class Unclaim extends SubCommand
+{
 
     @Override
-    public boolean onCommand(final PlotPlayer plr, final String[] args) {
+    public boolean onCommand(final PlotPlayer plr, final String[] args)
+    {
         final Location loc = plr.getLocation();
         final Plot plot = MainUtil.getPlot(loc);
-        if (plot == null) {
-            return !sendMessage(plr, C.NOT_IN_PLOT);
-        }
-        if (!plot.hasOwner()) {
-            return !sendMessage(plr, C.PLOT_NOT_CLAIMED);
-        }
-        if (!MainUtil.getTopPlot(plot).equals(MainUtil.getBottomPlot(plot))) {
-            return !sendMessage(plr, C.UNLINK_REQUIRED);
-        }
-        if (((!plot.hasOwner() || !plot.isOwner(plr.getUUID()))) && !Permissions.hasPermission(plr, "plots.admin.command.unclaim")) {
-            return !sendMessage(plr, C.NO_PLOT_PERMS);
-        }
+        if (plot == null) { return !sendMessage(plr, C.NOT_IN_PLOT); }
+        if (!plot.hasOwner()) { return !sendMessage(plr, C.PLOT_NOT_CLAIMED); }
+        if (!MainUtil.getTopPlot(plot).equals(MainUtil.getBottomPlot(plot))) { return !sendMessage(plr, C.UNLINK_REQUIRED); }
+        if (((!plot.hasOwner() || !plot.isOwner(plr.getUUID()))) && !Permissions.hasPermission(plr, "plots.admin.command.unclaim")) { return !sendMessage(plr, C.NO_PLOT_PERMS); }
         final PlotWorld pWorld = PS.get().getPlotWorld(plot.world);
-        if ((EconHandler.manager != null) && pWorld.USE_ECONOMY) {
+        if ((EconHandler.manager != null) && pWorld.USE_ECONOMY)
+        {
             final double c = pWorld.SELL_PRICE;
-            if (c > 0d) {
+            if (c > 0d)
+            {
                 EconHandler.manager.depositMoney(plr, c);
                 sendMessage(plr, C.ADDED_BALANCE, c + "");
             }
         }
-        if (plot.unclaim()) {
+        if (plot.unclaim())
+        {
             MainUtil.sendMessage(plr, C.UNCLAIM_SUCCESS);
         }
-        else {
+        else
+        {
             MainUtil.sendMessage(plr, C.UNCLAIM_FAILED);
         }
         return true;
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Undeny.java b/src/main/java/com/intellectualcrafters/plot/commands/Undeny.java
index 29613f264..63b63b607 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/Undeny.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/Undeny.java
@@ -35,75 +35,89 @@ import com.plotsquared.general.commands.Argument;
 import com.plotsquared.general.commands.CommandDeclaration;
 
 @CommandDeclaration(
-        command = "undeny",
-        aliases = {"ud"},
-        description = "Remove a denied user from a plot",
-        usage = "/plot undeny <player>",
-        requiredType = RequiredType.NONE,
-        category = CommandCategory.ACTIONS
-)
-public class Undeny extends SubCommand {
+command = "undeny",
+aliases = { "ud" },
+description = "Remove a denied user from a plot",
+usage = "/plot undeny <player>",
+requiredType = RequiredType.NONE,
+category = CommandCategory.ACTIONS)
+public class Undeny extends SubCommand
+{
 
-    public Undeny() {
+    public Undeny()
+    {
         requiredArguments = new Argument[] {
-                Argument.PlayerName
+        Argument.PlayerName
         };
     }
 
     @Override
-    public boolean onCommand(final PlotPlayer plr, final String ... args) {
-        
+    public boolean onCommand(final PlotPlayer plr, final String... args)
+    {
+
         final Location loc = plr.getLocation();
         final Plot plot = MainUtil.getPlot(loc);
-        if (plot == null) {
-            return !sendMessage(plr, C.NOT_IN_PLOT);
-        }
-        if (!plot.hasOwner()) {
+        if (plot == null) { return !sendMessage(plr, C.NOT_IN_PLOT); }
+        if (!plot.hasOwner())
+        {
             MainUtil.sendMessage(plr, C.PLOT_UNOWNED);
             return false;
         }
-        if (!plot.isOwner(plr.getUUID()) && !Permissions.hasPermission(plr, "plots.admin.command.undeny")) {
+        if (!plot.isOwner(plr.getUUID()) && !Permissions.hasPermission(plr, "plots.admin.command.undeny"))
+        {
             MainUtil.sendMessage(plr, C.NO_PLOT_PERMS);
             return true;
         }
         int count = 0;
-        switch (args[0]) {
+        switch (args[0])
+        {
             case "unknown":
-                ArrayList<UUID> toRemove = new ArrayList<>();
-                for (UUID uuid : plot.getDenied()) {
-                    if (UUIDHandler.getName(uuid) == null) {
+                final ArrayList<UUID> toRemove = new ArrayList<>();
+                for (final UUID uuid : plot.getDenied())
+                {
+                    if (UUIDHandler.getName(uuid) == null)
+                    {
                         toRemove.add(uuid);
                     }
                 }
-                for (UUID uuid : toRemove) {
+                for (final UUID uuid : toRemove)
+                {
                     plot.removeDenied(uuid);
                     count++;
                 }
                 break;
             case "*":
-                for (UUID uuid : new ArrayList<>(plot.getDenied())) {
+                for (final UUID uuid : new ArrayList<>(plot.getDenied()))
+                {
                     plot.removeDenied(uuid);
                     count++;
                 }
                 break;
             default:
-                UUID uuid = UUIDHandler.getUUID(args[0], null);
-                if (uuid != null) {
-                    if (plot.removeDenied(uuid)) {
+                final UUID uuid = UUIDHandler.getUUID(args[0], null);
+                if (uuid != null)
+                {
+                    if (plot.removeDenied(uuid))
+                    {
                         count++;
                     }
                 }
                 break;
         }
-        if (count == 0) {
-            if (UUIDHandler.implementation instanceof SQLUUIDHandler) {
+        if (count == 0)
+        {
+            if (UUIDHandler.implementation instanceof SQLUUIDHandler)
+            {
                 MainUtil.sendMessage(plr, C.INVALID_PLAYER_WAIT, args[0]);
-            } else {
+            }
+            else
+            {
                 MainUtil.sendMessage(plr, C.INVALID_PLAYER, args[0]);
             }
             return false;
         }
-        else {
+        else
+        {
             MainUtil.sendMessage(plr, C.REMOVED_PLAYERS, count + "");
         }
         return true;
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Unlink.java b/src/main/java/com/intellectualcrafters/plot/commands/Unlink.java
index 355ec0a93..b5c574933 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/Unlink.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/Unlink.java
@@ -32,44 +32,43 @@ import com.intellectualcrafters.plot.util.TaskManager;
 import com.plotsquared.general.commands.CommandDeclaration;
 
 @CommandDeclaration(
-        command = "unlink",
-        aliases = {"u", "unmerge"},
-        description = "Unlink a mega-plot",
-        usage = "/plot unlink",
-        requiredType = RequiredType.NONE,
-        category = CommandCategory.ACTIONS
-)
-public class Unlink extends SubCommand {
+command = "unlink",
+aliases = { "u", "unmerge" },
+description = "Unlink a mega-plot",
+usage = "/plot unlink",
+requiredType = RequiredType.NONE,
+category = CommandCategory.ACTIONS)
+public class Unlink extends SubCommand
+{
 
     @Override
-    public boolean onCommand(final PlotPlayer plr, final String[] args) {
-        
+    public boolean onCommand(final PlotPlayer plr, final String[] args)
+    {
 
         final Location loc = plr.getLocation();
         final Plot plot = MainUtil.getPlot(loc);
-        if (plot == null) {
-            return !sendMessage(plr, C.NOT_IN_PLOT);
-        }
-        if ((!plot.hasOwner() || !plot.isOwner(plr.getUUID())) && !Permissions.hasPermission(plr, "plots.admin.command.unlink")) {
-            return sendMessage(plr, C.NO_PLOT_PERMS);
-        }
-        if (MainUtil.getTopPlot(plot).equals(MainUtil.getBottomPlot(plot))) {
-            return sendMessage(plr, C.UNLINK_IMPOSSIBLE);
-        }
-        Runnable runnable = new Runnable() {
+        if (plot == null) { return !sendMessage(plr, C.NOT_IN_PLOT); }
+        if ((!plot.hasOwner() || !plot.isOwner(plr.getUUID())) && !Permissions.hasPermission(plr, "plots.admin.command.unlink")) { return sendMessage(plr, C.NO_PLOT_PERMS); }
+        if (MainUtil.getTopPlot(plot).equals(MainUtil.getBottomPlot(plot))) { return sendMessage(plr, C.UNLINK_IMPOSSIBLE); }
+        final Runnable runnable = new Runnable()
+        {
             @Override
-            public void run() {
-                if (!MainUtil.unlinkPlot(plot, true)) {
+            public void run()
+            {
+                if (!MainUtil.unlinkPlot(plot, true))
+                {
                     MainUtil.sendMessage(plr, "&cUnlink has been cancelled");
                     return;
                 }
                 MainUtil.sendMessage(plr, C.UNLINK_SUCCESS);
             }
         };
-        if (Settings.CONFIRM_UNLINK && !(Permissions.hasPermission(plr, "plots.confirm.bypass"))) {
+        if (Settings.CONFIRM_UNLINK && !(Permissions.hasPermission(plr, "plots.confirm.bypass")))
+        {
             CmdConfirm.addPending(plr, "/plot unlink " + plot.id, runnable);
         }
-        else {
+        else
+        {
             TaskManager.runTask(runnable);
         }
         return true;
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Untrust.java b/src/main/java/com/intellectualcrafters/plot/commands/Untrust.java
index a4eb7a1f4..d2b036266 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/Untrust.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/Untrust.java
@@ -36,71 +36,82 @@ import com.plotsquared.general.commands.CommandDeclaration;
 //     UNTRUST("untrust", "ut"),
 
 @CommandDeclaration(
-        command = "untrust",
-        aliases = {"ut"},
-        permission = "plots.untrust",
-        description = "Remove a trusted user from a plot",
-        usage = "/plot untrust <player>",
-        requiredType = RequiredType.NONE,
-        category = CommandCategory.ACTIONS
-)
-public class Untrust extends SubCommand {
+command = "untrust",
+aliases = { "ut" },
+permission = "plots.untrust",
+description = "Remove a trusted user from a plot",
+usage = "/plot untrust <player>",
+requiredType = RequiredType.NONE,
+category = CommandCategory.ACTIONS)
+public class Untrust extends SubCommand
+{
 
-    public Untrust() {
+    public Untrust()
+    {
         requiredArguments = new Argument[] {
-                Argument.PlayerName
+        Argument.PlayerName
         };
     }
 
     @Override
-    public boolean onCommand(final PlotPlayer plr, final String[] args) {
+    public boolean onCommand(final PlotPlayer plr, final String[] args)
+    {
         final Location loc = plr.getLocation();
         final Plot plot = MainUtil.getPlot(loc);
-        if (plot == null) {
-            return !sendMessage(plr, C.NOT_IN_PLOT);
-        }
-        if (!plot.hasOwner()) {
+        if (plot == null) { return !sendMessage(plr, C.NOT_IN_PLOT); }
+        if (!plot.hasOwner())
+        {
             MainUtil.sendMessage(plr, C.PLOT_UNOWNED);
             return false;
         }
-        if (!plot.isOwner(plr.getUUID()) && !Permissions.hasPermission(plr, "plots.admin.command.untrust")) {
+        if (!plot.isOwner(plr.getUUID()) && !Permissions.hasPermission(plr, "plots.admin.command.untrust"))
+        {
             MainUtil.sendMessage(plr, C.NO_PLOT_PERMS);
             return true;
         }
         int count = 0;
-        switch (args[0]) {
+        switch (args[0])
+        {
             case "unknown":
-                ArrayList<UUID> toRemove = new ArrayList<>();
-                for (UUID uuid : plot.getTrusted()) {
-                    if (UUIDHandler.getName(uuid) == null) {
+                final ArrayList<UUID> toRemove = new ArrayList<>();
+                for (final UUID uuid : plot.getTrusted())
+                {
+                    if (UUIDHandler.getName(uuid) == null)
+                    {
                         toRemove.add(uuid);
                     }
                 }
-                for (UUID uuid : toRemove) {
+                for (final UUID uuid : toRemove)
+                {
                     plot.removeTrusted(uuid);
                     count++;
                 }
                 break;
             case "*":
-                for (UUID uuid : new ArrayList<>(plot.getTrusted())) {
+                for (final UUID uuid : new ArrayList<>(plot.getTrusted()))
+                {
                     plot.removeTrusted(uuid);
                     count++;
                 }
                 break;
             default:
-                UUID uuid = UUIDHandler.getUUID(args[0], null);
-                if (uuid != null) {
-                    if (plot.removeTrusted(uuid)) {
+                final UUID uuid = UUIDHandler.getUUID(args[0], null);
+                if (uuid != null)
+                {
+                    if (plot.removeTrusted(uuid))
+                    {
                         count++;
                     }
                 }
                 break;
         }
-        if (count == 0) {
+        if (count == 0)
+        {
             MainUtil.sendMessage(plr, C.INVALID_PLAYER, args[0]);
             return false;
         }
-        else {
+        else
+        {
             MainUtil.sendMessage(plr, C.REMOVED_PLAYERS, count + "");
         }
         return true;
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Update.java b/src/main/java/com/intellectualcrafters/plot/commands/Update.java
index 6ea4fa419..ac7bc5d9d 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/Update.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/Update.java
@@ -30,43 +30,52 @@ import com.intellectualcrafters.plot.util.MainUtil;
 import com.plotsquared.general.commands.CommandDeclaration;
 
 @CommandDeclaration(
-        command = "update",
-        permission = "plots.admin",
-        description = "Update PlotSquared",
-        usage = "/plot update",
-        requiredType = RequiredType.NONE,
-        aliases = {"updateplugin"},
-        category = CommandCategory.DEBUG
-)
-public class Update extends SubCommand {
+command = "update",
+permission = "plots.admin",
+description = "Update PlotSquared",
+usage = "/plot update",
+requiredType = RequiredType.NONE,
+aliases = { "updateplugin" },
+category = CommandCategory.DEBUG)
+public class Update extends SubCommand
+{
 
     public static String version;
 
     @Override
-    public boolean onCommand(PlotPlayer plr, String[] args) {
+    public boolean onCommand(final PlotPlayer plr, final String[] args)
+    {
         URL url;
-        if (args.length == 0) {
+        if (args.length == 0)
+        {
             url = PS.get().update;
         }
-        else if (args.length == 1) {
-            try {
+        else if (args.length == 1)
+        {
+            try
+            {
                 url = new URL(args[0]);
-            } catch (MalformedURLException e) {
+            }
+            catch (final MalformedURLException e)
+            {
                 MainUtil.sendConsoleMessage("&cInvalid url: " + args[0]);
                 MainUtil.sendConsoleMessage(C.COMMAND_SYNTAX, "/plot update [url]");
                 return false;
             }
         }
-        else {
+        else
+        {
             MainUtil.sendMessage(plr, C.COMMAND_SYNTAX, getUsage().replaceAll("\\{label\\}", "plot"));
             return false;
         }
-        if (url == null) {
+        if (url == null)
+        {
             MainUtil.sendMessage(plr, "&cNo update found!");
             MainUtil.sendMessage(plr, "&cTo manually specify an update URL: /plot update <url>");
             return false;
         }
-        if (PS.get().update(null, url) && url == PS.get().update) {
+        if (PS.get().update(null, url) && (url == PS.get().update))
+        {
             PS.get().update = null;
         }
         return true;
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Visit.java b/src/main/java/com/intellectualcrafters/plot/commands/Visit.java
index f6d982151..c0a10c8d9 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/Visit.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/Visit.java
@@ -36,26 +36,30 @@ import com.plotsquared.general.commands.Argument;
 import com.plotsquared.general.commands.CommandDeclaration;
 
 @CommandDeclaration(
-        command = "visit",
-        permission = "plots.visit",
-        description = "Visit someones plot",
-        usage = "/plot visit <player|aliases|world|id> [#]",
-        aliases = {"v"},
-        requiredType = RequiredType.NONE,
-        category = CommandCategory.TELEPORT
-)
-public class Visit extends SubCommand {
+command = "visit",
+permission = "plots.visit",
+description = "Visit someones plot",
+usage = "/plot visit <player|aliases|world|id> [#]",
+aliases = { "v" },
+requiredType = RequiredType.NONE,
+category = CommandCategory.TELEPORT)
+public class Visit extends SubCommand
+{
 
-    public Visit() {
+    public Visit()
+    {
         requiredArguments = new Argument[] {
-                Argument.String
+        Argument.String
         };
     }
-    
-    public List<Plot> getPlots(final UUID uuid) {
+
+    public List<Plot> getPlots(final UUID uuid)
+    {
         final List<Plot> plots = new ArrayList<>();
-        for (final Plot p : PS.get().getPlots()) {
-            if (p.hasOwner() && p.isOwner(uuid)) {
+        for (final Plot p : PS.get().getPlots())
+        {
+            if (p.hasOwner() && p.isOwner(uuid))
+            {
                 plots.add(p);
             }
         }
@@ -63,65 +67,81 @@ public class Visit extends SubCommand {
     }
 
     @Override
-    public boolean onCommand(PlotPlayer plr, String[] args) {
+    public boolean onCommand(final PlotPlayer plr, final String[] args)
+    {
         ArrayList<Plot> plots = new ArrayList<>();
-        UUID user = UUIDHandler.getCachedUUID(args[0], null);
-        if (user != null ) {
+        final UUID user = UUIDHandler.getCachedUUID(args[0], null);
+        if (user != null)
+        {
             // do plots by username
             plots = PS.get().sortPlotsByTemp(PS.get().getPlots(user));
-        } else if (PS.get().isPlotWorld(args[0])) {
+        }
+        else if (PS.get().isPlotWorld(args[0]))
+        {
             // do plots by world
             plots = PS.get().sortPlots(PS.get().getPlotsInWorld(args[0]), SortType.DISTANCE_FROM_ORIGIN, null);
         }
-        else {
-            Plot plot = MainUtil.getPlotFromString(plr, args[0], true);
-            if (plot == null) {
-                return false;
-            }
+        else
+        {
+            final Plot plot = MainUtil.getPlotFromString(plr, args[0], true);
+            if (plot == null) { return false; }
             plots.add(plot);
         }
-        if (plots.size() == 0) {
+        if (plots.size() == 0)
+        {
             sendMessage(plr, C.FOUND_NO_PLOTS);
             return false;
         }
         int index = 0;
-        if (args.length == 2) {
-            try {
+        if (args.length == 2)
+        {
+            try
+            {
                 index = Integer.parseInt(args[1]) - 1;
-                if (index < 0 || index >= plots.size()) {
+                if ((index < 0) || (index >= plots.size()))
+                {
                     sendMessage(plr, C.NOT_VALID_NUMBER, "(1, " + plots.size() + ")");
                     sendMessage(plr, C.COMMAND_SYNTAX, "/plot visit " + args[0] + " [#]");
                     return false;
                 }
             }
-            catch (Exception e) {
+            catch (final Exception e)
+            {
                 sendMessage(plr, C.NOT_VALID_NUMBER, "(1, " + plots.size() + ")");
                 sendMessage(plr, C.COMMAND_SYNTAX, "/plot visit " + args[0] + " [#]");
                 return false;
             }
         }
 
-        Plot plot = plots.get(index);
-        if (!plot.hasOwner()) {
-            if (!Permissions.hasPermission(plr, "plots.visit.unowned")) {
+        final Plot plot = plots.get(index);
+        if (!plot.hasOwner())
+        {
+            if (!Permissions.hasPermission(plr, "plots.visit.unowned"))
+            {
                 sendMessage(plr, C.NO_PERMISSION, "plots.visit.unowned");
                 return false;
             }
         }
-        else if (plot.isOwner(plr.getUUID())) {
-            if (!Permissions.hasPermission(plr, "plots.visit.owned") && !Permissions.hasPermission(plr, "plots.home")) {
+        else if (plot.isOwner(plr.getUUID()))
+        {
+            if (!Permissions.hasPermission(plr, "plots.visit.owned") && !Permissions.hasPermission(plr, "plots.home"))
+            {
                 sendMessage(plr, C.NO_PERMISSION, "plots.visit.owned, plots.home");
                 return false;
             }
         }
-        else if (plot.isAdded(plr.getUUID())) {
-            if (!Permissions.hasPermission(plr, "plots.visit.shared")) {
+        else if (plot.isAdded(plr.getUUID()))
+        {
+            if (!Permissions.hasPermission(plr, "plots.visit.shared"))
+            {
                 sendMessage(plr, C.NO_PERMISSION, "plots.visit.shared");
                 return false;
             }
         }
-        else {
-            if (!Permissions.hasPermission(plr, "plots.visit.other")) {
+        else
+        {
+            if (!Permissions.hasPermission(plr, "plots.visit.other"))
+            {
                 sendMessage(plr, C.NO_PERMISSION, "plots.visit.other");
                 return false;
             }
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/WE_Anywhere.java b/src/main/java/com/intellectualcrafters/plot/commands/WE_Anywhere.java
index 35c5eee6e..52e75a492 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/WE_Anywhere.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/WE_Anywhere.java
@@ -20,30 +20,25 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 package com.intellectualcrafters.plot.commands;
 
-import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.object.PlotPlayer;
-import com.intellectualcrafters.plot.util.MainUtil;
-import com.intellectualcrafters.plot.util.Permissions;
-import com.plotsquared.bukkit.BukkitMain;
 import com.plotsquared.general.commands.CommandDeclaration;
-import com.plotsquared.listener.WEManager;
 
 @CommandDeclaration(
-        command = "weanywhere",
-        permission = "plots.worldedit.bypass",
-        description = "Force bypass of WorldEdit",
-        aliases = {"wea"},
-        usage = "/plot weanywhere",
-        requiredType = RequiredType.NONE,
-        category = CommandCategory.DEBUG
-)
-
+command = "weanywhere",
+permission = "plots.worldedit.bypass",
+description = "Force bypass of WorldEdit",
+aliases = { "wea" },
+usage = "/plot weanywhere",
+requiredType = RequiredType.NONE,
+category = CommandCategory.DEBUG)
 @Deprecated
-public class WE_Anywhere extends SubCommand {
+public class WE_Anywhere extends SubCommand
+{
 
     @Override
-    public boolean onCommand(PlotPlayer player, String[] arguments) {
-        return MainCommand.onCommand(player, "plot", new String[] {"toggle", "worldedit"});
+    public boolean onCommand(final PlotPlayer player, final String[] arguments)
+    {
+        return MainCommand.onCommand(player, "plot", new String[] { "toggle", "worldedit" });
     }
 
 }
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/list.java b/src/main/java/com/intellectualcrafters/plot/commands/list.java
index a294fc796..5ac8ae5ee 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/list.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/list.java
@@ -25,18 +25,13 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Map.Entry;
-import java.util.Set;
 import java.util.UUID;
 
-import org.bukkit.ChatColor;
-
 import com.intellectualcrafters.plot.PS;
 import com.intellectualcrafters.plot.PS.SortType;
 import com.intellectualcrafters.plot.config.C;
-import com.intellectualcrafters.plot.config.Settings;
 import com.intellectualcrafters.plot.flag.Flag;
 import com.intellectualcrafters.plot.flag.FlagManager;
-import com.intellectualcrafters.plot.object.ConsolePlayer;
 import com.intellectualcrafters.plot.object.Plot;
 import com.intellectualcrafters.plot.object.PlotMessage;
 import com.intellectualcrafters.plot.object.PlotPlayer;
@@ -48,98 +43,109 @@ import com.intellectualcrafters.plot.util.Permissions;
 import com.intellectualcrafters.plot.util.StringComparison;
 import com.intellectualcrafters.plot.util.StringMan;
 import com.intellectualcrafters.plot.util.UUIDHandler;
-import com.plotsquared.bukkit.object.BukkitPlayer;
 import com.plotsquared.general.commands.CommandDeclaration;
 
 @CommandDeclaration(
-        command = "list",
-        aliases = {"l"},
-        description = "List plots",
-        permission = "plots.list",
-        category = CommandCategory.INFO
-)
-public class list extends SubCommand {
+command = "list",
+aliases = { "l" },
+description = "List plots",
+permission = "plots.list",
+category = CommandCategory.INFO)
+public class list extends SubCommand
+{
 
-    private static String getName(final UUID id) {
-        if (id == null) {
-            return "none";
-        }
-        final String name = UUIDHandler.getName(id);
-        if (name == null) {
-            return "unknown";
-        }
-        return name;
-    }
-
-    private String[] getArgumentList(PlotPlayer player) {
-        List<String> args = new ArrayList<>();
-        if (EconHandler.manager != null && Permissions.hasPermission(player, "plots.list.forsale")) {
+    private String[] getArgumentList(final PlotPlayer player)
+    {
+        final List<String> args = new ArrayList<>();
+        if ((EconHandler.manager != null) && Permissions.hasPermission(player, "plots.list.forsale"))
+        {
             args.add("forsale");
         }
-        if (Permissions.hasPermission(player, "plots.list.mine")) {
+        if (Permissions.hasPermission(player, "plots.list.mine"))
+        {
             args.add("mine");
         }
-        if (Permissions.hasPermission(player, "plots.list.shared")) {
+        if (Permissions.hasPermission(player, "plots.list.shared"))
+        {
             args.add("shared");
         }
-        if (Permissions.hasPermission(player, "plots.list.world")) {
+        if (Permissions.hasPermission(player, "plots.list.world"))
+        {
             args.add("world");
         }
-        if (Permissions.hasPermission(player, "plots.list.top")) {
+        if (Permissions.hasPermission(player, "plots.list.top"))
+        {
             args.add("top");
         }
-        if (Permissions.hasPermission(player, "plots.list.all")) {
+        if (Permissions.hasPermission(player, "plots.list.all"))
+        {
             args.add("all");
         }
-        if (Permissions.hasPermission(player, "plots.list.unowned")) {
+        if (Permissions.hasPermission(player, "plots.list.unowned"))
+        {
             args.add("unowned");
         }
-        if (Permissions.hasPermission(player, "plots.list.unknown")) {
+        if (Permissions.hasPermission(player, "plots.list.unknown"))
+        {
             args.add("unknown");
         }
-        if (Permissions.hasPermission(player, "plots.list.player")) {
+        if (Permissions.hasPermission(player, "plots.list.player"))
+        {
             args.add("<player>");
         }
-        if (Permissions.hasPermission(player, "plots.list.world")) {
+        if (Permissions.hasPermission(player, "plots.list.world"))
+        {
             args.add("<world>");
         }
-        if (Permissions.hasPermission(player, "plots.list.done")) {
+        if (Permissions.hasPermission(player, "plots.list.done"))
+        {
             args.add("done");
         }
         return args.toArray(new String[args.size()]);
     }
-    
-    public void noArgs(PlotPlayer plr) {
+
+    public void noArgs(final PlotPlayer plr)
+    {
         MainUtil.sendMessage(plr, C.SUBCOMMAND_SET_OPTIONS_HEADER.s() + getArgumentList(getArgumentList(plr)));
     }
 
     @Override
-    public boolean onCommand(final PlotPlayer plr, final String[] args) {
-        if (args.length < 1) {
+    public boolean onCommand(final PlotPlayer plr, final String[] args)
+    {
+        if (args.length < 1)
+        {
             noArgs(plr);
             return false;
         }
         int page = 0;
-        if (args.length > 1) {
-            try {
+        if (args.length > 1)
+        {
+            try
+            {
                 page = Integer.parseInt(args[1]);
                 --page;
-                if (page < 0) {
+                if (page < 0)
+                {
                     page = 0;
                 }
-            } catch (final Exception e) {
+            }
+            catch (final Exception e)
+            {
                 page = 0;
             }
         }
-        
+
         List<Plot> plots = null;
-        
-        String world = plr.getLocation().getWorld();
-        String arg = args[0].toLowerCase();
+
+        final String world = plr.getLocation().getWorld();
+        final String arg = args[0].toLowerCase();
         boolean sort = true;
-        switch (arg) {
-            case "mine": {
-                if (!Permissions.hasPermission(plr, "plots.list.mine")) {
+        switch (arg)
+        {
+            case "mine":
+            {
+                if (!Permissions.hasPermission(plr, "plots.list.mine"))
+                {
                     MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.list.mine");
                     return false;
                 }
@@ -147,79 +153,102 @@ public class list extends SubCommand {
                 plots = PS.get().sortPlotsByTemp(PS.get().getPlots(plr));
                 break;
             }
-            case "shared": {
-                if (!Permissions.hasPermission(plr, "plots.list.shared")) {
+            case "shared":
+            {
+                if (!Permissions.hasPermission(plr, "plots.list.shared"))
+                {
                     MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.list.shared");
                     return false;
                 }
                 plots = new ArrayList<Plot>();
-                for (Plot plot : PS.get().getPlots()) {
-                    if (plot.getTrusted().contains(plr.getUUID()) || plot.getMembers().contains(plr.getUUID())) {
+                for (final Plot plot : PS.get().getPlots())
+                {
+                    if (plot.getTrusted().contains(plr.getUUID()) || plot.getMembers().contains(plr.getUUID()))
+                    {
                         plots.add(plot);
                     }
                 }
                 break;
             }
-            case "world": {
-                if (!Permissions.hasPermission(plr, "plots.list.world")) {
+            case "world":
+            {
+                if (!Permissions.hasPermission(plr, "plots.list.world"))
+                {
                     MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.list.world");
                     return false;
                 }
-                if (!Permissions.hasPermission(plr, "plots.list.world." + world)) {
+                if (!Permissions.hasPermission(plr, "plots.list.world." + world))
+                {
                     MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.list.world." + world);
                     return false;
                 }
                 plots = new ArrayList<>(PS.get().getPlotsInWorld(world));
                 break;
             }
-            case "all": {
-                if (!Permissions.hasPermission(plr, "plots.list.all")) {
+            case "all":
+            {
+                if (!Permissions.hasPermission(plr, "plots.list.all"))
+                {
                     MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.list.all");
                     return false;
                 }
                 plots = new ArrayList<>(PS.get().getPlots());
                 break;
             }
-            case "done": {
-                if (!Permissions.hasPermission(plr, "plots.list.done")) {
+            case "done":
+            {
+                if (!Permissions.hasPermission(plr, "plots.list.done"))
+                {
                     MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.list.done");
                     return false;
                 }
                 plots = new ArrayList<>();
                 String match;
-                if (args.length == 2) {
+                if (args.length == 2)
+                {
                     match = args[1];
                 }
-                else {
+                else
+                {
                     match = null;
                 }
-                for (Plot plot : PS.get().getPlots()) {
-                    Flag flag = plot.getSettings().flags.get("done"); 
-                    if (flag == null) {
+                for (final Plot plot : PS.get().getPlots())
+                {
+                    final Flag flag = plot.getSettings().flags.get("done");
+                    if (flag == null)
+                    {
                         continue;
                     }
-                    if (match != null) {
-                        try {
-                            if (flag.getValueString().matches(match)) {
+                    if (match != null)
+                    {
+                        try
+                        {
+                            if (flag.getValueString().matches(match))
+                            {
                                 plots.add(plot);
                             }
                         }
-                        catch (Exception e) {
+                        catch (final Exception e)
+                        {
                             break;
                         }
                     }
-                    else {
+                    else
+                    {
                         plots.add(plot);
                     }
                 }
-                Collections.sort(plots, new Comparator<Plot>() {
+                Collections.sort(plots, new Comparator<Plot>()
+                {
                     @Override
-                    public int compare(Plot a, Plot b) {
-                        String va = a.getSettings().flags.get("done").getValueString();
-                        String vb = b.getSettings().flags.get("done").getValueString();
-                        if (MathMan.isInteger(va)) {
+                    public int compare(final Plot a, final Plot b)
+                    {
+                        final String va = a.getSettings().flags.get("done").getValueString();
+                        final String vb = b.getSettings().flags.get("done").getValueString();
+                        if (MathMan.isInteger(va))
+                        {
                             if (MathMan.isInteger(vb)) {
-                                return Integer.parseInt(vb) - Integer.parseInt(va);
+                            return Integer.parseInt(vb) - Integer.parseInt(va);
                             }
                             return -1;
                         }
@@ -229,37 +258,45 @@ public class list extends SubCommand {
                 sort = false;
                 break;
             }
-            case "top": {
-                if (!Permissions.hasPermission(plr, "plots.list.top")) {
+            case "top":
+            {
+                if (!Permissions.hasPermission(plr, "plots.list.top"))
+                {
                     MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.list.top");
                     return false;
                 }
                 plots = new ArrayList<>(PS.get().getPlots());
-                Collections.sort(plots, new Comparator<Plot>() {
+                Collections.sort(plots, new Comparator<Plot>()
+                {
                     @Override
-                    public int compare(Plot p1, Plot p2) {
+                    public int compare(final Plot p1, final Plot p2)
+                    {
                         double v1 = 0;
                         double v2 = 0;
-                        int p1s = p1.getSettings().ratings != null ? p1.getSettings().ratings.size() : 0;
-                        int p2s = p2.getSettings().ratings != null ? p2.getSettings().ratings.size() : 0;
-                        if (p1.getSettings().ratings != null && p1s > 0) {
-                            for (Entry<UUID, Rating> entry : p1.getRatings().entrySet()) {
-                                double av = entry.getValue().getAverageRating();
+                        final int p1s = p1.getSettings().ratings != null ? p1.getSettings().ratings.size() : 0;
+                        final int p2s = p2.getSettings().ratings != null ? p2.getSettings().ratings.size() : 0;
+                        if ((p1.getSettings().ratings != null) && (p1s > 0))
+                        {
+                            for (final Entry<UUID, Rating> entry : p1.getRatings().entrySet())
+                            {
+                                final double av = entry.getValue().getAverageRating();
                                 v1 += av * av;
                             }
                             v1 /= p1s;
                             v1 += p1s;
                         }
-                        if (p2.getSettings().ratings != null && p2s > 0) {
-                            for (Entry<UUID, Rating> entry : p2.getRatings().entrySet()) {
-                                double av = entry.getValue().getAverageRating();
+                        if ((p2.getSettings().ratings != null) && (p2s > 0))
+                        {
+                            for (final Entry<UUID, Rating> entry : p2.getRatings().entrySet())
+                            {
+                                final double av = entry.getValue().getAverageRating();
                                 v2 += av * av;
                             }
                             v2 /= p2s;
                             v2 += p2s;
                         }
-                        if (v2 == v1 && v2 != 0) {
-                            return p2s - p1s;
+                        if ((v2 == v1) && (v2 != 0)) {
+                        return p2s - p1s;
                         }
                         return (int) Math.signum(v2 - v1);
                     }
@@ -267,59 +304,77 @@ public class list extends SubCommand {
                 sort = false;
                 break;
             }
-            case "forsale": {
-                if (!Permissions.hasPermission(plr, "plots.list.forsale")) {
+            case "forsale":
+            {
+                if (!Permissions.hasPermission(plr, "plots.list.forsale"))
+                {
                     MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.list.forsale");
                     return false;
                 }
-                if (EconHandler.manager == null) {
+                if (EconHandler.manager == null)
+                {
                     break;
                 }
                 plots = new ArrayList<>();
-                for (Plot plot : PS.get().getPlots()) {
+                for (final Plot plot : PS.get().getPlots())
+                {
                     final Flag price = FlagManager.getPlotFlag(plot, "price");
-                    if (price != null) {
+                    if (price != null)
+                    {
                         plots.add(plot);
                     }
                 }
                 break;
             }
-            case "unowned": {
-                if (!Permissions.hasPermission(plr, "plots.list.unowned")) {
+            case "unowned":
+            {
+                if (!Permissions.hasPermission(plr, "plots.list.unowned"))
+                {
                     MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.list.unowned");
                     return false;
                 }
                 plots = new ArrayList<>();
-                for (Plot plot : PS.get().getPlots()) {
-                    if (plot.owner == null) {
+                for (final Plot plot : PS.get().getPlots())
+                {
+                    if (plot.owner == null)
+                    {
                         plots.add(plot);
                     }
                 }
                 break;
             }
-            case "unknown": {
-                if (!Permissions.hasPermission(plr, "plots.list.unknown")) {
+            case "unknown":
+            {
+                if (!Permissions.hasPermission(plr, "plots.list.unknown"))
+                {
                     MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.list.unknown");
                     return false;
                 }
                 plots = new ArrayList<>();
-                for (Plot plot : PS.get().getPlots()) {
-                    if (plot.owner == null) {
+                for (final Plot plot : PS.get().getPlots())
+                {
+                    if (plot.owner == null)
+                    {
                         continue;
                     }
-                    if (UUIDHandler.getName(plot.owner) == null) {
+                    if (UUIDHandler.getName(plot.owner) == null)
+                    {
                         plots.add(plot);
                     }
                 }
                 break;
             }
-            default: {
-                if (PS.get().isPlotWorld(args[0])) {
-                    if (!Permissions.hasPermission(plr, "plots.list.world")) {
+            default:
+            {
+                if (PS.get().isPlotWorld(args[0]))
+                {
+                    if (!Permissions.hasPermission(plr, "plots.list.world"))
+                    {
                         MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.list.world");
                         return false;
                     }
-                    if (!Permissions.hasPermission(plr, "plots.list.world." + args[0])) {
+                    if (!Permissions.hasPermission(plr, "plots.list.world." + args[0]))
+                    {
                         MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.list.world." + args[0]);
                         return false;
                     }
@@ -327,14 +382,19 @@ public class list extends SubCommand {
                     break;
                 }
                 UUID uuid = UUIDHandler.getUUID(args[0], null);
-                if (uuid == null) {
-                    try {
+                if (uuid == null)
+                {
+                    try
+                    {
                         uuid = UUID.fromString(args[0]);
                     }
-                    catch (Exception e) {}
+                    catch (final Exception e)
+                    {}
                 }
-                if (uuid != null) {
-                    if (!Permissions.hasPermission(plr, "plots.list.player")) {
+                if (uuid != null)
+                {
+                    if (!Permissions.hasPermission(plr, "plots.list.player"))
+                    {
                         MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.list.player");
                         return false;
                     }
@@ -344,91 +404,107 @@ public class list extends SubCommand {
                 }
             }
         }
-        
-        if (plots == null) {
+
+        if (plots == null)
+        {
             sendMessage(plr, C.DID_YOU_MEAN, new StringComparison<String>(args[0], new String[] { "mine", "shared", "world", "all" }).getBestMatch());
             return false;
         }
-        
-        if (plots.size() == 0) {
+
+        if (plots.size() == 0)
+        {
             MainUtil.sendMessage(plr, C.FOUND_NO_PLOTS);
             return false;
         }
         displayPlots(plr, plots, 12, page, world, args, sort);
         return true;
     }
-    
-    public void displayPlots(PlotPlayer player, List<Plot> plots, int pageSize, int page, String world, String[] args, boolean sort) {
-        if (sort) {
+
+    public void displayPlots(final PlotPlayer player, List<Plot> plots, final int pageSize, int page, final String world, final String[] args, final boolean sort)
+    {
+        if (sort)
+        {
             plots = PS.get().sortPlots(plots, SortType.DISTANCE_FROM_ORIGIN, world);
         }
-        if (page < 0) {
+        if (page < 0)
+        {
             page = 0;
         }
         final int totalPages = (int) Math.ceil(plots.size() / pageSize);
-        if (page > totalPages) {
+        if (page > totalPages)
+        {
             page = totalPages;
         }
         // Only display pageSize!
         int max = (page * pageSize) + pageSize;
-        if (max > plots.size()) {
+        if (max > plots.size())
+        {
             max = plots.size();
         }
-        
-        List<Plot> subList = plots.subList(page * pageSize, max);
-        
+
+        final List<Plot> subList = plots.subList(page * pageSize, max);
+
         // Header
-        String header = C.PLOT_LIST_HEADER_PAGED.s()
-                .replaceAll("%cur", page + 1 + "")
-                .replaceAll("%max", totalPages + 1 + "")
-                .replaceAll("%amount%", plots.size() + "")
-                .replaceAll("%word%", "all");
+        final String header = C.PLOT_LIST_HEADER_PAGED.s()
+        .replaceAll("%cur", page + 1 + "")
+        .replaceAll("%max", totalPages + 1 + "")
+        .replaceAll("%amount%", plots.size() + "")
+        .replaceAll("%word%", "all");
         MainUtil.sendMessage(player, header);
 
         int i = page * pageSize;
-        for (Plot plot : subList) {
-            if (plot.getSettings().isMerged()) {
-                if (!MainUtil.getBottomPlot(plot).equals(plot)) {
+        for (final Plot plot : subList)
+        {
+            if (plot.getSettings().isMerged())
+            {
+                if (!MainUtil.getBottomPlot(plot).equals(plot))
+                {
                     continue;
                 }
             }
             i++;
             String color;
-            if (plot.owner == null) {
+            if (plot.owner == null)
+            {
                 color = "$3";
             }
-            else if (plot.isOwner(player.getUUID())) {
+            else if (plot.isOwner(player.getUUID()))
+            {
                 color = "$1";
             }
-            else if (plot.isAdded(player.getUUID())) {
+            else if (plot.isAdded(player.getUUID()))
+            {
                 color = "$4";
             }
-            else if (plot.isDenied(player.getUUID())) {
+            else if (plot.isDenied(player.getUUID()))
+            {
                 color = "$2";
             }
-            else {
+            else
+            {
                 color = "$1";
             }
-            PlotMessage trusted =
-                    new PlotMessage()
-                    .text(C.color(C.PLOT_INFO_TRUSTED.s().replaceAll("%trusted%", Info.getPlayerList(plot.getTrusted()))))
-                    .color("$1");
-            
-            PlotMessage members =
-                    new PlotMessage()
-                    .text(C.color(C.PLOT_INFO_MEMBERS.s().replaceAll("%members%", Info.getPlayerList(plot.getMembers()))))
-                    .color("$1");
-            
+            final PlotMessage trusted =
+            new PlotMessage()
+            .text(C.color(C.PLOT_INFO_TRUSTED.s().replaceAll("%trusted%", Info.getPlayerList(plot.getTrusted()))))
+            .color("$1");
+
+            final PlotMessage members =
+            new PlotMessage()
+            .text(C.color(C.PLOT_INFO_MEMBERS.s().replaceAll("%members%", Info.getPlayerList(plot.getMembers()))))
+            .color("$1");
+
             String strFlags = StringMan.join(plot.getSettings().flags.values(), ",");
-            if (strFlags.length() == 0) {
+            if (strFlags.length() == 0)
+            {
                 strFlags = C.NONE.s();
             }
-            
-            PlotMessage flags =
-                    new PlotMessage()
-                    .text(C.color(C.PLOT_INFO_FLAGS.s().replaceAll("%flags%", strFlags)))
-                    .color("$1");
-            
+
+            final PlotMessage flags =
+            new PlotMessage()
+            .text(C.color(C.PLOT_INFO_FLAGS.s().replaceAll("%flags%", strFlags)))
+            .color("$1");
+
             PlotMessage message = new PlotMessage()
             .text("[")
             .color("$3")
@@ -439,48 +515,54 @@ public class list extends SubCommand {
             .text("]")
             .color("$3")
             .text(" " + plot.toString())
-            
+
             .tooltip(trusted, members, flags)
             .command("/plot info " + plot.world + ";" + plot.id)
-            
+
             .color(color)
             .text(" - ")
             .color("$2");
             String prefix = "";
-            for (UUID uuid : plot.getOwners()) {
-                String name = UUIDHandler.getName(uuid);
-                if (name == null) {
+            for (final UUID uuid : plot.getOwners())
+            {
+                final String name = UUIDHandler.getName(uuid);
+                if (name == null)
+                {
                     message = message
-                            .text(prefix)
-                            .color("$4")
-                            .text("unknown")
-                            .color("$2")
-                            .tooltip(uuid.toString())
-                            .suggest(uuid.toString());
+                    .text(prefix)
+                    .color("$4")
+                    .text("unknown")
+                    .color("$2")
+                    .tooltip(uuid.toString())
+                    .suggest(uuid.toString());
                 }
-                else {
-                    PlotPlayer pp = UUIDHandler.getPlayer(uuid);
-                    if (pp != null) {
+                else
+                {
+                    final PlotPlayer pp = UUIDHandler.getPlayer(uuid);
+                    if (pp != null)
+                    {
                         message = message
-                                .text(prefix)
-                                .color("$4")
-                                .text(name).color("$1")
-                                .tooltip(new PlotMessage("Online").color("$4"));
+                        .text(prefix)
+                        .color("$4")
+                        .text(name).color("$1")
+                        .tooltip(new PlotMessage("Online").color("$4"));
                     }
-                    else {
+                    else
+                    {
                         message = message
-                                .text(prefix)
-                                .color("$4")
-                                .text(name).color("$1")
-                                .tooltip(new PlotMessage("Offline").color("$3"));
+                        .text(prefix)
+                        .color("$4")
+                        .text(name).color("$1")
+                        .tooltip(new PlotMessage("Offline").color("$3"));
                     }
                 }
                 prefix = ", ";
             }
             message.send(player);
         }
-        if (page < totalPages && page > 0) {
-            // back | next 
+        if ((page < totalPages) && (page > 0))
+        {
+            // back | next
             new PlotMessage()
             .text("<-")
             .color("$1")
@@ -495,7 +577,8 @@ public class list extends SubCommand {
             .send(player);
             return;
         }
-        if (page == 0 && totalPages != 0) {
+        if ((page == 0) && (totalPages != 0))
+        {
             // next
             new PlotMessage()
             .text("<-")
@@ -510,7 +593,8 @@ public class list extends SubCommand {
             .send(player);
             return;
         }
-        if (page == totalPages && totalPages != 0) {
+        if ((page == totalPages) && (totalPages != 0))
+        {
             // back
             new PlotMessage()
             .text("<-")
@@ -526,11 +610,13 @@ public class list extends SubCommand {
             return;
         }
     }
-    
-    private String getArgumentList(final String[] strings) {
+
+    private String getArgumentList(final String[] strings)
+    {
         final StringBuilder builder = new StringBuilder();
         String prefix = "";
-        for (final String s : strings) {
+        for (final String s : strings)
+        {
             builder.append(prefix + s);
             prefix = " | ";
         }
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/plugin.java b/src/main/java/com/intellectualcrafters/plot/commands/plugin.java
index 0a850482a..1e62adb8e 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/plugin.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/plugin.java
@@ -27,16 +27,17 @@ import com.intellectualcrafters.plot.util.StringMan;
 import com.plotsquared.general.commands.CommandDeclaration;
 
 @CommandDeclaration(
-        command = "plugin",
-        permission = "plots.use",
-        description = "Show plugin information",
-        aliases = {"version"},
-        category = CommandCategory.INFO
-)
-public class plugin extends SubCommand {
+command = "plugin",
+permission = "plots.use",
+description = "Show plugin information",
+aliases = { "version" },
+category = CommandCategory.INFO)
+public class plugin extends SubCommand
+{
 
     @Override
-    public boolean onCommand(final PlotPlayer plr, final String[] args) {
+    public boolean onCommand(final PlotPlayer plr, final String[] args)
+    {
         MainUtil.sendMessage(plr, String.format("$2>> $1&lPlotSquared $2($1Version$2: $1%s$2)", StringMan.join(PS.get().IMP.getPluginVersion(), ".")));
         MainUtil.sendMessage(plr, String.format("$2>> $1&lAuthors$2: $1Citymonstret $2& $1Empire92"));
         MainUtil.sendMessage(plr, String.format("$2>> $1&lWiki$2: $1https://github.com/IntellectualCrafters/PlotSquared/wiki"));
diff --git a/src/main/java/com/intellectualcrafters/plot/config/C.java b/src/main/java/com/intellectualcrafters/plot/config/C.java
index 0240131bc..71451288f 100644
--- a/src/main/java/com/intellectualcrafters/plot/config/C.java
+++ b/src/main/java/com/intellectualcrafters/plot/config/C.java
@@ -38,49 +38,50 @@ import com.plotsquared.general.commands.CommandCaller;
 /**
  * Captions class.
  *
- * @author Citymonstret 
+
  */
-public enum C {
+public enum C
+{
 
     /*
      * Static flags
      */
-    FLAG_USE("use","static.flags"),
-    FLAG_PLACE("place","static.flags"),
-    FLAG_PVP("pvp","static.flags"),
-    FLAG_HANGING_PLACE("hanging-place","static.flags"),
-    FLAG_HANGING_BREAK("hanging-break","static.flags"),
-    FLAG_HOSTILE_INTERACT("hostile-interact","static.flags"),
-    FLAG_ANIMAL_INTERACT("animal-interact","static.flags"),
-    FLAG_VEHICLE_USE("vehicle-use","static.flags"),
-    FLAG_PLAYER_INTERACT("player-interact","static.flags"),
-    FLAG_TAMED_INTERACT("tamed-interact","static.flags"),
-    FLAG_DISABLE_PHYSICS("disable-physics","static.flags"),
+    FLAG_USE("use", "static.flags"),
+    FLAG_PLACE("place", "static.flags"),
+    FLAG_PVP("pvp", "static.flags"),
+    FLAG_HANGING_PLACE("hanging-place", "static.flags"),
+    FLAG_HANGING_BREAK("hanging-break", "static.flags"),
+    FLAG_HOSTILE_INTERACT("hostile-interact", "static.flags"),
+    FLAG_ANIMAL_INTERACT("animal-interact", "static.flags"),
+    FLAG_VEHICLE_USE("vehicle-use", "static.flags"),
+    FLAG_PLAYER_INTERACT("player-interact", "static.flags"),
+    FLAG_TAMED_INTERACT("tamed-interact", "static.flags"),
+    FLAG_DISABLE_PHYSICS("disable-physics", "static.flags"),
     /*
      * Static permission
      */
-    PERMISSION_STAR("*","static.permissions"),
-    PERMISSION_ADMIN("plots.admin","static.permissions"),
-    PERMISSION_PROJECTILE_UNOWNED("plots.projectile.unowned","static.permissions"),
-    PERMISSION_PROJECTILE_OTHER("plots.projectile.other","static.permissions"),
-    PERMISSION_ADMIN_INTERACT_BLOCKED_CMDS("plots.admin.interact.blockedcommands","static.permissions"),
-    PERMISSION_WORLDEDIT_BYPASS("plots.worldedit.bypass","static.permissions"),
-    PERMISSION_PLOT_TOGGLE_TITLES("plots.toggle.titles","static.permissions"),
-    PERMISSION_PLOT_TOGGLE_CHAT("plots.toggle.chat","static.permissions"),
-    PERMISSION_ADMIN_EXIT_DENIED("plots.admin.exit.denied","static.permissions"),
-    PERMISSION_ADMIN_ENTRY_DENIED("plots.admin.entry.denied","static.permissions"),
-    PERMISSION_COMMANDS_CHAT("plots.admin.command.chat","static.permissions"),
-    PERMISSION_MERGE_OTHER("plots.merge.other","static.permissions"),
-    PERMISSION_ADMIN_DESTROY_UNOWNED("plots.admin.destroy.unowned","static.permissions"),
-    PERMISSION_ADMIN_DESTROY_OTHER( "plots.admin.destroy.other","static.permissions"),
-    PERMISSION_ADMIN_DESTROY_ROAD("plots.admin.destroy.road","static.permissions"),
-    PERMISSION_ADMIN_BUILD_ROAD("plots.admin.build.road","static.permissions"),
-    PERMISSION_ADMIN_BUILD_UNOWNED("plots.admin.build.unowned","static.permissions"),
-    PERMISSION_ADMIN_BUILD_OTHER("plots.admin.build.other","static.permissions"),
-    PERMISSION_ADMIN_INTERACT_ROAD("plots.admin.interact.road","static.permissions"),
-    PERMISSION_ADMIN_INTERACT_UNOWNED("plots.admin.interact.unowned","static.permissions"),
-    PERMISSION_ADMIN_INTERACT_OTHER("plots.admin.interact.other","static.permissions"),
-    PERMISSION_ADMIN_BUILD_HEIGHTLIMIT("plots.admin.build.heightlimit","static.permissions"),
+    PERMISSION_STAR("*", "static.permissions"),
+    PERMISSION_ADMIN("plots.admin", "static.permissions"),
+    PERMISSION_PROJECTILE_UNOWNED("plots.projectile.unowned", "static.permissions"),
+    PERMISSION_PROJECTILE_OTHER("plots.projectile.other", "static.permissions"),
+    PERMISSION_ADMIN_INTERACT_BLOCKED_CMDS("plots.admin.interact.blockedcommands", "static.permissions"),
+    PERMISSION_WORLDEDIT_BYPASS("plots.worldedit.bypass", "static.permissions"),
+    PERMISSION_PLOT_TOGGLE_TITLES("plots.toggle.titles", "static.permissions"),
+    PERMISSION_PLOT_TOGGLE_CHAT("plots.toggle.chat", "static.permissions"),
+    PERMISSION_ADMIN_EXIT_DENIED("plots.admin.exit.denied", "static.permissions"),
+    PERMISSION_ADMIN_ENTRY_DENIED("plots.admin.entry.denied", "static.permissions"),
+    PERMISSION_COMMANDS_CHAT("plots.admin.command.chat", "static.permissions"),
+    PERMISSION_MERGE_OTHER("plots.merge.other", "static.permissions"),
+    PERMISSION_ADMIN_DESTROY_UNOWNED("plots.admin.destroy.unowned", "static.permissions"),
+    PERMISSION_ADMIN_DESTROY_OTHER("plots.admin.destroy.other", "static.permissions"),
+    PERMISSION_ADMIN_DESTROY_ROAD("plots.admin.destroy.road", "static.permissions"),
+    PERMISSION_ADMIN_BUILD_ROAD("plots.admin.build.road", "static.permissions"),
+    PERMISSION_ADMIN_BUILD_UNOWNED("plots.admin.build.unowned", "static.permissions"),
+    PERMISSION_ADMIN_BUILD_OTHER("plots.admin.build.other", "static.permissions"),
+    PERMISSION_ADMIN_INTERACT_ROAD("plots.admin.interact.road", "static.permissions"),
+    PERMISSION_ADMIN_INTERACT_UNOWNED("plots.admin.interact.unowned", "static.permissions"),
+    PERMISSION_ADMIN_INTERACT_OTHER("plots.admin.interact.other", "static.permissions"),
+    PERMISSION_ADMIN_BUILD_HEIGHTLIMIT("plots.admin.build.heightlimit", "static.permissions"),
     /*
      * Confirm
      */
@@ -109,7 +110,9 @@ public enum C {
     /*
      * Cluster
      */
-    CLUSTER_AVAILABLE_ARGS("$1The following sub commands are available: $4list$2, $4create$2, $4delete$2, $4resize$2, $4invite$2, $4kick$2, $4leave$2, $4members$2, $4info$2, $4tp$2, $4sethome", "Cluster"),
+    CLUSTER_AVAILABLE_ARGS(
+    "$1The following sub commands are available: $4list$2, $4create$2, $4delete$2, $4resize$2, $4invite$2, $4kick$2, $4leave$2, $4members$2, $4info$2, $4tp$2, $4sethome",
+    "Cluster"),
     CLUSTER_LIST_HEADING("$2There are $1%s$2 clusters in this world", "Cluster"),
     CLUSTER_LIST_ELEMENT("$2 - $1%s&-", "Cluster"),
     CLUSTER_INTERSECTION("$2The proposed area overlaps with $1%s$2 existing cluster/s", "Cluster"),
@@ -183,7 +186,7 @@ public enum C {
     COMMENT_REMOVED("$4Successfully deleted comment/s:n$2 - '$3%s$2'", "Comment"),
     COMMENT_ADDED("$4A comment has been left", "Comment"),
     COMMENT_HEADER("$2&m---------&r $1Comments $2&m---------&r", "Comment"),
-    INBOX_EMPTY("$2No comments","Comment"),
+    INBOX_EMPTY("$2No comments", "Comment"),
     /*
      * Console
      */
@@ -206,7 +209,7 @@ public enum C {
     NO_CLIPBOARD("$2You don't have a selection in your clipboard", "Clipboard"),
     CLIPBOARD_INFO("$2Current Selection - Plot ID: $1%id$2, Width: $1%width$2, Total Blocks: $1%total$2", "Clipboard"),
     /*
-     * 
+     *
      */
     TOGGLE_ENABLED("$2Enabled setting: %s", "Toggle"),
     TOGGLE_DISABLED("$2Disabled setting: %s", "Toggle"),
@@ -215,11 +218,11 @@ public enum C {
     /*
      * Done
      */
-    DONE_ALREADY_DONE("$2This plot is already marked as done","Done"),
-    DONE_NOT_DONE("$2This plot is not marked as done.","Done"),
-    DONE_INSUFFICIENT_COMPLEXITY("$2This plot is too simple. Please add more detail before using this command.","Done"),
-    DONE_SUCCESS("$1Successfully marked this plot as done.","Done"),
-    DONE_REMOVED("$1You may now continue building in this plot.","Done"),
+    DONE_ALREADY_DONE("$2This plot is already marked as done", "Done"),
+    DONE_NOT_DONE("$2This plot is not marked as done.", "Done"),
+    DONE_INSUFFICIENT_COMPLEXITY("$2This plot is too simple. Please add more detail before using this command.", "Done"),
+    DONE_SUCCESS("$1Successfully marked this plot as done.", "Done"),
+    DONE_REMOVED("$1You may now continue building in this plot.", "Done"),
     /*
      * Ratings
      */
@@ -252,10 +255,16 @@ public enum C {
     SETUP_STEP("$3[$1Step %s0$3] $1%s1 $2- $1Expecting: $2%s2 $1Default: $2%s3", "Setup"),
     SETUP_INVALID_ARG("$2%s0 is not a valid argument for step %s1. To cancel setup use: $1/plot setup cancel", "Setup"),
     SETUP_VALID_ARG("$2Value $1%s0 $2set to %s1", "Setup"),
-    SETUP_FINISHED("$4You should have been teleported to the created world. Otherwise you will need to set the generator manually using the bukkit.yml or your chosen world management plugin.", "Setup"),
+    SETUP_FINISHED(
+    "$4You should have been teleported to the created world. Otherwise you will need to set the generator manually using the bukkit.yml or your chosen world management plugin.",
+    "Setup"),
     SETUP_WORLD_TAKEN("$2%s is already a registered plotworld", "Setup"),
-    SETUP_MISSING_WORLD("$2You need to specify a world name ($1/plot setup &l<world>$1 <generator>$2)&-$1Additional commands:&-$2 - $1/plot setup <value>&-$2 - $1/plot setup back&-$2 - $1/plot setup cancel", "Setup"),
-    SETUP_MISSING_GENERATOR("$2You need to specify a generator ($1/plot setup <world> &l<generator>&r$2)&-$1Additional commands:&-$2 - $1/plot setup <value>&-$2 - $1/plot setup back&-$2 - $1/plot setup cancel", "Setup"),
+    SETUP_MISSING_WORLD(
+    "$2You need to specify a world name ($1/plot setup &l<world>$1 <generator>$2)&-$1Additional commands:&-$2 - $1/plot setup <value>&-$2 - $1/plot setup back&-$2 - $1/plot setup cancel",
+    "Setup"),
+    SETUP_MISSING_GENERATOR(
+    "$2You need to specify a generator ($1/plot setup <world> &l<generator>&r$2)&-$1Additional commands:&-$2 - $1/plot setup <value>&-$2 - $1/plot setup back&-$2 - $1/plot setup cancel",
+    "Setup"),
     SETUP_INVALID_GENERATOR("$2Invalid generator. Possible options: %s", "Setup"),
     /*
      * Schematic Stuff
@@ -441,7 +450,16 @@ public enum C {
     PLOT_UNOWNED("$2The current plot must have an owner to perform this action", "Info"),
     PLOT_INFO_UNCLAIMED("$2Plot $1%s$2 is not yet claimed", "Info"),
     PLOT_INFO_HEADER("$3&m---------&r $1INFO $3&m---------", false, "Info"),
-    PLOT_INFO("$1ID: $2%id%$1&-" + "$1Alias: $2%alias%$1&-" + "$1Owner: $2%owner%$1&-" + "$1Biome: $2%biome%$1&-" + "$1Can Build: $2%build%$1&-" + "$1Rating: $2%rating%&-" + "$1Trusted: $2%trusted%$1&-" + "$1Members: $2%members%$1&-" + "$1Denied: $2%denied%$1&-" + "$1Flags: $2%flags%", "Info"),
+    PLOT_INFO("$1ID: $2%id%$1&-"
+    + "$1Alias: $2%alias%$1&-"
+    + "$1Owner: $2%owner%$1&-"
+    + "$1Biome: $2%biome%$1&-"
+    + "$1Can Build: $2%build%$1&-"
+    + "$1Rating: $2%rating%&-"
+    + "$1Trusted: $2%trusted%$1&-"
+    + "$1Members: $2%members%$1&-"
+    + "$1Denied: $2%denied%$1&-"
+    + "$1Flags: $2%flags%", "Info"),
     PLOT_INFO_FOOTER("$3&m---------&r $1INFO $3&m---------", false, "Info"),
     PLOT_INFO_TRUSTED("$1Trusted:$2 %trusted%", "Info"),
     PLOT_INFO_MEMBERS("$1Members:$2 %members%", "Info"),
@@ -593,7 +611,8 @@ public enum C {
     /**
      * Constructor for custom strings.
      */
-    C() {
+    C()
+    {
         /*
          * use setCustomString();
          */
@@ -605,10 +624,12 @@ public enum C {
      * @param d default
      * @param prefix use prefix
      */
-    C(final String d, final boolean prefix, String cat) {
+    C(final String d, final boolean prefix, final String cat)
+    {
         this.d = d;
-        if (this.s == null) {
-            this.s = d;
+        if (s == null)
+        {
+            s = d;
         }
         this.prefix = prefix;
         this.cat = cat.toLowerCase();
@@ -619,23 +640,27 @@ public enum C {
      *
      * @param d default
      */
-    C(final String d, String cat) {
+    C(final String d, final String cat)
+    {
         this(d, true, cat.toLowerCase());
     }
 
     @Override
-    public String toString() {
+    public String toString()
+    {
         return s;
     }
-    
-    public static String format(String m, Object... args) {
-        if (args.length == 0) {
-            return m;
-        }
-        Map<String, String> map = new LinkedHashMap<String, String>();
-        if (args.length > 0) {
-            for (int i = args.length - 1 ; i >= 0; i--) {
-                if (args[i] == null) {
+
+    public static String format(String m, final Object... args)
+    {
+        if (args.length == 0) { return m; }
+        final Map<String, String> map = new LinkedHashMap<String, String>();
+        if (args.length > 0)
+        {
+            for (int i = args.length - 1; i >= 0; i--)
+            {
+                if (args[i] == null)
+                {
                     args[i] = "";
                 }
                 map.put("%s" + i, args[i].toString());
@@ -647,49 +672,60 @@ public enum C {
         return m;
     }
 
-    public static String format(C c, Object... args) {
+    public static String format(final C c, final Object... args)
+    {
         return format(c.s, args);
     }
 
-    
-    public static String color(String string) {
+    public static String color(final String string)
+    {
         return StringMan.replaceFromMap(string, replacements);
     }
-    
-    public static void load(File file) {
-        try {
-            if (!file.exists()) {
+
+    public static void load(final File file)
+    {
+        try
+        {
+            if (!file.exists())
+            {
                 file.getParentFile().mkdirs();
                 file.createNewFile();
             }
-            YamlConfiguration yml = YamlConfiguration.loadConfiguration(file);
-            Set<String> keys = yml.getKeys(true);
-            EnumSet<C> all = EnumSet.allOf(C.class);
-            HashSet<String> allNames = new HashSet<>();
-            HashSet<String> allCats = new HashSet<>();
-            HashSet<String> toRemove = new HashSet<>();
-            for (C c: all) {
+            final YamlConfiguration yml = YamlConfiguration.loadConfiguration(file);
+            final Set<String> keys = yml.getKeys(true);
+            final EnumSet<C> all = EnumSet.allOf(C.class);
+            final HashSet<String> allNames = new HashSet<>();
+            final HashSet<String> allCats = new HashSet<>();
+            final HashSet<String> toRemove = new HashSet<>();
+            for (final C c : all)
+            {
                 allNames.add(c.name());
                 allCats.add(c.cat.toLowerCase());
             }
-            HashSet<C> captions = new HashSet<>();
+            final HashSet<C> captions = new HashSet<>();
             boolean changed = false;
-            for (String key : keys) {
-                if (!yml.isString(key)) {
-                    if (!allCats.contains(key)) {
+            for (final String key : keys)
+            {
+                if (!yml.isString(key))
+                {
+                    if (!allCats.contains(key))
+                    {
                         toRemove.add(key);
                     }
                     continue;
                 }
-                String[] split = key.split("\\.");
-                String node = split[split.length - 1].toUpperCase();
-                C caption = allNames.contains(node) ? valueOf(node) : null;
-                if (caption != null) {
-                    if (caption.cat.startsWith("static")) {
+                final String[] split = key.split("\\.");
+                final String node = split[split.length - 1].toUpperCase();
+                final C caption = allNames.contains(node) ? valueOf(node) : null;
+                if (caption != null)
+                {
+                    if (caption.cat.startsWith("static"))
+                    {
                         continue;
                     }
-                    String value = yml.getString(key);
-                    if (!split[0].equalsIgnoreCase(caption.cat)) {
+                    final String value = yml.getString(key);
+                    if (!split[0].equalsIgnoreCase(caption.cat))
+                    {
                         changed = true;
                         yml.set(key, null);
                         yml.set(caption.cat + "." + caption.name().toLowerCase(), value);
@@ -697,30 +733,37 @@ public enum C {
                     captions.add(caption);
                     caption.s = value;
                 }
-                else {
+                else
+                {
                     toRemove.add(key);
                 }
             }
-            for (String remove : toRemove) {
+            for (final String remove : toRemove)
+            {
                 changed = true;
                 yml.set(remove, null);
             }
-            ConfigurationSection config = PS.get().style.getConfigurationSection("color");
-            Set<String> styles = config.getKeys(false);
+            final ConfigurationSection config = PS.get().style.getConfigurationSection("color");
+            final Set<String> styles = config.getKeys(false);
             // HashMap<String, String> replacements = new HashMap<>();
             replacements.clear();
-            for (String style : styles) {
+            for (final String style : styles)
+            {
                 replacements.put("$" + style, "\u00a7" + config.getString(style));
             }
-            for (char letter : "1234567890abcdefklmnor".toCharArray()) {
+            for (final char letter : "1234567890abcdefklmnor".toCharArray())
+            {
                 replacements.put("&" + letter, "\u00a7" + letter);
             }
             replacements.put("\\\\n", "\n");
             replacements.put("\\n", "\n");
             replacements.put("&-", "\n");
-            for (C caption : all) {
-                if (!captions.contains(caption)) {
-                    if (caption.cat.startsWith("static")) {
+            for (final C caption : all)
+            {
+                if (!captions.contains(caption))
+                {
+                    if (caption.cat.startsWith("static"))
+                    {
                         continue;
                     }
                     changed = true;
@@ -728,36 +771,45 @@ public enum C {
                 }
                 caption.s = StringMan.replaceFromMap(caption.s, replacements);
             }
-            if (changed) {
+            if (changed)
+            {
                 yml.save(file);
             }
         }
-        catch (Exception e) {
+        catch (final Exception e)
+        {
             e.printStackTrace();
         }
     }
-    
-    public String s() {
-        return this.s;
+
+    public String s()
+    {
+        return s;
     }
 
-    public boolean usePrefix() {
-        return this.prefix;
+    public boolean usePrefix()
+    {
+        return prefix;
     }
 
-    public String formatted() {
+    public String formatted()
+    {
         return StringMan.replaceFromMap(s(), replacements);
     }
 
-    public String getCat() {
+    public String getCat()
+    {
         return cat;
     }
-    
-    public void send(CommandCaller plr, String... args) { 
-        if (plr == null) {
+
+    public void send(final CommandCaller plr, final String... args)
+    {
+        if (plr == null)
+        {
             MainUtil.sendConsoleMessage(this, args);
         }
-        else {
+        else
+        {
             plr.sendMessage(this, args);
         }
     }
diff --git a/src/main/java/com/intellectualcrafters/plot/config/Configuration.java b/src/main/java/com/intellectualcrafters/plot/config/Configuration.java
index a7af67992..59005ed1c 100644
--- a/src/main/java/com/intellectualcrafters/plot/config/Configuration.java
+++ b/src/main/java/com/intellectualcrafters/plot/config/Configuration.java
@@ -1,248 +1,313 @@
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// PlotSquared - A plot manager and world generator for the Bukkit API                             /
-// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
-//                                                                                                 /
-// This program is free software; you can redistribute it and/or modify                            /
-// it under the terms of the GNU General Public License as published by                            /
-// the Free Software Foundation; either version 3 of the License, or                               /
-// (at your option) any later version.                                                             /
-//                                                                                                 /
-// This program is distributed in the hope that it will be useful,                                 /
-// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
-// GNU General Public License for more details.                                                    /
-//                                                                                                 /
-// You should have received a copy of the GNU General Public License                               /
-// along with this program; if not, write to the Free Software Foundation,                         /
-// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
-//                                                                                                 /
-// You can contact us via: support@intellectualsites.com                                           /
-////////////////////////////////////////////////////////////////////////////////////////////////////
-package com.intellectualcrafters.plot.config;
-
-import java.util.ArrayList;
-
-import com.intellectualcrafters.plot.object.PlotBlock;
-import com.intellectualcrafters.plot.util.BlockManager;
-import com.intellectualcrafters.plot.util.StringComparison;
-
-/**
- * Main Configuration Utility
- *
- * @author Empire92
- */
-@SuppressWarnings("unused")
-public class Configuration {
-    
-    public static final SettingValue<String> STRING = new SettingValue<String>("STRING") {
-        @Override
-        public boolean validateValue(final String string) {
-            return true;
-        }
-
-        @Override
-        public String parseString(final String string) {
-            return string;
-        }
-    };
-    public static final SettingValue<String[]> STRINGLIST = new SettingValue<String[]>("STRINGLIST") {
-        @Override
-        public boolean validateValue(final String string) {
-            return true;
-        }
-
-        @Override
-        public String[] parseString(final String string) {
-            return string.split(",");
-        }
-    };
-    public static final SettingValue<Integer> INTEGER = new SettingValue<Integer>("INTEGER") {
-        @Override
-        public boolean validateValue(final String string) {
-            try {
-                Integer.parseInt(string);
-                return true;
-            } catch (final Exception e) {
-                return false;
-            }
-        }
-
-        @Override
-        public Integer parseString(final String string) {
-            return Integer.parseInt(string);
-        }
-    };
-    public static final SettingValue<Boolean> BOOLEAN = new SettingValue<Boolean>("BOOLEAN") {
-        @Override
-        public boolean validateValue(final String string) {
-            try {
-                Boolean.parseBoolean(string);
-                return true;
-            } catch (final Exception e) {
-                return false;
-            }
-        }
-
-        @Override
-        public Boolean parseString(final String string) {
-            return Boolean.parseBoolean(string);
-        }
-    };
-    public static final SettingValue<Double> DOUBLE = new SettingValue<Double>("DOUBLE") {
-        @Override
-        public boolean validateValue(final String string) {
-            try {
-                Double.parseDouble(string);
-                return true;
-            } catch (final Exception e) {
-                return false;
-            }
-        }
-
-        @Override
-        public Double parseString(final String string) {
-            return Double.parseDouble(string);
-        }
-    };
-    public static final SettingValue<String> BIOME = new SettingValue<String>("BIOME") {
-        @Override
-        public boolean validateValue(final String string) {
-            try {
-                final int biome = BlockManager.manager.getBiomeFromString(string.toUpperCase());
-                return biome != -1;
-            } catch (final Exception e) {
-                return false;
-            }
-        }
-
-        @Override
-        public String parseString(final String string) {
-            if (validateValue(string)) {
-                return string.toUpperCase();
-            }
-            return "FOREST";
-        }
-    };
-    public static final SettingValue<PlotBlock> BLOCK = new SettingValue<PlotBlock>("BLOCK") {
-        @Override
-        public boolean validateValue(final String string) {
-            try {
-                if (string.contains(":")) {
-                    final String[] split = string.split(":");
-                    Short.parseShort(split[0]);
-                    Short.parseShort(split[1]);
-                } else {
-                    Short.parseShort(string);
-                }
-                return true;
-            } catch (final Exception e) {
-                return false;
-            }
-        }
-
-        @Override
-        public PlotBlock parseString(final String string) {
-            if (string.contains(":")) {
-                final String[] split = string.split(":");
-                return new PlotBlock(Short.parseShort(split[0]), Byte.parseByte(split[1]));
-            } else {
-                return new PlotBlock(Short.parseShort(string), (byte) 0);
-            }
-        }
-    };
-    public static final SettingValue<PlotBlock[]> BLOCKLIST = new SettingValue<PlotBlock[]>("BLOCKLIST") {
-        @Override
-        public boolean validateValue(final String string) {
-            try {
-                for (String block : string.split(",")) {
-                    if (block.contains("%")) {
-                        final String[] split = block.split("%");
-                        Integer.parseInt(split[0]);
-                        block = split[1];
-                    }
-                    StringComparison<PlotBlock>.ComparisonResult value = BlockManager.manager.getClosestBlock(block);
-                    if (value == null || value.match > 1) {
-                        return false;
-                    }
-                }
-                return true;
-            } catch (final Exception e) {
-                return false;
-            }
-        }
-
-        @Override
-        public PlotBlock[] parseString(final String string) {
-            final String[] blocks = string.split(",");
-            final ArrayList<PlotBlock> parsedvalues = new ArrayList<>();
-            final PlotBlock[] values = new PlotBlock[blocks.length];
-            final int[] counts = new int[blocks.length];
-            int min = 100;
-            for (int i = 0; i < blocks.length; i++) {
-                try {
-                    if (blocks[i].contains("%")) {
-                        final String[] split = blocks[i].split("%");
-                        blocks[i] = split[1];
-                        final int value = Integer.parseInt(split[0]);
-                        counts[i] = value;
-                        if (value < min) {
-                            min = value;
-                        }
-                    } else {
-                        counts[i] = 1;
-                        if (1 < min) {
-                            min = 1;
-                        }
-                    }
-                    StringComparison<PlotBlock>.ComparisonResult result = BlockManager.manager.getClosestBlock(blocks[i]);
-                    if (result != null && result.match < 2) {
-                        values[i] = result.best;
-                    }
-                }
-                catch (Exception e) {}
-            }
-            final int gcd = gcd(counts);
-            for (int i = 0; i < counts.length; i++) {
-                final int num = counts[i];
-                for (int j = 0; j < (num / gcd); j++) {
-                    parsedvalues.add(values[i]);
-                }
-            }
-            return parsedvalues.toArray(new PlotBlock[parsedvalues.size()]);
-        }
-    };
-
-    public static int gcd(final int a, final int b) {
-        if (b == 0) {
-            return a;
-        }
-        return gcd(b, a % b);
-    }
-
-    private static int gcd(final int[] a) {
-        int result = a[0];
-        for (int i = 1; i < a.length; i++) {
-            result = gcd(result, a[i]);
-        }
-        return result;
-    }
-
-    /**
-     * Create your own SettingValue object to make the management of plotworld configuration easier
-     */
-    public static abstract class SettingValue<T> {
-        private final String type;
-
-        public SettingValue(final String type) {
-            this.type = type;
-        }
-
-        public String getType() {
-            return this.type;
-        }
-
-        public abstract T parseString(final String string);
-
-        public abstract boolean validateValue(final String string);
-    }
-}
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// PlotSquared - A plot manager and world generator for the Bukkit API                             /
+// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
+//                                                                                                 /
+// This program is free software; you can redistribute it and/or modify                            /
+// it under the terms of the GNU General Public License as published by                            /
+// the Free Software Foundation; either version 3 of the License, or                               /
+// (at your option) any later version.                                                             /
+//                                                                                                 /
+// This program is distributed in the hope that it will be useful,                                 /
+// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
+// GNU General Public License for more details.                                                    /
+//                                                                                                 /
+// You should have received a copy of the GNU General Public License                               /
+// along with this program; if not, write to the Free Software Foundation,                         /
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
+//                                                                                                 /
+// You can contact us via: support@intellectualsites.com                                           /
+////////////////////////////////////////////////////////////////////////////////////////////////////
+package com.intellectualcrafters.plot.config;
+
+import java.util.ArrayList;
+
+import com.intellectualcrafters.plot.object.PlotBlock;
+import com.intellectualcrafters.plot.util.BlockManager;
+import com.intellectualcrafters.plot.util.StringComparison;
+
+/**
+ * Main Configuration Utility
+ *

+ */
+@SuppressWarnings("unused")
+public class Configuration
+{
+
+    public static final SettingValue<String> STRING = new SettingValue<String>("STRING")
+    {
+        @Override
+        public boolean validateValue(final String string)
+        {
+            return true;
+        }
+
+        @Override
+        public String parseString(final String string)
+        {
+            return string;
+        }
+    };
+    public static final SettingValue<String[]> STRINGLIST = new SettingValue<String[]>("STRINGLIST")
+    {
+        @Override
+        public boolean validateValue(final String string)
+        {
+            return true;
+        }
+
+        @Override
+        public String[] parseString(final String string)
+        {
+            return string.split(",");
+        }
+    };
+    public static final SettingValue<Integer> INTEGER = new SettingValue<Integer>("INTEGER")
+    {
+        @Override
+        public boolean validateValue(final String string)
+        {
+            try
+            {
+                Integer.parseInt(string);
+                return true;
+            }
+            catch (final Exception e)
+            {
+                return false;
+            }
+        }
+
+        @Override
+        public Integer parseString(final String string)
+        {
+            return Integer.parseInt(string);
+        }
+    };
+    public static final SettingValue<Boolean> BOOLEAN = new SettingValue<Boolean>("BOOLEAN")
+    {
+        @Override
+        public boolean validateValue(final String string)
+        {
+            try
+            {
+                Boolean.parseBoolean(string);
+                return true;
+            }
+            catch (final Exception e)
+            {
+                return false;
+            }
+        }
+
+        @Override
+        public Boolean parseString(final String string)
+        {
+            return Boolean.parseBoolean(string);
+        }
+    };
+    public static final SettingValue<Double> DOUBLE = new SettingValue<Double>("DOUBLE")
+    {
+        @Override
+        public boolean validateValue(final String string)
+        {
+            try
+            {
+                Double.parseDouble(string);
+                return true;
+            }
+            catch (final Exception e)
+            {
+                return false;
+            }
+        }
+
+        @Override
+        public Double parseString(final String string)
+        {
+            return Double.parseDouble(string);
+        }
+    };
+    public static final SettingValue<String> BIOME = new SettingValue<String>("BIOME")
+    {
+        @Override
+        public boolean validateValue(final String string)
+        {
+            try
+            {
+                final int biome = BlockManager.manager.getBiomeFromString(string.toUpperCase());
+                return biome != -1;
+            }
+            catch (final Exception e)
+            {
+                return false;
+            }
+        }
+
+        @Override
+        public String parseString(final String string)
+        {
+            if (validateValue(string)) {
+            return string.toUpperCase();
+            }
+            return "FOREST";
+        }
+    };
+    public static final SettingValue<PlotBlock> BLOCK = new SettingValue<PlotBlock>("BLOCK")
+    {
+        @Override
+        public boolean validateValue(final String string)
+        {
+            try
+            {
+                if (string.contains(":"))
+                {
+                    final String[] split = string.split(":");
+                    Short.parseShort(split[0]);
+                    Short.parseShort(split[1]);
+                }
+                else
+                {
+                    Short.parseShort(string);
+                }
+                return true;
+            }
+            catch (final Exception e)
+            {
+                return false;
+            }
+        }
+
+        @Override
+        public PlotBlock parseString(final String string)
+        {
+            if (string.contains(":"))
+            {
+                final String[] split = string.split(":");
+                return new PlotBlock(Short.parseShort(split[0]), Byte.parseByte(split[1]));
+            }
+            else
+            {
+                return new PlotBlock(Short.parseShort(string), (byte) 0);
+            }
+        }
+    };
+    public static final SettingValue<PlotBlock[]> BLOCKLIST = new SettingValue<PlotBlock[]>("BLOCKLIST")
+    {
+        @Override
+        public boolean validateValue(final String string)
+        {
+            try
+            {
+                for (String block : string.split(","))
+                {
+                    if (block.contains("%"))
+                    {
+                        final String[] split = block.split("%");
+                        Integer.parseInt(split[0]);
+                        block = split[1];
+                    }
+                    final StringComparison<PlotBlock>.ComparisonResult value = BlockManager.manager.getClosestBlock(block);
+                    if ((value == null) || (value.match > 1)) {
+                    return false;
+                    }
+                }
+                return true;
+            }
+            catch (final Exception e)
+            {
+                return false;
+            }
+        }
+
+        @Override
+        public PlotBlock[] parseString(final String string)
+        {
+            final String[] blocks = string.split(",");
+            final ArrayList<PlotBlock> parsedvalues = new ArrayList<>();
+            final PlotBlock[] values = new PlotBlock[blocks.length];
+            final int[] counts = new int[blocks.length];
+            int min = 100;
+            for (int i = 0; i < blocks.length; i++)
+            {
+                try
+                {
+                    if (blocks[i].contains("%"))
+                    {
+                        final String[] split = blocks[i].split("%");
+                        blocks[i] = split[1];
+                        final int value = Integer.parseInt(split[0]);
+                        counts[i] = value;
+                        if (value < min)
+                        {
+                            min = value;
+                        }
+                    }
+                    else
+                    {
+                        counts[i] = 1;
+                        if (1 < min)
+                        {
+                            min = 1;
+                        }
+                    }
+                    final StringComparison<PlotBlock>.ComparisonResult result = BlockManager.manager.getClosestBlock(blocks[i]);
+                    if ((result != null) && (result.match < 2))
+                    {
+                        values[i] = result.best;
+                    }
+                }
+                catch (final Exception e)
+                {}
+            }
+            final int gcd = gcd(counts);
+            for (int i = 0; i < counts.length; i++)
+            {
+                final int num = counts[i];
+                for (int j = 0; j < (num / gcd); j++)
+                {
+                    parsedvalues.add(values[i]);
+                }
+            }
+            return parsedvalues.toArray(new PlotBlock[parsedvalues.size()]);
+        }
+    };
+
+    public static int gcd(final int a, final int b)
+    {
+        if (b == 0) { return a; }
+        return gcd(b, a % b);
+    }
+
+    private static int gcd(final int[] a)
+    {
+        int result = a[0];
+        for (int i = 1; i < a.length; i++)
+        {
+            result = gcd(result, a[i]);
+        }
+        return result;
+    }
+
+    /**
+     * Create your own SettingValue object to make the management of plotworld configuration easier
+     */
+    public static abstract class SettingValue<T>
+    {
+        private final String type;
+
+        public SettingValue(final String type)
+        {
+            this.type = type;
+        }
+
+        public String getType()
+        {
+            return this.type;
+        }
+
+        public abstract T parseString(final String string);
+
+        public abstract boolean validateValue(final String string);
+    }
+}
diff --git a/src/main/java/com/intellectualcrafters/plot/config/ConfigurationNode.java b/src/main/java/com/intellectualcrafters/plot/config/ConfigurationNode.java
index c6bb2259e..d6cab7b2d 100644
--- a/src/main/java/com/intellectualcrafters/plot/config/ConfigurationNode.java
+++ b/src/main/java/com/intellectualcrafters/plot/config/ConfigurationNode.java
@@ -1,101 +1,111 @@
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// PlotSquared - A plot manager and world generator for the Bukkit API                             /
-// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
-//                                                                                                 /
-// This program is free software; you can redistribute it and/or modify                            /
-// it under the terms of the GNU General Public License as published by                            /
-// the Free Software Foundation; either version 3 of the License, or                               /
-// (at your option) any later version.                                                             /
-//                                                                                                 /
-// This program is distributed in the hope that it will be useful,                                 /
-// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
-// GNU General Public License for more details.                                                    /
-//                                                                                                 /
-// You should have received a copy of the GNU General Public License                               /
-// along with this program; if not, write to the Free Software Foundation,                         /
-// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
-//                                                                                                 /
-// You can contact us via: support@intellectualsites.com                                           /
-////////////////////////////////////////////////////////////////////////////////////////////////////
-package com.intellectualcrafters.plot.config;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import com.intellectualcrafters.plot.config.Configuration.SettingValue;
-import com.intellectualcrafters.plot.object.PlotBlock;
-import com.intellectualcrafters.plot.util.StringMan;
-
-/**
- * Configuration Node
- *
- * @author Empire92
- */
-public class ConfigurationNode {
-    private final String constant;
-    private final Object default_value;
-    private final String description;
-    private final SettingValue type;
-    private Object value;
-
-    public ConfigurationNode(final String constant, final Object default_value, final String description, final SettingValue type, final boolean required) {
-        this.constant = constant;
-        this.default_value = default_value;
-        this.description = description;
-        this.value = default_value;
-        this.type = type;
-    }
-
-    public SettingValue getType() {
-        return this.type;
-    }
-
-    public boolean isValid(final String string) {
-        try {
-            final Object result = this.type.parseString(string);
-            return result != null;
-        } catch (final Exception e) {
-            return false;
-        }
-    }
-
-    public boolean setValue(final String string) {
-        if (!this.type.validateValue(string)) {
-            return false;
-        }
-        this.value = this.type.parseString(string);
-        return true;
-    }
-
-    public Object getValue() {
-        if (this.value instanceof String[]) {
-            return Arrays.asList((String[]) this.value);
-        } else if (this.value instanceof Object[]) {
-            final List<String> values = new ArrayList<String>();
-            for (final Object value : (Object[]) this.value) {
-                values.add(value.toString());
-            }
-            return values;
-        } else if (this.value instanceof PlotBlock) {
-            return this.value.toString();
-        }
-        return this.value;
-    }
-
-    public String getConstant() {
-        return this.constant;
-    }
-
-    public Object getDefaultValue() {
-        if (this.default_value instanceof Object[]) {
-            return StringMan.join((Object[]) this.default_value, ",");
-        }
-        return this.default_value;
-    }
-
-    public String getDescription() {
-        return this.description;
-    }
-}
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// PlotSquared - A plot manager and world generator for the Bukkit API                             /
+// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
+//                                                                                                 /
+// This program is free software; you can redistribute it and/or modify                            /
+// it under the terms of the GNU General Public License as published by                            /
+// the Free Software Foundation; either version 3 of the License, or                               /
+// (at your option) any later version.                                                             /
+//                                                                                                 /
+// This program is distributed in the hope that it will be useful,                                 /
+// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
+// GNU General Public License for more details.                                                    /
+//                                                                                                 /
+// You should have received a copy of the GNU General Public License                               /
+// along with this program; if not, write to the Free Software Foundation,                         /
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
+//                                                                                                 /
+// You can contact us via: support@intellectualsites.com                                           /
+////////////////////////////////////////////////////////////////////////////////////////////////////
+package com.intellectualcrafters.plot.config;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import com.intellectualcrafters.plot.config.Configuration.SettingValue;
+import com.intellectualcrafters.plot.object.PlotBlock;
+import com.intellectualcrafters.plot.util.StringMan;
+
+/**
+ * Configuration Node
+ *

+ */
+public class ConfigurationNode
+{
+    private final String constant;
+    private final Object default_value;
+    private final String description;
+    private final SettingValue type;
+    private Object value;
+
+    public ConfigurationNode(final String constant, final Object default_value, final String description, final SettingValue type, final boolean required)
+    {
+        this.constant = constant;
+        this.default_value = default_value;
+        this.description = description;
+        value = default_value;
+        this.type = type;
+    }
+
+    public SettingValue getType()
+    {
+        return type;
+    }
+
+    public boolean isValid(final String string)
+    {
+        try
+        {
+            final Object result = type.parseString(string);
+            return result != null;
+        }
+        catch (final Exception e)
+        {
+            return false;
+        }
+    }
+
+    public boolean setValue(final String string)
+    {
+        if (!type.validateValue(string)) { return false; }
+        value = type.parseString(string);
+        return true;
+    }
+
+    public Object getValue()
+    {
+        if (value instanceof String[])
+        {
+            return Arrays.asList((String[]) value);
+        }
+        else if (value instanceof Object[])
+        {
+            final List<String> values = new ArrayList<String>();
+            for (final Object value : (Object[]) this.value)
+            {
+                values.add(value.toString());
+            }
+            return values;
+        }
+        else if (value instanceof PlotBlock) { return value.toString(); }
+        return value;
+    }
+
+    public String getConstant()
+    {
+        return constant;
+    }
+
+    public Object getDefaultValue()
+    {
+        if (default_value instanceof Object[]) { return StringMan.join((Object[]) default_value, ","); }
+        return default_value;
+    }
+
+    public String getDescription()
+    {
+        return description;
+    }
+}
diff --git a/src/main/java/com/intellectualcrafters/plot/config/Settings.java b/src/main/java/com/intellectualcrafters/plot/config/Settings.java
index 816927cf3..d91b2769f 100644
--- a/src/main/java/com/intellectualcrafters/plot/config/Settings.java
+++ b/src/main/java/com/intellectualcrafters/plot/config/Settings.java
@@ -1,259 +1,258 @@
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// PlotSquared - A plot manager and world generator for the Bukkit API                             /
-// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
-//                                                                                                 /
-// This program is free software; you can redistribute it and/or modify                            /
-// it under the terms of the GNU General Public License as published by                            /
-// the Free Software Foundation; either version 3 of the License, or                               /
-// (at your option) any later version.                                                             /
-//                                                                                                 /
-// This program is distributed in the hope that it will be useful,                                 /
-// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
-// GNU General Public License for more details.                                                    /
-//                                                                                                 /
-// You should have received a copy of the GNU General Public License                               /
-// along with this program; if not, write to the Free Software Foundation,                         /
-// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
-//                                                                                                 /
-// You can contact us via: support@intellectualsites.com                                           /
-////////////////////////////////////////////////////////////////////////////////////////////////////
-package com.intellectualcrafters.plot.config;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Updater and DB settings
- *
- * @author Citymonstret
- * @author Empire92
- */
-public class Settings {
-    public static boolean USE_SQLUUIDHANDLER = false;
-
-    public static boolean ENABLE_CLUSTERS = false;
-    public static boolean FAST_CLEAR = false;
-    /**
-     * Default UUID_FECTHING: false
-     */
-    public static boolean PERMISSION_CACHING = false;
-    public static boolean CACHE_RATINGS = true;
-    public static boolean UUID_FROM_DISK = false;
-    
-    /**
-     * Web
-     */
-    public static String WEB_URL = "http://empcraft.com/plots/";
-    public static String WEB_IP = "your.ip.here";
-    public static boolean DOWNLOAD_REQUIRES_DONE = false;
-    /**
-     * Ratings
-     */
-    public static List<String> RATING_CATEGORIES = null;
-    public static boolean REQUIRE_DONE = false;
-    public static boolean DONE_COUNTS_TOWARDS_LIMIT = false;
-    public static boolean DONE_RESTRICTS_BUILDING = false;
-    
-    /**
-     * PlotMe settings
-     */
-    public static boolean CONVERT_PLOTME = true;
-    public static boolean CACHE_PLOTME = false;
-    public static boolean USE_PLOTME_ALIAS = false;
-    /**
-     * Comment system
-     */
-    public static boolean COMMENT_NOTIFICATIONS = false;
-    /**
-     * Chunk processor
-     */
-    public static boolean CHUNK_PROCESSOR = false;
-    public static boolean EXPERIMENTAL_FAST_ASYNC_WORLDEDIT = false;
-    public static boolean CHUNK_PROCESSOR_TRIM_ON_SAVE = false;
-    public static boolean CHUNK_PROCESSOR_GC = false;
-    public static int CHUNK_PROCESSOR_MAX_BLOCKSTATES = 4096;
-    public static int CHUNK_PROCESSOR_MAX_ENTITIES = 512;
-    public static boolean CHUNK_PROCESSOR_DISABLE_PHYSICS = false;
-    /**
-     * TNT listener
-     */
-    public static boolean TNT_LISTENER = false;
-    /**
-     * Redstone disabler
-     */
-    public static boolean REDSTONE_DISABLER = false;
-    public static boolean REDSTONE_DISABLER_UNOCCUPIED = false;
-    /**
-     * Check for falling blocks when pistons extend?
-     */
-    public static boolean PISTON_FALLING_BLOCK_CHECK = true;
-    /**
-     * Max auto claiming size
-     */
-    public static int MAX_AUTO_SIZE = 4;
-    /**
-     * Default worldedit-require-selection-in-mask: false
-     */
-    public static boolean REQUIRE_SELECTION = true;
-    public static boolean QUEUE_COMMANDS = false;
-    public static boolean WE_ALLOW_HELPER = false;
-    public static long WE_MAX_VOLUME = 500000;
-    public static long WE_MAX_ITERATIONS = 1000;
-    public static List<String> WE_BLACKLIST = new ArrayList<>();
-    /**
-     * Default kill road mobs: true
-     */
-    public final static boolean KILL_ROAD_MOBS_DEFAULT = false;
-    public final static boolean KILL_ROAD_VEHICLES_DEFAULT = false;
-    /**
-     * Default mob pathfinding: true
-     */
-    public final static boolean MOB_PATHFINDING_DEFAULT = true;
-    /**
-     * Teleport to path on login
-     */
-    public static boolean TELEPORT_ON_LOGIN = false;
-    /**
-     * Display titles
-     */
-    public static boolean TITLES = true;
-    /**
-     * Schematic Save Path
-     */
-    public static String SCHEMATIC_SAVE_PATH = "plugins/PlotSquared/schematics";
-    /**
-     * BO3 Save Path
-     */
-    public static String BO3_SAVE_PATH = "BO3";
-    /**
-     * Max allowed plots
-     */
-    public static int MAX_PLOTS = 127;
-    /**
-     * WorldGuard region on claimed plots
-     */
-    public static boolean WORLDGUARD = false;
-    /**
-     * metrics
-     */
-    public static boolean METRICS = true;
-    /**
-     * plot specific resource pack
-     */
-    public static String PLOT_SPECIFIC_RESOURCE_PACK = "";
-    /**
-     * Kill road mobs?
-     */
-    public static boolean KILL_ROAD_MOBS;
-    public static boolean KILL_ROAD_VEHICLES;
-    /**
-     * mob pathfinding?
-     */
-    public static boolean MOB_PATHFINDING;
-    /**
-     * Delete plots on ban?
-     */
-    public static boolean DELETE_PLOTS_ON_BAN = false;
-    /**
-     * Verbose?
-     */
-    public static boolean DEBUG = true;
-    /**
-     * Have colored console messages?
-     */
-    public static boolean CONSOLE_COLOR = true;
-    /**
-     * Fancy chat e.g. for /plot list
-     */
-    public static boolean FANCY_CHAT = true;
-    /**
-     * The delay (in seconds) before teleportation commences
-     */
-    public static int TELEPORT_DELAY;
-    /**
-     * Auto clear enabled
-     */
-    public static boolean AUTO_CLEAR = false;
-    /**
-     * Days until a plot gets cleared
-     */
-    public static int AUTO_CLEAR_DAYS = 360;
-    public static int CLEAR_THRESHOLD = 1;
-    public static int CLEAR_INTERVAL = 120;
-    /**
-     * API Location
-     */
-    public static String API_URL = "http://www.intellectualsites.com/minecraft.php";
-    /**
-     * Use the custom API
-     */
-    public static boolean CUSTOM_API = true;
-    /**
-     * Use offline mode storage
-     */
-    public static boolean TWIN_MODE_UUID = false;
-    public static boolean OFFLINE_MODE = false;
-    public static boolean UUID_LOWERCASE = false;
-    /**
-     * Command confirmation
-     */
-    public static boolean CONFIRM_CLEAR = true;
-    public static boolean CONFIRM_DELETE = true;
-    public static boolean CONFIRM_UNLINK = true;
-    /**
-     * Use global plot limit?
-     */
-    public static boolean GLOBAL_LIMIT = false;
-
-    /**
-     * Database settings
-     *
-     * @author Citymonstret
-     */
-    public static class DB {
-        /**
-         * MongoDB enabled?
-         */
-        public static boolean USE_MONGO = false; /*
-         * TODO: Implement Mongo
-         * @Brandon
-         */
-        /**
-         * SQLite enabled?
-         */
-        public static boolean USE_SQLITE = false;
-        /**
-         * MySQL Enabled?
-         */
-        public static boolean USE_MYSQL = true; /* NOTE: Fixed connector */
-        /**
-         * SQLite Database name
-         */
-        public static String SQLITE_DB = "storage";
-        /**
-         * MySQL Host name
-         */
-        public static String HOST_NAME = "localhost";
-        /**
-         * MySQL Port
-         */
-        public static String PORT = "3306";
-        /**
-         * MySQL DB
-         */
-        public static String DATABASE = "plot_db";
-        /**
-         * MySQL User
-         */
-        public static String USER = "root";
-        /**
-         * MySQL Password
-         */
-        public static String PASSWORD = "password";
-        /**
-         * MySQL Prefix
-         */
-        public static String PREFIX = "";
-    }
-}
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// PlotSquared - A plot manager and world generator for the Bukkit API                             /
+// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
+//                                                                                                 /
+// This program is free software; you can redistribute it and/or modify                            /
+// it under the terms of the GNU General Public License as published by                            /
+// the Free Software Foundation; either version 3 of the License, or                               /
+// (at your option) any later version.                                                             /
+//                                                                                                 /
+// This program is distributed in the hope that it will be useful,                                 /
+// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
+// GNU General Public License for more details.                                                    /
+//                                                                                                 /
+// You should have received a copy of the GNU General Public License                               /
+// along with this program; if not, write to the Free Software Foundation,                         /
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
+//                                                                                                 /
+// You can contact us via: support@intellectualsites.com                                           /
+////////////////////////////////////////////////////////////////////////////////////////////////////
+package com.intellectualcrafters.plot.config;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Updater and DB settings
+ *


+ */
+public class Settings
+{
+    public static boolean USE_SQLUUIDHANDLER = false;
+
+    public static boolean ENABLE_CLUSTERS = false;
+    public static boolean FAST_CLEAR = false;
+    /**
+     * Default UUID_FECTHING: false
+     */
+    public static boolean PERMISSION_CACHING = false;
+    public static boolean CACHE_RATINGS = true;
+    public static boolean UUID_FROM_DISK = false;
+
+    /**
+     * Web
+     */
+    public static String WEB_URL = "http://empcraft.com/plots/";
+    public static String WEB_IP = "your.ip.here";
+    public static boolean DOWNLOAD_REQUIRES_DONE = false;
+    /**
+     * Ratings
+     */
+    public static List<String> RATING_CATEGORIES = null;
+    public static boolean REQUIRE_DONE = false;
+    public static boolean DONE_COUNTS_TOWARDS_LIMIT = false;
+    public static boolean DONE_RESTRICTS_BUILDING = false;
+
+    /**
+     * PlotMe settings
+     */
+    public static boolean CONVERT_PLOTME = true;
+    public static boolean CACHE_PLOTME = false;
+    public static boolean USE_PLOTME_ALIAS = false;
+    /**
+     * Comment system
+     */
+    public static boolean COMMENT_NOTIFICATIONS = false;
+    /**
+     * Chunk processor
+     */
+    public static boolean CHUNK_PROCESSOR = false;
+    public static boolean EXPERIMENTAL_FAST_ASYNC_WORLDEDIT = false;
+    public static boolean CHUNK_PROCESSOR_TRIM_ON_SAVE = false;
+    public static boolean CHUNK_PROCESSOR_GC = false;
+    public static int CHUNK_PROCESSOR_MAX_BLOCKSTATES = 4096;
+    public static int CHUNK_PROCESSOR_MAX_ENTITIES = 512;
+    public static boolean CHUNK_PROCESSOR_DISABLE_PHYSICS = false;
+    /**
+     * TNT listener
+     */
+    public static boolean TNT_LISTENER = false;
+    /**
+     * Redstone disabler
+     */
+    public static boolean REDSTONE_DISABLER = false;
+    public static boolean REDSTONE_DISABLER_UNOCCUPIED = false;
+    /**
+     * Check for falling blocks when pistons extend?
+     */
+    public static boolean PISTON_FALLING_BLOCK_CHECK = true;
+    /**
+     * Max auto claiming size
+     */
+    public static int MAX_AUTO_SIZE = 4;
+    /**
+     * Default worldedit-require-selection-in-mask: false
+     */
+    public static boolean REQUIRE_SELECTION = true;
+    public static boolean QUEUE_COMMANDS = false;
+    public static boolean WE_ALLOW_HELPER = false;
+    public static long WE_MAX_VOLUME = 500000;
+    public static long WE_MAX_ITERATIONS = 1000;
+    public static List<String> WE_BLACKLIST = new ArrayList<>();
+    /**
+     * Default kill road mobs: true
+     */
+    public final static boolean KILL_ROAD_MOBS_DEFAULT = false;
+    public final static boolean KILL_ROAD_VEHICLES_DEFAULT = false;
+    /**
+     * Default mob pathfinding: true
+     */
+    public final static boolean MOB_PATHFINDING_DEFAULT = true;
+    /**
+     * Teleport to path on login
+     */
+    public static boolean TELEPORT_ON_LOGIN = false;
+    /**
+     * Display titles
+     */
+    public static boolean TITLES = true;
+    /**
+     * Schematic Save Path
+     */
+    public static String SCHEMATIC_SAVE_PATH = "plugins/PlotSquared/schematics";
+    /**
+     * BO3 Save Path
+     */
+    public static String BO3_SAVE_PATH = "BO3";
+    /**
+     * Max allowed plots
+     */
+    public static int MAX_PLOTS = 127;
+    /**
+     * WorldGuard region on claimed plots
+     */
+    public static boolean WORLDGUARD = false;
+    /**
+     * metrics
+     */
+    public static boolean METRICS = true;
+    /**
+     * plot specific resource pack
+     */
+    public static String PLOT_SPECIFIC_RESOURCE_PACK = "";
+    /**
+     * Kill road mobs?
+     */
+    public static boolean KILL_ROAD_MOBS;
+    public static boolean KILL_ROAD_VEHICLES;
+    /**
+     * mob pathfinding?
+     */
+    public static boolean MOB_PATHFINDING;
+    /**
+     * Delete plots on ban?
+     */
+    public static boolean DELETE_PLOTS_ON_BAN = false;
+    /**
+     * Verbose?
+     */
+    public static boolean DEBUG = true;
+    /**
+     * Have colored console messages?
+     */
+    public static boolean CONSOLE_COLOR = true;
+    /**
+     * Fancy chat e.g. for /plot list
+     */
+    public static boolean FANCY_CHAT = true;
+    /**
+     * The delay (in seconds) before teleportation commences
+     */
+    public static int TELEPORT_DELAY;
+    /**
+     * Auto clear enabled
+     */
+    public static boolean AUTO_CLEAR = false;
+    /**
+     * Days until a plot gets cleared
+     */
+    public static int AUTO_CLEAR_DAYS = 360;
+    public static int CLEAR_THRESHOLD = 1;
+    public static int CLEAR_INTERVAL = 120;
+    /**
+     * API Location
+     */
+    public static String API_URL = "http://www.intellectualsites.com/minecraft.php";
+    /**
+     * Use the custom API
+     */
+    public static boolean CUSTOM_API = true;
+    /**
+     * Use offline mode storage
+     */
+    public static boolean TWIN_MODE_UUID = false;
+    public static boolean OFFLINE_MODE = false;
+    public static boolean UUID_LOWERCASE = false;
+    /**
+     * Command confirmation
+     */
+    public static boolean CONFIRM_CLEAR = true;
+    public static boolean CONFIRM_DELETE = true;
+    public static boolean CONFIRM_UNLINK = true;
+    /**
+     * Use global plot limit?
+     */
+    public static boolean GLOBAL_LIMIT = false;
+
+    /**
+     * Database settings
+     *

+     */
+    public static class DB
+    {
+        /**
+         * MongoDB enabled?
+         */
+        public static boolean USE_MONGO = false; /*
+                                                 * TODO: Implement Mongo
+                                                 * @Brandon
+                                                 */
+        /**
+         * SQLite enabled?
+         */
+        public static boolean USE_SQLITE = false;
+        /**
+         * MySQL Enabled?
+         */
+        public static boolean USE_MYSQL = true; /* NOTE: Fixed connector */
+        /**
+         * SQLite Database name
+         */
+        public static String SQLITE_DB = "storage";
+        /**
+         * MySQL Host name
+         */
+        public static String HOST_NAME = "localhost";
+        /**
+         * MySQL Port
+         */
+        public static String PORT = "3306";
+        /**
+         * MySQL DB
+         */
+        public static String DATABASE = "plot_db";
+        /**
+         * MySQL User
+         */
+        public static String USER = "root";
+        /**
+         * MySQL Password
+         */
+        public static String PASSWORD = "password";
+        /**
+         * MySQL Prefix
+         */
+        public static String PREFIX = "";
+    }
+}
diff --git a/src/main/java/com/intellectualcrafters/plot/database/AbstractDB.java b/src/main/java/com/intellectualcrafters/plot/database/AbstractDB.java
index ea48bc90e..5d7b960b0 100644
--- a/src/main/java/com/intellectualcrafters/plot/database/AbstractDB.java
+++ b/src/main/java/com/intellectualcrafters/plot/database/AbstractDB.java
@@ -1,349 +1,348 @@
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// PlotSquared - A plot manager and world generator for the Bukkit API                             /
-// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
-//                                                                                                 /
-// This program is free software; you can redistribute it and/or modify                            /
-// it under the terms of the GNU General Public License as published by                            /
-// the Free Software Foundation; either version 3 of the License, or                               /
-// (at your option) any later version.                                                             /
-//                                                                                                 /
-// This program is distributed in the hope that it will be useful,                                 /
-// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
-// GNU General Public License for more details.                                                    /
-//                                                                                                 /
-// You should have received a copy of the GNU General Public License                               /
-// along with this program; if not, write to the Free Software Foundation,                         /
-// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
-//                                                                                                 /
-// You can contact us via: support@intellectualsites.com                                           /
-////////////////////////////////////////////////////////////////////////////////////////////////////
-package com.intellectualcrafters.plot.database;
-
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.ConcurrentHashMap;
-
-import com.intellectualcrafters.plot.flag.Flag;
-import com.intellectualcrafters.plot.object.Plot;
-import com.intellectualcrafters.plot.object.PlotCluster;
-import com.intellectualcrafters.plot.object.PlotClusterId;
-import com.intellectualcrafters.plot.object.PlotId;
-import com.intellectualcrafters.plot.object.RunnableVal;
-import com.intellectualcrafters.plot.object.comment.PlotComment;
-
-/**
- * @author Citymonstret
- * @author Empire92
- */
-public interface AbstractDB {
-    
-    /**
-     * The UUID that will count as everyone
-     */
-    UUID everyone = UUID.fromString("1-1-3-3-7");
-
-    /**
-     * Set Plot owner
-     *
-     * @param plot Plot in which the owner should be set
-     * @param uuid The uuid of the new owner
-     */
-    void setOwner(final Plot plot, final UUID uuid);
-
-    /**
-     * Create all settings, and create default helpers, trusted + denied lists
-     *
-     * @param plots Plots for which the default table entries should be created
-     */
-    void createPlotsAndData(final ArrayList<Plot> plots, Runnable whenDone);
-
-    /**
-     * Create a plot
-     *
-     * @param plot That should be created
-     */
-    void createPlot(final Plot plot);
-
-    /**
-     * Create tables
-     *
-     * @param database Database in which the tables will be created
-     *
-     * @throws SQLException If the database manager is unable to create the tables
-     */
-    void createTables() throws Exception;
-
-    /**
-     * Delete a plot
-     *
-     * @param plot Plot that should be deleted
-     */
-    void delete(final Plot plot);
-
-    void delete(final PlotCluster cluster);
-
-    /**
-     * Create plot settings
-     *
-     * @param id   Plot Entry ID
-     * @param plot Plot Object
-     */
-    void createPlotSettings(final int id, final Plot plot);
-
-    /**
-     * Get the table entry ID
-     *
-     * @param world Which the plot is located in
-     * @param id2   Plot ID
-     *
-     * @return Integer = Plot Entry Id
-     */
-    int getId(final Plot plot);
-
-    /**
-     * Get the id of a given plot cluster
-     *
-     * @param world Which the plot is located in
-     * @param id cluster id
-     *
-     * @return Integer = Cluster Entry Id
-     */
-    int getClusterId(final String world, final PlotClusterId id);
-
-    /**
-     * @return A linked hashmap containing all plots
-     */
-    ConcurrentHashMap<String, ConcurrentHashMap<PlotId, Plot>> getPlots();
-    
-    /**
-     * 
-     */
-    void validateAllPlots(Set<Plot> toValidate);
-
-    /**
-     * @return A hashmap containing all plot clusters
-     */
-    HashMap<String, HashSet<PlotCluster>> getClusters();
-
-    /**
-     * Set the merged status for a plot
-     *
-     * @param world  World in which the plot is located
-     * @param plot   Plot Object
-     * @param merged boolean[]
-     */
-    void setMerged(final Plot plot, final boolean[] merged);
-
-    /**
-     * Swap the settings, helpers etc. of two plots
-     * @param p1 Plot1
-     * @param p2 Plot2
-     */
-    void swapPlots(final Plot p1, final Plot p2);
-
-    /**
-     * Set plot flags
-     *
-     * @param world World in which the plot is located
-     * @param plot  Plot Object
-     * @param flags flags to set (flag[])
-     */
-    void setFlags(final Plot plot, final Collection<Flag> flags);
-
-    /**
-     * Set cluster flags
-     *
-     * @param cluster PlotCluster Object
-     * @param flags flags to set (flag[])
-     */
-    void setFlags(final PlotCluster cluster, final Collection<Flag> flags);
-
-    /**
-     * Rename a cluster
-     */
-    void setClusterName(final PlotCluster cluster, final String name);
-
-    /**
-     * Set the plot alias
-     *
-     * @param plot  Plot for which the alias should be set
-     * @param alias Plot Alias
-     */
-    void setAlias(final Plot plot, final String alias);
-
-    /**
-     * Purgle a plot
-     *
-     * @param world World in which the plot is located
-     * @param uniqueIds list of plot id (db) to be purged
-     */
-    void purgeIds(final String world, final Set<Integer> uniqueIds);
-
-    /**
-     * Purge a whole world
-     *
-     * @param world World in which the plots should be purged
-     */
-    void purge(final String world, final Set<PlotId> plotIds);
-
-    /**
-     * Set Plot Home Position
-     *
-     * @param plot     Plot Object
-     * @param position Plot Home Position
-     */
-    void setPosition(final Plot plot, final String position);
-
-    /**
-     *
-     * @param cluster
-     * @param position
-     */
-    void setPosition(final PlotCluster cluster, final String position);
-
-    /**
-     * @param plot   Plot Object
-     * @param uuid Player that should be removed
-     */
-    void removeTrusted(final Plot plot, final UUID uuid);
-
-    /**
-     * @param cluster   PlotCluster Object
-     * @param uuid Player that should be removed
-     */
-    void removeHelper(final PlotCluster cluster, final UUID uuid);
-
-    /**
-     * @param plot   Plot Object
-     * @param uuid Player that should be removed
-     */
-    void removeMember(final Plot plot, final UUID uuid);
-
-    /**
-     *
-     * @param cluster
-     * @param uuid
-     */
-    void removeInvited(final PlotCluster cluster, final UUID uuid);
-
-    /**
-     * @param plot   Plot Object
-     * @param uuid Player that should be removed
-     */
-    void setTrusted(final Plot plot, final UUID uuid);
-
-    /**
-     * @param cluster PlotCluster Object
-     * @param uuid Player that should be removed
-     */
-    void setHelper(final PlotCluster cluster, final UUID uuid);
-
-    /**
-     * @param plot   Plot Object
-     * @param uuid Player that should be added
-     */
-    void setMember(final Plot plot, final UUID uuid);
-
-    /**
-     *
-     * @param world
-     * @param cluster
-     * @param uuid
-     */
-    void setInvited(final PlotCluster cluster, final UUID uuid);
-
-    /**
-     * @param plot   Plot Object
-     * @param uuid   Player uuid
-     */
-    void removeDenied(final Plot plot, final UUID uuid);
-
-    /**
-     * @param plot   Plot Object
-     * @param uuid Player uuid that should be added
-     */
-    void setDenied(final Plot plot, final UUID uuid);
-
-    /**
-     * Get Plots ratings
-     *
-     * @param plot Plot Object
-     *
-     * @return Plot Ratings (pre-calculated)
-     */
-    HashMap<UUID, Integer> getRatings(final Plot plot);
-    
-    /**
-     * Set a rating for a plot
-     * @param plot
-     * @param rater
-     * @param value
-     */
-    void setRating(final Plot plot, UUID rater, int value);
-
-    /**
-     * Remove a plot comment
-     *
-     * @param world   World in which the plot is located
-     * @param plot    Plot Object
-     * @param comment Comment to remove
-     */
-    void removeComment(final Plot plot, final PlotComment comment);
-    
-    /**
-     * Clear an inbox
-     * @param plot
-     * @param inbox
-     */
-    void clearInbox(Plot plot, String inbox);
-
-    /**
-     * Set a plot comment
-     * 
-     * @param world   World in which the plot is located
-     * @param plot    Plot Object
-     * @param comment Comment to add
-     */
-    void setComment(final Plot plot, final PlotComment comment);
-
-    /**
-     * Get Plot Comments
-     *
-     * @param world World in which the plot is located
-     * @param plot  Plot Object
-     * @param tier  Comment Tier
-     *
-     * @return Plot Comments within the specified tier
-     */
-    void getComments(final Plot plot, final String inbox, RunnableVal whenDone);
-
-    void createPlotAndSettings(Plot plot, Runnable whenDone);
-
-    void createCluster(PlotCluster cluster);
-
-    void resizeCluster(PlotCluster current, PlotClusterId resize);
-
-    void movePlot(Plot originalPlot, Plot newPlot);
-
-    /**
-     * Replace a old uuid with a new one in the database<br>
-     * - Useful for replacing a few uuids (not the entire database)<br>
-     * - For entire conversion, the uuidconvert command scales better
-     * @param old
-     * @param now
-     */
-    void replaceUUID(UUID old, UUID now);
-    
-    /**
-     * Don't fuck with this one, unless you enjoy it rough
-     */
-    boolean deleteTables();
-
-    void close();
-}
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// PlotSquared - A plot manager and world generator for the Bukkit API                             /
+// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
+//                                                                                                 /
+// This program is free software; you can redistribute it and/or modify                            /
+// it under the terms of the GNU General Public License as published by                            /
+// the Free Software Foundation; either version 3 of the License, or                               /
+// (at your option) any later version.                                                             /
+//                                                                                                 /
+// This program is distributed in the hope that it will be useful,                                 /
+// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
+// GNU General Public License for more details.                                                    /
+//                                                                                                 /
+// You should have received a copy of the GNU General Public License                               /
+// along with this program; if not, write to the Free Software Foundation,                         /
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
+//                                                                                                 /
+// You can contact us via: support@intellectualsites.com                                           /
+////////////////////////////////////////////////////////////////////////////////////////////////////
+package com.intellectualcrafters.plot.database;
+
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+
+import com.intellectualcrafters.plot.flag.Flag;
+import com.intellectualcrafters.plot.object.Plot;
+import com.intellectualcrafters.plot.object.PlotCluster;
+import com.intellectualcrafters.plot.object.PlotClusterId;
+import com.intellectualcrafters.plot.object.PlotId;
+import com.intellectualcrafters.plot.object.RunnableVal;
+import com.intellectualcrafters.plot.object.comment.PlotComment;
+
+/**


+ */
+public interface AbstractDB
+{
+
+    /**
+     * The UUID that will count as everyone
+     */
+    UUID everyone = UUID.fromString("1-1-3-3-7");
+
+    /**
+     * Set Plot owner
+     *
+     * @param plot Plot in which the owner should be set
+     * @param uuid The uuid of the new owner
+     */
+    void setOwner(final Plot plot, final UUID uuid);
+
+    /**
+     * Create all settings, and create default helpers, trusted + denied lists
+     *
+     * @param plots Plots for which the default table entries should be created
+     */
+    void createPlotsAndData(final ArrayList<Plot> plots, final Runnable whenDone);
+
+    /**
+     * Create a plot
+     *
+     * @param plot That should be created
+     */
+    void createPlot(final Plot plot);
+
+    /**
+     * Create tables
+     *
+     * @param database Database in which the tables will be created
+     *
+     * @throws SQLException If the database manager is unable to create the tables
+     */
+    void createTables() throws Exception;
+
+    /**
+     * Delete a plot
+     *
+     * @param plot Plot that should be deleted
+     */
+    void delete(final Plot plot);
+
+    void delete(final PlotCluster cluster);
+
+    /**
+     * Create plot settings
+     *
+     * @param id   Plot Entry ID
+     * @param plot Plot Object
+     */
+    void createPlotSettings(final int id, final Plot plot);
+
+    /**
+     * Get the table entry ID
+     *
+     * @param world Which the plot is located in
+     * @param id2   Plot ID
+     *
+     * @return Integer = Plot Entry Id
+     */
+    int getId(final Plot plot);
+
+    /**
+     * Get the id of a given plot cluster
+     *
+     * @param world Which the plot is located in
+     * @param id cluster id
+     *
+     * @return Integer = Cluster Entry Id
+     */
+    int getClusterId(final String world, final PlotClusterId id);
+
+    /**
+     * @return A linked hashmap containing all plots
+     */
+    ConcurrentHashMap<String, ConcurrentHashMap<PlotId, Plot>> getPlots();
+
+    /**
+     *
+     */
+    void validateAllPlots(final Set<Plot> toValidate);
+
+    /**
+     * @return A hashmap containing all plot clusters
+     */
+    HashMap<String, HashSet<PlotCluster>> getClusters();
+
+    /**
+     * Set the merged status for a plot
+     *
+     * @param world  World in which the plot is located
+     * @param plot   Plot Object
+     * @param merged boolean[]
+     */
+    void setMerged(final Plot plot, final boolean[] merged);
+
+    /**
+     * Swap the settings, helpers etc. of two plots
+     * @param p1 Plot1
+     * @param p2 Plot2
+     */
+    void swapPlots(final Plot p1, final Plot p2);
+
+    /**
+     * Set plot flags
+     *
+     * @param world World in which the plot is located
+     * @param plot  Plot Object
+     * @param flags flags to set (flag[])
+     */
+    void setFlags(final Plot plot, final Collection<Flag> flags);
+
+    /**
+     * Set cluster flags
+     *
+     * @param cluster PlotCluster Object
+     * @param flags flags to set (flag[])
+     */
+    void setFlags(final PlotCluster cluster, final Collection<Flag> flags);
+
+    /**
+     * Rename a cluster
+     */
+    void setClusterName(final PlotCluster cluster, final String name);
+
+    /**
+     * Set the plot alias
+     *
+     * @param plot  Plot for which the alias should be set
+     * @param alias Plot Alias
+     */
+    void setAlias(final Plot plot, final String alias);
+
+    /**
+     * Purgle a plot
+     *
+     * @param world World in which the plot is located
+     * @param uniqueIds list of plot id (db) to be purged
+     */
+    void purgeIds(final String world, final Set<Integer> uniqueIds);
+
+    /**
+     * Purge a whole world
+     *
+     * @param world World in which the plots should be purged
+     */
+    void purge(final String world, final Set<PlotId> plotIds);
+
+    /**
+     * Set Plot Home Position
+     *
+     * @param plot     Plot Object
+     * @param position Plot Home Position
+     */
+    void setPosition(final Plot plot, final String position);
+
+    /**
+     *
+     * @param cluster
+     * @param position
+     */
+    void setPosition(final PlotCluster cluster, final String position);
+
+    /**
+     * @param plot   Plot Object
+     * @param uuid Player that should be removed
+     */
+    void removeTrusted(final Plot plot, final UUID uuid);
+
+    /**
+     * @param cluster   PlotCluster Object
+     * @param uuid Player that should be removed
+     */
+    void removeHelper(final PlotCluster cluster, final UUID uuid);
+
+    /**
+     * @param plot   Plot Object
+     * @param uuid Player that should be removed
+     */
+    void removeMember(final Plot plot, final UUID uuid);
+
+    /**
+     *
+     * @param cluster
+     * @param uuid
+     */
+    void removeInvited(final PlotCluster cluster, final UUID uuid);
+
+    /**
+     * @param plot   Plot Object
+     * @param uuid Player that should be removed
+     */
+    void setTrusted(final Plot plot, final UUID uuid);
+
+    /**
+     * @param cluster PlotCluster Object
+     * @param uuid Player that should be removed
+     */
+    void setHelper(final PlotCluster cluster, final UUID uuid);
+
+    /**
+     * @param plot   Plot Object
+     * @param uuid Player that should be added
+     */
+    void setMember(final Plot plot, final UUID uuid);
+
+    /**
+     *
+     * @param world
+     * @param cluster
+     * @param uuid
+     */
+    void setInvited(final PlotCluster cluster, final UUID uuid);
+
+    /**
+     * @param plot   Plot Object
+     * @param uuid   Player uuid
+     */
+    void removeDenied(final Plot plot, final UUID uuid);
+
+    /**
+     * @param plot   Plot Object
+     * @param uuid Player uuid that should be added
+     */
+    void setDenied(final Plot plot, final UUID uuid);
+
+    /**
+     * Get Plots ratings
+     *
+     * @param plot Plot Object
+     *
+     * @return Plot Ratings (pre-calculated)
+     */
+    HashMap<UUID, Integer> getRatings(final Plot plot);
+
+    /**
+     * Set a rating for a plot
+     * @param plot
+     * @param rater
+     * @param value
+     */
+    void setRating(final Plot plot, final UUID rater, final int value);
+
+    /**
+     * Remove a plot comment
+     *
+     * @param world   World in which the plot is located
+     * @param plot    Plot Object
+     * @param comment Comment to remove
+     */
+    void removeComment(final Plot plot, final PlotComment comment);
+
+    /**
+     * Clear an inbox
+     * @param plot
+     * @param inbox
+     */
+    void clearInbox(final Plot plot, final String inbox);
+
+    /**
+     * Set a plot comment
+     *
+     * @param world   World in which the plot is located
+     * @param plot    Plot Object
+     * @param comment Comment to add
+     */
+    void setComment(final Plot plot, final PlotComment comment);
+
+    /**
+     * Get Plot Comments
+     *
+     * @param world World in which the plot is located
+     * @param plot  Plot Object
+     * @param tier  Comment Tier
+     *
+     * @return Plot Comments within the specified tier
+     */
+    void getComments(final Plot plot, final String inbox, final RunnableVal whenDone);
+
+    void createPlotAndSettings(final Plot plot, final Runnable whenDone);
+
+    void createCluster(final PlotCluster cluster);
+
+    void resizeCluster(final PlotCluster current, final PlotClusterId resize);
+
+    void movePlot(final Plot originalPlot, final Plot newPlot);
+
+    /**
+     * Replace a old uuid with a new one in the database<br>
+     * - Useful for replacing a few uuids (not the entire database)<br>
+     * - For entire conversion, the uuidconvert command scales better
+     * @param old
+     * @param now
+     */
+    void replaceUUID(final UUID old, final UUID now);
+
+    /**
+     * Don't fuck with this one, unless you enjoy it rough
+     */
+    boolean deleteTables();
+
+    void close();
+}
diff --git a/src/main/java/com/intellectualcrafters/plot/database/DBFunc.java b/src/main/java/com/intellectualcrafters/plot/database/DBFunc.java
index 1768a026e..c4e09e509 100644
--- a/src/main/java/com/intellectualcrafters/plot/database/DBFunc.java
+++ b/src/main/java/com/intellectualcrafters/plot/database/DBFunc.java
@@ -1,436 +1,435 @@
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// PlotSquared - A plot manager and world generator for the Bukkit API                             /
-// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
-//                                                                                                 /
-// This program is free software; you can redistribute it and/or modify                            /
-// it under the terms of the GNU General Public License as published by                            /
-// the Free Software Foundation; either version 3 of the License, or                               /
-// (at your option) any later version.                                                             /
-//                                                                                                 /
-// This program is distributed in the hope that it will be useful,                                 /
-// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
-// GNU General Public License for more details.                                                    /
-//                                                                                                 /
-// You should have received a copy of the GNU General Public License                               /
-// along with this program; if not, write to the Free Software Foundation,                         /
-// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
-//                                                                                                 /
-// You can contact us via: support@intellectualsites.com                                           /
-////////////////////////////////////////////////////////////////////////////////////////////////////
-package com.intellectualcrafters.plot.database;
-
-import java.sql.ResultSet;
-import java.sql.ResultSetMetaData;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.ConcurrentHashMap;
-
-import com.intellectualcrafters.plot.flag.Flag;
-import com.intellectualcrafters.plot.object.Plot;
-import com.intellectualcrafters.plot.object.PlotCluster;
-import com.intellectualcrafters.plot.object.PlotClusterId;
-import com.intellectualcrafters.plot.object.PlotId;
-import com.intellectualcrafters.plot.object.RunnableVal;
-import com.intellectualcrafters.plot.object.comment.PlotComment;
-
-/**
- * DB Functions
- *
- * @author Empire92
- * @author Citymonstret
- */
-public class DBFunc {
-    /**
-     * The "global" uuid
-     */
-    public static final UUID everyone = UUID.fromString("1-1-3-3-7");
-    /**
-     * Abstract Database Manager
-     */
-    public static AbstractDB dbManager;
-
-    public static void movePlot(final Plot originalPlot, final Plot newPlot) {
-        if (originalPlot.temp == -1 || newPlot.temp == -1) {
-            return;
-        }
-        dbManager.movePlot(originalPlot, newPlot);
-    }
-    
-    public static void validatePlots(Set<Plot> plots) {
-        dbManager.validateAllPlots(plots);
-    }
-    
-    /**
-     * Check if a resultset contains a column
-     * @param rs
-     * @param columnName
-     * @return
-     * @throws SQLException
-     */
-    public static boolean hasColumn(ResultSet r, String name) {
-        try {
-            ResultSetMetaData meta = r.getMetaData();
-            int count = meta.getColumnCount();
-            for (int x = 1; x <= count; x++) {
-                if (name.equals(meta.getColumnName(x))) {
-                    return true;
-                }
-            }
-            return false;
-        }
-        catch (SQLException e) {
-            return false;
-        }
-    }
-    /**
-     * Set the owner of a plot
-     *
-     * @param plot Plot Object
-     * @param uuid New Owner
-     */
-    public static void setOwner(final Plot plot, final UUID uuid) {
-        if (plot.temp == -1) {
-            return;
-        }
-        dbManager.setOwner(plot, uuid);
-    }
-
-    /**
-     * Create all settings + (trusted, denied, members)
-     *
-     * @param plots List containing all plot objects
-     */
-    public static void createPlotsAndData(final ArrayList<Plot> plots, Runnable whenDone) {
-        dbManager.createPlotsAndData(plots, whenDone);
-    }
-
-    /**
-     * Create a plot
-     *
-     * @param plot Plot to create
-     */
-    public static void createPlot(final Plot plot) {
-        if (plot.temp == -1) {
-            return;
-        }
-        dbManager.createPlot(plot);
-    }
-
-    /**
-     * Create a plot
-     *
-     * @param plot Plot to create
-     */
-    public static void createPlotAndSettings(final Plot plot, Runnable whenDone) {
-        if (plot.temp == -1) {
-            return;
-        }
-        dbManager.createPlotAndSettings(plot, whenDone);
-    }
-
-    /**
-     * Create tables
-     *
-     * @throws Exception
-     */
-    public static void createTables(final String database) throws Exception {
-        dbManager.createTables();
-    }
-
-    /**
-     * Delete a plot
-     *
-     * @param plot Plot to delete
-     */
-    public static void delete(final Plot plot) {
-        if (plot.temp == -1) {
-            return;
-        }
-        dbManager.delete(plot);
-    }
-
-    public static void delete(final PlotCluster toDelete) {
-        dbManager.delete(toDelete);
-    }
-
-    /**
-     * Create plot settings
-     *
-     * @param id   Plot ID
-     * @param plot Plot Object
-     */
-    public static void createPlotSettings(final int id, final Plot plot) {
-        if (plot.temp == -1) {
-            return;
-        }
-        dbManager.createPlotSettings(id, plot);
-    }
-
-    /**
-     * Get a plot id
-     *
-     * @param world World
-     * @param id2   Plot ID
-     *
-     * @return ID
-     */
-    /*
-     * public static int getId(String plotId id2) { Statement stmt =
-     * null; try { stmt = connection.createStatement(); ResultSet r =
-     * stmt.executeQuery("SELECT `id` FROM `plot` WHERE `plot_id_x` = '" + id2.x
-     * + "' AND `plot_id_z` = '" + id2.y + "' AND `world` = '" + world +
-     * "' ORDER BY `timestamp` ASC"); int id = Integer.MAX_VALUE;
-     * while(r.next()) { id = r.getInt("id"); } stmt.close(); return id; }
-     * catch(SQLException e) { e.printStackTrace(); } return Integer.MAX_VALUE;
-     * }
-     */
-    public static int getId(final Plot plot) {
-        return dbManager.getId(plot);
-    }
-
-    /**
-     * @return Plots
-     */
-    public static ConcurrentHashMap<String, ConcurrentHashMap<PlotId, Plot>> getPlots() {
-        return dbManager.getPlots();
-    }
-
-    public static void setMerged(final Plot plot, final boolean[] merged) {
-        if (plot.temp == -1) {
-            return;
-        }
-        dbManager.setMerged(plot, merged);
-    }
-
-    public static void setFlags(final Plot plot, final Collection<Flag> flags) {
-        if (plot.temp == -1) {
-            return;
-        }
-        dbManager.setFlags(plot, flags);
-    }
-
-    public static void setFlags(final PlotCluster cluster, final Collection<Flag> flags) {
-        dbManager.setFlags(cluster, flags);
-    }
-
-    /**
-     * @param plot
-     * @param alias
-     */
-    public static void setAlias(final Plot plot, final String alias) {
-        if (plot.temp == -1) {
-            return;
-        }
-        dbManager.setAlias(plot, alias);
-    }
-
-    public static void purgeIds(final String world, final Set<Integer> uniqueIds) {
-        dbManager.purgeIds(world, uniqueIds);
-    }
-
-    public static void purge(final String world, final Set<PlotId> plotIds) {
-        dbManager.purge(world, plotIds);
-    }
-
-    /**
-     * @param plot
-     * @param position
-     */
-    public static void setPosition(final Plot plot, final String position) {
-        if (plot.temp == -1) {
-            return;
-        }
-        dbManager.setPosition(plot, position);
-    }
-
-    /**
-     * @param plot
-     * @param comment
-     */
-    public static void removeComment(final Plot plot, final PlotComment comment) {
-        if (plot != null && plot.temp == -1) {
-            return;
-        }
-        dbManager.removeComment(plot, comment);
-    }
-    
-    public static void clearInbox(final Plot plot, final String inbox) {
-        if (plot != null && plot.temp == -1) {
-            return;
-        }
-        dbManager.clearInbox(plot, inbox);
-    }
-
-    /**
-     * @param plot
-     * @param comment
-     */
-    public static void setComment(final Plot plot, final PlotComment comment) {
-        if (plot != null && plot.temp == -1) {
-            return;
-        }
-        dbManager.setComment(plot, comment);
-    }
-
-    /**
-     * @param plot
-     */
-    public static void getComments(final Plot plot, final String inbox, RunnableVal whenDone) {
-        if (plot != null && plot.temp == -1) {
-            return;
-        }
-        dbManager.getComments(plot, inbox, whenDone);
-    }
-
-    /**
-     * @param plot
-     * @param uuid
-     */
-    public static void removeTrusted(final Plot plot, final UUID uuid) {
-        if (plot.temp == -1) {
-            return;
-        }
-        dbManager.removeTrusted(plot, uuid);
-    }
-
-    /**
-     * @param cluster
-     * @param uuid
-     */
-    public static void removeHelper(final PlotCluster cluster, final UUID uuid) {
-        dbManager.removeHelper(cluster, uuid);
-    }
-
-    /**
-     * @param world
-     * @param cluster
-     */
-    public static void createCluster(final String world, final PlotCluster cluster) {
-        dbManager.createCluster(cluster);
-    }
-
-    /**
-     * @param current
-     * @param resize
-     */
-    public static void resizeCluster(final PlotCluster current, final PlotClusterId resize) {
-        dbManager.resizeCluster(current, resize);
-    }
-
-    /**
-     * @param plot
-     * @param uuid
-     */
-    public static void removeMember(final Plot plot, final UUID uuid) {
-        if (plot.temp == -1) {
-            return;
-        }
-        dbManager.removeMember(plot, uuid);
-    }
-
-    /**
-     *
-     * @param cluster
-     * @param uuid
-     */
-    public static void removeInvited(final PlotCluster cluster, final UUID uuid) {
-        dbManager.removeInvited(cluster, uuid);
-    }
-
-    /**
-     * @param world
-     * @param plot
-     * @param uuid
-     */
-    public static void setTrusted(final Plot plot, final UUID uuid) {
-        if (plot.temp == -1) {
-            return;
-        }
-        dbManager.setTrusted(plot, uuid);
-    }
-
-    public static void setHelper(final PlotCluster cluster, final UUID uuid) {
-        dbManager.setHelper(cluster, uuid);
-    }
-
-    /**
-     * @param world
-     * @param plot
-     * @param uuid
-     */
-    public static void setMember(final Plot plot, final UUID uuid) {
-        if (plot.temp == -1) {
-            return;
-        }
-        dbManager.setMember(plot, uuid);
-    }
-
-    public static void setInvited(final String world, final PlotCluster cluster, final UUID uuid) {
-        dbManager.setInvited(cluster, uuid);
-    }
-
-    /**
-     * @param world
-     * @param plot
-     * @param uuid
-     */
-    public static void removeDenied(final Plot plot, final UUID uuid) {
-        if (plot.temp == -1) {
-            return;
-        }
-        dbManager.removeDenied(plot, uuid);
-    }
-
-    /**
-     * @param world
-     * @param plot
-     * @param uuid
-     */
-    public static void setDenied(final Plot plot, final UUID uuid) {
-        if (plot.temp == -1) {
-            return;
-        }
-        dbManager.setDenied(plot, uuid);
-    }
-
-    public static HashMap<UUID, Integer> getRatings(final Plot plot) {
-        if (plot.temp == -1) {
-            return new HashMap<>();
-        }
-        return dbManager.getRatings(plot);
-    }
-    
-    public static void setRating(Plot plot, UUID rater, int value) {
-        if (plot.temp == -1) {
-            return;
-        }
-        dbManager.setRating(plot, rater, value);
-    }
-
-    public static HashMap<String, HashSet<PlotCluster>> getClusters() {
-        return dbManager.getClusters();
-    }
-
-    public static void setPosition(final PlotCluster cluster, final String position) {
-        dbManager.setPosition(cluster, position);
-    }
-    
-    /**
-     * Replace all occurances of a uuid in the database with another one
-     * @param old
-     * @param now
-     */
-    public static void replaceUUID(UUID old, UUID now) {
-        dbManager.replaceUUID(old, now);
-    }
-
-    public static void close() {
-        dbManager.close();
-    }
-}
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// PlotSquared - A plot manager and world generator for the Bukkit API                             /
+// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
+//                                                                                                 /
+// This program is free software; you can redistribute it and/or modify                            /
+// it under the terms of the GNU General Public License as published by                            /
+// the Free Software Foundation; either version 3 of the License, or                               /
+// (at your option) any later version.                                                             /
+//                                                                                                 /
+// This program is distributed in the hope that it will be useful,                                 /
+// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
+// GNU General Public License for more details.                                                    /
+//                                                                                                 /
+// You should have received a copy of the GNU General Public License                               /
+// along with this program; if not, write to the Free Software Foundation,                         /
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
+//                                                                                                 /
+// You can contact us via: support@intellectualsites.com                                           /
+////////////////////////////////////////////////////////////////////////////////////////////////////
+package com.intellectualcrafters.plot.database;
+
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+
+import com.intellectualcrafters.plot.flag.Flag;
+import com.intellectualcrafters.plot.object.Plot;
+import com.intellectualcrafters.plot.object.PlotCluster;
+import com.intellectualcrafters.plot.object.PlotClusterId;
+import com.intellectualcrafters.plot.object.PlotId;
+import com.intellectualcrafters.plot.object.RunnableVal;
+import com.intellectualcrafters.plot.object.comment.PlotComment;
+
+/**
+ * DB Functions
+ *


+ */
+public class DBFunc
+{
+    /**
+     * The "global" uuid
+     */
+    public static final UUID everyone = UUID.fromString("1-1-3-3-7");
+    /**
+     * Abstract Database Manager
+     */
+    public static AbstractDB dbManager;
+
+    public static void movePlot(final Plot originalPlot, final Plot newPlot)
+    {
+        if ((originalPlot.temp == -1) || (newPlot.temp == -1)) { return; }
+        dbManager.movePlot(originalPlot, newPlot);
+    }
+
+    public static void validatePlots(final Set<Plot> plots)
+    {
+        dbManager.validateAllPlots(plots);
+    }
+
+    /**
+     * Check if a resultset contains a column
+     * @param rs
+     * @param columnName
+     * @return
+     * @throws SQLException
+     */
+    public static boolean hasColumn(final ResultSet r, final String name)
+    {
+        try
+        {
+            final ResultSetMetaData meta = r.getMetaData();
+            final int count = meta.getColumnCount();
+            for (int x = 1; x <= count; x++)
+            {
+                if (name.equals(meta.getColumnName(x))) { return true; }
+            }
+            return false;
+        }
+        catch (final SQLException e)
+        {
+            return false;
+        }
+    }
+
+    /**
+     * Set the owner of a plot
+     *
+     * @param plot Plot Object
+     * @param uuid New Owner
+     */
+    public static void setOwner(final Plot plot, final UUID uuid)
+    {
+        if (plot.temp == -1) { return; }
+        dbManager.setOwner(plot, uuid);
+    }
+
+    /**
+     * Create all settings + (trusted, denied, members)
+     *
+     * @param plots List containing all plot objects
+     */
+    public static void createPlotsAndData(final ArrayList<Plot> plots, final Runnable whenDone)
+    {
+        dbManager.createPlotsAndData(plots, whenDone);
+    }
+
+    /**
+     * Create a plot
+     *
+     * @param plot Plot to create
+     */
+    public static void createPlot(final Plot plot)
+    {
+        if (plot.temp == -1) { return; }
+        dbManager.createPlot(plot);
+    }
+
+    /**
+     * Create a plot
+     *
+     * @param plot Plot to create
+     */
+    public static void createPlotAndSettings(final Plot plot, final Runnable whenDone)
+    {
+        if (plot.temp == -1) { return; }
+        dbManager.createPlotAndSettings(plot, whenDone);
+    }
+
+    /**
+     * Create tables
+     *
+     * @throws Exception
+     */
+    public static void createTables(final String database) throws Exception
+    {
+        dbManager.createTables();
+    }
+
+    /**
+     * Delete a plot
+     *
+     * @param plot Plot to delete
+     */
+    public static void delete(final Plot plot)
+    {
+        if (plot.temp == -1) { return; }
+        dbManager.delete(plot);
+    }
+
+    public static void delete(final PlotCluster toDelete)
+    {
+        dbManager.delete(toDelete);
+    }
+
+    /**
+     * Create plot settings
+     *
+     * @param id   Plot ID
+     * @param plot Plot Object
+     */
+    public static void createPlotSettings(final int id, final Plot plot)
+    {
+        if (plot.temp == -1) { return; }
+        dbManager.createPlotSettings(id, plot);
+    }
+
+    /**
+     * Get a plot id
+     *
+     * @param world World
+     * @param id2   Plot ID
+     *
+     * @return ID
+     */
+    /*
+     * public static int getId(String plotId id2) { Statement stmt =
+     * null; try { stmt = connection.createStatement(); ResultSet r =
+     * stmt.executeQuery("SELECT `id` FROM `plot` WHERE `plot_id_x` = '" + id2.x
+     * + "' AND `plot_id_z` = '" + id2.y + "' AND `world` = '" + world +
+     * "' ORDER BY `timestamp` ASC"); int id = Integer.MAX_VALUE;
+     * while(r.next()) { id = r.getInt("id"); } stmt.close(); return id; }
+     * catch(SQLException e) { e.printStackTrace(); } return Integer.MAX_VALUE;
+     * }
+     */
+    public static int getId(final Plot plot)
+    {
+        return dbManager.getId(plot);
+    }
+
+    /**
+     * @return Plots
+     */
+    public static ConcurrentHashMap<String, ConcurrentHashMap<PlotId, Plot>> getPlots()
+    {
+        return dbManager.getPlots();
+    }
+
+    public static void setMerged(final Plot plot, final boolean[] merged)
+    {
+        if (plot.temp == -1) { return; }
+        dbManager.setMerged(plot, merged);
+    }
+
+    public static void setFlags(final Plot plot, final Collection<Flag> flags)
+    {
+        if (plot.temp == -1) { return; }
+        dbManager.setFlags(plot, flags);
+    }
+
+    public static void setFlags(final PlotCluster cluster, final Collection<Flag> flags)
+    {
+        dbManager.setFlags(cluster, flags);
+    }
+
+    /**
+     * @param plot
+     * @param alias
+     */
+    public static void setAlias(final Plot plot, final String alias)
+    {
+        if (plot.temp == -1) { return; }
+        dbManager.setAlias(plot, alias);
+    }
+
+    public static void purgeIds(final String world, final Set<Integer> uniqueIds)
+    {
+        dbManager.purgeIds(world, uniqueIds);
+    }
+
+    public static void purge(final String world, final Set<PlotId> plotIds)
+    {
+        dbManager.purge(world, plotIds);
+    }
+
+    /**
+     * @param plot
+     * @param position
+     */
+    public static void setPosition(final Plot plot, final String position)
+    {
+        if (plot.temp == -1) { return; }
+        dbManager.setPosition(plot, position);
+    }
+
+    /**
+     * @param plot
+     * @param comment
+     */
+    public static void removeComment(final Plot plot, final PlotComment comment)
+    {
+        if ((plot != null) && (plot.temp == -1)) { return; }
+        dbManager.removeComment(plot, comment);
+    }
+
+    public static void clearInbox(final Plot plot, final String inbox)
+    {
+        if ((plot != null) && (plot.temp == -1)) { return; }
+        dbManager.clearInbox(plot, inbox);
+    }
+
+    /**
+     * @param plot
+     * @param comment
+     */
+    public static void setComment(final Plot plot, final PlotComment comment)
+    {
+        if ((plot != null) && (plot.temp == -1)) { return; }
+        dbManager.setComment(plot, comment);
+    }
+
+    /**
+     * @param plot
+     */
+    public static void getComments(final Plot plot, final String inbox, final RunnableVal whenDone)
+    {
+        if ((plot != null) && (plot.temp == -1)) { return; }
+        dbManager.getComments(plot, inbox, whenDone);
+    }
+
+    /**
+     * @param plot
+     * @param uuid
+     */
+    public static void removeTrusted(final Plot plot, final UUID uuid)
+    {
+        if (plot.temp == -1) { return; }
+        dbManager.removeTrusted(plot, uuid);
+    }
+
+    /**
+     * @param cluster
+     * @param uuid
+     */
+    public static void removeHelper(final PlotCluster cluster, final UUID uuid)
+    {
+        dbManager.removeHelper(cluster, uuid);
+    }
+
+    /**
+     * @param world
+     * @param cluster
+     */
+    public static void createCluster(final String world, final PlotCluster cluster)
+    {
+        dbManager.createCluster(cluster);
+    }
+
+    /**
+     * @param current
+     * @param resize
+     */
+    public static void resizeCluster(final PlotCluster current, final PlotClusterId resize)
+    {
+        dbManager.resizeCluster(current, resize);
+    }
+
+    /**
+     * @param plot
+     * @param uuid
+     */
+    public static void removeMember(final Plot plot, final UUID uuid)
+    {
+        if (plot.temp == -1) { return; }
+        dbManager.removeMember(plot, uuid);
+    }
+
+    /**
+     *
+     * @param cluster
+     * @param uuid
+     */
+    public static void removeInvited(final PlotCluster cluster, final UUID uuid)
+    {
+        dbManager.removeInvited(cluster, uuid);
+    }
+
+    /**
+     * @param world
+     * @param plot
+     * @param uuid
+     */
+    public static void setTrusted(final Plot plot, final UUID uuid)
+    {
+        if (plot.temp == -1) { return; }
+        dbManager.setTrusted(plot, uuid);
+    }
+
+    public static void setHelper(final PlotCluster cluster, final UUID uuid)
+    {
+        dbManager.setHelper(cluster, uuid);
+    }
+
+    /**
+     * @param world
+     * @param plot
+     * @param uuid
+     */
+    public static void setMember(final Plot plot, final UUID uuid)
+    {
+        if (plot.temp == -1) { return; }
+        dbManager.setMember(plot, uuid);
+    }
+
+    public static void setInvited(final String world, final PlotCluster cluster, final UUID uuid)
+    {
+        dbManager.setInvited(cluster, uuid);
+    }
+
+    /**
+     * @param world
+     * @param plot
+     * @param uuid
+     */
+    public static void removeDenied(final Plot plot, final UUID uuid)
+    {
+        if (plot.temp == -1) { return; }
+        dbManager.removeDenied(plot, uuid);
+    }
+
+    /**
+     * @param world
+     * @param plot
+     * @param uuid
+     */
+    public static void setDenied(final Plot plot, final UUID uuid)
+    {
+        if (plot.temp == -1) { return; }
+        dbManager.setDenied(plot, uuid);
+    }
+
+    public static HashMap<UUID, Integer> getRatings(final Plot plot)
+    {
+        if (plot.temp == -1) { return new HashMap<>(); }
+        return dbManager.getRatings(plot);
+    }
+
+    public static void setRating(final Plot plot, final UUID rater, final int value)
+    {
+        if (plot.temp == -1) { return; }
+        dbManager.setRating(plot, rater, value);
+    }
+
+    public static HashMap<String, HashSet<PlotCluster>> getClusters()
+    {
+        return dbManager.getClusters();
+    }
+
+    public static void setPosition(final PlotCluster cluster, final String position)
+    {
+        dbManager.setPosition(cluster, position);
+    }
+
+    /**
+     * Replace all occurances of a uuid in the database with another one
+     * @param old
+     * @param now
+     */
+    public static void replaceUUID(final UUID old, final UUID now)
+    {
+        dbManager.replaceUUID(old, now);
+    }
+
+    public static void close()
+    {
+        dbManager.close();
+    }
+}
diff --git a/src/main/java/com/intellectualcrafters/plot/database/Database.java b/src/main/java/com/intellectualcrafters/plot/database/Database.java
index 226a95955..cdecd932a 100644
--- a/src/main/java/com/intellectualcrafters/plot/database/Database.java
+++ b/src/main/java/com/intellectualcrafters/plot/database/Database.java
@@ -30,9 +30,10 @@ import java.sql.SQLException;
  * @author -_Husky_-
  * @author tips48
  */
-public abstract class Database {
-    
-    public abstract Connection forceConnection() throws SQLException, ClassNotFoundException ;
+public abstract class Database
+{
+
+    public abstract Connection forceConnection() throws SQLException, ClassNotFoundException;
 
     /**
      * Opens a connection with the database
diff --git a/src/main/java/com/intellectualcrafters/plot/database/MySQL.java b/src/main/java/com/intellectualcrafters/plot/database/MySQL.java
index 15ce74e20..0dd977503 100644
--- a/src/main/java/com/intellectualcrafters/plot/database/MySQL.java
+++ b/src/main/java/com/intellectualcrafters/plot/database/MySQL.java
@@ -32,7 +32,8 @@ import java.sql.Statement;
  * @author -_Husky_-
  * @author tips48
  */
-public class MySQL extends Database {
+public class MySQL extends Database
+{
     private final String user;
     private final String database;
     private final String password;
@@ -49,66 +50,73 @@ public class MySQL extends Database {
      * @param username Username
      * @param password Password
      */
-    public MySQL(final String hostname, final String port, final String database, final String username, final String password) {
+    public MySQL(final String hostname, final String port, final String database, final String username, final String password)
+    {
         this.hostname = hostname;
         this.port = port;
         this.database = database;
-        this.user = username;
+        user = username;
         this.password = password;
-        this.connection = null;
+        connection = null;
     }
 
-    public Connection forceConnection() throws SQLException, ClassNotFoundException {
+    @Override
+    public Connection forceConnection() throws SQLException, ClassNotFoundException
+    {
         Class.forName("com.mysql.jdbc.Driver");
-        this.connection = DriverManager.getConnection("jdbc:mysql://" + this.hostname + ":" + this.port + "/" + this.database, this.user, this.password);
-        return this.connection;
+        connection = DriverManager.getConnection("jdbc:mysql://" + hostname + ":" + port + "/" + database, user, password);
+        return connection;
     }
 
     @Override
-    public Connection openConnection() throws SQLException, ClassNotFoundException {
-        if (checkConnection()) {
-            return this.connection;
-        }
+    public Connection openConnection() throws SQLException, ClassNotFoundException
+    {
+        if (checkConnection()) { return connection; }
         Class.forName("com.mysql.jdbc.Driver");
-        this.connection = DriverManager.getConnection("jdbc:mysql://" + this.hostname + ":" + this.port + "/" + this.database, this.user, this.password);
-        return this.connection;
+        connection = DriverManager.getConnection("jdbc:mysql://" + hostname + ":" + port + "/" + database, user, password);
+        return connection;
     }
 
     @Override
-    public boolean checkConnection() throws SQLException {
-        return (this.connection != null) && !this.connection.isClosed();
+    public boolean checkConnection() throws SQLException
+    {
+        return (connection != null) && !connection.isClosed();
     }
 
     @Override
-    public Connection getConnection() {
-        return this.connection;
+    public Connection getConnection()
+    {
+        return connection;
     }
 
     @Override
-    public boolean closeConnection() throws SQLException {
-        if (this.connection == null) {
-            return false;
-        }
-        this.connection.close();
-        this.connection = null;
+    public boolean closeConnection() throws SQLException
+    {
+        if (connection == null) { return false; }
+        connection.close();
+        connection = null;
         return true;
     }
 
     @Override
-    public ResultSet querySQL(final String query) throws SQLException, ClassNotFoundException {
-        if (checkConnection()) {
+    public ResultSet querySQL(final String query) throws SQLException, ClassNotFoundException
+    {
+        if (checkConnection())
+        {
             openConnection();
         }
-        final Statement statement = this.connection.createStatement();
+        final Statement statement = connection.createStatement();
         return statement.executeQuery(query);
     }
 
     @Override
-    public int updateSQL(final String query) throws SQLException, ClassNotFoundException {
-        if (checkConnection()) {
+    public int updateSQL(final String query) throws SQLException, ClassNotFoundException
+    {
+        if (checkConnection())
+        {
             openConnection();
         }
-        final Statement statement = this.connection.createStatement();
+        final Statement statement = connection.createStatement();
         return statement.executeUpdate(query);
     }
 }
diff --git a/src/main/java/com/intellectualcrafters/plot/database/SQLManager.java b/src/main/java/com/intellectualcrafters/plot/database/SQLManager.java
index c4bf9192a..8c6dd961b 100644
--- a/src/main/java/com/intellectualcrafters/plot/database/SQLManager.java
+++ b/src/main/java/com/intellectualcrafters/plot/database/SQLManager.java
@@ -1,2607 +1,3402 @@
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// PlotSquared - A plot manager and world generator for the Bukkit API                             /
-// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
-//                                                                                                 /
-// This program is free software; you can redistribute it and/or modify                            /
-// it under the terms of the GNU General Public License as published by                            /
-// the Free Software Foundation; either version 3 of the License, or                               /
-// (at your option) any later version.                                                             /
-//                                                                                                 /
-// This program is distributed in the hope that it will be useful,                                 /
-// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
-// GNU General Public License for more details.                                                    /
-//                                                                                                 /
-// You should have received a copy of the GNU General Public License                               /
-// along with this program; if not, write to the Free Software Foundation,                         /
-// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
-//                                                                                                 /
-// You can contact us via: support@intellectualsites.com                                           /
-////////////////////////////////////////////////////////////////////////////////////////////////////
-package com.intellectualcrafters.plot.database;
-
-import java.sql.Connection;
-import java.sql.DatabaseMetaData;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.sql.Timestamp;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map.Entry;
-import java.util.Queue;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentLinkedQueue;
-
-import com.intellectualcrafters.plot.PS;
-import com.intellectualcrafters.plot.config.Settings;
-import com.intellectualcrafters.plot.flag.Flag;
-import com.intellectualcrafters.plot.flag.FlagManager;
-import com.intellectualcrafters.plot.object.BlockLoc;
-import com.intellectualcrafters.plot.object.Plot;
-import com.intellectualcrafters.plot.object.PlotCluster;
-import com.intellectualcrafters.plot.object.PlotClusterId;
-import com.intellectualcrafters.plot.object.PlotId;
-import com.intellectualcrafters.plot.object.PlotSettings;
-import com.intellectualcrafters.plot.object.RunnableVal;
-import com.intellectualcrafters.plot.object.comment.PlotComment;
-import com.intellectualcrafters.plot.util.ClusterManager;
-import com.intellectualcrafters.plot.util.MainUtil;
-import com.intellectualcrafters.plot.util.StringMan;
-import com.intellectualcrafters.plot.util.TaskManager;
-
-/**
- * @author Citymonstret
- */
-public class SQLManager implements AbstractDB {
-    // Public final
-    public final String SET_OWNER;
-    public final String GET_ALL_PLOTS;
-    public final String CREATE_PLOTS;
-    public final String CREATE_SETTINGS;
-    public final String CREATE_TIERS;
-    public final String CREATE_PLOT;
-    public final String CREATE_CLUSTER;
-    private final String prefix;
-    // Private
-    private Connection connection;
-    private boolean CLOSED = false;
-    // Private Final
-    private final Database database;
-    private final boolean MYSQL;
-
-    /**
-     * important tasks
-     */
-    public volatile Queue<Runnable> globalTasks;
-    
-    /**
-     * Notify tasks
-     */
-    public volatile Queue<Runnable> notifyTasks;
-    
-    /**
-     * plot
-     * plot_denied
-     * plot_helpers
-     * plot_trusted
-     * plot_comments
-     * plot_settings
-     * plot_rating
-     */
-    public volatile ConcurrentHashMap<Plot, Queue<UniqueStatement>> plotTasks;
-    
-    /**
-     * cluster
-     * cluster_helpers
-     * cluster_invited
-     * cluster_settings
-     */
-    public volatile ConcurrentHashMap<PlotCluster, Queue<UniqueStatement>> clusterTasks;
-    private boolean debug;
-    
-    public synchronized Queue<Runnable> getGlobalTasks() {
-        return globalTasks;
-    }
-    
-    public synchronized Queue<Runnable> getNotifyTasks() {
-        return notifyTasks;
-    }
-    
-    public synchronized void addPlotTask(Plot plot, UniqueStatement task) {
-        if (plot == null) {
-            plot = new Plot("", new PlotId(Integer.MAX_VALUE, Integer.MAX_VALUE), null);
-        }
-        Queue<UniqueStatement> tasks = plotTasks.get(plot);
-        if (tasks == null) {
-            tasks = new ConcurrentLinkedQueue<>();
-            plotTasks.put(plot, tasks);
-        }
-        if (task == null) {
-            task = new UniqueStatement(plot.hashCode() + "") {
-
-                @Override
-                public PreparedStatement get() throws SQLException {
-                    return null;
-                }
-
-                @Override
-                public void set(PreparedStatement stmt) throws SQLException {}
-                
-                @Override
-                public void addBatch(PreparedStatement stmt) throws SQLException {}
-                
-                @Override
-                public void execute(PreparedStatement stmt) throws SQLException {}
-                
-            };
-        }
-        tasks.add(task);
-    }
-    
-    public synchronized void addClusterTask(PlotCluster cluster, UniqueStatement task) {
-        Queue<UniqueStatement> tasks = clusterTasks.get(cluster);
-        if (tasks == null) {
-            tasks = new ConcurrentLinkedQueue<>();
-            clusterTasks.put(cluster, tasks);
-        }
-        tasks.add(task);
-    }
-    
-    public synchronized void addGlobalTask(Runnable task) {
-        getGlobalTasks().add(task);
-    }
-    
-    public synchronized void addNotifyTask(Runnable task) {
-        if (task != null) {
-            getNotifyTasks().add(task);
-        }
-    }
-    
-    
-    /**
-     * Constructor
-     *
-     * @param c connection
-     * @param p prefix
-     * @throws Exception 
-     */
-    public SQLManager(final Database database, final String p, final boolean debug) throws Exception {
-        this.debug = debug;
-        // Private final
-        this.database = database;
-        this.connection = database.openConnection();
-        this.MYSQL = (database instanceof MySQL);
-        globalTasks = new ConcurrentLinkedQueue<>();
-        notifyTasks = new ConcurrentLinkedQueue<>();
-        plotTasks = new ConcurrentHashMap<>();
-        clusterTasks = new ConcurrentHashMap<>();
-        TaskManager.runTaskAsync(new Runnable() {
-            @Override
-            public void run() {
-                long last = System.currentTimeMillis();
-                while (true) {
-                    if (CLOSED) {
-                        break;
-                    }
-                    // schedule reconnect
-                    if (MYSQL && System.currentTimeMillis() - last > 550000) {
-                        last = System.currentTimeMillis();
-                        try {
-                            close();
-                            CLOSED = false;
-                            connection = database.forceConnection();
-                        } catch (SQLException | ClassNotFoundException e) {
-                            e.printStackTrace();
-                        }
-                    }
-                    if (!sendBatch()) {
-                        try {
-                            if (getNotifyTasks().size() > 0) {
-                                for (Runnable task : getNotifyTasks()) {
-                                    TaskManager.runTask(task);
-                                }
-                                getNotifyTasks().clear();
-                            }
-                            Thread.sleep(50);
-                        } catch (InterruptedException e) {
-                            e.printStackTrace();
-                        }
-                    }
-                }
-            }
-        });
-        this.prefix = p;
-        // Set timout
-        // setTimout();
-        // Public final
-        this.SET_OWNER = "UPDATE `" + this.prefix + "plot` SET `owner` = ? WHERE `plot_id_x` = ? AND `plot_id_z` = ? AND `world` = ?";
-        this.GET_ALL_PLOTS = "SELECT `id`, `plot_id_x`, `plot_id_z`, `world` FROM `" + this.prefix + "plot`";
-        this.CREATE_PLOTS = "INSERT INTO `" + this.prefix + "plot`(`plot_id_x`, `plot_id_z`, `owner`, `world`, `timestamp`) values ";
-        this.CREATE_SETTINGS = "INSERT INTO `" + this.prefix + "plot_settings` (`plot_plot_id`) values ";
-        this.CREATE_TIERS = "INSERT INTO `" + this.prefix + "plot_%tier%` (`plot_plot_id`, `user_uuid`) values ";
-        this.CREATE_PLOT = "INSERT INTO `" + this.prefix + "plot`(`plot_id_x`, `plot_id_z`, `owner`, `world`, `timestamp`) VALUES(?, ?, ?, ?, ?)";
-        this.CREATE_CLUSTER = "INSERT INTO `" + this.prefix + "cluster`(`pos1_x`, `pos1_z`, `pos2_x`, `pos2_z`, `owner`, `world`) VALUES(?, ?, ?, ?, ?, ?)";
-        updateTables();
-        createTables();
-    }
-    
-    public boolean sendBatch() {
-        try {
-            if (getGlobalTasks().size() > 0) {
-                if (connection.getAutoCommit()) {
-                    connection.setAutoCommit(false);
-                }
-                Runnable task = getGlobalTasks().remove();
-                if (task != null) {
-                    task.run();
-                }
-                commit();
-                return true;
-            }
-            int count = -1;
-            if (plotTasks.size() > 0) {
-                count = 0;
-                if (connection.getAutoCommit()) {
-                    connection.setAutoCommit(false);
-                }
-                String method = null;
-                PreparedStatement stmt = null;
-                UniqueStatement task = null;
-                UniqueStatement lastTask = null;
-//                ArrayList<Entry<Plot, Queue<UniqueStatement>>> keys = new ArrayList<>(plotTasks.entrySet());
-                for (Entry<Plot, Queue<UniqueStatement>> entry : plotTasks.entrySet()) {
-                    Plot plot = entry.getKey();
-                    if (plotTasks.get(plot).size() == 0) {
-                        plotTasks.remove(plot);
-                        continue;
-                    }
-                    task = plotTasks.get(plot).remove();
-                    count++;
-                    if (task != null) {
-                        if (task._method == null || !task._method.equals(method)) {
-                            if (stmt != null) {
-                                lastTask.execute(stmt);
-                                stmt.close();
-                            }
-                            method = task._method;
-                            stmt = task.get();
-                        }
-                        task.set(stmt);
-                        task.addBatch(stmt);
-                    }
-                    lastTask = task;
-                }
-                if (stmt != null && task != null) {
-                    task.execute(stmt);
-                    stmt.close();
-                }
-            }
-            if (clusterTasks.size() > 0) {
-                count = 0;
-                if (connection.getAutoCommit()) {
-                    connection.setAutoCommit(false);
-                }
-                String method = null;
-                PreparedStatement stmt = null;
-                UniqueStatement task = null;
-                UniqueStatement lastTask = null;
-                for (Entry<PlotCluster, Queue<UniqueStatement>> entry : clusterTasks.entrySet()) {
-                    PlotCluster cluster = entry.getKey();
-                    if (clusterTasks.get(cluster).size() == 0) {
-                        clusterTasks.remove(cluster);
-                        continue;
-                    }
-                    task = clusterTasks.get(cluster).remove();
-                    count++;
-                    if (task != null) {
-                        if (task._method == null || !task._method.equals(method)) {
-                            if (stmt != null) {
-                                lastTask.execute(stmt);
-                                stmt.close();
-                            }
-                            method = task._method;
-                            stmt = task.get();
-                        }
-                        task.set(stmt);
-                        task.addBatch(stmt);
-                    }
-                    lastTask = task;
-                }
-                if (stmt != null && task != null) {
-                    task.execute(stmt);
-                    stmt.close();
-                }
-            }
-            if (count > 0) {
-                commit();
-                return true;
-            }
-            else if (count != -1) {
-                if (!connection.getAutoCommit()) {
-                    connection.setAutoCommit(true);
-                }
-            }
-            if (clusterTasks.size() > 0) {
-                clusterTasks.clear();
-               }
-            if (plotTasks.size() > 0) {
-                plotTasks.clear();
-            }
-        }
-        catch (Exception e) {
-            e.printStackTrace();
-        }
-        return false;
-    }
-
-    public abstract class UniqueStatement {
-        public String _method;
-
-        public UniqueStatement(String method) {
-            this._method = method;
-        }
-        
-        public void addBatch(PreparedStatement stmt) throws SQLException {
-            stmt.addBatch();
-        }
-
-        public void execute(PreparedStatement stmt) throws SQLException {
-            stmt.executeBatch();
-        }
-
-        public abstract PreparedStatement get() throws SQLException;
-        
-        public abstract void set(PreparedStatement stmt) throws SQLException;
-    }
-
-    public Connection getConnection() {
-        return this.connection;
-    }
-
-    /**
-     * Set Plot owner
-     *
-     * @param plot Plot Object
-     * @param uuid Owner UUID
-     */
-    @Override
-    public void setOwner(final Plot plot, final UUID uuid) {
-        addPlotTask(plot, new UniqueStatement("setOwner") {
-            @Override
-            public void set(PreparedStatement statement) throws SQLException {
-                statement.setString(1, uuid.toString());
-                statement.setInt(2, plot.id.x);
-                statement.setInt(3, plot.id.y);
-                statement.setString(4, plot.world);
-            }
-            
-            @Override
-            public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(SQLManager.this.SET_OWNER);
-            }
-        });
-    }
-
-    @Override
-    public void createPlotsAndData(final ArrayList<Plot> myList, final Runnable whenDone) {
-        addGlobalTask(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    // Create the plots
-                    createPlots(myList, new Runnable() {
-                        @Override
-                        public void run() {
-                            try {
-                         // Creating datastructures
-                            HashMap<PlotId, Plot> plotMap = new HashMap<>();
-                            for (Plot plot : myList) {
-                                plotMap.put(plot.id, plot);
-                            }
-                            final ArrayList<SettingsPair> settings = new ArrayList<>();
-                            final ArrayList<UUIDPair> helpers = new ArrayList<>();
-                            final ArrayList<UUIDPair> trusted = new ArrayList<>();
-                            final ArrayList<UUIDPair> denied = new ArrayList<>();
-
-                            // Populating structures
-                            final PreparedStatement stmt = connection.prepareStatement(GET_ALL_PLOTS);
-                            try (ResultSet result = stmt.executeQuery()) {
-                                while (result.next()) {
-                                    final int id = result.getInt("id");
-                                    int x = result.getInt("plot_id_x");
-                                    int y = result.getInt("plot_id_z");
-                                    PlotId plotId = new PlotId(x, y);
-                                    Plot plot = plotMap.get(plotId);
-                                    if (plot != null) {
-                                        settings.add(new SettingsPair(id, plot.getSettings()));
-                                        if (plot.getDenied() != null) {
-                                            for (UUID uuid : plot.getDenied()) {
-                                                denied.add(new UUIDPair(id, uuid));
-                                            }
-                                        }
-                                        if (plot.getMembers() != null) {
-                                            for (UUID uuid : plot.getMembers()) {
-                                                trusted.add(new UUIDPair(id, uuid));
-                                            }
-                                        }
-                                        if (plot.getTrusted() != null) {
-                                            for (UUID uuid : plot.getTrusted()) {
-                                                helpers.add(new UUIDPair(id, uuid));
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                            createSettings(settings, new Runnable() {
-                                @Override
-                                public void run() {
-                                    createTiers(helpers, "helpers", new Runnable() {
-                                        @Override
-                                        public void run() {
-                                            createTiers(trusted, "trusted", new Runnable() {
-                                                @Override
-                                                public void run() {
-                                                    createTiers(denied, "denied", new Runnable() {
-                                                        @Override
-                                                        public void run() {
-                                                            try {
-                                                                connection.commit();
-                                                            } catch (SQLException e) {
-                                                                e.printStackTrace();
-                                                            }
-                                                            if (whenDone != null) whenDone.run();
-                                                        }
-                                                    });
-                                                }
-                                            });
-                                        }
-                                    });
-                                }
-                            });
-                            }
-                            catch (SQLException e) {
-                                e.printStackTrace();
-                                PS.debug("&7[WARN] " + "Failed to set all helpers for plots");
-                                try {
-                                    connection.commit();
-                                } catch (SQLException e1) {
-                                    e1.printStackTrace();
-                                }
-                            }
-                        }
-                    });
-                } catch (Exception e) {
-                    e.printStackTrace();
-                    PS.debug("&7[WARN] " + "Failed to set all helpers for plots");
-                    try {
-                        connection.commit();
-                    } catch (SQLException e1) {
-                        e1.printStackTrace();
-                    }
-                }
-            }
-        });
-    }
-
-    /**
-     * Create a plot
-     *
-     * @param myList list of plots to be created
-     */
-    public void createTiers(final ArrayList<UUIDPair> myList, final String tier, final Runnable whenDone) {
-        final StmtMod<UUIDPair> mod = new StmtMod<UUIDPair>() {
-            @Override
-            public String getCreateMySQL(int size) {
-                return getCreateMySQL(size, CREATE_TIERS.replaceAll("%tier%", tier), 2);
-            }
-
-            @Override
-            public String getCreateSQLite(int size) {
-                return getCreateSQLite(size,
-                        "INSERT INTO `" + prefix + "plot_" + tier + "` SELECT ? AS `plot_plot_id`, ? AS `user_uuid`", 2);
-            }
-
-            @Override
-            public String getCreateSQL() {
-                return "INSERT INTO `" + SQLManager.this.prefix + "plot_" + tier + "` (`plot_plot_id`, `user_uuid`) VALUES(?,?)";
-            }
-
-            @Override
-            public void setMySQL(PreparedStatement stmt, int i, UUIDPair pair) throws SQLException {
-                stmt.setInt((i * 2) + 1, pair.id);
-                stmt.setString((i * 2) + 2, pair.uuid.toString());
-            }
-
-            @Override
-            public void setSQLite(PreparedStatement stmt, int i, UUIDPair pair) throws SQLException {
-                stmt.setInt((i * 2) + 1, pair.id);
-                stmt.setString((i * 2) + 2, pair.uuid.toString());
-            }
-
-            @Override
-            public void setSQL(PreparedStatement stmt, UUIDPair pair) throws SQLException {
-                stmt.setInt(1, pair.id);
-                stmt.setString(2, pair.uuid.toString());
-            }
-        };
-        setBulk(myList, mod, whenDone);
-    }
-    
-    /**
-     * Create a plot
-     *
-     * @param myList list of plots to be created
-     */
-    public void createPlots(final ArrayList<Plot> myList, final Runnable whenDone) {
-        final StmtMod<Plot> mod = new StmtMod<Plot>() {
-            @Override
-            public String getCreateMySQL(int size) {
-                return getCreateMySQL(size, CREATE_PLOTS, 5);
-            }
-
-            @Override
-            public String getCreateSQLite(int size) {
-                return getCreateSQLite(size, "INSERT INTO `" + prefix + "plot` SELECT ? AS `id`, ? AS `plot_id_x`, ? AS `plot_id_z`, ? AS `owner`, ? AS `world`, ? AS `timestamp` ", 6);
-            }
-
-            @Override
-            public String getCreateSQL() {
-                return CREATE_PLOT;
-            }
-
-            @Override
-            public void setMySQL(PreparedStatement stmt, int i, Plot plot) throws SQLException {
-                stmt.setInt((i * 5) + 1, plot.id.x);
-                stmt.setInt((i * 5) + 2, plot.id.y);
-                try {
-                    stmt.setString((i * 4) + 3, plot.owner.toString());
-                } catch (final Exception e) {
-                    stmt.setString((i * 4) + 3, everyone.toString());
-                }
-                stmt.setString((i * 5) + 4, plot.world);
-                stmt.setTimestamp((i * 5) + 5, new Timestamp(plot.getTimestamp()));
-            }
-
-            @Override
-            public void setSQLite(PreparedStatement stmt, int i, Plot plot) throws SQLException {
-                stmt.setNull((i * 6) + 1, 4);
-                stmt.setInt((i * 6) + 2, plot.id.x);
-                stmt.setInt((i * 6) + 3, plot.id.y);
-                try {
-                    stmt.setString((i * 6) + 4, plot.owner.toString());
-                } catch (final Exception e1) {
-                    stmt.setString((i * 6) + 4, everyone.toString());
-                }
-                stmt.setString((i * 6) + 5, plot.world);
-                stmt.setTimestamp((i * 6) + 6, new Timestamp(plot.getTimestamp()));
-            }
-
-            @Override
-            public void setSQL(PreparedStatement stmt, Plot plot) throws SQLException {
-                stmt.setInt(1, plot.id.x);
-                stmt.setInt(2, plot.id.y);
-                stmt.setString(3, plot.owner.toString());
-                stmt.setString(4, plot.world);
-                stmt.setTimestamp(5, new Timestamp(plot.getTimestamp()));
-                
-            }
-        };
-        setBulk(myList, mod, whenDone);
-    }
-
-    public <T> void setBulk(ArrayList<T> objList, StmtMod<T> mod, Runnable whenDone) {
-        final int size = objList.size();
-        if (size == 0) {
-            if (whenDone != null) whenDone.run();
-            return;
-        }
-        int packet;
-        if (MYSQL) {
-            packet = Math.min(size, 5000);
-        } else {
-            packet = Math.min(size, 50);
-        }
-        final int amount = size / packet;
-        try {
-            int count = 0;
-            PreparedStatement preparedStmt = null;
-            String statement = null;
-            int last = -1;
-            for (int j = 0; j <= amount; j++) {
-                final List<T> subList = objList.subList(j * packet, Math.min(size, (j + 1) * packet));
-                if (subList.size() == 0) {
-                    break;
-                }
-                if (last == -1) {
-                    last = subList.size();
-                    statement = mod.getCreateMySQL(subList.size());
-                    preparedStmt = this.connection.prepareStatement(statement.toString());
-                }
-                if (subList.size() != last || (count % 5000 == 0 && count > 0)) {
-                    preparedStmt.executeBatch();
-                    preparedStmt.close();
-                    statement = mod.getCreateMySQL(subList.size());
-                    preparedStmt = this.connection.prepareStatement(statement.toString());
-                }
-                for (int i = 0; i < subList.size(); i++) {
-                    count++;
-                    final T obj = subList.get(i);
-                    mod.setMySQL(preparedStmt, i, obj);
-                }
-                last = subList.size();
-                preparedStmt.addBatch();
-            }
-            PS.debug("&aBatch 1: " + count + " | " + objList.get(0).getClass().getCanonicalName());
-            preparedStmt.executeBatch();
-            preparedStmt.clearParameters();
-            preparedStmt.close();
-            if (whenDone != null) whenDone.run();
-            return;
-        } catch (Exception e) {
-            if (MYSQL) {
-                e.printStackTrace();
-                PS.debug("&cERROR 1: " + " | " + objList.get(0).getClass().getCanonicalName());
-            }
-        }
-        try {
-            int count = 0;
-            PreparedStatement preparedStmt = null;
-            String statement = null;
-            int last = -1;
-            for (int j = 0; j <= amount; j++) {
-                final List<T> subList = objList.subList(j * packet, Math.min(size, (j + 1) * packet));
-                if (subList.size() == 0) {
-                    break;
-                }
-                if (last == -1) {
-                    last = subList.size();
-                    statement = mod.getCreateSQLite(subList.size());
-                    preparedStmt = this.connection.prepareStatement(statement.toString());
-                }
-                if (subList.size() != last || (count % 5000 == 0 && count > 0)) {
-                    preparedStmt.executeBatch();
-                    preparedStmt.clearParameters();
-                    statement = mod.getCreateSQLite(subList.size());
-                    preparedStmt = this.connection.prepareStatement(statement.toString());
-                }
-                for (int i = 0; i < subList.size(); i++) {
-                    count++;
-                    final T obj = subList.get(i);
-                    mod.setSQLite(preparedStmt, i, obj);
-                }
-                last = subList.size();
-                preparedStmt.addBatch();
-            }
-            PS.debug("&aBatch 2: " + count + " | " + objList.get(0).getClass().getCanonicalName());
-            preparedStmt.executeBatch();
-            preparedStmt.clearParameters();
-            preparedStmt.close();
-        } catch (Exception e) {
-            e.printStackTrace();
-            PS.debug("&cERROR 2: " + " | " + objList.get(0).getClass().getCanonicalName());
-            PS.debug("&6[WARN] " + "Could not bulk save!");
-            try {
-                PreparedStatement preparedStmt = null;
-                String nonBulk = mod.getCreateSQL();
-                preparedStmt = this.connection.prepareStatement(nonBulk.toString());
-                for (final T obj : objList) {
-                    try {
-                        mod.setSQL(preparedStmt, obj);
-                        preparedStmt.addBatch();
-                    } catch (final Exception e3) {
-                        PS.debug("&c[ERROR] " + "Failed to save " + obj + "!");
-                    }
-                }
-                PS.debug("&aBatch 3");
-                preparedStmt.executeBatch();
-                preparedStmt.close();
-            } catch (Exception e3) {
-                e3.printStackTrace();
-                PS.debug("&c[ERROR] " + "Failed to save all!");
-            }
-        }
-        if (whenDone != null) whenDone.run();
-    }
-
-    public void createSettings(final ArrayList<SettingsPair> myList, final Runnable whenDone) {
-        final StmtMod<SettingsPair> mod = new StmtMod<SettingsPair>() {
-            @Override
-            public String getCreateMySQL(int size) {
-                return getCreateMySQL(size, "INSERT INTO `" + prefix + "plot_settings`(`plot_plot_id`,`biome`,`rain`,`custom_time`,`time`,`deny_entry`,`alias`,`flags`,`merged`,`position`) VALUES ", 10);
-            }
-
-            @Override
-            public String getCreateSQLite(int size) {
-                return getCreateSQLite(size, "INSERT INTO `" + prefix + "plot_settings` SELECT ? AS `plot_plot_id`, ? AS `biome`, ? AS `rain`, ? AS `custom_time`, ? AS `time`, ? AS `deny_entry`, ? AS `alias`, ? AS `flags`, ? AS `merged`, ? AS `position`", 10);
-            }
-
-            @Override
-            public String getCreateSQL() {
-                return "INSERT INTO `" + SQLManager.this.prefix + "plot_settings`(`plot_plot_id`) VALUES(?)";
-            }
-
-            @Override
-            public void setMySQL(PreparedStatement stmt, int i, SettingsPair pair) throws SQLException {
-                stmt.setInt((i * 10) + 1, pair.id); // id
-                stmt.setNull((i * 10) + 2, 4);  // biome
-                stmt.setNull((i * 10) + 3, 4);  // rain
-                stmt.setNull((i * 10) + 4, 4);  // custom_time
-                stmt.setNull((i * 10) + 5, 4);  // time
-                stmt.setNull((i * 10) + 6, 4);  // deny_entry
-                if (pair.settings.getAlias().equals("")) {
-                    stmt.setNull((i * 10) + 7, 4);
-                } else {
-                    stmt.setString((i * 10) + 7, pair.settings.getAlias());
-                }
-                if (pair.settings.flags == null) {
-                    stmt.setNull((i * 10) + 8, 4);
-                } else {
-                    final StringBuilder flag_string = new StringBuilder();
-                    int k = 0;
-                    for (final Flag flag : pair.settings.flags.values()) {
-                        if (k != 0) {
-                            flag_string.append(",");
-                        }
-                        flag_string.append(flag.getKey() + ":" + flag.getValueString().replaceAll(":", "\u00AF").replaceAll(",", "\u00B4"));
-                        k++;
-                    }
-                    stmt.setString((i * 10) + 8, flag_string.toString());
-                }
-                boolean[] merged = pair.settings.getMerged();
-                int n = 0;
-                for (int j = 0; j < 4; ++j) {
-                    n = (n << 1) + (merged[j] ? 1 : 0);
-                }
-                stmt.setInt((i * 10) + 9, n);
-                BlockLoc loc = pair.settings.getPosition();
-                String position;
-                if (loc.y == 0) {
-                    position = "DEFAULT";
-                } else {
-                    position = loc.x + "," + loc.y + "," + loc.z;
-                }
-                stmt.setString((i * 10) + 10, position);
-            }
-
-            @Override
-            public void setSQLite(PreparedStatement stmt, int i, SettingsPair pair) throws SQLException {
-                stmt.setInt((i * 10) + 1, pair.id); // id
-                stmt.setNull((i * 10) + 2, 4);  // biome
-                stmt.setNull((i * 10) + 3, 4);  // rain
-                stmt.setNull((i * 10) + 4, 4);  // custom_time
-                stmt.setNull((i * 10) + 5, 4);  // time
-                stmt.setNull((i * 10) + 6, 4);  // deny_entry
-                if (pair.settings.getAlias().equals("")) {
-                    stmt.setNull((i * 10) + 7, 4);
-                } else {
-                    stmt.setString((i * 10) + 7, pair.settings.getAlias());
-                }
-                if (pair.settings.flags == null) {
-                    stmt.setNull((i * 10) + 8, 4);
-                } else {
-                    final StringBuilder flag_string = new StringBuilder();
-                    int k = 0;
-                    for (final Flag flag : pair.settings.flags.values()) {
-                        if (k != 0) {
-                            flag_string.append(",");
-                        }
-                        flag_string.append(flag.getKey() + ":" + flag.getValueString().replaceAll(":", "\u00AF").replaceAll(",", "\u00B4"));
-                        k++;
-                    }
-                    stmt.setString((i * 10) + 8, flag_string.toString());
-                }
-                boolean[] merged = pair.settings.getMerged();
-                int n = 0;
-                for (int j = 0; j < 4; ++j) {
-                    n = (n << 1) + (merged[j] ? 1 : 0);
-                }
-                stmt.setInt((i * 10) + 9, n);
-                BlockLoc loc = pair.settings.getPosition();
-                String position;
-                if (loc.y == 0) {
-                    position = "DEFAULT";
-                } else {
-                    position = loc.x + "," + loc.y + "," + loc.z;
-                }
-                stmt.setString((i * 10) + 10, position);
-            }
-
-            @Override
-            public void setSQL(PreparedStatement stmt, SettingsPair pair) throws SQLException {
-                stmt.setInt(1, pair.id);
-            }
-        };
-        addGlobalTask(new Runnable() {
-            @Override
-            public void run() {
-                setBulk(myList, mod, whenDone);
-            }
-        });
-    }
-
-    public void createEmptySettings(final ArrayList<Integer> myList, final Runnable whenDone) {
-        final StmtMod<Integer> mod = new StmtMod<Integer>() {
-            @Override
-            public String getCreateMySQL(int size) {
-                return getCreateMySQL(size, CREATE_SETTINGS, 1);
-            }
-
-            @Override
-            public String getCreateSQLite(int size) {
-                return getCreateSQLite(size, "INSERT INTO `" + prefix + "plot_settings` SELECT ? AS `plot_plot_id`, ? AS `biome`, ? AS `rain`, ? AS `custom_time`, ? AS `time`, ? AS `deny_entry`, ? AS `alias`, ? AS `flags`, ? AS `merged`, ? AS `position` ", 10);
-            }
-
-            @Override
-            public String getCreateSQL() {
-                return "INSERT INTO `" + SQLManager.this.prefix + "plot_settings`(`plot_plot_id`) VALUES(?)";
-            }
-
-            @Override
-            public void setMySQL(PreparedStatement stmt, int i, Integer id) throws SQLException {
-                stmt.setInt((i * 1) + 1, id);
-            }
-
-            @Override
-            public void setSQLite(PreparedStatement stmt, int i, Integer id) throws SQLException {
-                stmt.setInt((i * 10) + 1, id);
-                stmt.setNull((i * 10) + 2, 4);
-                stmt.setNull((i * 10) + 3, 4);
-                stmt.setNull((i * 10) + 4, 4);
-                stmt.setNull((i * 10) + 5, 4);
-                stmt.setNull((i * 10) + 6, 4);
-                stmt.setNull((i * 10) + 7, 4);
-                stmt.setNull((i * 10) + 8, 4);
-                stmt.setNull((i * 10) + 9, 4);
-                stmt.setString((i * 10) + 10, "DEFAULT");
-            }
-
-            @Override
-            public void setSQL(PreparedStatement stmt, Integer id) throws SQLException {
-                stmt.setInt(1, id);
-            }
-        };
-        addGlobalTask(new Runnable() {
-            @Override
-            public void run() {
-                setBulk(myList, mod, whenDone);
-            }
-        });
-    }
-
-    /**
-     * Create a plot
-     *
-     * @param plot
-     */
-    @Override
-    public void createPlot(final Plot plot) {
-        addPlotTask(plot, new UniqueStatement("createPlot") {
-            @Override
-            public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setInt(1, plot.id.x);
-                stmt.setInt(2, plot.id.y);
-                stmt.setString(3, plot.owner.toString());
-                stmt.setString(4, plot.world);
-                stmt.setTimestamp(5, new Timestamp(plot.getTimestamp()));
-            }
-            
-            @Override
-            public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(SQLManager.this.CREATE_PLOT);
-            }
-        });
-    }
-    
-    public void commit() {
-        try {
-            if (CLOSED) {
-                return;
-            }
-            if (!this.connection.getAutoCommit()) {
-                this.connection.commit();
-                this.connection.setAutoCommit(true);
-            }
-        } catch (SQLException e) {
-            e.printStackTrace();
-        }
-    }
-
-    @Override
-    public void createPlotAndSettings(final Plot plot, final Runnable whenDone) {
-        addPlotTask(plot, new UniqueStatement("createPlotAndSettings_" + plot.hashCode()) {
-            @Override
-            public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setInt(1, plot.id.x);
-                stmt.setInt(2, plot.id.y);
-                stmt.setString(3, plot.owner.toString());
-                stmt.setString(4, plot.world);
-                stmt.setTimestamp(5, new Timestamp(plot.getTimestamp()));
-            }
-            
-            @Override
-            public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(SQLManager.this.CREATE_PLOT, Statement.RETURN_GENERATED_KEYS);
-            }
-            
-            @Override
-            public void execute(PreparedStatement stmt) throws SQLException {
-                
-            }
-            
-            @Override
-            public void addBatch(PreparedStatement stmt) throws SQLException {
-                stmt.executeUpdate();
-                ResultSet keys = stmt.getGeneratedKeys();
-                int id = -1;
-                if (keys.next()) {
-                    plot.temp = keys.getInt(1);
-                }
-            }
-        });
-        addPlotTask(plot, new UniqueStatement("createPlotAndSettings_settings_" + plot.hashCode()) {
-            @Override
-            public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setInt(1, getId(plot));
-            }
-            
-            @Override
-            public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement("INSERT INTO `" + SQLManager.this.prefix + "plot_settings`(`plot_plot_id`) VALUES(" + "?)");
-            }
-        });
-        addNotifyTask(whenDone);
-    }
-
-    /**
-     * Create tables
-     *
-     * @throws SQLException
-     */
-    @Override
-    public void createTables() throws SQLException {
-        final String[] tables;
-        if (Settings.ENABLE_CLUSTERS) {
-            tables = new String[]{"plot", "plot_denied", "plot_helpers", "plot_comments", "plot_trusted", "plot_rating", "plot_settings", "cluster"};
-        } else {
-            tables = new String[]{"plot", "plot_denied", "plot_helpers", "plot_comments", "plot_trusted", "plot_rating", "plot_settings"};
-        }
-        final DatabaseMetaData meta = connection.getMetaData();
-        int create = 0;
-        for (final String s : tables) {
-            ResultSet set = meta.getTables(null, null, prefix + s, new String[] {"TABLE"});
-//            ResultSet set = meta.getTables(null, null, prefix + s, null);
-            if (!set.next()) {
-                create++;
-            }
-            else {
-            }
-            set.close();
-        }
-        if (create == 0) {
-            return;
-        }
-        boolean add_constraint;
-        add_constraint = create == tables.length;
-        PS.debug("Creating tables");
-        final Statement stmt = this.connection.createStatement();
-        if (MYSQL) {
-            stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot` (" + "`id` INT(11) NOT NULL AUTO_INCREMENT," + "`plot_id_x` INT(11) NOT NULL," + "`plot_id_z` INT(11) NOT NULL," + "`owner` VARCHAR(40) NOT NULL," + "`world` VARCHAR(45) NOT NULL," + "`timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP," + "PRIMARY KEY (`id`)" + ") ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=0");
-            stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot_denied` (" + "`plot_plot_id` INT(11) NOT NULL," + "`user_uuid` VARCHAR(40) NOT NULL" + ") ENGINE=InnoDB DEFAULT CHARSET=utf8");
-            stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot_helpers` (" + "`plot_plot_id` INT(11) NOT NULL," + "`user_uuid` VARCHAR(40) NOT NULL" + ") ENGINE=InnoDB DEFAULT CHARSET=utf8");
-            stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot_comments` (" + "`world` VARCHAR(40) NOT NULL, `hashcode` INT(11) NOT NULL," + "`comment` VARCHAR(40) NOT NULL," + "`inbox` VARCHAR(40) NOT NULL," + "`timestamp` INT(11) NOT NULL," + "`sender` VARCHAR(40) NOT NULL" + ") ENGINE=InnoDB DEFAULT CHARSET=utf8");
-            stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot_trusted` (" + "`plot_plot_id` INT(11) NOT NULL," + "`user_uuid` VARCHAR(40) NOT NULL" + ") ENGINE=InnoDB DEFAULT CHARSET=utf8");
-            stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot_settings` (" + "  `plot_plot_id` INT(11) NOT NULL," + "  `biome` VARCHAR(45) DEFAULT 'FOREST'," + "  `rain` INT(1) DEFAULT 0," + "  `custom_time` TINYINT(1) DEFAULT '0'," + "  `time` INT(11) DEFAULT '8000'," + "  `deny_entry` TINYINT(1) DEFAULT '0'," + "  `alias` VARCHAR(50) DEFAULT NULL," + "  `flags` VARCHAR(512) DEFAULT NULL," + "  `merged` INT(11) DEFAULT NULL," + "  `position` VARCHAR(50) NOT NULL DEFAULT 'DEFAULT'," + "  PRIMARY KEY (`plot_plot_id`)," + "  UNIQUE KEY `unique_alias` (`alias`)" + ") ENGINE=InnoDB DEFAULT CHARSET=utf8");
-            stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot_rating` ( `plot_plot_id` INT(11) NOT NULL, `rating` INT(2) NOT NULL, `player` VARCHAR(40) NOT NULL) ENGINE=InnoDB DEFAULT CHARSET=utf8");
-            if (add_constraint) {
-                stmt.addBatch("ALTER TABLE `" + this.prefix + "plot_settings` ADD CONSTRAINT `" + this.prefix + "plot_settings_ibfk_1` FOREIGN KEY (`plot_plot_id`) REFERENCES `" + this.prefix + "plot` (`id`) ON DELETE CASCADE");
-            }
-            stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "cluster` (" + "`id` INT(11) NOT NULL AUTO_INCREMENT," + "`pos1_x` INT(11) NOT NULL," + "`pos1_z` INT(11) NOT NULL," + "`pos2_x` INT(11) NOT NULL," + "`pos2_z` INT(11) NOT NULL," + "`owner` VARCHAR(40) NOT NULL," + "`world` VARCHAR(45) NOT NULL," + "`timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP," + "PRIMARY KEY (`id`)" + ") ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=0");
-            stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "cluster_helpers` (" + "`cluster_id` INT(11) NOT NULL," + "`user_uuid` VARCHAR(40) NOT NULL" + ") ENGINE=InnoDB DEFAULT CHARSET=utf8");
-            stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "cluster_invited` (" + "`cluster_id` INT(11) NOT NULL," + "`user_uuid` VARCHAR(40) NOT NULL" + ") ENGINE=InnoDB DEFAULT CHARSET=utf8");
-            stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "cluster_settings` (" + "  `cluster_id` INT(11) NOT NULL," + "  `biome` VARCHAR(45) DEFAULT 'FOREST'," + "  `rain` INT(1) DEFAULT 0," + "  `custom_time` TINYINT(1) DEFAULT '0'," + "  `time` INT(11) DEFAULT '8000'," + "  `deny_entry` TINYINT(1) DEFAULT '0'," + "  `alias` VARCHAR(50) DEFAULT NULL," + "  `flags` VARCHAR(512) DEFAULT NULL," + "  `merged` INT(11) DEFAULT NULL," + "  `position` VARCHAR(50) NOT NULL DEFAULT 'DEFAULT'," + "  PRIMARY KEY (`cluster_id`)" + ") ENGINE=InnoDB DEFAULT CHARSET=utf8");
-        } else {
-            stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot` (" + "`id` INTEGER PRIMARY KEY AUTOINCREMENT," + "`plot_id_x` INT(11) NOT NULL," + "`plot_id_z` INT(11) NOT NULL," + "`owner` VARCHAR(45) NOT NULL," + "`world` VARCHAR(45) NOT NULL," + "`timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP)");
-            stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot_denied` (" + "`plot_plot_id` INT(11) NOT NULL," + "`user_uuid` VARCHAR(40) NOT NULL" + ")");
-            stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot_helpers` (" + "`plot_plot_id` INT(11) NOT NULL," + "`user_uuid` VARCHAR(40) NOT NULL" + ")");
-            stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot_trusted` (" + "`plot_plot_id` INT(11) NOT NULL," + "`user_uuid` VARCHAR(40) NOT NULL" + ")");
-            stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot_comments` (" + "`world` VARCHAR(40) NOT NULL, `hashcode` INT(11) NOT NULL," + "`comment` VARCHAR(40) NOT NULL," + "`inbox` VARCHAR(40) NOT NULL, `timestamp` INT(11) NOT NULL," + "`sender` VARCHAR(40) NOT NULL" + ")");
-            stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot_settings` (" + "  `plot_plot_id` INT(11) NOT NULL," + "  `biome` VARCHAR(45) DEFAULT 'FOREST'," + "  `rain` INT(1) DEFAULT 0," + "  `custom_time` TINYINT(1) DEFAULT '0'," + "  `time` INT(11) DEFAULT '8000'," + "  `deny_entry` TINYINT(1) DEFAULT '0'," + "  `alias` VARCHAR(50) DEFAULT NULL," + "  `flags` VARCHAR(512) DEFAULT NULL," + "  `merged` INT(11) DEFAULT NULL," + "  `position` VARCHAR(50) NOT NULL DEFAULT 'DEFAULT'," + "  PRIMARY KEY (`plot_plot_id`)" + ")");
-            stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot_rating` (`plot_plot_id` INT(11) NOT NULL, `rating` INT(2) NOT NULL, `player` VARCHAR(40) NOT NULL)");
-            stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "cluster` (" + "`id` INTEGER PRIMARY KEY AUTOINCREMENT," + "`pos1_x` INT(11) NOT NULL," + "`pos1_z` INT(11) NOT NULL," + "`pos2_x` INT(11) NOT NULL," + "`pos2_z` INT(11) NOT NULL," + "`owner` VARCHAR(40) NOT NULL," + "`world` VARCHAR(45) NOT NULL," + "`timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP" + ")");
-            stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "cluster_helpers` (" + "`cluster_id` INT(11) NOT NULL," + "`user_uuid` VARCHAR(40) NOT NULL" + ")");
-            stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "cluster_invited` (" + "`cluster_id` INT(11) NOT NULL," + "`user_uuid` VARCHAR(40) NOT NULL" + ")");
-            stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "cluster_settings` (" + "  `cluster_id` INT(11) NOT NULL," + "  `biome` VARCHAR(45) DEFAULT 'FOREST'," + "  `rain` INT(1) DEFAULT 0," + "  `custom_time` TINYINT(1) DEFAULT '0'," + "  `time` INT(11) DEFAULT '8000'," + "  `deny_entry` TINYINT(1) DEFAULT '0'," + "  `alias` VARCHAR(50) DEFAULT NULL," + "  `flags` VARCHAR(512) DEFAULT NULL," + "  `merged` INT(11) DEFAULT NULL," + "  `position` VARCHAR(50) NOT NULL DEFAULT 'DEFAULT'," + "  PRIMARY KEY (`cluster_id`)" + ")");
-        }
-        stmt.executeBatch();
-        stmt.clearBatch();
-        stmt.close();
-    }
-
-    /**
-     * Delete a plot
-     *
-     * @param plot
-     */
-    @Override
-    public void delete(final Plot plot) {
-        PS.get().removePlot(plot.world, plot.id, false);
-        addPlotTask(plot, new UniqueStatement("delete_plot_settings") {
-            @Override
-            public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setInt(1, getId(plot));
-            }
-            
-            @Override
-            public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement("DELETE FROM `" + SQLManager.this.prefix + "plot_settings` WHERE `plot_plot_id` = ?");
-            }
-        });
-        addPlotTask(plot, new UniqueStatement("delete_plot_helpers") {
-            @Override
-            public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setInt(1, getId(plot));
-            }
-            
-            @Override
-            public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement("DELETE FROM `" + SQLManager.this.prefix + "plot_helpers` WHERE `plot_plot_id` = ?");
-            }
-        });
-        addPlotTask(plot, new UniqueStatement("delete_plot_trusted") {
-            @Override
-            public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setInt(1, getId(plot));
-            }
-            
-            @Override
-            public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement("DELETE FROM `" + SQLManager.this.prefix + "plot_trusted` WHERE `plot_plot_id` = ?");
-            }
-        });
-        addPlotTask(plot, new UniqueStatement("delete_plot_denied") {
-            @Override
-            public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setInt(1, getId(plot));
-            }
-            
-            @Override
-            public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement("DELETE FROM `" + SQLManager.this.prefix + "plot_denied` WHERE `plot_plot_id` = ?");
-            }
-        });
-        addPlotTask(plot, new UniqueStatement("delete_plot_comments") {
-            @Override
-            public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setString(1, plot.world);
-                stmt.setInt(2, plot.hashCode());
-            }
-            
-            @Override
-            public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement("DELETE FROM `" + SQLManager.this.prefix + "plot_comments` WHERE `world` = ? AND `hashcode` = ?");
-            }
-        });
-        addPlotTask(plot, new UniqueStatement("delete_plot") {
-            @Override
-            public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setInt(1, getId(plot));
-            }
-            
-            @Override
-            public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement("DELETE FROM `" + SQLManager.this.prefix + "plot` WHERE `id` = ?");
-            }
-        });
-    }
-
-    /**
-     * Create plot settings
-     *
-     * @param id
-     * @param plot
-     */
-    @Override
-    public void createPlotSettings(final int id, final Plot plot) {
-        addPlotTask(plot, new UniqueStatement("createPlotSettings") {
-            @Override
-            public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setInt(1, id);
-            }
-            
-            @Override
-            public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement("INSERT INTO `" + SQLManager.this.prefix + "plot_settings`(`plot_plot_id`) VALUES(" + "?)");
-            }
-        });
-    }
-    
-    @Override
-    public int getId(Plot plot) {
-        if (plot.temp > 0) {
-            return plot.temp;
-        }
-        PreparedStatement stmt = null;
-        try {
-            commit();
-            if (plot.temp > 0) {
-                return plot.temp;
-            }
-            stmt = this.connection.prepareStatement("SELECT `id` FROM `" + this.prefix + "plot` WHERE `plot_id_x` = ? AND `plot_id_z` = ? AND world = ? ORDER BY `timestamp` ASC");
-            stmt.setInt(1, plot.id.x);
-            stmt.setInt(2, plot.id.y);
-            stmt.setString(3, plot.world);
-            final ResultSet r = stmt.executeQuery();
-            int id = Integer.MAX_VALUE;
-            while (r.next()) {
-                id = r.getInt("id");
-            }
-            r.close();
-            stmt.close();
-            if (id == Integer.MAX_VALUE || id == 0) {
-                if (plot.temp > 0) {
-                    return plot.temp;
-                }
-                id = 1/0;
-            }
-            plot.temp = id;
-            return id;
-        } catch (final SQLException e) {
-            e.printStackTrace();
-        }
-        return Integer.MAX_VALUE;
-    }
-    
-    public void updateTables() {
-        
-        // TODO task
-        
-        if (PS.get().getVersion().equals(PS.get().getLastVersion()) ||  PS.get().getLastVersion() == null) {
-            return;
-        }
-        try {
-            final DatabaseMetaData data = this.connection.getMetaData();
-            ResultSet rs = data.getColumns(null, null, this.prefix + "plot_comments", "plot_plot_id");
-            if (rs.next()) {
-                rs.close();
-                rs = data.getColumns(null, null, this.prefix + "plot_comments", "hashcode");
-                if (!rs.next()) {
-                    rs.close();
-                    try {
-                        final Statement statement = this.connection.createStatement();
-                        statement.addBatch("DROP TABLE `" + this.prefix + "plot_comments`");
-                        if (Settings.DB.USE_MYSQL) {
-                            statement.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot_comments` (" + "`world` VARCHAR(40) NOT NULL, `hashcode` INT(11) NOT NULL," + "`comment` VARCHAR(40) NOT NULL," + "`inbox` VARCHAR(40) NOT NULL," + "`timestamp` INT(11) NOT NULL," + "`sender` VARCHAR(40) NOT NULL" + ") ENGINE=InnoDB DEFAULT CHARSET=utf8");
-                        } else {
-                            statement.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot_comments` (" + "`world` VARCHAR(40) NOT NULL, `hashcode` INT(11) NOT NULL," + "`comment` VARCHAR(40) NOT NULL," + "`inbox` VARCHAR(40) NOT NULL, `timestamp` INT(11) NOT NULL," + "`sender` VARCHAR(40) NOT NULL" + ")");
-                        }
-                        statement.executeBatch();
-                        statement.close();
-                    } catch (SQLException e) {
-                        final Statement statement = this.connection.createStatement();
-                        statement.addBatch("ALTER IGNORE TABLE `" + this.prefix + "plot_comments` ADD `inbox` VARCHAR(11) DEFAULT `public`");
-                        statement.addBatch("ALTER IGNORE TABLE `" + this.prefix + "plot_comments` ADD `timestamp` INT(11) DEFAULT 0");
-                        statement.addBatch("ALTER TABLE `" + this.prefix + "plot` DROP `tier`");
-                        statement.executeBatch();
-                        statement.close();
-                    }
-                }
-            }
-            rs.close();
-            rs = data.getColumns(null, null, this.prefix + "plot_denied", "plot_plot_id");
-            if (rs.next()) {
-                try (Statement statement = connection.createStatement()) {
-                    statement.executeUpdate("DELETE FROM `" + this.prefix + "plot_denied` WHERE `plot_plot_id` NOT IN (SELECT `id` FROM `" + this.prefix + "plot`)");
-                    statement.close();
-                }
-                catch (Exception e) {
-                    e.printStackTrace();
-                }
-                
-                rs.close();
-                try (Statement statement = connection.createStatement()) {
-                    for (String table : new String[]{"plot_denied", "plot_helpers", "plot_trusted"} ) {
-                        ResultSet result = statement.executeQuery("SELECT plot_plot_id, user_uuid, COUNT(*) FROM " + this.prefix + table + " GROUP BY plot_plot_id, user_uuid HAVING COUNT(*) > 1");
-                        if (result.next()) {
-                            PS.debug("BACKING UP: " + this.prefix + table);
-                            result.close();
-                            statement.executeUpdate("CREATE TABLE "  + this.prefix + table + "_tmp AS SELECT * FROM " + this.prefix + table + " GROUP BY plot_plot_id, user_uuid");
-                            statement.executeUpdate("DROP TABLE " + this.prefix + table);
-                            statement.executeUpdate("CREATE TABLE " + this.prefix + table + " AS SELECT * FROM "  + this.prefix + table + "_tmp");
-                            statement.executeUpdate("DROP TABLE " + this.prefix + table + "_tmp");
-                            PS.debug("RESTORING: " + this.prefix + table);
-                        }
-                    }
-                    statement.close();
-                }
-                catch (Exception e2) {
-                    e2.printStackTrace();
-                }
-            }
-        }
-        catch (Exception e) {
-            e.printStackTrace();
-        }
-            
-    }
-
-    /**
-     * Load all plots, helpers, denied, trusted, and every setting from DB into a hashmap
-     */
-    @Override
-    public ConcurrentHashMap<String, ConcurrentHashMap<PlotId, Plot>> getPlots() {
-        final ConcurrentHashMap<String, ConcurrentHashMap<PlotId, Plot>> newplots = new ConcurrentHashMap<String, ConcurrentHashMap<PlotId, Plot>>();
-        final HashMap<Integer, Plot> plots = new HashMap<>();
-        Statement stmt = null;
-        try {
-            Set<String> worlds = new HashSet<>();
-            if (PS.get().config.contains("worlds")) {
-                worlds = PS.get().config.getConfigurationSection("worlds").getKeys(false);
-            }
-            final HashMap<String, UUID> uuids = new HashMap<String, UUID>();
-            final HashMap<String, Integer> noExist = new HashMap<String, Integer>();
-            
-            PlotId plot_id;
-            int id;
-            Plot p;
-            String o;
-            UUID user;
-            
-            /*
-             * Getting plots
-             */
-            stmt = this.connection.createStatement();
-            try (ResultSet r = stmt.executeQuery("SELECT `id`, `plot_id_x`, `plot_id_z`, `owner`, `world`, `timestamp` FROM `" + this.prefix + "plot`")) {
-                while (r.next()) {
-                    plot_id = new PlotId(r.getInt("plot_id_x"), r.getInt("plot_id_z"));
-                    id = r.getInt("id");
-                    final String worldname = r.getString("world");
-                    if (!worlds.contains(worldname)) {
-                        if (noExist.containsKey(worldname)) {
-                            noExist.put(worldname, noExist.get(worldname) + 1);
-                        } else {
-                            noExist.put(worldname, 1);
-                        }
-                    }
-                    o = r.getString("owner");
-                    user = uuids.get(o);
-                    if (user == null) {
-                        user = UUID.fromString(o);
-                        uuids.put(o, user);
-                    }
-                    Timestamp timestamp = null;
-                    try {
-                        timestamp = r.getTimestamp("timestamp");
-                    }
-                    catch (Exception e) {};
-                    long time;
-                    if (timestamp == null) {
-                        time = plot_id.hashCode();
-                    }
-                    else {
-                        time = timestamp.getTime();
-                    }
-                    p = new Plot(plot_id, user, new HashSet<UUID>(), new HashSet<UUID>(), new HashSet<UUID>(), "", null, null, worldname, new boolean[]{false, false, false, false}, time, id);
-                    plots.put(id, p);
-                }
-            }
-            if (Settings.CACHE_RATINGS) {
-                try (ResultSet r = stmt.executeQuery("SELECT `plot_plot_id`, `player`, `rating` FROM `" + this.prefix + "plot_rating`")) {
-                    while (r.next()) {
-                        id = r.getInt("plot_plot_id");
-                        o = r.getString("player");
-                        user = uuids.get(o);
-                        if (user == null) {
-                            user = UUID.fromString(o);
-                            uuids.put(o, user);
-                        }
-                        final Plot plot = plots.get(id);
-                        if (plot != null) {
-                            if (plot.getSettings().ratings == null) {
-                                plot.getSettings().ratings = new HashMap<UUID, Integer>();
-                            }
-                            plot.getSettings().ratings.put(user, r.getInt("rating"));
-                        } else {
-                            PS.debug("&cPLOT " + id + " in plot_helpers does not exist. Please create the plot or remove this entry.");
-                        }
-                    }
-                }
-            }
-            
-            /*
-             * Getting helpers
-             */
-            try (ResultSet r = stmt.executeQuery("SELECT `user_uuid`, `plot_plot_id` FROM `" + this.prefix + "plot_helpers`")) {
-                while (r.next()) {
-                    id = r.getInt("plot_plot_id");
-                    o = r.getString("user_uuid");
-                    user = uuids.get(o);
-                    if (user == null) {
-                        user = UUID.fromString(o);
-                        uuids.put(o, user);
-                    }
-                    final Plot plot = plots.get(id);
-                    if (plot != null) {
-                        plot.getTrusted().add(user);
-                    } else {
-                        PS.debug("&cPLOT " + id + " in plot_helpers does not exist. Please create the plot or remove this entry.");
-                    }
-                }
-            }
-            
-            /*
-             * Getting trusted
-             */
-            try (ResultSet r = stmt.executeQuery("SELECT `user_uuid`, `plot_plot_id` FROM `" + this.prefix + "plot_trusted`")) {
-                while (r.next()) {
-                    id = r.getInt("plot_plot_id");
-                    o = r.getString("user_uuid");
-                    user = uuids.get(o);
-                    if (user == null) {
-                        user = UUID.fromString(o);
-                        uuids.put(o, user);
-                    }
-                    final Plot plot = plots.get(id);
-                    if (plot != null) {
-                        plot.getMembers().add(user);
-                    } else {
-                        PS.debug("&cPLOT " + id + " in plot_trusted does not exist. Please create the plot or remove this entry.");
-                    }
-                }
-            }
-            
-            /*
-             * Getting denied
-             */
-            try (ResultSet r = stmt.executeQuery("SELECT `user_uuid`, `plot_plot_id` FROM `" + this.prefix + "plot_denied`")) {
-                while (r.next()) {
-                    id = r.getInt("plot_plot_id");
-                    o = r.getString("user_uuid");
-                    user = uuids.get(o);
-                    if (user == null) {
-                        user = UUID.fromString(o);
-                        uuids.put(o, user);
-                    }
-                    final Plot plot = plots.get(id);
-                    if (plot != null) {
-                        plot.getDenied().add(user);
-                    } else {
-                        PS.debug("&cPLOT " + id + " in plot_denied does not exist. Please create the plot or remove this entry.");
-                    }
-                }
-            }
-            
-            try (ResultSet r = stmt.executeQuery("SELECT * FROM `" + this.prefix + "plot_settings`")) {
-                while (r.next()) {
-                    id = r.getInt("plot_plot_id");
-                    final Plot plot = plots.get(id);
-                    if (plot != null) {
-                        plots.remove(id);
-                        if (!newplots.containsKey(plot.world)) {
-                            newplots.put(plot.world, new ConcurrentHashMap<PlotId, Plot>());
-                        }
-                        newplots.get(plot.world).put(plot.id, plot);
-                        final String alias = r.getString("alias");
-                        if (alias != null) {
-                            plot.getSettings().setAlias(alias);
-                        }
-                        final String pos = r.getString("position");
-                        switch (pos.toLowerCase()) {
-                            case "":
-                            case "default":
-                            case "0,0,0":
-                            case "center":
-                                break;
-                            default:
-                                try {
-                                    plot.getSettings().setPosition(BlockLoc.fromString(pos));
-                                } catch (final Exception e) {
-                                }
-                        }
-                        final Integer m = r.getInt("merged");
-                        if (m != null) {
-                            final boolean[] merged = new boolean[4];
-                            for (int i = 0; i < 4; i++) {
-                                merged[3 - i] = ((m) & (1 << i)) != 0;
-                            }
-                            plot.getSettings().setMerged(merged);
-                        } else {
-                            plot.getSettings().setMerged(new boolean[]{false, false, false, false});
-                        }
-                        String[] flags_string;
-                        final String myflags = r.getString("flags");
-                        if (myflags == null) {
-                            flags_string = new String[]{};
-                        } else {
-                            if (myflags.length() > 0) {
-                                flags_string = myflags.split(",");
-                            } else {
-                                flags_string = new String[]{};
-                            }
-                        }
-                        final HashMap<String, Flag> flags = new HashMap<>();
-                        boolean exception = false;
-                        for (String element : flags_string) {
-                            if (element.contains(":")) {
-                                final String[] split = element.split(":");
-                                try {
-                                    final String flag_str = split[1].replaceAll("\u00AF", ":").replaceAll("\u00B4", ",");
-                                    final Flag flag = new Flag(FlagManager.getFlag(split[0], true), flag_str);
-                                    flags.put(flag.getKey(), flag);
-                                } catch (final Exception e) {
-                                    e.printStackTrace();
-                                    exception = true;
-                                }
-                            } else {
-                                element = element.replaceAll("\u00AF", ":").replaceAll("\u00B4", ",");
-                                if (StringMan.isAlpha(element.replaceAll("_", "").replaceAll("-", ""))) {
-                                    Flag flag = new Flag(FlagManager.getFlag(element, true), "");
-                                    flags.put(flag.getKey(), flag);
-                                } else {
-                                    PS.debug("INVALID FLAG: " + element);
-                                }
-                            }
-                        }
-                        if (exception) {
-                            PS.debug("&cPlot " + id + " | " + plot + " had an invalid flag. A fix has been attempted.");
-                            PS.debug("&c" + myflags);
-                            this.setFlags(plot, flags.values());
-                        }
-                        plot.getSettings().flags = flags;
-                    } else {
-                        PS.debug("&cPLOT " + id + " in plot_settings does not exist. Please create the plot or remove this entry.");
-                    }
-                }
-                stmt.close();
-            }
-            if (plots.entrySet().size() > 0) {
-                this.createEmptySettings(new ArrayList<Integer>(plots.keySet()), null);
-            }
-            boolean invalidPlot = false;
-            for (Entry<String, Integer> entry : noExist.entrySet()) {
-                String worldname = entry.getKey();
-                invalidPlot = true;
-                PS.debug("&c[WARNING] Found " + noExist.get(worldname) + " plots in DB for non existant world; '" + worldname + "'.");
-            }
-            if (invalidPlot) {
-                PS.debug("&c[WARNING] - Please create the world/s or remove the plots using the purge command");
-            }
-        } catch (final SQLException e) {
-            PS.debug("&7[WARN] " + "Failed to load plots.");
-            e.printStackTrace();
-        }
-        return newplots;
-    }
-
-    @Override
-    public void setMerged(final Plot plot, final boolean[] merged) {
-        plot.getSettings().setMerged(merged);
-        addPlotTask(plot, new UniqueStatement("setMerged") {
-            @Override
-            public void set(PreparedStatement stmt) throws SQLException {
-                int n = 0;
-                for (int i = 0; i < 4; ++i) {
-                    n = (n << 1) + (merged[i] ? 1 : 0);
-                }
-                stmt.setInt(1, n);
-                stmt.setInt(2, getId(plot));
-            }
-            
-            @Override
-            public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement("UPDATE `" + SQLManager.this.prefix + "plot_settings` SET `merged` = ? WHERE `plot_plot_id` = ?");
-            }
-        });
-    }
-
-    @Override
-    public void swapPlots(final Plot p1, final Plot p2) {
-        final String world = p1.world;
-        final int id1 = getId(p1);
-        final int id2 = getId(p2);
-        final PlotId pos1 = p1.getId();
-        final PlotId pos2 = p2.getId();
-        addPlotTask(p1, new UniqueStatement("swapPlots") {
-            @Override
-            public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setInt(1, pos2.x);
-                stmt.setInt(2, pos2.y);
-                stmt.setInt(3, id1);
-            }
-            
-            @Override
-            public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement("UPDATE `" + SQLManager.this.prefix + "plot` SET `plot_id_x` = ?, `plot_id_z` = ? WHERE `id` = ?");
-            }
-        });
-        addPlotTask(p2, new UniqueStatement("swapPlots") {
-            @Override
-            public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setInt(1, pos1.x);
-                stmt.setInt(2, pos1.y);
-                stmt.setInt(3, id2);
-            }
-            
-            @Override
-            public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement("UPDATE `" + SQLManager.this.prefix + "plot` SET `plot_id_x` = ?, `plot_id_z` = ? WHERE `id` = ?");
-            }
-        });
-    }
-
-    @Override
-    public void movePlot(final Plot original, final Plot newPlot) {
-        addPlotTask(original, new UniqueStatement("movePlot") {
-            @Override
-            public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setInt(1, newPlot.id.x);
-                stmt.setInt(2, newPlot.id.y);
-                stmt.setInt(3, getId(original));
-            }
-            
-            @Override
-            public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement("UPDATE `" + SQLManager.this.prefix + "plot` SET `plot_id_x` = ?, `plot_id_z` = ? WHERE `id` = ?");
-            }
-        });
-        addPlotTask(newPlot, null);
-    }
-
-    @Override
-    public void setFlags(final Plot plot, final Collection<Flag> flags) {
-        final StringBuilder flag_string = new StringBuilder();
-        int i = 0;
-        for (final Flag flag : flags) {
-            if (i != 0) {
-                flag_string.append(",");
-            }
-            flag_string.append(flag.getKey() + ":" + flag.getValueString().replaceAll(":", "\u00AF").replaceAll(",", "\u00B4"));
-            i++;
-        }
-        addPlotTask(plot, new UniqueStatement("setFlags") {
-            @Override
-            public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setString(1, flag_string.toString());
-                stmt.setInt(2, getId(plot));
-            }
-            
-            @Override
-            public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement("UPDATE `" + SQLManager.this.prefix + "plot_settings` SET `flags` = ? WHERE `plot_plot_id` = ?");
-            }
-        });
-    }
-
-    @Override
-    public void setAlias(final Plot plot, final String alias) {
-        addPlotTask(plot, new UniqueStatement("setAlias") {
-            @Override
-            public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setString(1, alias);
-                stmt.setInt(2, getId(plot));
-            }
-            
-            @Override
-            public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement("UPDATE `" + SQLManager.this.prefix + "plot_settings` SET `alias` = ?  WHERE `plot_plot_id` = ?");
-            }
-        });
-    }
-
-    /**
-     * Purge all plots with the following database IDs
-     */
-    @Override
-    public void purgeIds(final String world, final Set<Integer> uniqueIds) {
-        addGlobalTask(new Runnable() {
-            @Override
-            public void run() {
-                if (uniqueIds.size() > 0) {
-                    try {
-                        String stmt_prefix = "";
-                        final StringBuilder idstr2 = new StringBuilder("");
-                        for (final Integer id : uniqueIds) {
-                            idstr2.append(stmt_prefix + id);
-                            stmt_prefix = " OR `id` = ";
-                        }
-                        stmt_prefix = "";
-                        final StringBuilder idstr = new StringBuilder("");
-                        for (final Integer id : uniqueIds) {
-                            idstr.append(stmt_prefix + id);
-                            stmt_prefix = " OR `plot_plot_id` = ";
-                        }
-                        PreparedStatement stmt = SQLManager.this.connection.prepareStatement("DELETE FROM `" + prefix + "plot_helpers` WHERE `plot_plot_id` = " + idstr + "");
-                        stmt.executeUpdate();
-                        stmt.close();
-                        stmt = SQLManager.this.connection.prepareStatement("DELETE FROM `" + prefix + "plot_denied` WHERE `plot_plot_id` = " + idstr + "");
-                        stmt.executeUpdate();
-                        stmt.close();
-                        stmt = SQLManager.this.connection.prepareStatement("DELETE FROM `" + prefix + "plot_settings` WHERE `plot_plot_id` = " + idstr + "");
-                        stmt.executeUpdate();
-                        stmt.close();
-                        stmt = SQLManager.this.connection.prepareStatement("DELETE FROM `" + prefix + "plot_trusted` WHERE `plot_plot_id` = " + idstr + "");
-                        stmt.executeUpdate();
-                        stmt.close();
-                        stmt = SQLManager.this.connection.prepareStatement("DELETE FROM `" + prefix + "plot` WHERE `id` = " + idstr2 + "");
-                        stmt.executeUpdate();
-                        stmt.close();
-                    } catch (final SQLException e) {
-                        e.printStackTrace();
-                        PS.debug("&c[ERROR] " + "FAILED TO PURGE WORLD '" + world + "'!");
-                        return;
-                    }
-                }
-                PS.debug("&6[INFO] " + "SUCCESSFULLY PURGED WORLD '" + world + "'!");
-            }
-        });
-    }
-
-    @Override
-    public void purge(final String world, final Set<PlotId> plots) {
-        addGlobalTask(new Runnable() {
-            @Override
-            public void run() {
-                PreparedStatement stmt;
-                try {
-                    stmt = SQLManager.this.connection.prepareStatement("SELECT `id`, `plot_id_x`, `plot_id_z` FROM `" + prefix + "plot` WHERE `world` = ?");
-                    stmt.setString(1, world);
-                    final ResultSet r = stmt.executeQuery();
-                    PlotId plot_id;
-                    final Set<Integer> ids = new HashSet<>();
-                    while (r.next()) {
-                        plot_id = new PlotId(r.getInt("plot_id_x"), r.getInt("plot_id_z"));
-                        if (plots.contains(plot_id)) {
-                            ids.add(r.getInt("id"));
-                        }
-                    }
-                    purgeIds(world, ids);
-                    stmt.close();
-                    r.close();
-                    for (Iterator<PlotId> iter = plots.iterator(); iter.hasNext(); ) {
-                        PlotId plotId = iter.next();
-                        iter.remove();
-                        PlotId id = new PlotId(plotId.x, plotId.y);
-                        PS.get().removePlot(world, new PlotId(id.x, id.y), true);
-                    }
-                } catch (final SQLException e) {
-                    e.printStackTrace();
-                    PS.debug("&c[ERROR] " + "FAILED TO PURGE WORLD '" + world + "'!");
-                }
-            }
-        });
-    }
-
-    @Override
-    public void setPosition(final Plot plot, final String position) {
-        addPlotTask(plot, new UniqueStatement("setPosition") {
-            @Override
-            public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setString(1, position);
-                stmt.setInt(2, getId(plot));
-            }
-            
-            @Override
-            public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement("UPDATE `" + SQLManager.this.prefix + "plot_settings` SET `position` = ?  WHERE `plot_plot_id` = ?");
-            }
-        });
-    }
-
-    @Override
-    public void removeComment(final Plot plot, final PlotComment comment) {
-        addPlotTask(plot, new UniqueStatement("removeComment") {
-            @Override
-            public void set(PreparedStatement statement) throws SQLException {
-                if (plot != null) {
-                    statement.setString(1, plot.world);
-                    statement.setInt(2, plot.id.hashCode());
-                    statement.setString(3, comment.comment);
-                    statement.setString(4, comment.inbox);
-                    statement.setString(5, comment.senderName);
-                }
-                else {
-                    statement.setString(1, comment.comment);
-                    statement.setString(2, comment.inbox);
-                    statement.setString(3, comment.senderName);
-                }
-            }
-            
-            @Override
-            public PreparedStatement get() throws SQLException {
-                if (plot != null) {
-                    return SQLManager.this.connection.prepareStatement("DELETE FROM `" + SQLManager.this.prefix + "plot_comments` WHERE `world` = ? AND `hashcode` = ? AND `comment` = ? AND `inbox` = ? AND `sender` = ?");
-                }
-                return SQLManager.this.connection.prepareStatement("DELETE FROM `" + SQLManager.this.prefix + "plot_comments` WHERE `comment` = ? AND `inbox` = ? AND `sender` = ?");
-            }
-        });
-    }
-
-    @Override
-    public void clearInbox(final Plot plot, final String inbox) {
-        addPlotTask(plot, new UniqueStatement("clearInbox") {
-            @Override
-            public void set(PreparedStatement statement) throws SQLException {
-                if (plot != null) {
-                    statement.setString(1, plot.world);
-                    statement.setInt(2, plot.id.hashCode());
-                    statement.setString(3, inbox);
-                }
-                else {
-                    statement.setString(1, inbox);
-                }
-            }
-            
-            @Override
-            public PreparedStatement get() throws SQLException {
-                if (plot != null) {
-                    return SQLManager.this.connection.prepareStatement("DELETE FROM `" + SQLManager.this.prefix + "plot_comments` WHERE `world` = ? AND `hashcode` = ? AND `inbox` = ?");
-                }
-                return SQLManager.this.connection.prepareStatement("DELETE FROM `" + SQLManager.this.prefix + "plot_comments` `inbox` = ?");
-            }
-        });
-    }
-
-    @Override
-    public void getComments(final Plot plot, final String inbox, final RunnableVal whenDone) {
-            addPlotTask(plot, new UniqueStatement("getComments_" + plot) {
-            @Override
-            public void set(PreparedStatement statement) throws SQLException {
-                if (plot != null) {
-                    statement.setString(1, plot.world);
-                    statement.setInt(2, plot.id.hashCode());
-                    statement.setString(3, inbox);
-                }
-                else {
-                    statement.setString(1, inbox);
-                }
-            }
-            
-            @Override
-            public PreparedStatement get() throws SQLException {
-                if (plot != null) {
-                    return SQLManager.this.connection.prepareStatement("SELECT * FROM `" + prefix + "plot_comments` WHERE `world` = ? AND `hashcode` = ? AND `inbox` = ?");
-                }
-                return SQLManager.this.connection.prepareStatement("SELECT * FROM `" + prefix + "plot_comments` WHERE `inbox` = ?");
-            }
-            
-            @Override
-            public void execute(PreparedStatement stmt) throws SQLException {
-            }
-            
-            @Override
-            public void addBatch(PreparedStatement statement) throws SQLException {
-                final ArrayList<PlotComment> comments = new ArrayList<PlotComment>();
-                final ResultSet set = statement.executeQuery();
-                PlotComment comment;
-                while (set.next()) {
-                    final String sender = set.getString("sender");
-                    final String world = set.getString("world");
-                    final int hash = set.getInt("hashcode");
-                    PlotId id;
-                    if (hash != 0) {
-                        id = PlotId.unpair(hash);
-                    } else {
-                        id = null;
-                    }
-                    final String msg = set.getString("comment");
-                    final long timestamp = set.getInt("timestamp") * 1000;
-                    comment = new PlotComment(world, id, msg, sender, inbox, timestamp);
-                    comments.add(comment);
-                    whenDone.value = comments;
-                }
-                TaskManager.runTask(whenDone);
-            }
-        });
-    }
-
-    @Override
-    public void setComment(final Plot plot, final PlotComment comment) {
-        addPlotTask(plot, new UniqueStatement("setComment") {
-            @Override
-            public void set(PreparedStatement statement) throws SQLException {
-                statement.setString(1, plot.world);
-                statement.setInt(2, plot.id.hashCode());
-                statement.setString(3, comment.comment);
-                statement.setString(4, comment.inbox);
-                statement.setInt(5, (int) (comment.timestamp / 1000));
-                statement.setString(6, comment.senderName);
-            }
-            
-            @Override
-            public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement("INSERT INTO `" + SQLManager.this.prefix + "plot_comments` (`world`, `hashcode`, `comment`, `inbox`, `timestamp`, `sender`) VALUES(?,?,?,?,?,?)");
-            }
-        });
-    }
-
-    @Override
-    public void removeTrusted(final Plot plot, final UUID uuid) {
-        addPlotTask(plot, new UniqueStatement("removeTrusted") {
-            @Override
-            public void set(PreparedStatement statement) throws SQLException {
-                statement.setInt(1, getId(plot));
-                statement.setString(2, uuid.toString());
-            }
-            
-            @Override
-            public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement("DELETE FROM `" + SQLManager.this.prefix + "plot_helpers` WHERE `plot_plot_id` = ? AND `user_uuid` = ?");
-            }
-        });
-    }
-
-    @Override
-    public void removeMember(final Plot plot, final UUID uuid) {
-        addPlotTask(plot, new UniqueStatement("removeMember") {
-            @Override
-            public void set(PreparedStatement statement) throws SQLException {
-                statement.setInt(1, getId(plot));
-                statement.setString(2, uuid.toString());
-            }
-            
-            @Override
-            public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement("DELETE FROM `" + SQLManager.this.prefix + "plot_trusted` WHERE `plot_plot_id` = ? AND `user_uuid` = ?");
-            }
-        });
-    }
-
-    @Override
-    public void setTrusted(final Plot plot, final UUID uuid) {
-        addPlotTask(plot, new UniqueStatement("setTrusted") {
-            @Override
-            public void set(PreparedStatement statement) throws SQLException {
-                statement.setInt(1, getId(plot));
-                statement.setString(2, uuid.toString());
-            }
-            
-            @Override
-            public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement("INSERT INTO `" + SQLManager.this.prefix + "plot_helpers` (`plot_plot_id`, `user_uuid`) VALUES(?,?)");
-            }
-        });
-    }
-
-    @Override
-    public void setMember(final Plot plot, final UUID uuid) {
-        addPlotTask(plot, new UniqueStatement("setMember") {
-            @Override
-            public void set(PreparedStatement statement) throws SQLException {
-                statement.setInt(1, getId(plot));
-                statement.setString(2, uuid.toString());
-            }
-            
-            @Override
-            public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement("INSERT INTO `" + SQLManager.this.prefix + "plot_trusted` (`plot_plot_id`, `user_uuid`) VALUES(?,?)");
-            }
-        });
-    }
-
-    @Override
-    public void removeDenied(final Plot plot, final UUID uuid) {
-        addPlotTask(plot, new UniqueStatement("removeDenied") {
-            @Override
-            public void set(PreparedStatement statement) throws SQLException {
-                statement.setInt(1, getId(plot));
-                statement.setString(2, uuid.toString());
-            }
-            
-            @Override
-            public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement("DELETE FROM `" + SQLManager.this.prefix + "plot_denied` WHERE `plot_plot_id` = ? AND `user_uuid` = ?");
-            }
-        });
-    }
-
-    @Override
-    public void setDenied(final Plot plot, final UUID uuid) {
-        addPlotTask(plot, new UniqueStatement("setDenied") {
-            @Override
-            public void set(PreparedStatement statement) throws SQLException {
-                statement.setInt(1, getId(plot));
-                statement.setString(2, uuid.toString());
-            }
-            
-            @Override
-            public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement("INSERT INTO `" + SQLManager.this.prefix + "plot_denied` (`plot_plot_id`, `user_uuid`) VALUES(?,?)");
-            }
-        });
-    }
-
-    @Override
-    public HashMap<UUID, Integer> getRatings(final Plot plot) {
-        HashMap<UUID, Integer> map = new HashMap<UUID, Integer>();
-        try {
-            final PreparedStatement statement = this.connection.prepareStatement("SELECT `rating`, `player` FROM `" + this.prefix + "plot_rating` WHERE `plot_plot_id` = ? ");
-            statement.setInt(1, getId(plot));
-            final ResultSet set = statement.executeQuery();
-            while (set.next()) {
-                UUID uuid = UUID.fromString(set.getString("player"));
-                int rating = set.getInt("rating");
-                map.put(uuid, rating);
-            }
-            statement.close();
-            set.close();
-        } catch (final SQLException e) {
-            PS.debug("&7[WARN] " + "Failed to fetch rating for plot " + plot.getId().toString());
-            e.printStackTrace();
-        }
-        return map;
-    }
-
-    @Override
-    public void setRating(final Plot plot, final UUID rater, final int value) {
-        addPlotTask(plot, new UniqueStatement("setRating") {
-            @Override
-            public void set(PreparedStatement statement) throws SQLException {
-                statement.setInt(1, getId(plot));
-                statement.setInt(2, value);
-                statement.setString(3, rater.toString());
-            }
-            
-            @Override
-            public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement("INSERT INTO `" + SQLManager.this.prefix + "plot_rating` (`plot_plot_id`, `rating`, `player`) VALUES(?,?,?)");
-            }
-        });
-    }
-
-    @Override
-    public void delete(final PlotCluster cluster) {
-        final int id = getClusterId(cluster.world, ClusterManager.getClusterId(cluster));
-        addClusterTask(cluster, new UniqueStatement("delete_cluster_settings") {
-            @Override
-            public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setInt(1, id);
-            }
-            
-            @Override
-            public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement("DELETE FROM `" + SQLManager.this.prefix + "cluster_settings` WHERE `cluster_id` = ?");
-            }
-        });
-        addClusterTask(cluster, new UniqueStatement("delete_cluster_helpers") {
-            @Override
-            public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setInt(1, id);
-            }
-            
-            @Override
-            public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement("DELETE FROM `" + SQLManager.this.prefix + "cluster_helpers` WHERE `cluster_id` = ?");
-            }
-        });
-        addClusterTask(cluster, new UniqueStatement("delete_cluster_invited") {
-            @Override
-            public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setInt(1, id);
-            }
-            
-            @Override
-            public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement("DELETE FROM `" + SQLManager.this.prefix + "cluster_invited` WHERE `cluster_id` = ?");
-            }
-        });
-        addClusterTask(cluster, new UniqueStatement("delete_cluster") {
-            @Override
-            public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setInt(1, id);
-            }
-            
-            @Override
-            public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement("DELETE FROM `" + SQLManager.this.prefix + "cluster` WHERE `id` = ?");
-            }
-        });
-    }
-
-    @Override
-    public int getClusterId(final String world, final PlotClusterId id) {
-        PreparedStatement stmt = null;
-        try {
-            stmt = this.connection.prepareStatement("SELECT `id` FROM `" + this.prefix + "cluster` WHERE `pos1_x` = ? AND `pos1_z` = ? AND `pos2_x` = ? AND `pos2_z` = ? AND `world` = ? ORDER BY `timestamp` ASC");
-            stmt.setInt(1, id.pos1.x);
-            stmt.setInt(2, id.pos1.y);
-            stmt.setInt(3, id.pos2.x);
-            stmt.setInt(4, id.pos2.y);
-            stmt.setString(5, world);
-            final ResultSet r = stmt.executeQuery();
-            int c_id = Integer.MAX_VALUE;
-            while (r.next()) {
-                c_id = r.getInt("id");
-            }
-            stmt.close();
-            r.close();
-            return c_id;
-        } catch (final SQLException e) {
-            e.printStackTrace();
-        }
-        return Integer.MAX_VALUE;
-    }
-
-    @Override
-    public HashMap<String, HashSet<PlotCluster>> getClusters() {
-        final LinkedHashMap<String, HashSet<PlotCluster>> newClusters = new LinkedHashMap<>();
-        final HashMap<Integer, PlotCluster> clusters = new HashMap<>();
-        Statement stmt = null;
-        try {
-            Set<String> worlds = new HashSet<>();
-            if (PS.get().config.contains("worlds")) {
-                worlds = PS.get().config.getConfigurationSection("worlds").getKeys(false);
-            }
-            final HashMap<String, UUID> uuids = new HashMap<String, UUID>();
-            final HashMap<String, Integer> noExist = new HashMap<String, Integer>();
-            /*
-             * Getting clusters
-             */
-            stmt = this.connection.createStatement();
-            ResultSet r = stmt.executeQuery("SELECT * FROM `" + this.prefix + "cluster`");
-            PlotId pos1;
-            PlotId pos2;
-            PlotCluster cluster;
-            String owner;
-            String worldname;
-            UUID user;
-            int id;
-            while (r.next()) {
-                pos1 = new PlotId(r.getInt("pos1_x"), r.getInt("pos1_z"));
-                pos2 = new PlotId(r.getInt("pos2_x"), r.getInt("pos2_z"));
-                id = r.getInt("id");
-                worldname = r.getString("world");
-                if (!worlds.contains(worldname)) {
-                    if (noExist.containsKey(worldname)) {
-                        noExist.put(worldname, noExist.get(worldname) + 1);
-                    } else {
-                        noExist.put(worldname, 1);
-                    }
-                }
-                owner = r.getString("owner");
-                user = uuids.get(owner);
-                if (user == null) {
-                    user = UUID.fromString(owner);
-                    uuids.put(owner, user);
-                }
-                cluster = new PlotCluster(worldname, pos1, pos2, user);
-                clusters.put(id, cluster);
-            }
-            /*
-             * Getting helpers
-             */
-            r = stmt.executeQuery("SELECT `user_uuid`, `cluster_id` FROM `" + this.prefix + "cluster_helpers`");
-            while (r.next()) {
-                id = r.getInt("cluster_id");
-                owner = r.getString("user_uuid");
-                user = uuids.get(owner);
-                if (user == null) {
-                    user = UUID.fromString(owner);
-                    uuids.put(owner, user);
-                }
-                cluster = clusters.get(id);
-                if (cluster != null) {
-                    cluster.helpers.add(user);
-                } else {
-                    PS.debug("&cCluster " + id + " in cluster_helpers does not exist. Please create the cluster or remove this entry.");
-                }
-            }
-            /*
-             * Getting invited
-             */
-            r = stmt.executeQuery("SELECT `user_uuid`, `cluster_id` FROM `" + this.prefix + "cluster_invited`");
-            while (r.next()) {
-                id = r.getInt("cluster_id");
-                owner = r.getString("user_uuid");
-                user = uuids.get(owner);
-                if (user == null) {
-                    user = UUID.fromString(owner);
-                    uuids.put(owner, user);
-                }
-                cluster = clusters.get(id);
-                if (cluster != null) {
-                    cluster.invited.add(user);
-                } else {
-                    PS.debug("&cCluster " + id + " in cluster_invited does not exist. Please create the cluster or remove this entry.");
-                }
-            }
-            r = stmt.executeQuery("SELECT * FROM `" + this.prefix + "cluster_settings`");
-            while (r.next()) {
-                id = r.getInt("cluster_id");
-                cluster = clusters.get(id);
-                if (cluster != null) {
-                    final String alias = r.getString("alias");
-                    if (alias != null) {
-                        cluster.settings.setAlias(alias);
-                    }
-                    final String pos = r.getString("position");
-                    switch (pos.toLowerCase()) {
-                        case "":
-                        case "default":
-                        case "0,0,0":
-                        case "center":
-                            break;
-                        default:
-                            try {
-                                final String[] split = pos.split(",");
-                                final BlockLoc loc = new BlockLoc(Integer.parseInt(split[0]), Integer.parseInt(split[1]), Integer.parseInt(split[2]));
-                                cluster.settings.setPosition(loc);
-                            } catch (final Exception e) {
-                            }
-                    }
-                    final Integer m = r.getInt("merged");
-                    if (m != null) {
-                        final boolean[] merged = new boolean[4];
-                        for (int i = 0; i < 4; i++) {
-                            merged[3 - i] = ((m) & (1 << i)) != 0;
-                        }
-                        cluster.settings.setMerged(merged);
-                    } else {
-                        cluster.settings.setMerged(new boolean[]{false, false, false, false});
-                    }
-                    String[] flags_string;
-                    final String myflags = r.getString("flags");
-                    if (myflags == null) {
-                        flags_string = new String[]{};
-                    } else {
-                        if (myflags.length() > 0) {
-                            flags_string = myflags.split(",");
-                        } else {
-                            flags_string = new String[]{};
-                        }
-                    }
-                    final HashMap<String, Flag> flags = new HashMap<>();
-                    boolean exception = false;
-                    for (final String element : flags_string) {
-                        if (element.contains(":")) {
-                            final String[] split = element.split(":");
-                            try {
-                                final String flag_str = split[1].replaceAll("\u00AF", ":").replaceAll("�", ",");
-                                final Flag flag = new Flag(FlagManager.getFlag(split[0], true), flag_str);
-                                flags.put(flag.getKey(), flag);
-                            } catch (final Exception e) {
-                                e.printStackTrace();
-                                exception = true;
-                            }
-                        } else {
-                            Flag flag = new Flag(FlagManager.getFlag(element, true), "");
-                            flags.put(flag.getKey(), flag);
-                        }
-                    }
-                    if (exception) {
-                        PS.debug("&cCluster " + id + " had an invalid flag. A fix has been attempted.");
-                        PS.debug("&c" + myflags);
-                    }
-                    cluster.settings.flags = flags;
-                } else {
-                    PS.debug("&cCluster " + id + " in cluster_settings does not exist. Please create the cluster or remove this entry.");
-                }
-            }
-            stmt.close();
-            r.close();
-            for (final PlotCluster c : clusters.values()) {
-                final String world = c.world;
-                if (!newClusters.containsKey(world)) {
-                    newClusters.put(world, new HashSet<PlotCluster>());
-                }
-                newClusters.get(world).add(c);
-            }
-            boolean invalidPlot = false;
-            for (Entry<String, Integer> entry : noExist.entrySet()) {
-                String w = entry.getKey();
-                invalidPlot = true;
-                PS.debug("&c[WARNING] Found " + noExist.get(w) + " clusters in DB for non existant world; '" + w + "'.");
-            }
-            if (invalidPlot) {
-                PS.debug("&c[WARNING] - Please create the world/s or remove the clusters using the purge command");
-            }
-        } catch (final SQLException e) {
-            PS.debug("&7[WARN] " + "Failed to load clusters.");
-            e.printStackTrace();
-        }
-        return newClusters;
-    }
-
-    @Override
-    public void setFlags(final PlotCluster cluster, final Collection<Flag> flags) {
-        final StringBuilder flag_string = new StringBuilder();
-        int i = 0;
-        for (final Flag flag : flags) {
-            if (i != 0) {
-                flag_string.append(",");
-            }
-            flag_string.append(flag.getKey() + ":" + flag.getValueString().replaceAll(":", "\u00AF").replaceAll(",", "\u00B4"));
-            i++;
-        }
-        addClusterTask(cluster, new UniqueStatement("setFlags") {
-            @Override
-            public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setString(1, flag_string.toString());
-                stmt.setInt(2, getClusterId(cluster.world, ClusterManager.getClusterId(cluster)));
-            }
-            
-            @Override
-            public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement("UPDATE `" + SQLManager.this.prefix + "cluster_settings` SET `flags` = ? WHERE `cluster_id` = ?");
-            }
-        });
-    }
-
-    @Override
-    public void setClusterName(final PlotCluster cluster, final String name) {
-        addClusterTask(cluster, new UniqueStatement("setClusterName") {
-            @Override
-            public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setString(1, name);
-                stmt.setInt(2, getClusterId(cluster.world, ClusterManager.getClusterId(cluster)));
-            }
-            
-            @Override
-            public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement("UPDATE `" + SQLManager.this.prefix + "cluster_settings` SET `alias` = ?  WHERE `cluster_id` = ?");
-            }
-        });
-        cluster.settings.setAlias(name);
-    }
-
-    @Override
-    public void removeHelper(final PlotCluster cluster, final UUID uuid) {
-        addClusterTask(cluster, new UniqueStatement("removeHelper") {
-            @Override
-            public void set(PreparedStatement statement) throws SQLException {
-                statement.setInt(1, getClusterId(cluster.world, ClusterManager.getClusterId(cluster)));
-                statement.setString(2, uuid.toString());
-            }
-            
-            @Override
-            public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement("DELETE FROM `" + SQLManager.this.prefix + "cluster_helpers` WHERE `cluster_id` = ? AND `user_uuid` = ?");
-            }
-        });
-    }
-
-    @Override
-    public void setHelper(final PlotCluster cluster, final UUID uuid) {
-        addClusterTask(cluster, new UniqueStatement("setHelper") {
-            @Override
-            public void set(PreparedStatement statement) throws SQLException {
-                statement.setInt(1, getClusterId(cluster.world, ClusterManager.getClusterId(cluster)));
-                statement.setString(2, uuid.toString());
-            }
-            
-            @Override
-            public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement("INSERT INTO `" + SQLManager.this.prefix + "cluster_helpers` (`cluster_id`, `user_uuid`) VALUES(?,?)");
-            }
-        });
-    }
-
-    @Override
-    public void createCluster(final PlotCluster cluster) {
-        addClusterTask(cluster, new UniqueStatement("createCluster") {
-            @Override
-            public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setInt(1, cluster.getP1().x);
-                stmt.setInt(2, cluster.getP1().y);
-                stmt.setInt(3, cluster.getP2().x);
-                stmt.setInt(4, cluster.getP2().y);
-                stmt.setString(5, cluster.owner.toString());
-                stmt.setString(6, cluster.world);
-                // TODO resultset getId
-            }
-            
-            @Override
-            public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(SQLManager.this.CREATE_CLUSTER);
-            }
-        });
-        addClusterTask(cluster, new UniqueStatement("createClusterSettings") {
-            @Override
-            public void set(PreparedStatement stmt) throws SQLException {
-                final int id = getClusterId(cluster.world, ClusterManager.getClusterId(cluster));
-                stmt.setInt(1, id);
-                stmt.setString(2, cluster.settings.getAlias());
-                stmt.executeUpdate();
-                stmt.close();
-            }
-            
-            @Override
-            public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement("INSERT INTO `" + SQLManager.this.prefix + "cluster_settings`(`cluster_id`, `alias`) VALUES(?, ?" + ")");
-            }
-        });
-    }
-
-    @Override
-    public void resizeCluster(final PlotCluster current, final PlotClusterId resize) {
-        final PlotId pos1 = new PlotId(current.getP1().x, current.getP1().y);
-        final PlotId pos2 = new PlotId(current.getP2().x, current.getP2().y);
-        current.setP1(resize.pos1);
-        current.setP2(resize.pos2);
-        
-        addClusterTask(current, new UniqueStatement("resizeCluster") {
-            @Override
-            public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setInt(1, pos1.x);
-                stmt.setInt(2, pos1.y);
-                stmt.setInt(3, pos2.x);
-                stmt.setInt(4, pos2.y);
-                stmt.setInt(5, getClusterId(current.world, ClusterManager.getClusterId(current)));
-            }
-            
-            @Override
-            public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement("UPDATE `" + SQLManager.this.prefix + "cluster` SET `pos1_x` = ?, `pos1_z` = ?, `pos2_x` = ?, `pos2_z` = ?  WHERE `id` = ?");
-            }
-        });
-    }
-
-    @Override
-    public void setPosition(final PlotCluster cluster, final String position) {
-        addClusterTask(cluster, new UniqueStatement("setPosition") {
-            @Override
-            public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setString(1, position);
-                stmt.setInt(2, getClusterId(cluster.world, ClusterManager.getClusterId(cluster)));
-            }
-            
-            @Override
-            public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement("UPDATE `" + SQLManager.this.prefix + "cluster_settings` SET `position` = ?  WHERE `cluster_id` = ?");
-            }
-        });
-    }
-
-    @Override
-    public void removeInvited(final PlotCluster cluster, final UUID uuid) {
-        addClusterTask(cluster, new UniqueStatement("removeInvited") {
-            @Override
-            public void set(PreparedStatement statement) throws SQLException {
-                statement.setInt(1, getClusterId(cluster.world, ClusterManager.getClusterId(cluster)));
-                statement.setString(2, uuid.toString());
-            }
-            
-            @Override
-            public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement("DELETE FROM `" + SQLManager.this.prefix + "cluster_invited` WHERE `cluster_id` = ? AND `user_uuid` = ?");
-            }
-        });
-    }
-
-    @Override
-    public void setInvited(final PlotCluster cluster, final UUID uuid) {
-        addClusterTask(cluster, new UniqueStatement("setInvited") {
-            @Override
-            public void set(PreparedStatement statement) throws SQLException {
-                statement.setInt(1, getClusterId(cluster.world, ClusterManager.getClusterId(cluster)));
-                statement.setString(2, uuid.toString());
-            }
-            
-            @Override
-            public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement("INSERT INTO `" + SQLManager.this.prefix + "cluster_invited` (`cluster_id`, `user_uuid`) VALUES(?,?)");
-            }
-        });
-    }
-
-    @Override
-    public boolean deleteTables() {
-        try {
-            close();
-            CLOSED = false;
-            SQLManager.this.connection = database.forceConnection();
-            final Statement stmt = connection.createStatement();
-            stmt.addBatch("DROP TABLE `" + prefix + "cluster_invited`");
-            stmt.addBatch("DROP TABLE `" + prefix + "cluster_helpers`");
-            stmt.addBatch("DROP TABLE `" + prefix + "cluster`");
-            stmt.addBatch("DROP TABLE `" + prefix + "plot_rating`");
-            stmt.addBatch("DROP TABLE `" + prefix + "plot_settings`");
-            stmt.addBatch("DROP TABLE `" + prefix + "plot_comments`");
-            stmt.addBatch("DROP TABLE `" + prefix + "plot_trusted`");
-            stmt.addBatch("DROP TABLE `" + prefix + "plot_helpers`");
-            stmt.addBatch("DROP TABLE `" + prefix + "plot_denied`");
-            stmt.executeBatch();
-            stmt.clearBatch();
-            stmt.close();
-
-            PreparedStatement statement = connection.prepareStatement("DROP TABLE `" + prefix + "plot`");
-            statement.executeUpdate();
-            statement.close();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return true;
-    }
-
-    private class UUIDPair {
-        public final int id;
-        public final UUID uuid;
-
-        public UUIDPair(int id, UUID uuid) {
-            this.id = id;
-            this.uuid = uuid;
-        }
-    }
-
-    private class SettingsPair {
-        public final int id;
-        public final PlotSettings settings;
-
-        public SettingsPair(int id, PlotSettings settings) {
-            this.id = id;
-            this.settings = settings;
-        }
-    }
-
-    @Override
-    public void validateAllPlots(Set<Plot> toValidate) {
-        try {
-            if (connection.isClosed() || CLOSED) {
-                CLOSED = false;
-                connection = database.forceConnection();
-            }
-        }
-        catch (Exception e) {
-            e.printStackTrace();
-        }
-        PS.debug("$1All DB transactions during this session are being validated (This may take a while if corrections need to be made)");
-        commit();
-        while (true) {
-            if (!sendBatch()) {
-                break;
-            }
-        }
-        try {
-            if (connection.getAutoCommit()) {
-                connection.setAutoCommit(false);
-            }
-        } catch (SQLException e) {
-            e.printStackTrace();
-        }
-        ConcurrentHashMap<String, ConcurrentHashMap<PlotId, Plot>> database = getPlots();
-        ArrayList<Plot> toCreate = new ArrayList<>();
-        for (Plot plot : PS.get().getPlotsRaw()) {
-            if (plot.temp == -1) {
-                continue;
-            }
-            ConcurrentHashMap<PlotId, Plot> worldplots = database.get(plot.world);
-            if (worldplots == null) {
-                PS.debug("&8 - &7Creating plot (1): " + plot);
-                toCreate.add(plot);
-                continue;
-            }
-            Plot dataplot = worldplots.remove(plot.id);
-            if (dataplot == null) {
-                PS.debug("&8 - &7Creating plot (2): " + plot);
-                toCreate.add(plot);
-                continue;
-            }
-            // owner
-            if (!plot.owner.equals(dataplot.owner)) {
-                PS.debug("&8 - &7Setting owner: " + plot +" -> " + MainUtil.getName(plot.owner));
-                setOwner(plot, plot.owner);
-            }
-            // trusted
-            if (!plot.getTrusted().equals(dataplot.trusted)) {
-                HashSet<UUID> toAdd = (HashSet<UUID>) plot.getTrusted().clone();
-                HashSet<UUID> toRemove = (HashSet<UUID>) dataplot.getTrusted().clone();
-                toRemove.removeAll(plot.getTrusted());
-                toAdd.removeAll(dataplot.getTrusted());
-                PS.debug("&8 - &7Correcting " + (toAdd.size() + toRemove.size()) + " trusted for: " + plot);
-                if (toRemove.size() > 0) {
-                    for (UUID uuid : toRemove) {
-                        removeTrusted(plot, uuid);
-                    }
-                }
-                if (toAdd.size() > 0) {
-                    for (UUID uuid : toAdd) {
-                        setTrusted(plot, uuid);
-                    }
-                }
-            }
-            if (!plot.getMembers().equals(dataplot.members)) {
-                HashSet<UUID> toAdd = (HashSet<UUID>) plot.getMembers().clone();
-                HashSet<UUID> toRemove = (HashSet<UUID>) dataplot.getMembers().clone();
-                toRemove.removeAll(plot.getMembers());
-                toAdd.removeAll(dataplot.getMembers());
-                PS.debug("&8 - &7Correcting " + (toAdd.size() + toRemove.size()) + " members for: " + plot);
-                if (toRemove.size() > 0) {
-                    for (UUID uuid : toRemove) {
-                        removeMember(plot, uuid);
-                    }
-                }
-                if (toAdd.size() > 0) {
-                    for (UUID uuid : toAdd) {
-                        setMember(plot, uuid);
-                    }
-                }
-            }
-            if (!plot.getDenied().equals(dataplot.denied)) {
-                HashSet<UUID> toAdd = (HashSet<UUID>) plot.getDenied().clone();
-                HashSet<UUID> toRemove = (HashSet<UUID>) dataplot.getDenied().clone();
-                toRemove.removeAll(plot.getDenied());
-                toAdd.removeAll(dataplot.getDenied());
-                PS.debug("&8 - &7Correcting " + (toAdd.size() + toRemove.size()) + " denied for: " + plot);
-                if (toRemove.size() > 0) {
-                    for (UUID uuid : toRemove) {
-                        removeDenied(plot, uuid);
-                    }
-                }
-                if (toAdd.size() > 0) {
-                    for (UUID uuid : toAdd) {
-                        setDenied(plot, uuid);
-                    }
-                }
-            }
-            PlotSettings ps = plot.getSettings();
-            PlotSettings ds = dataplot.getSettings();
-            boolean[] pm = ps.getMerged();
-            boolean[] dm = ds.getMerged();
-            if (pm[0] != dm[0] || pm[1] != dm[1] || pm[1] != dm[1] || pm[1] != dm[1]) {
-                PS.debug("&8 - &7Correcting merge for: " + plot);
-                setMerged(dataplot, ps.getMerged());
-            }
-            HashMap<String, Flag> pf = ps.flags;
-            HashMap<String, Flag> df = ds.flags;
-            if (pf.size() != 0 && df.size() != 0) {
-                if (pf.size() != df.size() || !StringMan.isEqual(StringMan.joinOrdered(pf.values(), ","),StringMan.joinOrdered(df.values(), ","))) {
-                    PS.debug("&8 - &7Correcting flags for: " + plot);
-                    setFlags(plot, pf.values());
-                }
-            }
-            // TODO comments (null)
-            // TODO ratings (null)
-            // TODO alias
-            // TODO unconnected entries from helpers, trusted, denied, comments, settings, rating
-        }
-        
-        for (Entry<String, ConcurrentHashMap<PlotId, Plot>> entry : database.entrySet()) {
-            ConcurrentHashMap<PlotId, Plot> map = entry.getValue();
-            if (map.size() > 0) {
-                for (Entry<PlotId, Plot> entry2 : map.entrySet()) {
-                    PS.debug("$1Plot was deleted: " + entry.getValue() + "// TODO implement this when sure safe");
-                }
-            }
-        }
-        commit();
-    }
-    
-    @Override
-    public void replaceUUID(final UUID old, final UUID now) {
-        addGlobalTask(new Runnable() {
-            @Override
-            public void run() {
-                try (Statement stmt = connection.createStatement()) {
-                    stmt.executeUpdate("UPDATE `" + prefix + "cluster` SET `owner` = '" + now.toString() + "' WHERE `owner` = '" + old.toString() + "'");
-                    stmt.executeUpdate("UPDATE `" + prefix + "cluster_helpers` SET `user_uuid` = '" + now.toString() + "' WHERE `user_uuid` = '" + old.toString() + "'");
-                    stmt.executeUpdate("UPDATE `" + prefix + "cluster_invited` SET `user_uuid` = '" + now.toString() + "' WHERE `user_uuid` = '" + old.toString() + "'");
-                    stmt.executeUpdate("UPDATE `" + prefix + "plot` SET `owner` = '" + now.toString() + "' WHERE `owner` = '" + old.toString() + "'");
-                    stmt.executeUpdate("UPDATE `" + prefix + "plot_denied` SET `user_uuid` = '" + now.toString() + "' WHERE `user_uuid` = '" + old.toString() + "'");
-                    stmt.executeUpdate("UPDATE `" + prefix + "plot_helpers` SET `user_uuid` = '" + now.toString() + "' WHERE `user_uuid` = '" + old.toString() + "'");
-                    stmt.executeUpdate("UPDATE `" + prefix + "plot_trusted` SET `user_uuid` = '" + now.toString() + "' WHERE `user_uuid` = '" + old.toString() + "'");
-                    stmt.close();
-                }
-                catch (Exception e) {
-                    e.printStackTrace();
-                }
-            }
-        });
-    }
-
-    @Override
-    public void close() {
-        try {
-            CLOSED = true;
-            connection.close();
-        } catch (SQLException e) {
-            e.printStackTrace();
-        }
-    }
-}
\ No newline at end of file
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// PlotSquared - A plot manager and world generator for the Bukkit API                             /
+// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
+//                                                                                                 /
+// This program is free software; you can redistribute it and/or modify                            /
+// it under the terms of the GNU General Public License as published by                            /
+// the Free Software Foundation; either version 3 of the License, or                               /
+// (at your option) any later version.                                                             /
+//                                                                                                 /
+// This program is distributed in the hope that it will be useful,                                 /
+// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
+// GNU General Public License for more details.                                                    /
+//                                                                                                 /
+// You should have received a copy of the GNU General Public License                               /
+// along with this program; if not, write to the Free Software Foundation,                         /
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
+//                                                                                                 /
+// You can contact us via: support@intellectualsites.com                                           /
+////////////////////////////////////////////////////////////////////////////////////////////////////
+package com.intellectualcrafters.plot.database;
+
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map.Entry;
+import java.util.Queue;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentLinkedQueue;
+
+import com.intellectualcrafters.plot.PS;
+import com.intellectualcrafters.plot.config.Settings;
+import com.intellectualcrafters.plot.flag.Flag;
+import com.intellectualcrafters.plot.flag.FlagManager;
+import com.intellectualcrafters.plot.object.BlockLoc;
+import com.intellectualcrafters.plot.object.Plot;
+import com.intellectualcrafters.plot.object.PlotCluster;
+import com.intellectualcrafters.plot.object.PlotClusterId;
+import com.intellectualcrafters.plot.object.PlotId;
+import com.intellectualcrafters.plot.object.PlotSettings;
+import com.intellectualcrafters.plot.object.RunnableVal;
+import com.intellectualcrafters.plot.object.comment.PlotComment;
+import com.intellectualcrafters.plot.util.ClusterManager;
+import com.intellectualcrafters.plot.util.MainUtil;
+import com.intellectualcrafters.plot.util.StringMan;
+import com.intellectualcrafters.plot.util.TaskManager;
+
+/**

+ */
+public class SQLManager implements AbstractDB
+{
+    // Public final
+    public final String SET_OWNER;
+    public final String GET_ALL_PLOTS;
+    public final String CREATE_PLOTS;
+    public final String CREATE_SETTINGS;
+    public final String CREATE_TIERS;
+    public final String CREATE_PLOT;
+    public final String CREATE_CLUSTER;
+    private final String prefix;
+    // Private
+    private Connection connection;
+    private boolean CLOSED = false;
+    // Private Final
+    private final Database database;
+    private final boolean MYSQL;
+
+    /**
+     * important tasks
+     */
+    public volatile Queue<Runnable> globalTasks;
+
+    /**
+     * Notify tasks
+     */
+    public volatile Queue<Runnable> notifyTasks;
+
+    /**
+     * plot
+     * plot_denied
+     * plot_helpers
+     * plot_trusted
+     * plot_comments
+     * plot_settings
+     * plot_rating
+     */
+    public volatile ConcurrentHashMap<Plot, Queue<UniqueStatement>> plotTasks;
+
+    /**
+     * cluster
+     * cluster_helpers
+     * cluster_invited
+     * cluster_settings
+     */
+    public volatile ConcurrentHashMap<PlotCluster, Queue<UniqueStatement>> clusterTasks;
+
+    public synchronized Queue<Runnable> getGlobalTasks()
+    {
+        return globalTasks;
+    }
+
+    public synchronized Queue<Runnable> getNotifyTasks()
+    {
+        return notifyTasks;
+    }
+
+    public synchronized void addPlotTask(Plot plot, UniqueStatement task)
+    {
+        if (plot == null)
+        {
+            plot = new Plot("", new PlotId(Integer.MAX_VALUE, Integer.MAX_VALUE), null);
+        }
+        Queue<UniqueStatement> tasks = plotTasks.get(plot);
+        if (tasks == null)
+        {
+            tasks = new ConcurrentLinkedQueue<>();
+            plotTasks.put(plot, tasks);
+        }
+        if (task == null)
+        {
+            task = new UniqueStatement(plot.hashCode() + "")
+            {
+
+                @Override
+                public PreparedStatement get() throws SQLException
+                {
+                    return null;
+                }
+
+                @Override
+                public void set(final PreparedStatement stmt) throws SQLException
+                {}
+
+                @Override
+                public void addBatch(final PreparedStatement stmt) throws SQLException
+                {}
+
+                @Override
+                public void execute(final PreparedStatement stmt) throws SQLException
+                {}
+
+            };
+        }
+        tasks.add(task);
+    }
+
+    public synchronized void addClusterTask(final PlotCluster cluster, final UniqueStatement task)
+    {
+        Queue<UniqueStatement> tasks = clusterTasks.get(cluster);
+        if (tasks == null)
+        {
+            tasks = new ConcurrentLinkedQueue<>();
+            clusterTasks.put(cluster, tasks);
+        }
+        tasks.add(task);
+    }
+
+    public synchronized void addGlobalTask(final Runnable task)
+    {
+        getGlobalTasks().add(task);
+    }
+
+    public synchronized void addNotifyTask(final Runnable task)
+    {
+        if (task != null)
+        {
+            getNotifyTasks().add(task);
+        }
+    }
+
+    /**
+     * Constructor
+     *
+     * @param c connection
+     * @param p prefix
+     * @throws Exception
+     */
+    public SQLManager(final Database database, final String p, final boolean debug) throws Exception
+    {
+        // Private final
+        this.database = database;
+        connection = database.openConnection();
+        MYSQL = (database instanceof MySQL);
+        globalTasks = new ConcurrentLinkedQueue<>();
+        notifyTasks = new ConcurrentLinkedQueue<>();
+        plotTasks = new ConcurrentHashMap<>();
+        clusterTasks = new ConcurrentHashMap<>();
+        TaskManager.runTaskAsync(new Runnable()
+        {
+            @Override
+            public void run()
+            {
+                long last = System.currentTimeMillis();
+                while (true)
+                {
+                    if (CLOSED)
+                    {
+                        break;
+                    }
+                    // schedule reconnect
+                    if (MYSQL && ((System.currentTimeMillis() - last) > 550000))
+                    {
+                        last = System.currentTimeMillis();
+                        try
+                        {
+                            close();
+                            CLOSED = false;
+                            connection = database.forceConnection();
+                        }
+                        catch (SQLException | ClassNotFoundException e)
+                        {
+                            e.printStackTrace();
+                        }
+                    }
+                    if (!sendBatch())
+                    {
+                        try
+                        {
+                            if (getNotifyTasks().size() > 0)
+                            {
+                                for (final Runnable task : getNotifyTasks())
+                                {
+                                    TaskManager.runTask(task);
+                                }
+                                getNotifyTasks().clear();
+                            }
+                            Thread.sleep(50);
+                        }
+                        catch (final InterruptedException e)
+                        {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            }
+        });
+        prefix = p;
+        // Set timout
+        // setTimout();
+        // Public final
+        SET_OWNER = "UPDATE `" + prefix + "plot` SET `owner` = ? WHERE `plot_id_x` = ? AND `plot_id_z` = ? AND `world` = ?";
+        GET_ALL_PLOTS = "SELECT `id`, `plot_id_x`, `plot_id_z`, `world` FROM `" + prefix + "plot`";
+        CREATE_PLOTS = "INSERT INTO `" + prefix + "plot`(`plot_id_x`, `plot_id_z`, `owner`, `world`, `timestamp`) values ";
+        CREATE_SETTINGS = "INSERT INTO `" + prefix + "plot_settings` (`plot_plot_id`) values ";
+        CREATE_TIERS = "INSERT INTO `" + prefix + "plot_%tier%` (`plot_plot_id`, `user_uuid`) values ";
+        CREATE_PLOT = "INSERT INTO `" + prefix + "plot`(`plot_id_x`, `plot_id_z`, `owner`, `world`, `timestamp`) VALUES(?, ?, ?, ?, ?)";
+        CREATE_CLUSTER = "INSERT INTO `" + prefix + "cluster`(`pos1_x`, `pos1_z`, `pos2_x`, `pos2_z`, `owner`, `world`) VALUES(?, ?, ?, ?, ?, ?)";
+        updateTables();
+        createTables();
+    }
+
+    public boolean sendBatch()
+    {
+        try
+        {
+            if (getGlobalTasks().size() > 0)
+            {
+                if (connection.getAutoCommit())
+                {
+                    connection.setAutoCommit(false);
+                }
+                final Runnable task = getGlobalTasks().remove();
+                if (task != null)
+                {
+                    task.run();
+                }
+                commit();
+                return true;
+            }
+            int count = -1;
+            if (plotTasks.size() > 0)
+            {
+                count = 0;
+                if (connection.getAutoCommit())
+                {
+                    connection.setAutoCommit(false);
+                }
+                String method = null;
+                PreparedStatement stmt = null;
+                UniqueStatement task = null;
+                UniqueStatement lastTask = null;
+                //                ArrayList<Entry<Plot, Queue<UniqueStatement>>> keys = new ArrayList<>(plotTasks.entrySet());
+                for (final Entry<Plot, Queue<UniqueStatement>> entry : plotTasks.entrySet())
+                {
+                    final Plot plot = entry.getKey();
+                    if (plotTasks.get(plot).size() == 0)
+                    {
+                        plotTasks.remove(plot);
+                        continue;
+                    }
+                    task = plotTasks.get(plot).remove();
+                    count++;
+                    if (task != null)
+                    {
+                        if ((task._method == null) || !task._method.equals(method))
+                        {
+                            if (stmt != null)
+                            {
+                                lastTask.execute(stmt);
+                                stmt.close();
+                            }
+                            method = task._method;
+                            stmt = task.get();
+                        }
+                        task.set(stmt);
+                        task.addBatch(stmt);
+                    }
+                    lastTask = task;
+                }
+                if ((stmt != null) && (task != null))
+                {
+                    task.execute(stmt);
+                    stmt.close();
+                }
+            }
+            if (clusterTasks.size() > 0)
+            {
+                count = 0;
+                if (connection.getAutoCommit())
+                {
+                    connection.setAutoCommit(false);
+                }
+                String method = null;
+                PreparedStatement stmt = null;
+                UniqueStatement task = null;
+                UniqueStatement lastTask = null;
+                for (final Entry<PlotCluster, Queue<UniqueStatement>> entry : clusterTasks.entrySet())
+                {
+                    final PlotCluster cluster = entry.getKey();
+                    if (clusterTasks.get(cluster).size() == 0)
+                    {
+                        clusterTasks.remove(cluster);
+                        continue;
+                    }
+                    task = clusterTasks.get(cluster).remove();
+                    count++;
+                    if (task != null)
+                    {
+                        if ((task._method == null) || !task._method.equals(method))
+                        {
+                            if (stmt != null)
+                            {
+                                lastTask.execute(stmt);
+                                stmt.close();
+                            }
+                            method = task._method;
+                            stmt = task.get();
+                        }
+                        task.set(stmt);
+                        task.addBatch(stmt);
+                    }
+                    lastTask = task;
+                }
+                if ((stmt != null) && (task != null))
+                {
+                    task.execute(stmt);
+                    stmt.close();
+                }
+            }
+            if (count > 0)
+            {
+                commit();
+                return true;
+            }
+            else if (count != -1)
+            {
+                if (!connection.getAutoCommit())
+                {
+                    connection.setAutoCommit(true);
+                }
+            }
+            if (clusterTasks.size() > 0)
+            {
+                clusterTasks.clear();
+            }
+            if (plotTasks.size() > 0)
+            {
+                plotTasks.clear();
+            }
+        }
+        catch (final Exception e)
+        {
+            e.printStackTrace();
+        }
+        return false;
+    }
+
+    public abstract class UniqueStatement
+    {
+        public String _method;
+
+        public UniqueStatement(final String method)
+        {
+            _method = method;
+        }
+
+        public void addBatch(final PreparedStatement stmt) throws SQLException
+        {
+            stmt.addBatch();
+        }
+
+        public void execute(final PreparedStatement stmt) throws SQLException
+        {
+            stmt.executeBatch();
+        }
+
+        public abstract PreparedStatement get() throws SQLException;
+
+        public abstract void set(final PreparedStatement stmt) throws SQLException;
+    }
+
+    public Connection getConnection()
+    {
+        return connection;
+    }
+
+    /**
+     * Set Plot owner
+     *
+     * @param plot Plot Object
+     * @param uuid Owner UUID
+     */
+    @Override
+    public void setOwner(final Plot plot, final UUID uuid)
+    {
+        addPlotTask(plot, new UniqueStatement("setOwner")
+        {
+            @Override
+            public void set(final PreparedStatement statement) throws SQLException
+            {
+                statement.setString(1, uuid.toString());
+                statement.setInt(2, plot.id.x);
+                statement.setInt(3, plot.id.y);
+                statement.setString(4, plot.world);
+            }
+
+            @Override
+            public PreparedStatement get() throws SQLException
+            {
+                return connection.prepareStatement(SET_OWNER);
+            }
+        });
+    }
+
+    @Override
+    public void createPlotsAndData(final ArrayList<Plot> myList, final Runnable whenDone)
+    {
+        addGlobalTask(new Runnable()
+        {
+            @Override
+            public void run()
+            {
+                try
+                {
+                    // Create the plots
+                    createPlots(myList, new Runnable()
+                    {
+                        @Override
+                        public void run()
+                        {
+                            try
+                            {
+                                // Creating datastructures
+                                final HashMap<PlotId, Plot> plotMap = new HashMap<>();
+                                for (final Plot plot : myList)
+                                {
+                                    plotMap.put(plot.id, plot);
+                                }
+                                final ArrayList<SettingsPair> settings = new ArrayList<>();
+                                final ArrayList<UUIDPair> helpers = new ArrayList<>();
+                                final ArrayList<UUIDPair> trusted = new ArrayList<>();
+                                final ArrayList<UUIDPair> denied = new ArrayList<>();
+
+                                // Populating structures
+                                final PreparedStatement stmt = connection.prepareStatement(GET_ALL_PLOTS);
+                                try (ResultSet result = stmt.executeQuery())
+                                {
+                                    while (result.next())
+                                    {
+                                        final int id = result.getInt("id");
+                                        final int x = result.getInt("plot_id_x");
+                                        final int y = result.getInt("plot_id_z");
+                                        final PlotId plotId = new PlotId(x, y);
+                                        final Plot plot = plotMap.get(plotId);
+                                        if (plot != null)
+                                        {
+                                            settings.add(new SettingsPair(id, plot.getSettings()));
+                                            if (plot.getDenied() != null)
+                                            {
+                                                for (final UUID uuid : plot.getDenied())
+                                                {
+                                                    denied.add(new UUIDPair(id, uuid));
+                                                }
+                                            }
+                                            if (plot.getMembers() != null)
+                                            {
+                                                for (final UUID uuid : plot.getMembers())
+                                                {
+                                                    trusted.add(new UUIDPair(id, uuid));
+                                                }
+                                            }
+                                            if (plot.getTrusted() != null)
+                                            {
+                                                for (final UUID uuid : plot.getTrusted())
+                                                {
+                                                    helpers.add(new UUIDPair(id, uuid));
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                                createSettings(settings, new Runnable()
+                                {
+                                    @Override
+                                    public void run()
+                                    {
+                                        createTiers(helpers, "helpers", new Runnable()
+                                        {
+                                            @Override
+                                            public void run()
+                                            {
+                                                createTiers(trusted, "trusted", new Runnable()
+                                                {
+                                                    @Override
+                                                    public void run()
+                                                    {
+                                                        createTiers(denied, "denied", new Runnable()
+                                                        {
+                                                            @Override
+                                                            public void run()
+                                                            {
+                                                                try
+                                                                {
+                                                                    connection.commit();
+                                                                }
+                                                                catch (final SQLException e)
+                                                                {
+                                                                    e.printStackTrace();
+                                                                }
+                                                                if (whenDone != null)
+                                                                {
+                                                                    whenDone.run();
+                                                                }
+                                                            }
+                                                        });
+                                                    }
+                                                });
+                                            }
+                                        });
+                                    }
+                                });
+                            }
+                            catch (final SQLException e)
+                            {
+                                e.printStackTrace();
+                                PS.debug("&7[WARN] " + "Failed to set all helpers for plots");
+                                try
+                                {
+                                    connection.commit();
+                                }
+                                catch (final SQLException e1)
+                                {
+                                    e1.printStackTrace();
+                                }
+                            }
+                        }
+                    });
+                }
+                catch (final Exception e)
+                {
+                    e.printStackTrace();
+                    PS.debug("&7[WARN] " + "Failed to set all helpers for plots");
+                    try
+                    {
+                        connection.commit();
+                    }
+                    catch (final SQLException e1)
+                    {
+                        e1.printStackTrace();
+                    }
+                }
+            }
+        });
+    }
+
+    /**
+     * Create a plot
+     *
+     * @param myList list of plots to be created
+     */
+    public void createTiers(final ArrayList<UUIDPair> myList, final String tier, final Runnable whenDone)
+    {
+        final StmtMod<UUIDPair> mod = new StmtMod<UUIDPair>()
+        {
+            @Override
+            public String getCreateMySQL(final int size)
+            {
+                return getCreateMySQL(size, CREATE_TIERS.replaceAll("%tier%", tier), 2);
+            }
+
+            @Override
+            public String getCreateSQLite(final int size)
+            {
+                return getCreateSQLite(size,
+                "INSERT INTO `" + prefix + "plot_" + tier + "` SELECT ? AS `plot_plot_id`, ? AS `user_uuid`", 2);
+            }
+
+            @Override
+            public String getCreateSQL()
+            {
+                return "INSERT INTO `" + prefix + "plot_" + tier + "` (`plot_plot_id`, `user_uuid`) VALUES(?,?)";
+            }
+
+            @Override
+            public void setMySQL(final PreparedStatement stmt, final int i, final UUIDPair pair) throws SQLException
+            {
+                stmt.setInt((i * 2) + 1, pair.id);
+                stmt.setString((i * 2) + 2, pair.uuid.toString());
+            }
+
+            @Override
+            public void setSQLite(final PreparedStatement stmt, final int i, final UUIDPair pair) throws SQLException
+            {
+                stmt.setInt((i * 2) + 1, pair.id);
+                stmt.setString((i * 2) + 2, pair.uuid.toString());
+            }
+
+            @Override
+            public void setSQL(final PreparedStatement stmt, final UUIDPair pair) throws SQLException
+            {
+                stmt.setInt(1, pair.id);
+                stmt.setString(2, pair.uuid.toString());
+            }
+        };
+        setBulk(myList, mod, whenDone);
+    }
+
+    /**
+     * Create a plot
+     *
+     * @param myList list of plots to be created
+     */
+    public void createPlots(final ArrayList<Plot> myList, final Runnable whenDone)
+    {
+        final StmtMod<Plot> mod = new StmtMod<Plot>()
+        {
+            @Override
+            public String getCreateMySQL(final int size)
+            {
+                return getCreateMySQL(size, CREATE_PLOTS, 5);
+            }
+
+            @Override
+            public String getCreateSQLite(final int size)
+            {
+                return getCreateSQLite(size, "INSERT INTO `" + prefix + "plot` SELECT ? AS `id`, ? AS `plot_id_x`, ? AS `plot_id_z`, ? AS `owner`, ? AS `world`, ? AS `timestamp` ", 6);
+            }
+
+            @Override
+            public String getCreateSQL()
+            {
+                return CREATE_PLOT;
+            }
+
+            @Override
+            public void setMySQL(final PreparedStatement stmt, final int i, final Plot plot) throws SQLException
+            {
+                stmt.setInt((i * 5) + 1, plot.id.x);
+                stmt.setInt((i * 5) + 2, plot.id.y);
+                try
+                {
+                    stmt.setString((i * 4) + 3, plot.owner.toString());
+                }
+                catch (final Exception e)
+                {
+                    stmt.setString((i * 4) + 3, everyone.toString());
+                }
+                stmt.setString((i * 5) + 4, plot.world);
+                stmt.setTimestamp((i * 5) + 5, new Timestamp(plot.getTimestamp()));
+            }
+
+            @Override
+            public void setSQLite(final PreparedStatement stmt, final int i, final Plot plot) throws SQLException
+            {
+                stmt.setNull((i * 6) + 1, 4);
+                stmt.setInt((i * 6) + 2, plot.id.x);
+                stmt.setInt((i * 6) + 3, plot.id.y);
+                try
+                {
+                    stmt.setString((i * 6) + 4, plot.owner.toString());
+                }
+                catch (final Exception e1)
+                {
+                    stmt.setString((i * 6) + 4, everyone.toString());
+                }
+                stmt.setString((i * 6) + 5, plot.world);
+                stmt.setTimestamp((i * 6) + 6, new Timestamp(plot.getTimestamp()));
+            }
+
+            @Override
+            public void setSQL(final PreparedStatement stmt, final Plot plot) throws SQLException
+            {
+                stmt.setInt(1, plot.id.x);
+                stmt.setInt(2, plot.id.y);
+                stmt.setString(3, plot.owner.toString());
+                stmt.setString(4, plot.world);
+                stmt.setTimestamp(5, new Timestamp(plot.getTimestamp()));
+
+            }
+        };
+        setBulk(myList, mod, whenDone);
+    }
+
+    public <T> void setBulk(final ArrayList<T> objList, final StmtMod<T> mod, final Runnable whenDone)
+    {
+        final int size = objList.size();
+        if (size == 0)
+        {
+            if (whenDone != null)
+            {
+                whenDone.run();
+            }
+            return;
+        }
+        int packet;
+        if (MYSQL)
+        {
+            packet = Math.min(size, 5000);
+        }
+        else
+        {
+            packet = Math.min(size, 50);
+        }
+        final int amount = size / packet;
+        try
+        {
+            int count = 0;
+            PreparedStatement preparedStmt = null;
+            String statement = null;
+            int last = -1;
+            for (int j = 0; j <= amount; j++)
+            {
+                final List<T> subList = objList.subList(j * packet, Math.min(size, (j + 1) * packet));
+                if (subList.size() == 0)
+                {
+                    break;
+                }
+                if (last == -1)
+                {
+                    last = subList.size();
+                    statement = mod.getCreateMySQL(subList.size());
+                    preparedStmt = connection.prepareStatement(statement.toString());
+                }
+                if ((subList.size() != last) || (((count % 5000) == 0) && (count > 0)))
+                {
+                    preparedStmt.executeBatch();
+                    preparedStmt.close();
+                    statement = mod.getCreateMySQL(subList.size());
+                    preparedStmt = connection.prepareStatement(statement.toString());
+                }
+                for (int i = 0; i < subList.size(); i++)
+                {
+                    count++;
+                    final T obj = subList.get(i);
+                    mod.setMySQL(preparedStmt, i, obj);
+                }
+                last = subList.size();
+                preparedStmt.addBatch();
+            }
+            PS.debug("&aBatch 1: " + count + " | " + objList.get(0).getClass().getCanonicalName());
+            preparedStmt.executeBatch();
+            preparedStmt.clearParameters();
+            preparedStmt.close();
+            if (whenDone != null)
+            {
+                whenDone.run();
+            }
+            return;
+        }
+        catch (final Exception e)
+        {
+            if (MYSQL)
+            {
+                e.printStackTrace();
+                PS.debug("&cERROR 1: " + " | " + objList.get(0).getClass().getCanonicalName());
+            }
+        }
+        try
+        {
+            int count = 0;
+            PreparedStatement preparedStmt = null;
+            String statement = null;
+            int last = -1;
+            for (int j = 0; j <= amount; j++)
+            {
+                final List<T> subList = objList.subList(j * packet, Math.min(size, (j + 1) * packet));
+                if (subList.size() == 0)
+                {
+                    break;
+                }
+                if (last == -1)
+                {
+                    last = subList.size();
+                    statement = mod.getCreateSQLite(subList.size());
+                    preparedStmt = connection.prepareStatement(statement.toString());
+                }
+                if ((subList.size() != last) || (((count % 5000) == 0) && (count > 0)))
+                {
+                    preparedStmt.executeBatch();
+                    preparedStmt.clearParameters();
+                    statement = mod.getCreateSQLite(subList.size());
+                    preparedStmt = connection.prepareStatement(statement.toString());
+                }
+                for (int i = 0; i < subList.size(); i++)
+                {
+                    count++;
+                    final T obj = subList.get(i);
+                    mod.setSQLite(preparedStmt, i, obj);
+                }
+                last = subList.size();
+                preparedStmt.addBatch();
+            }
+            PS.debug("&aBatch 2: " + count + " | " + objList.get(0).getClass().getCanonicalName());
+            preparedStmt.executeBatch();
+            preparedStmt.clearParameters();
+            preparedStmt.close();
+        }
+        catch (final Exception e)
+        {
+            e.printStackTrace();
+            PS.debug("&cERROR 2: " + " | " + objList.get(0).getClass().getCanonicalName());
+            PS.debug("&6[WARN] " + "Could not bulk save!");
+            try
+            {
+                PreparedStatement preparedStmt = null;
+                final String nonBulk = mod.getCreateSQL();
+                preparedStmt = connection.prepareStatement(nonBulk.toString());
+                for (final T obj : objList)
+                {
+                    try
+                    {
+                        mod.setSQL(preparedStmt, obj);
+                        preparedStmt.addBatch();
+                    }
+                    catch (final Exception e3)
+                    {
+                        PS.debug("&c[ERROR] " + "Failed to save " + obj + "!");
+                    }
+                }
+                PS.debug("&aBatch 3");
+                preparedStmt.executeBatch();
+                preparedStmt.close();
+            }
+            catch (final Exception e3)
+            {
+                e3.printStackTrace();
+                PS.debug("&c[ERROR] " + "Failed to save all!");
+            }
+        }
+        if (whenDone != null)
+        {
+            whenDone.run();
+        }
+    }
+
+    public void createSettings(final ArrayList<SettingsPair> myList, final Runnable whenDone)
+    {
+        final StmtMod<SettingsPair> mod = new StmtMod<SettingsPair>()
+        {
+            @Override
+            public String getCreateMySQL(final int size)
+            {
+                return getCreateMySQL(size, "INSERT INTO `" + prefix + "plot_settings`(`plot_plot_id`,`biome`,`rain`,`custom_time`,`time`,`deny_entry`,`alias`,`flags`,`merged`,`position`) VALUES ",
+                10);
+            }
+
+            @Override
+            public String getCreateSQLite(final int size)
+            {
+                return getCreateSQLite(
+                size,
+                "INSERT INTO `"
+                + prefix
+                + "plot_settings` SELECT ? AS `plot_plot_id`, ? AS `biome`, ? AS `rain`, ? AS `custom_time`, ? AS `time`, ? AS `deny_entry`, ? AS `alias`, ? AS `flags`, ? AS `merged`, ? AS `position`",
+                10);
+            }
+
+            @Override
+            public String getCreateSQL()
+            {
+                return "INSERT INTO `" + prefix + "plot_settings`(`plot_plot_id`) VALUES(?)";
+            }
+
+            @Override
+            public void setMySQL(final PreparedStatement stmt, final int i, final SettingsPair pair) throws SQLException
+            {
+                stmt.setInt((i * 10) + 1, pair.id); // id
+                stmt.setNull((i * 10) + 2, 4); // biome
+                stmt.setNull((i * 10) + 3, 4); // rain
+                stmt.setNull((i * 10) + 4, 4); // custom_time
+                stmt.setNull((i * 10) + 5, 4); // time
+                stmt.setNull((i * 10) + 6, 4); // deny_entry
+                if (pair.settings.getAlias().equals(""))
+                {
+                    stmt.setNull((i * 10) + 7, 4);
+                }
+                else
+                {
+                    stmt.setString((i * 10) + 7, pair.settings.getAlias());
+                }
+                if (pair.settings.flags == null)
+                {
+                    stmt.setNull((i * 10) + 8, 4);
+                }
+                else
+                {
+                    final StringBuilder flag_string = new StringBuilder();
+                    int k = 0;
+                    for (final Flag flag : pair.settings.flags.values())
+                    {
+                        if (k != 0)
+                        {
+                            flag_string.append(",");
+                        }
+                        flag_string.append(flag.getKey() + ":" + flag.getValueString().replaceAll(":", "\u00AF").replaceAll(",", "\u00B4"));
+                        k++;
+                    }
+                    stmt.setString((i * 10) + 8, flag_string.toString());
+                }
+                final boolean[] merged = pair.settings.getMerged();
+                int n = 0;
+                for (int j = 0; j < 4; ++j)
+                {
+                    n = (n << 1) + (merged[j] ? 1 : 0);
+                }
+                stmt.setInt((i * 10) + 9, n);
+                final BlockLoc loc = pair.settings.getPosition();
+                String position;
+                if (loc.y == 0)
+                {
+                    position = "DEFAULT";
+                }
+                else
+                {
+                    position = loc.x + "," + loc.y + "," + loc.z;
+                }
+                stmt.setString((i * 10) + 10, position);
+            }
+
+            @Override
+            public void setSQLite(final PreparedStatement stmt, final int i, final SettingsPair pair) throws SQLException
+            {
+                stmt.setInt((i * 10) + 1, pair.id); // id
+                stmt.setNull((i * 10) + 2, 4); // biome
+                stmt.setNull((i * 10) + 3, 4); // rain
+                stmt.setNull((i * 10) + 4, 4); // custom_time
+                stmt.setNull((i * 10) + 5, 4); // time
+                stmt.setNull((i * 10) + 6, 4); // deny_entry
+                if (pair.settings.getAlias().equals(""))
+                {
+                    stmt.setNull((i * 10) + 7, 4);
+                }
+                else
+                {
+                    stmt.setString((i * 10) + 7, pair.settings.getAlias());
+                }
+                if (pair.settings.flags == null)
+                {
+                    stmt.setNull((i * 10) + 8, 4);
+                }
+                else
+                {
+                    final StringBuilder flag_string = new StringBuilder();
+                    int k = 0;
+                    for (final Flag flag : pair.settings.flags.values())
+                    {
+                        if (k != 0)
+                        {
+                            flag_string.append(",");
+                        }
+                        flag_string.append(flag.getKey() + ":" + flag.getValueString().replaceAll(":", "\u00AF").replaceAll(",", "\u00B4"));
+                        k++;
+                    }
+                    stmt.setString((i * 10) + 8, flag_string.toString());
+                }
+                final boolean[] merged = pair.settings.getMerged();
+                int n = 0;
+                for (int j = 0; j < 4; ++j)
+                {
+                    n = (n << 1) + (merged[j] ? 1 : 0);
+                }
+                stmt.setInt((i * 10) + 9, n);
+                final BlockLoc loc = pair.settings.getPosition();
+                String position;
+                if (loc.y == 0)
+                {
+                    position = "DEFAULT";
+                }
+                else
+                {
+                    position = loc.x + "," + loc.y + "," + loc.z;
+                }
+                stmt.setString((i * 10) + 10, position);
+            }
+
+            @Override
+            public void setSQL(final PreparedStatement stmt, final SettingsPair pair) throws SQLException
+            {
+                stmt.setInt(1, pair.id);
+            }
+        };
+        addGlobalTask(new Runnable()
+        {
+            @Override
+            public void run()
+            {
+                setBulk(myList, mod, whenDone);
+            }
+        });
+    }
+
+    public void createEmptySettings(final ArrayList<Integer> myList, final Runnable whenDone)
+    {
+        final StmtMod<Integer> mod = new StmtMod<Integer>()
+        {
+            @Override
+            public String getCreateMySQL(final int size)
+            {
+                return getCreateMySQL(size, CREATE_SETTINGS, 1);
+            }
+
+            @Override
+            public String getCreateSQLite(final int size)
+            {
+                return getCreateSQLite(
+                size,
+                "INSERT INTO `"
+                + prefix
+                + "plot_settings` SELECT ? AS `plot_plot_id`, ? AS `biome`, ? AS `rain`, ? AS `custom_time`, ? AS `time`, ? AS `deny_entry`, ? AS `alias`, ? AS `flags`, ? AS `merged`, ? AS `position` ",
+                10);
+            }
+
+            @Override
+            public String getCreateSQL()
+            {
+                return "INSERT INTO `" + prefix + "plot_settings`(`plot_plot_id`) VALUES(?)";
+            }
+
+            @Override
+            public void setMySQL(final PreparedStatement stmt, final int i, final Integer id) throws SQLException
+            {
+                stmt.setInt((i * 1) + 1, id);
+            }
+
+            @Override
+            public void setSQLite(final PreparedStatement stmt, final int i, final Integer id) throws SQLException
+            {
+                stmt.setInt((i * 10) + 1, id);
+                stmt.setNull((i * 10) + 2, 4);
+                stmt.setNull((i * 10) + 3, 4);
+                stmt.setNull((i * 10) + 4, 4);
+                stmt.setNull((i * 10) + 5, 4);
+                stmt.setNull((i * 10) + 6, 4);
+                stmt.setNull((i * 10) + 7, 4);
+                stmt.setNull((i * 10) + 8, 4);
+                stmt.setNull((i * 10) + 9, 4);
+                stmt.setString((i * 10) + 10, "DEFAULT");
+            }
+
+            @Override
+            public void setSQL(final PreparedStatement stmt, final Integer id) throws SQLException
+            {
+                stmt.setInt(1, id);
+            }
+        };
+        addGlobalTask(new Runnable()
+        {
+            @Override
+            public void run()
+            {
+                setBulk(myList, mod, whenDone);
+            }
+        });
+    }
+
+    /**
+     * Create a plot
+     *
+     * @param plot
+     */
+    @Override
+    public void createPlot(final Plot plot)
+    {
+        addPlotTask(plot, new UniqueStatement("createPlot")
+        {
+            @Override
+            public void set(final PreparedStatement stmt) throws SQLException
+            {
+                stmt.setInt(1, plot.id.x);
+                stmt.setInt(2, plot.id.y);
+                stmt.setString(3, plot.owner.toString());
+                stmt.setString(4, plot.world);
+                stmt.setTimestamp(5, new Timestamp(plot.getTimestamp()));
+            }
+
+            @Override
+            public PreparedStatement get() throws SQLException
+            {
+                return connection.prepareStatement(CREATE_PLOT);
+            }
+        });
+    }
+
+    public void commit()
+    {
+        try
+        {
+            if (CLOSED) { return; }
+            if (!connection.getAutoCommit())
+            {
+                connection.commit();
+                connection.setAutoCommit(true);
+            }
+        }
+        catch (final SQLException e)
+        {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public void createPlotAndSettings(final Plot plot, final Runnable whenDone)
+    {
+        addPlotTask(plot, new UniqueStatement("createPlotAndSettings_" + plot.hashCode())
+        {
+            @Override
+            public void set(final PreparedStatement stmt) throws SQLException
+            {
+                stmt.setInt(1, plot.id.x);
+                stmt.setInt(2, plot.id.y);
+                stmt.setString(3, plot.owner.toString());
+                stmt.setString(4, plot.world);
+                stmt.setTimestamp(5, new Timestamp(plot.getTimestamp()));
+            }
+
+            @Override
+            public PreparedStatement get() throws SQLException
+            {
+                return connection.prepareStatement(CREATE_PLOT, Statement.RETURN_GENERATED_KEYS);
+            }
+
+            @Override
+            public void execute(final PreparedStatement stmt) throws SQLException
+            {
+
+            }
+
+            @Override
+            public void addBatch(final PreparedStatement stmt) throws SQLException
+            {
+                stmt.executeUpdate();
+                final ResultSet keys = stmt.getGeneratedKeys();
+                if (keys.next())
+                {
+                    plot.temp = keys.getInt(1);
+                }
+            }
+        });
+        addPlotTask(plot, new UniqueStatement("createPlotAndSettings_settings_" + plot.hashCode())
+        {
+            @Override
+            public void set(final PreparedStatement stmt) throws SQLException
+            {
+                stmt.setInt(1, getId(plot));
+            }
+
+            @Override
+            public PreparedStatement get() throws SQLException
+            {
+                return connection.prepareStatement("INSERT INTO `" + prefix + "plot_settings`(`plot_plot_id`) VALUES(" + "?)");
+            }
+        });
+        addNotifyTask(whenDone);
+    }
+
+    /**
+     * Create tables
+     *
+     * @throws SQLException
+     */
+    @Override
+    public void createTables() throws SQLException
+    {
+        final String[] tables;
+        if (Settings.ENABLE_CLUSTERS)
+        {
+            tables = new String[] { "plot", "plot_denied", "plot_helpers", "plot_comments", "plot_trusted", "plot_rating", "plot_settings", "cluster" };
+        }
+        else
+        {
+            tables = new String[] { "plot", "plot_denied", "plot_helpers", "plot_comments", "plot_trusted", "plot_rating", "plot_settings" };
+        }
+        final DatabaseMetaData meta = connection.getMetaData();
+        int create = 0;
+        for (final String s : tables)
+        {
+            final ResultSet set = meta.getTables(null, null, prefix + s, new String[] { "TABLE" });
+            //            ResultSet set = meta.getTables(null, null, prefix + s, null);
+            if (!set.next())
+            {
+                create++;
+            }
+            else
+            {}
+            set.close();
+        }
+        if (create == 0) { return; }
+        boolean add_constraint;
+        add_constraint = create == tables.length;
+        PS.debug("Creating tables");
+        final Statement stmt = connection.createStatement();
+        if (MYSQL)
+        {
+            stmt.addBatch("CREATE TABLE IF NOT EXISTS `"
+            + prefix
+            + "plot` ("
+            + "`id` INT(11) NOT NULL AUTO_INCREMENT,"
+            + "`plot_id_x` INT(11) NOT NULL,"
+            + "`plot_id_z` INT(11) NOT NULL,"
+            + "`owner` VARCHAR(40) NOT NULL,"
+            + "`world` VARCHAR(45) NOT NULL,"
+            + "`timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,"
+            + "PRIMARY KEY (`id`)"
+            + ") ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=0");
+            stmt.addBatch("CREATE TABLE IF NOT EXISTS `"
+            + prefix
+            + "plot_denied` ("
+            + "`plot_plot_id` INT(11) NOT NULL,"
+            + "`user_uuid` VARCHAR(40) NOT NULL"
+            + ") ENGINE=InnoDB DEFAULT CHARSET=utf8");
+            stmt.addBatch("CREATE TABLE IF NOT EXISTS `"
+            + prefix
+            + "plot_helpers` ("
+            + "`plot_plot_id` INT(11) NOT NULL,"
+            + "`user_uuid` VARCHAR(40) NOT NULL"
+            + ") ENGINE=InnoDB DEFAULT CHARSET=utf8");
+            stmt.addBatch("CREATE TABLE IF NOT EXISTS `"
+            + prefix
+            + "plot_comments` ("
+            + "`world` VARCHAR(40) NOT NULL, `hashcode` INT(11) NOT NULL,"
+            + "`comment` VARCHAR(40) NOT NULL,"
+            + "`inbox` VARCHAR(40) NOT NULL,"
+            + "`timestamp` INT(11) NOT NULL,"
+            + "`sender` VARCHAR(40) NOT NULL"
+            + ") ENGINE=InnoDB DEFAULT CHARSET=utf8");
+            stmt.addBatch("CREATE TABLE IF NOT EXISTS `"
+            + prefix
+            + "plot_trusted` ("
+            + "`plot_plot_id` INT(11) NOT NULL,"
+            + "`user_uuid` VARCHAR(40) NOT NULL"
+            + ") ENGINE=InnoDB DEFAULT CHARSET=utf8");
+            stmt.addBatch("CREATE TABLE IF NOT EXISTS `"
+            + prefix
+            + "plot_settings` ("
+            + "  `plot_plot_id` INT(11) NOT NULL,"
+            + "  `biome` VARCHAR(45) DEFAULT 'FOREST',"
+            + "  `rain` INT(1) DEFAULT 0,"
+            + "  `custom_time` TINYINT(1) DEFAULT '0',"
+            + "  `time` INT(11) DEFAULT '8000',"
+            + "  `deny_entry` TINYINT(1) DEFAULT '0',"
+            + "  `alias` VARCHAR(50) DEFAULT NULL,"
+            + "  `flags` VARCHAR(512) DEFAULT NULL,"
+            + "  `merged` INT(11) DEFAULT NULL,"
+            + "  `position` VARCHAR(50) NOT NULL DEFAULT 'DEFAULT',"
+            + "  PRIMARY KEY (`plot_plot_id`),"
+            + "  UNIQUE KEY `unique_alias` (`alias`)"
+            + ") ENGINE=InnoDB DEFAULT CHARSET=utf8");
+            stmt.addBatch("CREATE TABLE IF NOT EXISTS `"
+            + prefix
+            + "plot_rating` ( `plot_plot_id` INT(11) NOT NULL, `rating` INT(2) NOT NULL, `player` VARCHAR(40) NOT NULL) ENGINE=InnoDB DEFAULT CHARSET=utf8");
+            if (add_constraint)
+            {
+                stmt.addBatch("ALTER TABLE `"
+                + prefix
+                + "plot_settings` ADD CONSTRAINT `"
+                + prefix
+                + "plot_settings_ibfk_1` FOREIGN KEY (`plot_plot_id`) REFERENCES `"
+                + prefix
+                + "plot` (`id`) ON DELETE CASCADE");
+            }
+            stmt.addBatch("CREATE TABLE IF NOT EXISTS `"
+            + prefix
+            + "cluster` ("
+            + "`id` INT(11) NOT NULL AUTO_INCREMENT,"
+            + "`pos1_x` INT(11) NOT NULL,"
+            + "`pos1_z` INT(11) NOT NULL,"
+            + "`pos2_x` INT(11) NOT NULL,"
+            + "`pos2_z` INT(11) NOT NULL,"
+            + "`owner` VARCHAR(40) NOT NULL,"
+            + "`world` VARCHAR(45) NOT NULL,"
+            + "`timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,"
+            + "PRIMARY KEY (`id`)"
+            + ") ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=0");
+            stmt.addBatch("CREATE TABLE IF NOT EXISTS `"
+            + prefix
+            + "cluster_helpers` ("
+            + "`cluster_id` INT(11) NOT NULL,"
+            + "`user_uuid` VARCHAR(40) NOT NULL"
+            + ") ENGINE=InnoDB DEFAULT CHARSET=utf8");
+            stmt.addBatch("CREATE TABLE IF NOT EXISTS `"
+            + prefix
+            + "cluster_invited` ("
+            + "`cluster_id` INT(11) NOT NULL,"
+            + "`user_uuid` VARCHAR(40) NOT NULL"
+            + ") ENGINE=InnoDB DEFAULT CHARSET=utf8");
+            stmt.addBatch("CREATE TABLE IF NOT EXISTS `"
+            + prefix
+            + "cluster_settings` ("
+            + "  `cluster_id` INT(11) NOT NULL,"
+            + "  `biome` VARCHAR(45) DEFAULT 'FOREST',"
+            + "  `rain` INT(1) DEFAULT 0,"
+            + "  `custom_time` TINYINT(1) DEFAULT '0',"
+            + "  `time` INT(11) DEFAULT '8000',"
+            + "  `deny_entry` TINYINT(1) DEFAULT '0',"
+            + "  `alias` VARCHAR(50) DEFAULT NULL,"
+            + "  `flags` VARCHAR(512) DEFAULT NULL,"
+            + "  `merged` INT(11) DEFAULT NULL,"
+            + "  `position` VARCHAR(50) NOT NULL DEFAULT 'DEFAULT',"
+            + "  PRIMARY KEY (`cluster_id`)"
+            + ") ENGINE=InnoDB DEFAULT CHARSET=utf8");
+        }
+        else
+        {
+            stmt.addBatch("CREATE TABLE IF NOT EXISTS `"
+            + prefix
+            + "plot` ("
+            + "`id` INTEGER PRIMARY KEY AUTOINCREMENT,"
+            + "`plot_id_x` INT(11) NOT NULL,"
+            + "`plot_id_z` INT(11) NOT NULL,"
+            + "`owner` VARCHAR(45) NOT NULL,"
+            + "`world` VARCHAR(45) NOT NULL,"
+            + "`timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP)");
+            stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + prefix + "plot_denied` (" + "`plot_plot_id` INT(11) NOT NULL," + "`user_uuid` VARCHAR(40) NOT NULL" + ")");
+            stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + prefix + "plot_helpers` (" + "`plot_plot_id` INT(11) NOT NULL," + "`user_uuid` VARCHAR(40) NOT NULL" + ")");
+            stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + prefix + "plot_trusted` (" + "`plot_plot_id` INT(11) NOT NULL," + "`user_uuid` VARCHAR(40) NOT NULL" + ")");
+            stmt.addBatch("CREATE TABLE IF NOT EXISTS `"
+            + prefix
+            + "plot_comments` ("
+            + "`world` VARCHAR(40) NOT NULL, `hashcode` INT(11) NOT NULL,"
+            + "`comment` VARCHAR(40) NOT NULL,"
+            + "`inbox` VARCHAR(40) NOT NULL, `timestamp` INT(11) NOT NULL,"
+            + "`sender` VARCHAR(40) NOT NULL"
+            + ")");
+            stmt.addBatch("CREATE TABLE IF NOT EXISTS `"
+            + prefix
+            + "plot_settings` ("
+            + "  `plot_plot_id` INT(11) NOT NULL,"
+            + "  `biome` VARCHAR(45) DEFAULT 'FOREST',"
+            + "  `rain` INT(1) DEFAULT 0,"
+            + "  `custom_time` TINYINT(1) DEFAULT '0',"
+            + "  `time` INT(11) DEFAULT '8000',"
+            + "  `deny_entry` TINYINT(1) DEFAULT '0',"
+            + "  `alias` VARCHAR(50) DEFAULT NULL,"
+            + "  `flags` VARCHAR(512) DEFAULT NULL,"
+            + "  `merged` INT(11) DEFAULT NULL,"
+            + "  `position` VARCHAR(50) NOT NULL DEFAULT 'DEFAULT',"
+            + "  PRIMARY KEY (`plot_plot_id`)"
+            + ")");
+            stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + prefix + "plot_rating` (`plot_plot_id` INT(11) NOT NULL, `rating` INT(2) NOT NULL, `player` VARCHAR(40) NOT NULL)");
+            stmt.addBatch("CREATE TABLE IF NOT EXISTS `"
+            + prefix
+            + "cluster` ("
+            + "`id` INTEGER PRIMARY KEY AUTOINCREMENT,"
+            + "`pos1_x` INT(11) NOT NULL,"
+            + "`pos1_z` INT(11) NOT NULL,"
+            + "`pos2_x` INT(11) NOT NULL,"
+            + "`pos2_z` INT(11) NOT NULL,"
+            + "`owner` VARCHAR(40) NOT NULL,"
+            + "`world` VARCHAR(45) NOT NULL,"
+            + "`timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP"
+            + ")");
+            stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + prefix + "cluster_helpers` (" + "`cluster_id` INT(11) NOT NULL," + "`user_uuid` VARCHAR(40) NOT NULL" + ")");
+            stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + prefix + "cluster_invited` (" + "`cluster_id` INT(11) NOT NULL," + "`user_uuid` VARCHAR(40) NOT NULL" + ")");
+            stmt.addBatch("CREATE TABLE IF NOT EXISTS `"
+            + prefix
+            + "cluster_settings` ("
+            + "  `cluster_id` INT(11) NOT NULL,"
+            + "  `biome` VARCHAR(45) DEFAULT 'FOREST',"
+            + "  `rain` INT(1) DEFAULT 0,"
+            + "  `custom_time` TINYINT(1) DEFAULT '0',"
+            + "  `time` INT(11) DEFAULT '8000',"
+            + "  `deny_entry` TINYINT(1) DEFAULT '0',"
+            + "  `alias` VARCHAR(50) DEFAULT NULL,"
+            + "  `flags` VARCHAR(512) DEFAULT NULL,"
+            + "  `merged` INT(11) DEFAULT NULL,"
+            + "  `position` VARCHAR(50) NOT NULL DEFAULT 'DEFAULT',"
+            + "  PRIMARY KEY (`cluster_id`)"
+            + ")");
+        }
+        stmt.executeBatch();
+        stmt.clearBatch();
+        stmt.close();
+    }
+
+    /**
+     * Delete a plot
+     *
+     * @param plot
+     */
+    @Override
+    public void delete(final Plot plot)
+    {
+        PS.get().removePlot(plot.world, plot.id, false);
+        addPlotTask(plot, new UniqueStatement("delete_plot_settings")
+        {
+            @Override
+            public void set(final PreparedStatement stmt) throws SQLException
+            {
+                stmt.setInt(1, getId(plot));
+            }
+
+            @Override
+            public PreparedStatement get() throws SQLException
+            {
+                return connection.prepareStatement("DELETE FROM `" + prefix + "plot_settings` WHERE `plot_plot_id` = ?");
+            }
+        });
+        addPlotTask(plot, new UniqueStatement("delete_plot_helpers")
+        {
+            @Override
+            public void set(final PreparedStatement stmt) throws SQLException
+            {
+                stmt.setInt(1, getId(plot));
+            }
+
+            @Override
+            public PreparedStatement get() throws SQLException
+            {
+                return connection.prepareStatement("DELETE FROM `" + prefix + "plot_helpers` WHERE `plot_plot_id` = ?");
+            }
+        });
+        addPlotTask(plot, new UniqueStatement("delete_plot_trusted")
+        {
+            @Override
+            public void set(final PreparedStatement stmt) throws SQLException
+            {
+                stmt.setInt(1, getId(plot));
+            }
+
+            @Override
+            public PreparedStatement get() throws SQLException
+            {
+                return connection.prepareStatement("DELETE FROM `" + prefix + "plot_trusted` WHERE `plot_plot_id` = ?");
+            }
+        });
+        addPlotTask(plot, new UniqueStatement("delete_plot_denied")
+        {
+            @Override
+            public void set(final PreparedStatement stmt) throws SQLException
+            {
+                stmt.setInt(1, getId(plot));
+            }
+
+            @Override
+            public PreparedStatement get() throws SQLException
+            {
+                return connection.prepareStatement("DELETE FROM `" + prefix + "plot_denied` WHERE `plot_plot_id` = ?");
+            }
+        });
+        addPlotTask(plot, new UniqueStatement("delete_plot_comments")
+        {
+            @Override
+            public void set(final PreparedStatement stmt) throws SQLException
+            {
+                stmt.setString(1, plot.world);
+                stmt.setInt(2, plot.hashCode());
+            }
+
+            @Override
+            public PreparedStatement get() throws SQLException
+            {
+                return connection.prepareStatement("DELETE FROM `" + prefix + "plot_comments` WHERE `world` = ? AND `hashcode` = ?");
+            }
+        });
+        addPlotTask(plot, new UniqueStatement("delete_plot")
+        {
+            @Override
+            public void set(final PreparedStatement stmt) throws SQLException
+            {
+                stmt.setInt(1, getId(plot));
+            }
+
+            @Override
+            public PreparedStatement get() throws SQLException
+            {
+                return connection.prepareStatement("DELETE FROM `" + prefix + "plot` WHERE `id` = ?");
+            }
+        });
+    }
+
+    /**
+     * Create plot settings
+     *
+     * @param id
+     * @param plot
+     */
+    @Override
+    public void createPlotSettings(final int id, final Plot plot)
+    {
+        addPlotTask(plot, new UniqueStatement("createPlotSettings")
+        {
+            @Override
+            public void set(final PreparedStatement stmt) throws SQLException
+            {
+                stmt.setInt(1, id);
+            }
+
+            @Override
+            public PreparedStatement get() throws SQLException
+            {
+                return connection.prepareStatement("INSERT INTO `" + prefix + "plot_settings`(`plot_plot_id`) VALUES(" + "?)");
+            }
+        });
+    }
+
+    @Override
+    public int getId(final Plot plot)
+    {
+        if (plot.temp > 0) { return plot.temp; }
+        PreparedStatement stmt = null;
+        try
+        {
+            commit();
+            if (plot.temp > 0) { return plot.temp; }
+            stmt = connection.prepareStatement("SELECT `id` FROM `" + prefix + "plot` WHERE `plot_id_x` = ? AND `plot_id_z` = ? AND world = ? ORDER BY `timestamp` ASC");
+            stmt.setInt(1, plot.id.x);
+            stmt.setInt(2, plot.id.y);
+            stmt.setString(3, plot.world);
+            final ResultSet r = stmt.executeQuery();
+            int id = Integer.MAX_VALUE;
+            while (r.next())
+            {
+                id = r.getInt("id");
+            }
+            r.close();
+            stmt.close();
+            if ((id == Integer.MAX_VALUE) || (id == 0))
+            {
+                if (plot.temp > 0) { return plot.temp; }
+                id = 1 / 0;
+            }
+            plot.temp = id;
+            return id;
+        }
+        catch (final SQLException e)
+        {
+            e.printStackTrace();
+        }
+        return Integer.MAX_VALUE;
+    }
+
+    public void updateTables()
+    {
+
+        // TODO task
+
+        if (PS.get().getVersion().equals(PS.get().getLastVersion()) || (PS.get().getLastVersion() == null)) { return; }
+        try
+        {
+            final DatabaseMetaData data = connection.getMetaData();
+            ResultSet rs = data.getColumns(null, null, prefix + "plot_comments", "plot_plot_id");
+            if (rs.next())
+            {
+                rs.close();
+                rs = data.getColumns(null, null, prefix + "plot_comments", "hashcode");
+                if (!rs.next())
+                {
+                    rs.close();
+                    try
+                    {
+                        final Statement statement = connection.createStatement();
+                        statement.addBatch("DROP TABLE `" + prefix + "plot_comments`");
+                        if (Settings.DB.USE_MYSQL)
+                        {
+                            statement.addBatch("CREATE TABLE IF NOT EXISTS `"
+                            + prefix
+                            + "plot_comments` ("
+                            + "`world` VARCHAR(40) NOT NULL, `hashcode` INT(11) NOT NULL,"
+                            + "`comment` VARCHAR(40) NOT NULL,"
+                            + "`inbox` VARCHAR(40) NOT NULL,"
+                            + "`timestamp` INT(11) NOT NULL,"
+                            + "`sender` VARCHAR(40) NOT NULL"
+                            + ") ENGINE=InnoDB DEFAULT CHARSET=utf8");
+                        }
+                        else
+                        {
+                            statement.addBatch("CREATE TABLE IF NOT EXISTS `"
+                            + prefix
+                            + "plot_comments` ("
+                            + "`world` VARCHAR(40) NOT NULL, `hashcode` INT(11) NOT NULL,"
+                            + "`comment` VARCHAR(40) NOT NULL,"
+                            + "`inbox` VARCHAR(40) NOT NULL, `timestamp` INT(11) NOT NULL,"
+                            + "`sender` VARCHAR(40) NOT NULL"
+                            + ")");
+                        }
+                        statement.executeBatch();
+                        statement.close();
+                    }
+                    catch (final SQLException e)
+                    {
+                        final Statement statement = connection.createStatement();
+                        statement.addBatch("ALTER IGNORE TABLE `" + prefix + "plot_comments` ADD `inbox` VARCHAR(11) DEFAULT `public`");
+                        statement.addBatch("ALTER IGNORE TABLE `" + prefix + "plot_comments` ADD `timestamp` INT(11) DEFAULT 0");
+                        statement.addBatch("ALTER TABLE `" + prefix + "plot` DROP `tier`");
+                        statement.executeBatch();
+                        statement.close();
+                    }
+                }
+            }
+            rs.close();
+            rs = data.getColumns(null, null, prefix + "plot_denied", "plot_plot_id");
+            if (rs.next())
+            {
+                try (Statement statement = connection.createStatement())
+                {
+                    statement.executeUpdate("DELETE FROM `" + prefix + "plot_denied` WHERE `plot_plot_id` NOT IN (SELECT `id` FROM `" + prefix + "plot`)");
+                    statement.close();
+                }
+                catch (final Exception e)
+                {
+                    e.printStackTrace();
+                }
+
+                rs.close();
+                try (Statement statement = connection.createStatement())
+                {
+                    for (final String table : new String[] { "plot_denied", "plot_helpers", "plot_trusted" })
+                    {
+                        final ResultSet result = statement.executeQuery("SELECT plot_plot_id, user_uuid, COUNT(*) FROM " + prefix + table + " GROUP BY plot_plot_id, user_uuid HAVING COUNT(*) > 1");
+                        if (result.next())
+                        {
+                            PS.debug("BACKING UP: " + prefix + table);
+                            result.close();
+                            statement.executeUpdate("CREATE TABLE " + prefix + table + "_tmp AS SELECT * FROM " + prefix + table + " GROUP BY plot_plot_id, user_uuid");
+                            statement.executeUpdate("DROP TABLE " + prefix + table);
+                            statement.executeUpdate("CREATE TABLE " + prefix + table + " AS SELECT * FROM " + prefix + table + "_tmp");
+                            statement.executeUpdate("DROP TABLE " + prefix + table + "_tmp");
+                            PS.debug("RESTORING: " + prefix + table);
+                        }
+                    }
+                    statement.close();
+                }
+                catch (final Exception e2)
+                {
+                    e2.printStackTrace();
+                }
+            }
+        }
+        catch (final Exception e)
+        {
+            e.printStackTrace();
+        }
+
+    }
+
+    /**
+     * Load all plots, helpers, denied, trusted, and every setting from DB into a hashmap
+     */
+    @Override
+    public ConcurrentHashMap<String, ConcurrentHashMap<PlotId, Plot>> getPlots()
+    {
+        final ConcurrentHashMap<String, ConcurrentHashMap<PlotId, Plot>> newplots = new ConcurrentHashMap<String, ConcurrentHashMap<PlotId, Plot>>();
+        final HashMap<Integer, Plot> plots = new HashMap<>();
+        Statement stmt = null;
+        try
+        {
+            Set<String> worlds = new HashSet<>();
+            if (PS.get().config.contains("worlds"))
+            {
+                worlds = PS.get().config.getConfigurationSection("worlds").getKeys(false);
+            }
+            final HashMap<String, UUID> uuids = new HashMap<String, UUID>();
+            final HashMap<String, Integer> noExist = new HashMap<String, Integer>();
+
+            PlotId plot_id;
+            int id;
+            Plot p;
+            String o;
+            UUID user;
+
+            /*
+             * Getting plots
+             */
+            stmt = connection.createStatement();
+            try (ResultSet r = stmt.executeQuery("SELECT `id`, `plot_id_x`, `plot_id_z`, `owner`, `world`, `timestamp` FROM `" + prefix + "plot`"))
+            {
+                while (r.next())
+                {
+                    plot_id = new PlotId(r.getInt("plot_id_x"), r.getInt("plot_id_z"));
+                    id = r.getInt("id");
+                    final String worldname = r.getString("world");
+                    if (!worlds.contains(worldname))
+                    {
+                        if (noExist.containsKey(worldname))
+                        {
+                            noExist.put(worldname, noExist.get(worldname) + 1);
+                        }
+                        else
+                        {
+                            noExist.put(worldname, 1);
+                        }
+                    }
+                    o = r.getString("owner");
+                    user = uuids.get(o);
+                    if (user == null)
+                    {
+                        user = UUID.fromString(o);
+                        uuids.put(o, user);
+                    }
+                    Timestamp timestamp = null;
+                    try
+                    {
+                        timestamp = r.getTimestamp("timestamp");
+                    }
+                    catch (final Exception e)
+                    {};
+                    long time;
+                    if (timestamp == null)
+                    {
+                        time = plot_id.hashCode();
+                    }
+                    else
+                    {
+                        time = timestamp.getTime();
+                    }
+                    p = new Plot(plot_id, user, new HashSet<UUID>(), new HashSet<UUID>(), new HashSet<UUID>(), "", null, null, worldname, new boolean[] { false, false, false, false }, time, id);
+                    plots.put(id, p);
+                }
+            }
+            if (Settings.CACHE_RATINGS)
+            {
+                try (ResultSet r = stmt.executeQuery("SELECT `plot_plot_id`, `player`, `rating` FROM `" + prefix + "plot_rating`"))
+                {
+                    while (r.next())
+                    {
+                        id = r.getInt("plot_plot_id");
+                        o = r.getString("player");
+                        user = uuids.get(o);
+                        if (user == null)
+                        {
+                            user = UUID.fromString(o);
+                            uuids.put(o, user);
+                        }
+                        final Plot plot = plots.get(id);
+                        if (plot != null)
+                        {
+                            if (plot.getSettings().ratings == null)
+                            {
+                                plot.getSettings().ratings = new HashMap<UUID, Integer>();
+                            }
+                            plot.getSettings().ratings.put(user, r.getInt("rating"));
+                        }
+                        else
+                        {
+                            PS.debug("&cPLOT " + id + " in plot_helpers does not exist. Please create the plot or remove this entry.");
+                        }
+                    }
+                }
+            }
+
+            /*
+             * Getting helpers
+             */
+            try (ResultSet r = stmt.executeQuery("SELECT `user_uuid`, `plot_plot_id` FROM `" + prefix + "plot_helpers`"))
+            {
+                while (r.next())
+                {
+                    id = r.getInt("plot_plot_id");
+                    o = r.getString("user_uuid");
+                    user = uuids.get(o);
+                    if (user == null)
+                    {
+                        user = UUID.fromString(o);
+                        uuids.put(o, user);
+                    }
+                    final Plot plot = plots.get(id);
+                    if (plot != null)
+                    {
+                        plot.getTrusted().add(user);
+                    }
+                    else
+                    {
+                        PS.debug("&cPLOT " + id + " in plot_helpers does not exist. Please create the plot or remove this entry.");
+                    }
+                }
+            }
+
+            /*
+             * Getting trusted
+             */
+            try (ResultSet r = stmt.executeQuery("SELECT `user_uuid`, `plot_plot_id` FROM `" + prefix + "plot_trusted`"))
+            {
+                while (r.next())
+                {
+                    id = r.getInt("plot_plot_id");
+                    o = r.getString("user_uuid");
+                    user = uuids.get(o);
+                    if (user == null)
+                    {
+                        user = UUID.fromString(o);
+                        uuids.put(o, user);
+                    }
+                    final Plot plot = plots.get(id);
+                    if (plot != null)
+                    {
+                        plot.getMembers().add(user);
+                    }
+                    else
+                    {
+                        PS.debug("&cPLOT " + id + " in plot_trusted does not exist. Please create the plot or remove this entry.");
+                    }
+                }
+            }
+
+            /*
+             * Getting denied
+             */
+            try (ResultSet r = stmt.executeQuery("SELECT `user_uuid`, `plot_plot_id` FROM `" + prefix + "plot_denied`"))
+            {
+                while (r.next())
+                {
+                    id = r.getInt("plot_plot_id");
+                    o = r.getString("user_uuid");
+                    user = uuids.get(o);
+                    if (user == null)
+                    {
+                        user = UUID.fromString(o);
+                        uuids.put(o, user);
+                    }
+                    final Plot plot = plots.get(id);
+                    if (plot != null)
+                    {
+                        plot.getDenied().add(user);
+                    }
+                    else
+                    {
+                        PS.debug("&cPLOT " + id + " in plot_denied does not exist. Please create the plot or remove this entry.");
+                    }
+                }
+            }
+
+            try (ResultSet r = stmt.executeQuery("SELECT * FROM `" + prefix + "plot_settings`"))
+            {
+                while (r.next())
+                {
+                    id = r.getInt("plot_plot_id");
+                    final Plot plot = plots.get(id);
+                    if (plot != null)
+                    {
+                        plots.remove(id);
+                        if (!newplots.containsKey(plot.world))
+                        {
+                            newplots.put(plot.world, new ConcurrentHashMap<PlotId, Plot>());
+                        }
+                        newplots.get(plot.world).put(plot.id, plot);
+                        final String alias = r.getString("alias");
+                        if (alias != null)
+                        {
+                            plot.getSettings().setAlias(alias);
+                        }
+                        final String pos = r.getString("position");
+                        switch (pos.toLowerCase())
+                        {
+                            case "":
+                            case "default":
+                            case "0,0,0":
+                            case "center":
+                                break;
+                            default:
+                                try
+                                {
+                                    plot.getSettings().setPosition(BlockLoc.fromString(pos));
+                                }
+                                catch (final Exception e)
+                                {}
+                        }
+                        final Integer m = r.getInt("merged");
+                        if (m != null)
+                        {
+                            final boolean[] merged = new boolean[4];
+                            for (int i = 0; i < 4; i++)
+                            {
+                                merged[3 - i] = ((m) & (1 << i)) != 0;
+                            }
+                            plot.getSettings().setMerged(merged);
+                        }
+                        else
+                        {
+                            plot.getSettings().setMerged(new boolean[] { false, false, false, false });
+                        }
+                        String[] flags_string;
+                        final String myflags = r.getString("flags");
+                        if (myflags == null)
+                        {
+                            flags_string = new String[] {};
+                        }
+                        else
+                        {
+                            if (myflags.length() > 0)
+                            {
+                                flags_string = myflags.split(",");
+                            }
+                            else
+                            {
+                                flags_string = new String[] {};
+                            }
+                        }
+                        final HashMap<String, Flag> flags = new HashMap<>();
+                        boolean exception = false;
+                        for (String element : flags_string)
+                        {
+                            if (element.contains(":"))
+                            {
+                                final String[] split = element.split(":");
+                                try
+                                {
+                                    final String flag_str = split[1].replaceAll("\u00AF", ":").replaceAll("\u00B4", ",");
+                                    final Flag flag = new Flag(FlagManager.getFlag(split[0], true), flag_str);
+                                    flags.put(flag.getKey(), flag);
+                                }
+                                catch (final Exception e)
+                                {
+                                    e.printStackTrace();
+                                    exception = true;
+                                }
+                            }
+                            else
+                            {
+                                element = element.replaceAll("\u00AF", ":").replaceAll("\u00B4", ",");
+                                if (StringMan.isAlpha(element.replaceAll("_", "").replaceAll("-", "")))
+                                {
+                                    final Flag flag = new Flag(FlagManager.getFlag(element, true), "");
+                                    flags.put(flag.getKey(), flag);
+                                }
+                                else
+                                {
+                                    PS.debug("INVALID FLAG: " + element);
+                                }
+                            }
+                        }
+                        if (exception)
+                        {
+                            PS.debug("&cPlot " + id + " | " + plot + " had an invalid flag. A fix has been attempted.");
+                            PS.debug("&c" + myflags);
+                            this.setFlags(plot, flags.values());
+                        }
+                        plot.getSettings().flags = flags;
+                    }
+                    else
+                    {
+                        PS.debug("&cPLOT " + id + " in plot_settings does not exist. Please create the plot or remove this entry.");
+                    }
+                }
+                stmt.close();
+            }
+            if (plots.entrySet().size() > 0)
+            {
+                createEmptySettings(new ArrayList<Integer>(plots.keySet()), null);
+            }
+            boolean invalidPlot = false;
+            for (final Entry<String, Integer> entry : noExist.entrySet())
+            {
+                final String worldname = entry.getKey();
+                invalidPlot = true;
+                PS.debug("&c[WARNING] Found " + noExist.get(worldname) + " plots in DB for non existant world; '" + worldname + "'.");
+            }
+            if (invalidPlot)
+            {
+                PS.debug("&c[WARNING] - Please create the world/s or remove the plots using the purge command");
+            }
+        }
+        catch (final SQLException e)
+        {
+            PS.debug("&7[WARN] " + "Failed to load plots.");
+            e.printStackTrace();
+        }
+        return newplots;
+    }
+
+    @Override
+    public void setMerged(final Plot plot, final boolean[] merged)
+    {
+        plot.getSettings().setMerged(merged);
+        addPlotTask(plot, new UniqueStatement("setMerged")
+        {
+            @Override
+            public void set(final PreparedStatement stmt) throws SQLException
+            {
+                int n = 0;
+                for (int i = 0; i < 4; ++i)
+                {
+                    n = (n << 1) + (merged[i] ? 1 : 0);
+                }
+                stmt.setInt(1, n);
+                stmt.setInt(2, getId(plot));
+            }
+
+            @Override
+            public PreparedStatement get() throws SQLException
+            {
+                return connection.prepareStatement("UPDATE `" + prefix + "plot_settings` SET `merged` = ? WHERE `plot_plot_id` = ?");
+            }
+        });
+    }
+
+    @Override
+    public void swapPlots(final Plot p1, final Plot p2)
+    {
+        final int id1 = getId(p1);
+        final int id2 = getId(p2);
+        final PlotId pos1 = p1.getId();
+        final PlotId pos2 = p2.getId();
+        addPlotTask(p1, new UniqueStatement("swapPlots")
+        {
+            @Override
+            public void set(final PreparedStatement stmt) throws SQLException
+            {
+                stmt.setInt(1, pos2.x);
+                stmt.setInt(2, pos2.y);
+                stmt.setInt(3, id1);
+            }
+
+            @Override
+            public PreparedStatement get() throws SQLException
+            {
+                return connection.prepareStatement("UPDATE `" + prefix + "plot` SET `plot_id_x` = ?, `plot_id_z` = ? WHERE `id` = ?");
+            }
+        });
+        addPlotTask(p2, new UniqueStatement("swapPlots")
+        {
+            @Override
+            public void set(final PreparedStatement stmt) throws SQLException
+            {
+                stmt.setInt(1, pos1.x);
+                stmt.setInt(2, pos1.y);
+                stmt.setInt(3, id2);
+            }
+
+            @Override
+            public PreparedStatement get() throws SQLException
+            {
+                return connection.prepareStatement("UPDATE `" + prefix + "plot` SET `plot_id_x` = ?, `plot_id_z` = ? WHERE `id` = ?");
+            }
+        });
+    }
+
+    @Override
+    public void movePlot(final Plot original, final Plot newPlot)
+    {
+        addPlotTask(original, new UniqueStatement("movePlot")
+        {
+            @Override
+            public void set(final PreparedStatement stmt) throws SQLException
+            {
+                stmt.setInt(1, newPlot.id.x);
+                stmt.setInt(2, newPlot.id.y);
+                stmt.setInt(3, getId(original));
+            }
+
+            @Override
+            public PreparedStatement get() throws SQLException
+            {
+                return connection.prepareStatement("UPDATE `" + prefix + "plot` SET `plot_id_x` = ?, `plot_id_z` = ? WHERE `id` = ?");
+            }
+        });
+        addPlotTask(newPlot, null);
+    }
+
+    @Override
+    public void setFlags(final Plot plot, final Collection<Flag> flags)
+    {
+        final StringBuilder flag_string = new StringBuilder();
+        int i = 0;
+        for (final Flag flag : flags)
+        {
+            if (i != 0)
+            {
+                flag_string.append(",");
+            }
+            flag_string.append(flag.getKey() + ":" + flag.getValueString().replaceAll(":", "\u00AF").replaceAll(",", "\u00B4"));
+            i++;
+        }
+        addPlotTask(plot, new UniqueStatement("setFlags")
+        {
+            @Override
+            public void set(final PreparedStatement stmt) throws SQLException
+            {
+                stmt.setString(1, flag_string.toString());
+                stmt.setInt(2, getId(plot));
+            }
+
+            @Override
+            public PreparedStatement get() throws SQLException
+            {
+                return connection.prepareStatement("UPDATE `" + prefix + "plot_settings` SET `flags` = ? WHERE `plot_plot_id` = ?");
+            }
+        });
+    }
+
+    @Override
+    public void setAlias(final Plot plot, final String alias)
+    {
+        addPlotTask(plot, new UniqueStatement("setAlias")
+        {
+            @Override
+            public void set(final PreparedStatement stmt) throws SQLException
+            {
+                stmt.setString(1, alias);
+                stmt.setInt(2, getId(plot));
+            }
+
+            @Override
+            public PreparedStatement get() throws SQLException
+            {
+                return connection.prepareStatement("UPDATE `" + prefix + "plot_settings` SET `alias` = ?  WHERE `plot_plot_id` = ?");
+            }
+        });
+    }
+
+    /**
+     * Purge all plots with the following database IDs
+     */
+    @Override
+    public void purgeIds(final String world, final Set<Integer> uniqueIds)
+    {
+        addGlobalTask(new Runnable()
+        {
+            @Override
+            public void run()
+            {
+                if (uniqueIds.size() > 0)
+                {
+                    try
+                    {
+                        String stmt_prefix = "";
+                        final StringBuilder idstr2 = new StringBuilder("");
+                        for (final Integer id : uniqueIds)
+                        {
+                            idstr2.append(stmt_prefix + id);
+                            stmt_prefix = " OR `id` = ";
+                        }
+                        stmt_prefix = "";
+                        final StringBuilder idstr = new StringBuilder("");
+                        for (final Integer id : uniqueIds)
+                        {
+                            idstr.append(stmt_prefix + id);
+                            stmt_prefix = " OR `plot_plot_id` = ";
+                        }
+                        PreparedStatement stmt = connection.prepareStatement("DELETE FROM `" + prefix + "plot_helpers` WHERE `plot_plot_id` = " + idstr + "");
+                        stmt.executeUpdate();
+                        stmt.close();
+                        stmt = connection.prepareStatement("DELETE FROM `" + prefix + "plot_denied` WHERE `plot_plot_id` = " + idstr + "");
+                        stmt.executeUpdate();
+                        stmt.close();
+                        stmt = connection.prepareStatement("DELETE FROM `" + prefix + "plot_settings` WHERE `plot_plot_id` = " + idstr + "");
+                        stmt.executeUpdate();
+                        stmt.close();
+                        stmt = connection.prepareStatement("DELETE FROM `" + prefix + "plot_trusted` WHERE `plot_plot_id` = " + idstr + "");
+                        stmt.executeUpdate();
+                        stmt.close();
+                        stmt = connection.prepareStatement("DELETE FROM `" + prefix + "plot` WHERE `id` = " + idstr2 + "");
+                        stmt.executeUpdate();
+                        stmt.close();
+                    }
+                    catch (final SQLException e)
+                    {
+                        e.printStackTrace();
+                        PS.debug("&c[ERROR] " + "FAILED TO PURGE WORLD '" + world + "'!");
+                        return;
+                    }
+                }
+                PS.debug("&6[INFO] " + "SUCCESSFULLY PURGED WORLD '" + world + "'!");
+            }
+        });
+    }
+
+    @Override
+    public void purge(final String world, final Set<PlotId> plots)
+    {
+        addGlobalTask(new Runnable()
+        {
+            @Override
+            public void run()
+            {
+                PreparedStatement stmt;
+                try
+                {
+                    stmt = connection.prepareStatement("SELECT `id`, `plot_id_x`, `plot_id_z` FROM `" + prefix + "plot` WHERE `world` = ?");
+                    stmt.setString(1, world);
+                    final ResultSet r = stmt.executeQuery();
+                    PlotId plot_id;
+                    final Set<Integer> ids = new HashSet<>();
+                    while (r.next())
+                    {
+                        plot_id = new PlotId(r.getInt("plot_id_x"), r.getInt("plot_id_z"));
+                        if (plots.contains(plot_id))
+                        {
+                            ids.add(r.getInt("id"));
+                        }
+                    }
+                    purgeIds(world, ids);
+                    stmt.close();
+                    r.close();
+                    for (final Iterator<PlotId> iter = plots.iterator(); iter.hasNext();)
+                    {
+                        final PlotId plotId = iter.next();
+                        iter.remove();
+                        final PlotId id = new PlotId(plotId.x, plotId.y);
+                        PS.get().removePlot(world, new PlotId(id.x, id.y), true);
+                    }
+                }
+                catch (final SQLException e)
+                {
+                    e.printStackTrace();
+                    PS.debug("&c[ERROR] " + "FAILED TO PURGE WORLD '" + world + "'!");
+                }
+            }
+        });
+    }
+
+    @Override
+    public void setPosition(final Plot plot, final String position)
+    {
+        addPlotTask(plot, new UniqueStatement("setPosition")
+        {
+            @Override
+            public void set(final PreparedStatement stmt) throws SQLException
+            {
+                stmt.setString(1, position);
+                stmt.setInt(2, getId(plot));
+            }
+
+            @Override
+            public PreparedStatement get() throws SQLException
+            {
+                return connection.prepareStatement("UPDATE `" + prefix + "plot_settings` SET `position` = ?  WHERE `plot_plot_id` = ?");
+            }
+        });
+    }
+
+    @Override
+    public void removeComment(final Plot plot, final PlotComment comment)
+    {
+        addPlotTask(plot, new UniqueStatement("removeComment")
+        {
+            @Override
+            public void set(final PreparedStatement statement) throws SQLException
+            {
+                if (plot != null)
+                {
+                    statement.setString(1, plot.world);
+                    statement.setInt(2, plot.id.hashCode());
+                    statement.setString(3, comment.comment);
+                    statement.setString(4, comment.inbox);
+                    statement.setString(5, comment.senderName);
+                }
+                else
+                {
+                    statement.setString(1, comment.comment);
+                    statement.setString(2, comment.inbox);
+                    statement.setString(3, comment.senderName);
+                }
+            }
+
+            @Override
+            public PreparedStatement get() throws SQLException
+            {
+                if (plot != null) {
+                return connection.prepareStatement("DELETE FROM `"
+                + prefix
+                + "plot_comments` WHERE `world` = ? AND `hashcode` = ? AND `comment` = ? AND `inbox` = ? AND `sender` = ?");
+                }
+                return connection.prepareStatement("DELETE FROM `" + prefix + "plot_comments` WHERE `comment` = ? AND `inbox` = ? AND `sender` = ?");
+            }
+        });
+    }
+
+    @Override
+    public void clearInbox(final Plot plot, final String inbox)
+    {
+        addPlotTask(plot, new UniqueStatement("clearInbox")
+        {
+            @Override
+            public void set(final PreparedStatement statement) throws SQLException
+            {
+                if (plot != null)
+                {
+                    statement.setString(1, plot.world);
+                    statement.setInt(2, plot.id.hashCode());
+                    statement.setString(3, inbox);
+                }
+                else
+                {
+                    statement.setString(1, inbox);
+                }
+            }
+
+            @Override
+            public PreparedStatement get() throws SQLException
+            {
+                if (plot != null) {
+                return connection.prepareStatement("DELETE FROM `" + prefix + "plot_comments` WHERE `world` = ? AND `hashcode` = ? AND `inbox` = ?");
+                }
+                return connection.prepareStatement("DELETE FROM `" + prefix + "plot_comments` `inbox` = ?");
+            }
+        });
+    }
+
+    @Override
+    public void getComments(final Plot plot, final String inbox, final RunnableVal whenDone)
+    {
+        addPlotTask(plot, new UniqueStatement("getComments_" + plot)
+        {
+            @Override
+            public void set(final PreparedStatement statement) throws SQLException
+            {
+                if (plot != null)
+                {
+                    statement.setString(1, plot.world);
+                    statement.setInt(2, plot.id.hashCode());
+                    statement.setString(3, inbox);
+                }
+                else
+                {
+                    statement.setString(1, inbox);
+                }
+            }
+
+            @Override
+            public PreparedStatement get() throws SQLException
+            {
+                if (plot != null) {
+                return connection.prepareStatement("SELECT * FROM `" + prefix + "plot_comments` WHERE `world` = ? AND `hashcode` = ? AND `inbox` = ?");
+                }
+                return connection.prepareStatement("SELECT * FROM `" + prefix + "plot_comments` WHERE `inbox` = ?");
+            }
+
+            @Override
+            public void execute(final PreparedStatement stmt) throws SQLException
+            {}
+
+            @Override
+            public void addBatch(final PreparedStatement statement) throws SQLException
+            {
+                final ArrayList<PlotComment> comments = new ArrayList<PlotComment>();
+                final ResultSet set = statement.executeQuery();
+                PlotComment comment;
+                while (set.next())
+                {
+                    final String sender = set.getString("sender");
+                    final String world = set.getString("world");
+                    final int hash = set.getInt("hashcode");
+                    PlotId id;
+                    if (hash != 0)
+                    {
+                        id = PlotId.unpair(hash);
+                    }
+                    else
+                    {
+                        id = null;
+                    }
+                    final String msg = set.getString("comment");
+                    final long timestamp = set.getInt("timestamp") * 1000;
+                    comment = new PlotComment(world, id, msg, sender, inbox, timestamp);
+                    comments.add(comment);
+                    whenDone.value = comments;
+                }
+                TaskManager.runTask(whenDone);
+            }
+        });
+    }
+
+    @Override
+    public void setComment(final Plot plot, final PlotComment comment)
+    {
+        addPlotTask(plot, new UniqueStatement("setComment")
+        {
+            @Override
+            public void set(final PreparedStatement statement) throws SQLException
+            {
+                statement.setString(1, plot.world);
+                statement.setInt(2, plot.id.hashCode());
+                statement.setString(3, comment.comment);
+                statement.setString(4, comment.inbox);
+                statement.setInt(5, (int) (comment.timestamp / 1000));
+                statement.setString(6, comment.senderName);
+            }
+
+            @Override
+            public PreparedStatement get() throws SQLException
+            {
+                return connection.prepareStatement("INSERT INTO `"
+                + prefix
+                + "plot_comments` (`world`, `hashcode`, `comment`, `inbox`, `timestamp`, `sender`) VALUES(?,?,?,?,?,?)");
+            }
+        });
+    }
+
+    @Override
+    public void removeTrusted(final Plot plot, final UUID uuid)
+    {
+        addPlotTask(plot, new UniqueStatement("removeTrusted")
+        {
+            @Override
+            public void set(final PreparedStatement statement) throws SQLException
+            {
+                statement.setInt(1, getId(plot));
+                statement.setString(2, uuid.toString());
+            }
+
+            @Override
+            public PreparedStatement get() throws SQLException
+            {
+                return connection.prepareStatement("DELETE FROM `" + prefix + "plot_helpers` WHERE `plot_plot_id` = ? AND `user_uuid` = ?");
+            }
+        });
+    }
+
+    @Override
+    public void removeMember(final Plot plot, final UUID uuid)
+    {
+        addPlotTask(plot, new UniqueStatement("removeMember")
+        {
+            @Override
+            public void set(final PreparedStatement statement) throws SQLException
+            {
+                statement.setInt(1, getId(plot));
+                statement.setString(2, uuid.toString());
+            }
+
+            @Override
+            public PreparedStatement get() throws SQLException
+            {
+                return connection.prepareStatement("DELETE FROM `" + prefix + "plot_trusted` WHERE `plot_plot_id` = ? AND `user_uuid` = ?");
+            }
+        });
+    }
+
+    @Override
+    public void setTrusted(final Plot plot, final UUID uuid)
+    {
+        addPlotTask(plot, new UniqueStatement("setTrusted")
+        {
+            @Override
+            public void set(final PreparedStatement statement) throws SQLException
+            {
+                statement.setInt(1, getId(plot));
+                statement.setString(2, uuid.toString());
+            }
+
+            @Override
+            public PreparedStatement get() throws SQLException
+            {
+                return connection.prepareStatement("INSERT INTO `" + prefix + "plot_helpers` (`plot_plot_id`, `user_uuid`) VALUES(?,?)");
+            }
+        });
+    }
+
+    @Override
+    public void setMember(final Plot plot, final UUID uuid)
+    {
+        addPlotTask(plot, new UniqueStatement("setMember")
+        {
+            @Override
+            public void set(final PreparedStatement statement) throws SQLException
+            {
+                statement.setInt(1, getId(plot));
+                statement.setString(2, uuid.toString());
+            }
+
+            @Override
+            public PreparedStatement get() throws SQLException
+            {
+                return connection.prepareStatement("INSERT INTO `" + prefix + "plot_trusted` (`plot_plot_id`, `user_uuid`) VALUES(?,?)");
+            }
+        });
+    }
+
+    @Override
+    public void removeDenied(final Plot plot, final UUID uuid)
+    {
+        addPlotTask(plot, new UniqueStatement("removeDenied")
+        {
+            @Override
+            public void set(final PreparedStatement statement) throws SQLException
+            {
+                statement.setInt(1, getId(plot));
+                statement.setString(2, uuid.toString());
+            }
+
+            @Override
+            public PreparedStatement get() throws SQLException
+            {
+                return connection.prepareStatement("DELETE FROM `" + prefix + "plot_denied` WHERE `plot_plot_id` = ? AND `user_uuid` = ?");
+            }
+        });
+    }
+
+    @Override
+    public void setDenied(final Plot plot, final UUID uuid)
+    {
+        addPlotTask(plot, new UniqueStatement("setDenied")
+        {
+            @Override
+            public void set(final PreparedStatement statement) throws SQLException
+            {
+                statement.setInt(1, getId(plot));
+                statement.setString(2, uuid.toString());
+            }
+
+            @Override
+            public PreparedStatement get() throws SQLException
+            {
+                return connection.prepareStatement("INSERT INTO `" + prefix + "plot_denied` (`plot_plot_id`, `user_uuid`) VALUES(?,?)");
+            }
+        });
+    }
+
+    @Override
+    public HashMap<UUID, Integer> getRatings(final Plot plot)
+    {
+        final HashMap<UUID, Integer> map = new HashMap<UUID, Integer>();
+        try
+        {
+            final PreparedStatement statement = connection.prepareStatement("SELECT `rating`, `player` FROM `" + prefix + "plot_rating` WHERE `plot_plot_id` = ? ");
+            statement.setInt(1, getId(plot));
+            final ResultSet set = statement.executeQuery();
+            while (set.next())
+            {
+                final UUID uuid = UUID.fromString(set.getString("player"));
+                final int rating = set.getInt("rating");
+                map.put(uuid, rating);
+            }
+            statement.close();
+            set.close();
+        }
+        catch (final SQLException e)
+        {
+            PS.debug("&7[WARN] " + "Failed to fetch rating for plot " + plot.getId().toString());
+            e.printStackTrace();
+        }
+        return map;
+    }
+
+    @Override
+    public void setRating(final Plot plot, final UUID rater, final int value)
+    {
+        addPlotTask(plot, new UniqueStatement("setRating")
+        {
+            @Override
+            public void set(final PreparedStatement statement) throws SQLException
+            {
+                statement.setInt(1, getId(plot));
+                statement.setInt(2, value);
+                statement.setString(3, rater.toString());
+            }
+
+            @Override
+            public PreparedStatement get() throws SQLException
+            {
+                return connection.prepareStatement("INSERT INTO `" + prefix + "plot_rating` (`plot_plot_id`, `rating`, `player`) VALUES(?,?,?)");
+            }
+        });
+    }
+
+    @Override
+    public void delete(final PlotCluster cluster)
+    {
+        final int id = getClusterId(cluster.world, ClusterManager.getClusterId(cluster));
+        addClusterTask(cluster, new UniqueStatement("delete_cluster_settings")
+        {
+            @Override
+            public void set(final PreparedStatement stmt) throws SQLException
+            {
+                stmt.setInt(1, id);
+            }
+
+            @Override
+            public PreparedStatement get() throws SQLException
+            {
+                return connection.prepareStatement("DELETE FROM `" + prefix + "cluster_settings` WHERE `cluster_id` = ?");
+            }
+        });
+        addClusterTask(cluster, new UniqueStatement("delete_cluster_helpers")
+        {
+            @Override
+            public void set(final PreparedStatement stmt) throws SQLException
+            {
+                stmt.setInt(1, id);
+            }
+
+            @Override
+            public PreparedStatement get() throws SQLException
+            {
+                return connection.prepareStatement("DELETE FROM `" + prefix + "cluster_helpers` WHERE `cluster_id` = ?");
+            }
+        });
+        addClusterTask(cluster, new UniqueStatement("delete_cluster_invited")
+        {
+            @Override
+            public void set(final PreparedStatement stmt) throws SQLException
+            {
+                stmt.setInt(1, id);
+            }
+
+            @Override
+            public PreparedStatement get() throws SQLException
+            {
+                return connection.prepareStatement("DELETE FROM `" + prefix + "cluster_invited` WHERE `cluster_id` = ?");
+            }
+        });
+        addClusterTask(cluster, new UniqueStatement("delete_cluster")
+        {
+            @Override
+            public void set(final PreparedStatement stmt) throws SQLException
+            {
+                stmt.setInt(1, id);
+            }
+
+            @Override
+            public PreparedStatement get() throws SQLException
+            {
+                return connection.prepareStatement("DELETE FROM `" + prefix + "cluster` WHERE `id` = ?");
+            }
+        });
+    }
+
+    @Override
+    public int getClusterId(final String world, final PlotClusterId id)
+    {
+        PreparedStatement stmt = null;
+        try
+        {
+            stmt = connection.prepareStatement("SELECT `id` FROM `"
+            + prefix
+            + "cluster` WHERE `pos1_x` = ? AND `pos1_z` = ? AND `pos2_x` = ? AND `pos2_z` = ? AND `world` = ? ORDER BY `timestamp` ASC");
+            stmt.setInt(1, id.pos1.x);
+            stmt.setInt(2, id.pos1.y);
+            stmt.setInt(3, id.pos2.x);
+            stmt.setInt(4, id.pos2.y);
+            stmt.setString(5, world);
+            final ResultSet r = stmt.executeQuery();
+            int c_id = Integer.MAX_VALUE;
+            while (r.next())
+            {
+                c_id = r.getInt("id");
+            }
+            stmt.close();
+            r.close();
+            return c_id;
+        }
+        catch (final SQLException e)
+        {
+            e.printStackTrace();
+        }
+        return Integer.MAX_VALUE;
+    }
+
+    @Override
+    public HashMap<String, HashSet<PlotCluster>> getClusters()
+    {
+        final LinkedHashMap<String, HashSet<PlotCluster>> newClusters = new LinkedHashMap<>();
+        final HashMap<Integer, PlotCluster> clusters = new HashMap<>();
+        Statement stmt = null;
+        try
+        {
+            Set<String> worlds = new HashSet<>();
+            if (PS.get().config.contains("worlds"))
+            {
+                worlds = PS.get().config.getConfigurationSection("worlds").getKeys(false);
+            }
+            final HashMap<String, UUID> uuids = new HashMap<String, UUID>();
+            final HashMap<String, Integer> noExist = new HashMap<String, Integer>();
+            /*
+             * Getting clusters
+             */
+            stmt = connection.createStatement();
+            ResultSet r = stmt.executeQuery("SELECT * FROM `" + prefix + "cluster`");
+            PlotId pos1;
+            PlotId pos2;
+            PlotCluster cluster;
+            String owner;
+            String worldname;
+            UUID user;
+            int id;
+            while (r.next())
+            {
+                pos1 = new PlotId(r.getInt("pos1_x"), r.getInt("pos1_z"));
+                pos2 = new PlotId(r.getInt("pos2_x"), r.getInt("pos2_z"));
+                id = r.getInt("id");
+                worldname = r.getString("world");
+                if (!worlds.contains(worldname))
+                {
+                    if (noExist.containsKey(worldname))
+                    {
+                        noExist.put(worldname, noExist.get(worldname) + 1);
+                    }
+                    else
+                    {
+                        noExist.put(worldname, 1);
+                    }
+                }
+                owner = r.getString("owner");
+                user = uuids.get(owner);
+                if (user == null)
+                {
+                    user = UUID.fromString(owner);
+                    uuids.put(owner, user);
+                }
+                cluster = new PlotCluster(worldname, pos1, pos2, user);
+                clusters.put(id, cluster);
+            }
+            /*
+             * Getting helpers
+             */
+            r = stmt.executeQuery("SELECT `user_uuid`, `cluster_id` FROM `" + prefix + "cluster_helpers`");
+            while (r.next())
+            {
+                id = r.getInt("cluster_id");
+                owner = r.getString("user_uuid");
+                user = uuids.get(owner);
+                if (user == null)
+                {
+                    user = UUID.fromString(owner);
+                    uuids.put(owner, user);
+                }
+                cluster = clusters.get(id);
+                if (cluster != null)
+                {
+                    cluster.helpers.add(user);
+                }
+                else
+                {
+                    PS.debug("&cCluster " + id + " in cluster_helpers does not exist. Please create the cluster or remove this entry.");
+                }
+            }
+            /*
+             * Getting invited
+             */
+            r = stmt.executeQuery("SELECT `user_uuid`, `cluster_id` FROM `" + prefix + "cluster_invited`");
+            while (r.next())
+            {
+                id = r.getInt("cluster_id");
+                owner = r.getString("user_uuid");
+                user = uuids.get(owner);
+                if (user == null)
+                {
+                    user = UUID.fromString(owner);
+                    uuids.put(owner, user);
+                }
+                cluster = clusters.get(id);
+                if (cluster != null)
+                {
+                    cluster.invited.add(user);
+                }
+                else
+                {
+                    PS.debug("&cCluster " + id + " in cluster_invited does not exist. Please create the cluster or remove this entry.");
+                }
+            }
+            r = stmt.executeQuery("SELECT * FROM `" + prefix + "cluster_settings`");
+            while (r.next())
+            {
+                id = r.getInt("cluster_id");
+                cluster = clusters.get(id);
+                if (cluster != null)
+                {
+                    final String alias = r.getString("alias");
+                    if (alias != null)
+                    {
+                        cluster.settings.setAlias(alias);
+                    }
+                    final String pos = r.getString("position");
+                    switch (pos.toLowerCase())
+                    {
+                        case "":
+                        case "default":
+                        case "0,0,0":
+                        case "center":
+                            break;
+                        default:
+                            try
+                            {
+                                final String[] split = pos.split(",");
+                                final BlockLoc loc = new BlockLoc(Integer.parseInt(split[0]), Integer.parseInt(split[1]), Integer.parseInt(split[2]));
+                                cluster.settings.setPosition(loc);
+                            }
+                            catch (final Exception e)
+                            {}
+                    }
+                    final Integer m = r.getInt("merged");
+                    if (m != null)
+                    {
+                        final boolean[] merged = new boolean[4];
+                        for (int i = 0; i < 4; i++)
+                        {
+                            merged[3 - i] = ((m) & (1 << i)) != 0;
+                        }
+                        cluster.settings.setMerged(merged);
+                    }
+                    else
+                    {
+                        cluster.settings.setMerged(new boolean[] { false, false, false, false });
+                    }
+                    String[] flags_string;
+                    final String myflags = r.getString("flags");
+                    if (myflags == null)
+                    {
+                        flags_string = new String[] {};
+                    }
+                    else
+                    {
+                        if (myflags.length() > 0)
+                        {
+                            flags_string = myflags.split(",");
+                        }
+                        else
+                        {
+                            flags_string = new String[] {};
+                        }
+                    }
+                    final HashMap<String, Flag> flags = new HashMap<>();
+                    boolean exception = false;
+                    for (final String element : flags_string)
+                    {
+                        if (element.contains(":"))
+                        {
+                            final String[] split = element.split(":");
+                            try
+                            {
+                                final String flag_str = split[1].replaceAll("\u00AF", ":").replaceAll("�", ",");
+                                final Flag flag = new Flag(FlagManager.getFlag(split[0], true), flag_str);
+                                flags.put(flag.getKey(), flag);
+                            }
+                            catch (final Exception e)
+                            {
+                                e.printStackTrace();
+                                exception = true;
+                            }
+                        }
+                        else
+                        {
+                            final Flag flag = new Flag(FlagManager.getFlag(element, true), "");
+                            flags.put(flag.getKey(), flag);
+                        }
+                    }
+                    if (exception)
+                    {
+                        PS.debug("&cCluster " + id + " had an invalid flag. A fix has been attempted.");
+                        PS.debug("&c" + myflags);
+                    }
+                    cluster.settings.flags = flags;
+                }
+                else
+                {
+                    PS.debug("&cCluster " + id + " in cluster_settings does not exist. Please create the cluster or remove this entry.");
+                }
+            }
+            stmt.close();
+            r.close();
+            for (final PlotCluster c : clusters.values())
+            {
+                final String world = c.world;
+                if (!newClusters.containsKey(world))
+                {
+                    newClusters.put(world, new HashSet<PlotCluster>());
+                }
+                newClusters.get(world).add(c);
+            }
+            boolean invalidPlot = false;
+            for (final Entry<String, Integer> entry : noExist.entrySet())
+            {
+                final String w = entry.getKey();
+                invalidPlot = true;
+                PS.debug("&c[WARNING] Found " + noExist.get(w) + " clusters in DB for non existant world; '" + w + "'.");
+            }
+            if (invalidPlot)
+            {
+                PS.debug("&c[WARNING] - Please create the world/s or remove the clusters using the purge command");
+            }
+        }
+        catch (final SQLException e)
+        {
+            PS.debug("&7[WARN] " + "Failed to load clusters.");
+            e.printStackTrace();
+        }
+        return newClusters;
+    }
+
+    @Override
+    public void setFlags(final PlotCluster cluster, final Collection<Flag> flags)
+    {
+        final StringBuilder flag_string = new StringBuilder();
+        int i = 0;
+        for (final Flag flag : flags)
+        {
+            if (i != 0)
+            {
+                flag_string.append(",");
+            }
+            flag_string.append(flag.getKey() + ":" + flag.getValueString().replaceAll(":", "\u00AF").replaceAll(",", "\u00B4"));
+            i++;
+        }
+        addClusterTask(cluster, new UniqueStatement("setFlags")
+        {
+            @Override
+            public void set(final PreparedStatement stmt) throws SQLException
+            {
+                stmt.setString(1, flag_string.toString());
+                stmt.setInt(2, getClusterId(cluster.world, ClusterManager.getClusterId(cluster)));
+            }
+
+            @Override
+            public PreparedStatement get() throws SQLException
+            {
+                return connection.prepareStatement("UPDATE `" + prefix + "cluster_settings` SET `flags` = ? WHERE `cluster_id` = ?");
+            }
+        });
+    }
+
+    @Override
+    public void setClusterName(final PlotCluster cluster, final String name)
+    {
+        addClusterTask(cluster, new UniqueStatement("setClusterName")
+        {
+            @Override
+            public void set(final PreparedStatement stmt) throws SQLException
+            {
+                stmt.setString(1, name);
+                stmt.setInt(2, getClusterId(cluster.world, ClusterManager.getClusterId(cluster)));
+            }
+
+            @Override
+            public PreparedStatement get() throws SQLException
+            {
+                return connection.prepareStatement("UPDATE `" + prefix + "cluster_settings` SET `alias` = ?  WHERE `cluster_id` = ?");
+            }
+        });
+        cluster.settings.setAlias(name);
+    }
+
+    @Override
+    public void removeHelper(final PlotCluster cluster, final UUID uuid)
+    {
+        addClusterTask(cluster, new UniqueStatement("removeHelper")
+        {
+            @Override
+            public void set(final PreparedStatement statement) throws SQLException
+            {
+                statement.setInt(1, getClusterId(cluster.world, ClusterManager.getClusterId(cluster)));
+                statement.setString(2, uuid.toString());
+            }
+
+            @Override
+            public PreparedStatement get() throws SQLException
+            {
+                return connection.prepareStatement("DELETE FROM `" + prefix + "cluster_helpers` WHERE `cluster_id` = ? AND `user_uuid` = ?");
+            }
+        });
+    }
+
+    @Override
+    public void setHelper(final PlotCluster cluster, final UUID uuid)
+    {
+        addClusterTask(cluster, new UniqueStatement("setHelper")
+        {
+            @Override
+            public void set(final PreparedStatement statement) throws SQLException
+            {
+                statement.setInt(1, getClusterId(cluster.world, ClusterManager.getClusterId(cluster)));
+                statement.setString(2, uuid.toString());
+            }
+
+            @Override
+            public PreparedStatement get() throws SQLException
+            {
+                return connection.prepareStatement("INSERT INTO `" + prefix + "cluster_helpers` (`cluster_id`, `user_uuid`) VALUES(?,?)");
+            }
+        });
+    }
+
+    @Override
+    public void createCluster(final PlotCluster cluster)
+    {
+        addClusterTask(cluster, new UniqueStatement("createCluster")
+        {
+            @Override
+            public void set(final PreparedStatement stmt) throws SQLException
+            {
+                stmt.setInt(1, cluster.getP1().x);
+                stmt.setInt(2, cluster.getP1().y);
+                stmt.setInt(3, cluster.getP2().x);
+                stmt.setInt(4, cluster.getP2().y);
+                stmt.setString(5, cluster.owner.toString());
+                stmt.setString(6, cluster.world);
+                // TODO resultset getId
+            }
+
+            @Override
+            public PreparedStatement get() throws SQLException
+            {
+                return connection.prepareStatement(CREATE_CLUSTER);
+            }
+        });
+        addClusterTask(cluster, new UniqueStatement("createClusterSettings")
+        {
+            @Override
+            public void set(final PreparedStatement stmt) throws SQLException
+            {
+                final int id = getClusterId(cluster.world, ClusterManager.getClusterId(cluster));
+                stmt.setInt(1, id);
+                stmt.setString(2, cluster.settings.getAlias());
+                stmt.executeUpdate();
+                stmt.close();
+            }
+
+            @Override
+            public PreparedStatement get() throws SQLException
+            {
+                return connection.prepareStatement("INSERT INTO `" + prefix + "cluster_settings`(`cluster_id`, `alias`) VALUES(?, ?" + ")");
+            }
+        });
+    }
+
+    @Override
+    public void resizeCluster(final PlotCluster current, final PlotClusterId resize)
+    {
+        final PlotId pos1 = new PlotId(current.getP1().x, current.getP1().y);
+        final PlotId pos2 = new PlotId(current.getP2().x, current.getP2().y);
+        current.setP1(resize.pos1);
+        current.setP2(resize.pos2);
+
+        addClusterTask(current, new UniqueStatement("resizeCluster")
+        {
+            @Override
+            public void set(final PreparedStatement stmt) throws SQLException
+            {
+                stmt.setInt(1, pos1.x);
+                stmt.setInt(2, pos1.y);
+                stmt.setInt(3, pos2.x);
+                stmt.setInt(4, pos2.y);
+                stmt.setInt(5, getClusterId(current.world, ClusterManager.getClusterId(current)));
+            }
+
+            @Override
+            public PreparedStatement get() throws SQLException
+            {
+                return connection.prepareStatement("UPDATE `" + prefix + "cluster` SET `pos1_x` = ?, `pos1_z` = ?, `pos2_x` = ?, `pos2_z` = ?  WHERE `id` = ?");
+            }
+        });
+    }
+
+    @Override
+    public void setPosition(final PlotCluster cluster, final String position)
+    {
+        addClusterTask(cluster, new UniqueStatement("setPosition")
+        {
+            @Override
+            public void set(final PreparedStatement stmt) throws SQLException
+            {
+                stmt.setString(1, position);
+                stmt.setInt(2, getClusterId(cluster.world, ClusterManager.getClusterId(cluster)));
+            }
+
+            @Override
+            public PreparedStatement get() throws SQLException
+            {
+                return connection.prepareStatement("UPDATE `" + prefix + "cluster_settings` SET `position` = ?  WHERE `cluster_id` = ?");
+            }
+        });
+    }
+
+    @Override
+    public void removeInvited(final PlotCluster cluster, final UUID uuid)
+    {
+        addClusterTask(cluster, new UniqueStatement("removeInvited")
+        {
+            @Override
+            public void set(final PreparedStatement statement) throws SQLException
+            {
+                statement.setInt(1, getClusterId(cluster.world, ClusterManager.getClusterId(cluster)));
+                statement.setString(2, uuid.toString());
+            }
+
+            @Override
+            public PreparedStatement get() throws SQLException
+            {
+                return connection.prepareStatement("DELETE FROM `" + prefix + "cluster_invited` WHERE `cluster_id` = ? AND `user_uuid` = ?");
+            }
+        });
+    }
+
+    @Override
+    public void setInvited(final PlotCluster cluster, final UUID uuid)
+    {
+        addClusterTask(cluster, new UniqueStatement("setInvited")
+        {
+            @Override
+            public void set(final PreparedStatement statement) throws SQLException
+            {
+                statement.setInt(1, getClusterId(cluster.world, ClusterManager.getClusterId(cluster)));
+                statement.setString(2, uuid.toString());
+            }
+
+            @Override
+            public PreparedStatement get() throws SQLException
+            {
+                return connection.prepareStatement("INSERT INTO `" + prefix + "cluster_invited` (`cluster_id`, `user_uuid`) VALUES(?,?)");
+            }
+        });
+    }
+
+    @Override
+    public boolean deleteTables()
+    {
+        try
+        {
+            close();
+            CLOSED = false;
+            SQLManager.this.connection = database.forceConnection();
+            final Statement stmt = connection.createStatement();
+            stmt.addBatch("DROP TABLE `" + prefix + "cluster_invited`");
+            stmt.addBatch("DROP TABLE `" + prefix + "cluster_helpers`");
+            stmt.addBatch("DROP TABLE `" + prefix + "cluster`");
+            stmt.addBatch("DROP TABLE `" + prefix + "plot_rating`");
+            stmt.addBatch("DROP TABLE `" + prefix + "plot_settings`");
+            stmt.addBatch("DROP TABLE `" + prefix + "plot_comments`");
+            stmt.addBatch("DROP TABLE `" + prefix + "plot_trusted`");
+            stmt.addBatch("DROP TABLE `" + prefix + "plot_helpers`");
+            stmt.addBatch("DROP TABLE `" + prefix + "plot_denied`");
+            stmt.executeBatch();
+            stmt.clearBatch();
+            stmt.close();
+
+            final PreparedStatement statement = connection.prepareStatement("DROP TABLE `" + prefix + "plot`");
+            statement.executeUpdate();
+            statement.close();
+        }
+        catch (final Exception e)
+        {
+            e.printStackTrace();
+        }
+        return true;
+    }
+
+    private class UUIDPair
+    {
+        public final int id;
+        public final UUID uuid;
+
+        public UUIDPair(final int id, final UUID uuid)
+        {
+            this.id = id;
+            this.uuid = uuid;
+        }
+    }
+
+    private class SettingsPair
+    {
+        public final int id;
+        public final PlotSettings settings;
+
+        public SettingsPair(final int id, final PlotSettings settings)
+        {
+            this.id = id;
+            this.settings = settings;
+        }
+    }
+
+    @Override
+    public void validateAllPlots(final Set<Plot> toValidate)
+    {
+        try
+        {
+            if (connection.isClosed() || CLOSED)
+            {
+                CLOSED = false;
+                connection = database.forceConnection();
+            }
+        }
+        catch (final Exception e)
+        {
+            e.printStackTrace();
+        }
+        PS.debug("$1All DB transactions during this session are being validated (This may take a while if corrections need to be made)");
+        commit();
+        while (true)
+        {
+            if (!sendBatch())
+            {
+                break;
+            }
+        }
+        try
+        {
+            if (connection.getAutoCommit())
+            {
+                connection.setAutoCommit(false);
+            }
+        }
+        catch (final SQLException e)
+        {
+            e.printStackTrace();
+        }
+        final ConcurrentHashMap<String, ConcurrentHashMap<PlotId, Plot>> database = getPlots();
+        final ArrayList<Plot> toCreate = new ArrayList<>();
+        for (final Plot plot : PS.get().getPlotsRaw())
+        {
+            if (plot.temp == -1)
+            {
+                continue;
+            }
+            final ConcurrentHashMap<PlotId, Plot> worldplots = database.get(plot.world);
+            if (worldplots == null)
+            {
+                PS.debug("&8 - &7Creating plot (1): " + plot);
+                toCreate.add(plot);
+                continue;
+            }
+            final Plot dataplot = worldplots.remove(plot.id);
+            if (dataplot == null)
+            {
+                PS.debug("&8 - &7Creating plot (2): " + plot);
+                toCreate.add(plot);
+                continue;
+            }
+            // owner
+            if (!plot.owner.equals(dataplot.owner))
+            {
+                PS.debug("&8 - &7Setting owner: " + plot + " -> " + MainUtil.getName(plot.owner));
+                setOwner(plot, plot.owner);
+            }
+            // trusted
+            if (!plot.getTrusted().equals(dataplot.trusted))
+            {
+                final HashSet<UUID> toAdd = (HashSet<UUID>) plot.getTrusted().clone();
+                final HashSet<UUID> toRemove = (HashSet<UUID>) dataplot.getTrusted().clone();
+                toRemove.removeAll(plot.getTrusted());
+                toAdd.removeAll(dataplot.getTrusted());
+                PS.debug("&8 - &7Correcting " + (toAdd.size() + toRemove.size()) + " trusted for: " + plot);
+                if (toRemove.size() > 0)
+                {
+                    for (final UUID uuid : toRemove)
+                    {
+                        removeTrusted(plot, uuid);
+                    }
+                }
+                if (toAdd.size() > 0)
+                {
+                    for (final UUID uuid : toAdd)
+                    {
+                        setTrusted(plot, uuid);
+                    }
+                }
+            }
+            if (!plot.getMembers().equals(dataplot.members))
+            {
+                final HashSet<UUID> toAdd = (HashSet<UUID>) plot.getMembers().clone();
+                final HashSet<UUID> toRemove = (HashSet<UUID>) dataplot.getMembers().clone();
+                toRemove.removeAll(plot.getMembers());
+                toAdd.removeAll(dataplot.getMembers());
+                PS.debug("&8 - &7Correcting " + (toAdd.size() + toRemove.size()) + " members for: " + plot);
+                if (toRemove.size() > 0)
+                {
+                    for (final UUID uuid : toRemove)
+                    {
+                        removeMember(plot, uuid);
+                    }
+                }
+                if (toAdd.size() > 0)
+                {
+                    for (final UUID uuid : toAdd)
+                    {
+                        setMember(plot, uuid);
+                    }
+                }
+            }
+            if (!plot.getDenied().equals(dataplot.denied))
+            {
+                final HashSet<UUID> toAdd = (HashSet<UUID>) plot.getDenied().clone();
+                final HashSet<UUID> toRemove = (HashSet<UUID>) dataplot.getDenied().clone();
+                toRemove.removeAll(plot.getDenied());
+                toAdd.removeAll(dataplot.getDenied());
+                PS.debug("&8 - &7Correcting " + (toAdd.size() + toRemove.size()) + " denied for: " + plot);
+                if (toRemove.size() > 0)
+                {
+                    for (final UUID uuid : toRemove)
+                    {
+                        removeDenied(plot, uuid);
+                    }
+                }
+                if (toAdd.size() > 0)
+                {
+                    for (final UUID uuid : toAdd)
+                    {
+                        setDenied(plot, uuid);
+                    }
+                }
+            }
+            final PlotSettings ps = plot.getSettings();
+            final PlotSettings ds = dataplot.getSettings();
+            final boolean[] pm = ps.getMerged();
+            final boolean[] dm = ds.getMerged();
+            if ((pm[0] != dm[0]) || (pm[1] != dm[1]) || (pm[1] != dm[1]) || (pm[1] != dm[1]))
+            {
+                PS.debug("&8 - &7Correcting merge for: " + plot);
+                setMerged(dataplot, ps.getMerged());
+            }
+            final HashMap<String, Flag> pf = ps.flags;
+            final HashMap<String, Flag> df = ds.flags;
+            if ((pf.size() != 0) && (df.size() != 0))
+            {
+                if ((pf.size() != df.size()) || !StringMan.isEqual(StringMan.joinOrdered(pf.values(), ","), StringMan.joinOrdered(df.values(), ",")))
+                {
+                    PS.debug("&8 - &7Correcting flags for: " + plot);
+                    setFlags(plot, pf.values());
+                }
+            }
+            // TODO comments (null)
+            // TODO ratings (null)
+            // TODO alias
+            // TODO unconnected entries from helpers, trusted, denied, comments, settings, rating
+        }
+
+        for (final Entry<String, ConcurrentHashMap<PlotId, Plot>> entry : database.entrySet())
+        {
+            final ConcurrentHashMap<PlotId, Plot> map = entry.getValue();
+            if (map.size() > 0)
+            {
+                for (final Entry<PlotId, Plot> entry2 : map.entrySet())
+                {
+                    PS.debug("$1Plot was deleted: " + entry.getValue() + "// TODO implement this when sure safe");
+                }
+            }
+        }
+        commit();
+    }
+
+    @Override
+    public void replaceUUID(final UUID old, final UUID now)
+    {
+        addGlobalTask(new Runnable()
+        {
+            @Override
+            public void run()
+            {
+                try (Statement stmt = connection.createStatement())
+                {
+                    stmt.executeUpdate("UPDATE `" + prefix + "cluster` SET `owner` = '" + now.toString() + "' WHERE `owner` = '" + old.toString() + "'");
+                    stmt.executeUpdate("UPDATE `" + prefix + "cluster_helpers` SET `user_uuid` = '" + now.toString() + "' WHERE `user_uuid` = '" + old.toString() + "'");
+                    stmt.executeUpdate("UPDATE `" + prefix + "cluster_invited` SET `user_uuid` = '" + now.toString() + "' WHERE `user_uuid` = '" + old.toString() + "'");
+                    stmt.executeUpdate("UPDATE `" + prefix + "plot` SET `owner` = '" + now.toString() + "' WHERE `owner` = '" + old.toString() + "'");
+                    stmt.executeUpdate("UPDATE `" + prefix + "plot_denied` SET `user_uuid` = '" + now.toString() + "' WHERE `user_uuid` = '" + old.toString() + "'");
+                    stmt.executeUpdate("UPDATE `" + prefix + "plot_helpers` SET `user_uuid` = '" + now.toString() + "' WHERE `user_uuid` = '" + old.toString() + "'");
+                    stmt.executeUpdate("UPDATE `" + prefix + "plot_trusted` SET `user_uuid` = '" + now.toString() + "' WHERE `user_uuid` = '" + old.toString() + "'");
+                    stmt.close();
+                }
+                catch (final Exception e)
+                {
+                    e.printStackTrace();
+                }
+            }
+        });
+    }
+
+    @Override
+    public void close()
+    {
+        try
+        {
+            CLOSED = true;
+            connection.close();
+        }
+        catch (final SQLException e)
+        {
+            e.printStackTrace();
+        }
+    }
+}
diff --git a/src/main/java/com/intellectualcrafters/plot/database/SQLite.java b/src/main/java/com/intellectualcrafters/plot/database/SQLite.java
index c93131609..e62bb7176 100644
--- a/src/main/java/com/intellectualcrafters/plot/database/SQLite.java
+++ b/src/main/java/com/intellectualcrafters/plot/database/SQLite.java
@@ -1,117 +1,128 @@
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// PlotSquared - A plot manager and world generator for the Bukkit API                             /
-// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
-//                                                                                                 /
-// This program is free software; you can redistribute it and/or modify                            /
-// it under the terms of the GNU General Public License as published by                            /
-// the Free Software Foundation; either version 3 of the License, or                               /
-// (at your option) any later version.                                                             /
-//                                                                                                 /
-// This program is distributed in the hope that it will be useful,                                 /
-// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
-// GNU General Public License for more details.                                                    /
-//                                                                                                 /
-// You should have received a copy of the GNU General Public License                               /
-// along with this program; if not, write to the Free Software Foundation,                         /
-// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
-//                                                                                                 /
-// You can contact us via: support@intellectualsites.com                                           /
-////////////////////////////////////////////////////////////////////////////////////////////////////
-package com.intellectualcrafters.plot.database;
-
-import java.io.File;
-import java.io.IOException;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-
-import com.intellectualcrafters.plot.PS;
-
-/**
- * Connects to and uses a SQLite database
- *
- * @author Citymonstret
- * @author tips48
- */
-public class SQLite extends Database {
-    private final String dbLocation;
-    private Connection connection;
-
-    /**
-     * Creates a new SQLite instance
-     *
-     * @param dbLocation Location of the Database (Must end in .db)
-     */
-    public SQLite(final String dbLocation) {
-        this.dbLocation = dbLocation;
-    }
-
-    @Override
-    public Connection openConnection() throws SQLException, ClassNotFoundException {
-        if (checkConnection()) {
-            return this.connection;
-        }
-        if (!PS.get().IMP.getDirectory().exists()) {
-            PS.get().IMP.getDirectory().mkdirs();
-        }
-        final File file = new File(this.dbLocation);
-        if (!(file.exists())) {
-            try {
-                file.createNewFile();
-            } catch (final IOException e) {
-                PS.debug("&cUnable to create database!");
-            }
-        }
-        Class.forName("org.sqlite.JDBC");
-        this.connection = DriverManager.getConnection("jdbc:sqlite:" + this.dbLocation);
-        return this.connection;
-    }
-
-    @Override
-    public boolean checkConnection() throws SQLException {
-        return (this.connection != null) && !this.connection.isClosed();
-    }
-
-    @Override
-    public Connection getConnection() {
-        return this.connection;
-    }
-
-    @Override
-    public boolean closeConnection() throws SQLException {
-        if (this.connection == null) {
-            return false;
-        }
-        this.connection.close();
-        this.connection = null;
-        return true;
-    }
-
-    @Override
-    public ResultSet querySQL(final String query) throws SQLException, ClassNotFoundException {
-        if (checkConnection()) {
-            openConnection();
-        }
-        final Statement statement = this.connection.createStatement();
-        return statement.executeQuery(query);
-    }
-
-    @Override
-    public int updateSQL(final String query) throws SQLException, ClassNotFoundException {
-        if (checkConnection()) {
-            openConnection();
-        }
-        final Statement statement = this.connection.createStatement();
-        return statement.executeUpdate(query);
-    }
-
-    @Override
-    public Connection forceConnection() throws SQLException, ClassNotFoundException {
-        Class.forName("org.sqlite.JDBC");
-        this.connection = DriverManager.getConnection("jdbc:sqlite:" + this.dbLocation);
-        return this.connection;
-    }
-}
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// PlotSquared - A plot manager and world generator for the Bukkit API                             /
+// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
+//                                                                                                 /
+// This program is free software; you can redistribute it and/or modify                            /
+// it under the terms of the GNU General Public License as published by                            /
+// the Free Software Foundation; either version 3 of the License, or                               /
+// (at your option) any later version.                                                             /
+//                                                                                                 /
+// This program is distributed in the hope that it will be useful,                                 /
+// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
+// GNU General Public License for more details.                                                    /
+//                                                                                                 /
+// You should have received a copy of the GNU General Public License                               /
+// along with this program; if not, write to the Free Software Foundation,                         /
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
+//                                                                                                 /
+// You can contact us via: support@intellectualsites.com                                           /
+////////////////////////////////////////////////////////////////////////////////////////////////////
+package com.intellectualcrafters.plot.database;
+
+import java.io.File;
+import java.io.IOException;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+
+import com.intellectualcrafters.plot.PS;
+
+/**
+ * Connects to and uses a SQLite database
+ *

+ * @author tips48
+ */
+public class SQLite extends Database
+{
+    private final String dbLocation;
+    private Connection connection;
+
+    /**
+     * Creates a new SQLite instance
+     *
+     * @param dbLocation Location of the Database (Must end in .db)
+     */
+    public SQLite(final String dbLocation)
+    {
+        this.dbLocation = dbLocation;
+    }
+
+    @Override
+    public Connection openConnection() throws SQLException, ClassNotFoundException
+    {
+        if (checkConnection()) { return connection; }
+        if (!PS.get().IMP.getDirectory().exists())
+        {
+            PS.get().IMP.getDirectory().mkdirs();
+        }
+        final File file = new File(dbLocation);
+        if (!(file.exists()))
+        {
+            try
+            {
+                file.createNewFile();
+            }
+            catch (final IOException e)
+            {
+                PS.debug("&cUnable to create database!");
+            }
+        }
+        Class.forName("org.sqlite.JDBC");
+        connection = DriverManager.getConnection("jdbc:sqlite:" + dbLocation);
+        return connection;
+    }
+
+    @Override
+    public boolean checkConnection() throws SQLException
+    {
+        return (connection != null) && !connection.isClosed();
+    }
+
+    @Override
+    public Connection getConnection()
+    {
+        return connection;
+    }
+
+    @Override
+    public boolean closeConnection() throws SQLException
+    {
+        if (connection == null) { return false; }
+        connection.close();
+        connection = null;
+        return true;
+    }
+
+    @Override
+    public ResultSet querySQL(final String query) throws SQLException, ClassNotFoundException
+    {
+        if (checkConnection())
+        {
+            openConnection();
+        }
+        final Statement statement = connection.createStatement();
+        return statement.executeQuery(query);
+    }
+
+    @Override
+    public int updateSQL(final String query) throws SQLException, ClassNotFoundException
+    {
+        if (checkConnection())
+        {
+            openConnection();
+        }
+        final Statement statement = connection.createStatement();
+        return statement.executeUpdate(query);
+    }
+
+    @Override
+    public Connection forceConnection() throws SQLException, ClassNotFoundException
+    {
+        Class.forName("org.sqlite.JDBC");
+        connection = DriverManager.getConnection("jdbc:sqlite:" + dbLocation);
+        return connection;
+    }
+}
diff --git a/src/main/java/com/intellectualcrafters/plot/database/StmtMod.java b/src/main/java/com/intellectualcrafters/plot/database/StmtMod.java
index 2aaa21c6c..df11b8d59 100644
--- a/src/main/java/com/intellectualcrafters/plot/database/StmtMod.java
+++ b/src/main/java/com/intellectualcrafters/plot/database/StmtMod.java
@@ -5,31 +5,39 @@ import java.sql.SQLException;
 
 import com.intellectualcrafters.plot.util.StringMan;
 
-public abstract class StmtMod<T> {
-	public abstract String getCreateMySQL(int size);
-	
-	public String getCreateMySQL(int size, String query, int params) {
-		final StringBuilder statement = new StringBuilder(query);
-        for (int i = 0; i < size - 1; i++) {
+public abstract class StmtMod<T>
+{
+    public abstract String getCreateMySQL(final int size);
+
+    public String getCreateMySQL(final int size, final String query, final int params)
+    {
+        final StringBuilder statement = new StringBuilder(query);
+        for (int i = 0; i < (size - 1); i++)
+        {
             statement.append("(" + StringMan.repeat(",(?)", params).substring(1) + "),");
         }
         statement.append("(" + StringMan.repeat(",(?)", params).substring(1) + ")");
         return statement.toString();
-	}
-	
-	public String getCreateSQLite(int size, String query, int params) {
-		StringBuilder statement = new StringBuilder(query);
-		String modParams = StringMan.repeat(",?", params).substring(1);
-		for (int i = 0; i < (size - 1); i++) {
+    }
+
+    public String getCreateSQLite(final int size, final String query, final int params)
+    {
+        final StringBuilder statement = new StringBuilder(query);
+        final String modParams = StringMan.repeat(",?", params).substring(1);
+        for (int i = 0; i < (size - 1); i++)
+        {
             statement.append("UNION SELECT " + modParams + " ");
         }
-		return statement.toString();
-	}
-	
-	public abstract String getCreateSQLite(int size);
-	public abstract String getCreateSQL();
-	
-	public abstract void setMySQL(PreparedStatement stmt, int i, T obj) throws SQLException;
-	public abstract void setSQLite(PreparedStatement stmt, int i, T obj) throws SQLException;
-	public abstract void setSQL(PreparedStatement stmt, T obj) throws SQLException;
+        return statement.toString();
+    }
+
+    public abstract String getCreateSQLite(final int size);
+
+    public abstract String getCreateSQL();
+
+    public abstract void setMySQL(final PreparedStatement stmt, final int i, final T obj) throws SQLException;
+
+    public abstract void setSQLite(final PreparedStatement stmt, final int i, final T obj) throws SQLException;
+
+    public abstract void setSQL(final PreparedStatement stmt, final T obj) throws SQLException;
 }
diff --git a/src/main/java/com/intellectualcrafters/plot/flag/AbstractFlag.java b/src/main/java/com/intellectualcrafters/plot/flag/AbstractFlag.java
index c3d0ce9ef..ce8bc1377 100644
--- a/src/main/java/com/intellectualcrafters/plot/flag/AbstractFlag.java
+++ b/src/main/java/com/intellectualcrafters/plot/flag/AbstractFlag.java
@@ -1,112 +1,117 @@
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// PlotSquared - A plot manager and world generator for the Bukkit API                             /
-// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
-//                                                                                                 /
-// This program is free software; you can redistribute it and/or modify                            /
-// it under the terms of the GNU General Public License as published by                            /
-// the Free Software Foundation; either version 3 of the License, or                               /
-// (at your option) any later version.                                                             /
-//                                                                                                 /
-// This program is distributed in the hope that it will be useful,                                 /
-// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
-// GNU General Public License for more details.                                                    /
-//                                                                                                 /
-// You should have received a copy of the GNU General Public License                               /
-// along with this program; if not, write to the Free Software Foundation,                         /
-// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
-//                                                                                                 /
-// You can contact us via: support@intellectualsites.com                                           /
-////////////////////////////////////////////////////////////////////////////////////////////////////
-package com.intellectualcrafters.plot.flag;
-
-import com.intellectualcrafters.plot.util.StringMan;
-
-/**
- * Created 2014-09-23 for PlotSquared
- *
- * @author Citymonstret
- * @author Empire92
- */
-public class AbstractFlag {
-    public final String key;
-    public final FlagValue<?> value;
-
-    public AbstractFlag(final String key) {
-        this(key, new FlagValue.StringValue());
-    }
-
-    /**
-     * AbstractFlag is a parameter used in creating a new Flag<br>
-     * The key must be alphabetical characters and &lt;= 16 characters in length
-     * @param key
-     */
-    public AbstractFlag(final String key, final FlagValue<?> value) {
-        if (!StringMan.isAlpha(key.replaceAll("_", "").replaceAll("-", ""))) {
-            throw new IllegalArgumentException("Flag must be alphabetic characters");
-        }
-        if (key.length() > 16) {
-            throw new IllegalArgumentException("Key must be <= 16 characters");
-        }
-        this.key = key.toLowerCase();
-        if (value == null) {
-            this.value = new FlagValue.StringValue();
-        } else {
-            this.value = value;
-        }
-    }
-
-    public boolean isList() {
-        return this.value instanceof FlagValue.ListValue;
-    }
-
-    public Object parseValueRaw(final String value) {
-        try {
-            return this.value.parse(value);
-        } catch (final Exception e) {
-            return null;
-        }
-    }
-
-    public String toString(final Object t) {
-        return this.value.toString(t);
-    }
-
-    public String getValueDesc() {
-        return this.value.getDescription();
-    }
-
-    /**
-     * AbstractFlag key
-     *
-     * @return String
-     */
-    public String getKey() {
-        return this.key;
-    }
-
-    @Override
-    public String toString() {
-        return this.key;
-    }
-    
-    @Override
-    public int hashCode() {
-        return this.key.hashCode();
-    }
-
-    @Override
-    public boolean equals(final Object other) {
-        if (other == null) {
-            return false;
-        }
-        if (other == this) {
-            return true;
-        }
-        if (!(other instanceof AbstractFlag)) {
-            return false;
-        }
-        final AbstractFlag otherObj = (AbstractFlag) other;
-        return (otherObj.key.equals(this.key));
-    }
-}
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// PlotSquared - A plot manager and world generator for the Bukkit API                             /
+// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
+//                                                                                                 /
+// This program is free software; you can redistribute it and/or modify                            /
+// it under the terms of the GNU General Public License as published by                            /
+// the Free Software Foundation; either version 3 of the License, or                               /
+// (at your option) any later version.                                                             /
+//                                                                                                 /
+// This program is distributed in the hope that it will be useful,                                 /
+// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
+// GNU General Public License for more details.                                                    /
+//                                                                                                 /
+// You should have received a copy of the GNU General Public License                               /
+// along with this program; if not, write to the Free Software Foundation,                         /
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
+//                                                                                                 /
+// You can contact us via: support@intellectualsites.com                                           /
+////////////////////////////////////////////////////////////////////////////////////////////////////
+package com.intellectualcrafters.plot.flag;
+
+import com.intellectualcrafters.plot.util.StringMan;
+
+/**
+ * Created 2014-09-23 for PlotSquared
+ *


+ */
+public class AbstractFlag
+{
+    public final String key;
+    public final FlagValue<?> value;
+
+    public AbstractFlag(final String key)
+    {
+        this(key, new FlagValue.StringValue());
+    }
+
+    /**
+     * AbstractFlag is a parameter used in creating a new Flag<br>
+     * The key must be alphabetical characters and &lt;= 16 characters in length
+     * @param key
+     */
+    public AbstractFlag(final String key, final FlagValue<?> value)
+    {
+        if (!StringMan.isAlpha(key.replaceAll("_", "").replaceAll("-", ""))) { throw new IllegalArgumentException("Flag must be alphabetic characters"); }
+        if (key.length() > 16) { throw new IllegalArgumentException("Key must be <= 16 characters"); }
+        this.key = key.toLowerCase();
+        if (value == null)
+        {
+            this.value = new FlagValue.StringValue();
+        }
+        else
+        {
+            this.value = value;
+        }
+    }
+
+    public boolean isList()
+    {
+        return value instanceof FlagValue.ListValue;
+    }
+
+    public Object parseValueRaw(final String value)
+    {
+        try
+        {
+            return this.value.parse(value);
+        }
+        catch (final Exception e)
+        {
+            return null;
+        }
+    }
+
+    public String toString(final Object t)
+    {
+        return value.toString(t);
+    }
+
+    public String getValueDesc()
+    {
+        return value.getDescription();
+    }
+
+    /**
+     * AbstractFlag key
+     *
+     * @return String
+     */
+    public String getKey()
+    {
+        return key;
+    }
+
+    @Override
+    public String toString()
+    {
+        return key;
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return key.hashCode();
+    }
+
+    @Override
+    public boolean equals(final Object other)
+    {
+        if (other == null) { return false; }
+        if (other == this) { return true; }
+        if (!(other instanceof AbstractFlag)) { return false; }
+        final AbstractFlag otherObj = (AbstractFlag) other;
+        return (otherObj.key.equals(key));
+    }
+}
diff --git a/src/main/java/com/intellectualcrafters/plot/flag/Flag.java b/src/main/java/com/intellectualcrafters/plot/flag/Flag.java
index 72c4ff094..5cd00c229 100644
--- a/src/main/java/com/intellectualcrafters/plot/flag/Flag.java
+++ b/src/main/java/com/intellectualcrafters/plot/flag/Flag.java
@@ -22,7 +22,8 @@ package com.intellectualcrafters.plot.flag;
 
 import com.intellectualcrafters.plot.util.StringMan;
 
-public class Flag {
+public class Flag
+{
     private AbstractFlag key;
     private Object value;
 
@@ -35,31 +36,29 @@ public class Flag {
      *
      * @throws IllegalArgumentException if you provide inadequate inputs
      */
-    public Flag(final AbstractFlag key, final String value) {
-        if (!StringMan.isAsciiPrintable(value)) {
-            throw new IllegalArgumentException("Flag must be ascii");
-        }
-        if (value.length() > 128) {
-            throw new IllegalArgumentException("Value must be <= 128 characters");
-        }
+    public Flag(final AbstractFlag key, final String value)
+    {
+        if (!StringMan.isAsciiPrintable(value)) { throw new IllegalArgumentException("Flag must be ascii"); }
+        if (value.length() > 128) { throw new IllegalArgumentException("Value must be <= 128 characters"); }
         this.key = key;
         this.value = key.parseValueRaw(value);
-        if (this.value == null) {
-            throw new IllegalArgumentException(key.getValueDesc() + " (" + value + ")");
-        }
+        if (this.value == null) { throw new IllegalArgumentException(key.getValueDesc() + " (" + value + ")"); }
     }
 
-    public void setKey(final AbstractFlag key) {
+    public void setKey(final AbstractFlag key)
+    {
         this.key = key;
-        if (this.value instanceof String) {
-            this.value = key.parseValueRaw((String) this.value);
+        if (value instanceof String)
+        {
+            value = key.parseValueRaw((String) value);
         }
     }
 
     /**
      * Warning: Unchecked
      */
-    public Flag(final AbstractFlag key, final Object value) {
+    public Flag(final AbstractFlag key, final Object value)
+    {
         this.key = key;
         this.value = value;
     }
@@ -69,8 +68,9 @@ public class Flag {
      *
      * @return AbstractFlag
      */
-    public AbstractFlag getAbstractFlag() {
-        return this.key;
+    public AbstractFlag getAbstractFlag()
+    {
+        return key;
     }
 
     /**
@@ -78,8 +78,9 @@ public class Flag {
      *
      * @return String
      */
-    public String getKey() {
-        return this.key.getKey();
+    public String getKey()
+    {
+        return key.getKey();
     }
 
     /**
@@ -87,39 +88,36 @@ public class Flag {
      *
      * @return String
      */
-    public Object getValue() {
-        return this.value;
+    public Object getValue()
+    {
+        return value;
     }
 
-    public String getValueString() {
-        return this.key.toString(this.value);
+    public String getValueString()
+    {
+        return key.toString(value);
     }
 
     @Override
-    public String toString() {
-        if (this.value.equals("")) {
-            return this.key.getKey();
-        }
-        return this.key + ":" + getValueString();
+    public String toString()
+    {
+        if (value.equals("")) { return key.getKey(); }
+        return key + ":" + getValueString();
     }
 
     @Override
-    public boolean equals(final Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
+    public boolean equals(final Object obj)
+    {
+        if (this == obj) { return true; }
+        if (obj == null) { return false; }
+        if (getClass() != obj.getClass()) { return false; }
         final Flag other = (Flag) obj;
-        return (this.key.getKey().equals(other.key.getKey()) && this.value.equals(other.value));
+        return (key.getKey().equals(other.key.getKey()) && value.equals(other.value));
     }
 
     @Override
-    public int hashCode() {
-        return this.key.getKey().hashCode();
+    public int hashCode()
+    {
+        return key.getKey().hashCode();
     }
 }
diff --git a/src/main/java/com/intellectualcrafters/plot/flag/FlagManager.java b/src/main/java/com/intellectualcrafters/plot/flag/FlagManager.java
index a569ce21c..6aeff03fb 100644
--- a/src/main/java/com/intellectualcrafters/plot/flag/FlagManager.java
+++ b/src/main/java/com/intellectualcrafters/plot/flag/FlagManager.java
@@ -1,443 +1,484 @@
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// PlotSquared - A plot manager and world generator for the Bukkit API                             /
-// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
-//                                                                                                 /
-// This program is free software; you can redistribute it and/or modify                            /
-// it under the terms of the GNU General Public License as published by                            /
-// the Free Software Foundation; either version 3 of the License, or                               /
-// (at your option) any later version.                                                             /
-//                                                                                                 /
-// This program is distributed in the hope that it will be useful,                                 /
-// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
-// GNU General Public License for more details.                                                    /
-//                                                                                                 /
-// You should have received a copy of the GNU General Public License                               /
-// along with this program; if not, write to the Free Software Foundation,                         /
-// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
-//                                                                                                 /
-// You can contact us via: support@intellectualsites.com                                           /
-////////////////////////////////////////////////////////////////////////////////////////////////////
-package com.intellectualcrafters.plot.flag;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import com.intellectualcrafters.plot.PS;
-import com.intellectualcrafters.plot.config.C;
-import com.intellectualcrafters.plot.database.DBFunc;
-import com.intellectualcrafters.plot.object.Plot;
-import com.intellectualcrafters.plot.object.PlotCluster;
-import com.intellectualcrafters.plot.object.PlotPlayer;
-import com.intellectualcrafters.plot.object.PlotSettings;
-import com.intellectualcrafters.plot.object.PlotWorld;
-import com.intellectualcrafters.plot.util.EventUtil;
-import com.intellectualcrafters.plot.util.MainUtil;
-import com.intellectualcrafters.plot.util.Permissions;
-
-/**
- * Flag Manager Utility
- *
- * @author Citymonstret
- * @author Empire92
- */
-@SuppressWarnings("unused")
-public class FlagManager {
-    // TODO add some flags
-    // - Plot clear interval
-    // - Mob cap
-    // - customized plot composition
-    
-    private final static HashSet<String> reserved = new HashSet<>();
-    
-    private final static HashSet<AbstractFlag> flags = new HashSet<>();
-
-    /**
-     * Reserve a flag so that it cannot be set by players
-     * @param flag
-     */
-    public static void reserveFlag(String flag) {
-        reserved.add(flag);
-    }
-    
-    /**
-     * Get if a flag is reserved
-     * @param flag
-     * @return
-     */
-    public static boolean isReserved(String flag) {
-        return reserved.contains(flag);
-    }
-    
-    /**
-     * Get the reserved flags
-     * @return
-     */
-    public static HashSet<String> getReservedFlags() {
-        return (HashSet<String>) reserved.clone();
-    }
-    
-    /**
-     * Unreserve a flag
-     * @param flag
-     */
-    public static void unreserveFlag(String flag) {
-        reserved.remove(flag);
-    }
-    
-    /**
-     * Register an AbstractFlag with PlotSquared
-     *
-     * @param af Flag to register
-     *
-     * @return boolean success
-     */
-    public static boolean addFlag(AbstractFlag af) {
-        return addFlag(af, false);
-    }
-    
-    public static boolean addFlag(AbstractFlag af, boolean reserved) {
-        PS.debug(C.PREFIX.s() + "&8 - Adding flag: &7" + af);
-        for (PlotWorld plotworld : PS.get().getPlotWorldObjects()) {
-            Flag flag = ((HashMap<String, Flag>) plotworld.DEFAULT_FLAGS.clone()).get(af.getKey());
-            if (flag != null) {
-                flag.setKey(af);
-            }
-        }
-        if (PS.get().getAllPlotsRaw() != null) {
-            for (final Plot plot : PS.get().getPlotsRaw()) {
-                Flag flag = plot.getSettings().flags.get(af.getKey());
-                if (flag != null) {
-                    flag.setKey(af);
-                }
-            }
-        }
-        if ((getFlag(af.getKey()) == null) && flags.add(af)) {
-            if (reserved) reserveFlag(af.getKey());
-            return true;
-        }
-        return false;
-    }
-
-    public static Flag getSettingFlag(final String world, final PlotSettings settings, final String id) {
-        Flag flag;
-        if (settings.flags.size() == 0 || (flag = settings.flags.get(id)) == null) {
-            PlotWorld plotworld = PS.get().getPlotWorld(world);
-            if (plotworld == null) {
-                return null;
-            }
-            if (plotworld.DEFAULT_FLAGS.size() == 0) {
-                return null;
-            }
-            return ((HashMap<String, Flag>) plotworld.DEFAULT_FLAGS.clone()).get(id);
-        }
-        return flag;
-    }
-    
-    public static boolean isBooleanFlag(final Plot plot, final String key, final boolean defaultValue) {
-        final Flag flag = FlagManager.getPlotFlag(plot, key);
-        if (flag == null) {
-            return defaultValue;
-        }
-        final Object value = flag.getValue();
-        if (value instanceof Boolean) {
-            return (boolean) value;
-        }
-        return defaultValue;
-    }
-
-    /**
-     * Get the value of a flag for a plot (respects flag defaults)
-     * @param plot
-     * @param flag
-     * @return Flag
-     */
-    public static Flag getPlotFlag(final Plot plot, final String flag) {
-        if (!plot.hasOwner()) {
-            return null;
-        }
-        return getSettingFlag(plot.world, plot.getSettings(), flag);
-    }
-
-    public static boolean isPlotFlagTrue(final Plot plot, final String strFlag) {
-        if (plot.owner == null) {
-            return false;
-        }
-        final Flag flag = getPlotFlag(plot, strFlag);
-        return !(flag == null || !((Boolean) flag.getValue()));
-    }
-    
-    public static boolean isPlotFlagFalse(final Plot plot, final String strFlag) {
-        if (plot.owner == null) {
-            return false;
-        }
-        final Flag flag = getPlotFlag(plot, strFlag);
-        if (flag == null || ((Boolean) flag.getValue())) {
-            return false;
-        }
-        return false;
-    }
-
-    /**
-     * Get the value of a flag for a plot (ignores flag defaults)
-     * @param plot
-     * @param flag
-     * @return Flag
-     */
-    public static Flag getPlotFlagAbs(final Plot plot, final String flag) {
-        return getSettingFlagAbs(plot.getSettings(), flag);
-    }
-
-    public static Flag getSettingFlagAbs(final PlotSettings settings, final String flag) {
-        if ((settings.flags == null) || (settings.flags.size() == 0)) {
-            return null;
-        }
-        return settings.flags.get(flag);
-    }
-
-    /**
-     * Add a flag to a plot
-     * @param plot
-     * @param flag
-     */
-    public static boolean addPlotFlag(final Plot plot, final Flag flag) {
-        final boolean result = EventUtil.manager.callFlagAdd(flag, plot);
-        if (!result) {
-            return false;
-        }
-        plot.getSettings().flags.put(flag.getKey(), flag);
-        MainUtil.reEnterPlot(plot);
-        DBFunc.setFlags(plot, plot.getSettings().flags.values());
-        return true;
-    }
-    
-    public static boolean addPlotFlagAbs(final Plot plot, final Flag flag) {
-        final boolean result = EventUtil.manager.callFlagAdd(flag, plot);
-        if (!result) {
-            return false;
-        }
-        plot.getSettings().flags.put(flag.getKey(), flag);
-        return true;
-    }
-
-    public static boolean addClusterFlag(final PlotCluster cluster, final Flag flag) {
-        //TODO plot cluster flag event
-        final Flag hasFlag = getSettingFlag(cluster.world, cluster.settings, flag.getKey());
-        cluster.settings.flags.put(flag.getKey(), flag);
-        DBFunc.setFlags(cluster, cluster.settings.flags.values());
-        return true;
-    }
-
-    /**
-     *
-     * @param plot
-     * @return set of flags
-     */
-    public static HashMap<String, Flag> getPlotFlags(final Plot plot) {
-        if (!plot.hasOwner()) {
-            return null;
-        }
-        return getSettingFlags(plot.world, plot.getSettings());
-    }
-
-    public static HashMap<String, Flag> getPlotFlags(final String world, final PlotSettings settings, final boolean ignorePluginflags) {
-        HashMap<String, Flag> flags = new HashMap<>();
-
-        PlotWorld plotWorld = PS.get().getPlotWorld(world);
-        if (plotWorld != null && plotWorld.DEFAULT_FLAGS.size() != 0) {
-            flags.putAll(plotWorld.DEFAULT_FLAGS);
-        }
-
-        if (ignorePluginflags) {
-            for (final Map.Entry<String, Flag> flag : settings.flags.entrySet()) {
-                if (isReserved(flag.getValue().getAbstractFlag().getKey())) continue;
-                flags.put(flag.getKey(), flag.getValue());
-            }
-        } else {
-            flags.putAll(settings.flags);
-        }
-
-        return flags;
-    }
-
-    public static HashMap<String, Flag> getSettingFlags(final String world, final PlotSettings settings) {
-        return getPlotFlags(world, settings, false);
-    }
-
-    public static boolean removePlotFlag(final Plot plot, final String id) {
-        Flag flag = plot.getSettings().flags.remove(id);
-        if (flag == null) {
-            return false;
-        }
-        final boolean result = EventUtil.manager.callFlagRemove(flag, plot);
-        if (!result) {
-            plot.getSettings().flags.put(id, flag);
-            return false;
-        }
-        MainUtil.reEnterPlot(plot);
-        DBFunc.setFlags(plot, plot.getSettings().flags.values());
-        return true;
-    }
-
-    public static boolean removeClusterFlag(final PlotCluster cluster, final String id) {
-        Flag flag = cluster.settings.flags.remove(id);
-        if (flag == null) {
-            return false;
-        }
-        final boolean result = EventUtil.manager.callFlagRemove(flag, cluster);
-        if (!result) {
-            cluster.settings.flags.put(id, flag);
-            return false;
-        }
-        DBFunc.setFlags(cluster, cluster.settings.flags.values());
-        return true;
-    }
-
-    public static void setPlotFlags(final Plot plot, final Set<Flag> flags) {
-        if (flags != null && flags.size() != 0) {
-            plot.getSettings().flags.clear();
-            for (Flag flag : flags) {
-                plot.getSettings().flags.put(flag.getKey(), flag);
-            }
-        }
-        else if (plot.getSettings().flags.size() == 0) {
-            return;
-        }
-        else {
-            plot.getSettings().flags.clear();
-        }
-        MainUtil.reEnterPlot(plot);
-        DBFunc.setFlags(plot, plot.getSettings().flags.values());
-    }
-
-    public static void setClusterFlags(final PlotCluster cluster, final Set<Flag> flags) {
-        if (flags != null && flags.size() != 0) {
-            cluster.settings.flags.clear();
-            for (Flag flag : flags) {
-                cluster.settings.flags.put(flag.getKey(), flag);
-            }
-        }
-        else if (cluster.settings.flags.size() == 0) {
-            return;
-        }
-        else {
-            cluster.settings.flags.clear();
-        }
-        DBFunc.setFlags(cluster, cluster.settings.flags.values());
-    }
-
-    public static Flag[] removeFlag(final Flag[] flags, final String r) {
-        final Flag[] f = new Flag[flags.length - 1];
-        int index = 0;
-        for (final Flag flag : flags) {
-            if (!flag.getKey().equals(r)) {
-                f[index++] = flag;
-            }
-        }
-        return f;
-    }
-
-    public static Set<Flag> removeFlag(final Set<Flag> flags, final String r) {
-        final HashSet<Flag> newflags = new HashSet<>();
-        for (final Flag flag : flags) {
-            if (!flag.getKey().equalsIgnoreCase(r)) {
-                newflags.add(flag);
-            }
-        }
-        return newflags;
-    }
-
-    /**
-     * Get a list of registered AbstractFlag objects
-     *
-     * @return List (AbstractFlag)
-     */
-    public static HashSet<AbstractFlag> getFlags() {
-        return flags;
-    }
-
-    /**
-     * Get a list of registerd AbstragFlag objects based on player permissions
-     *
-     * @param player with permissions
-     *
-     * @return List (AbstractFlag)
-     */
-    public static List<AbstractFlag> getFlags(final PlotPlayer player) {
-        final List<AbstractFlag> returnFlags = new ArrayList<>();
-        for (final AbstractFlag flag : flags) {
-            if (Permissions.hasPermission(player, "plots.set.flag." + flag.getKey().toLowerCase())) {
-                returnFlags.add(flag);
-            }
-        }
-        return returnFlags;
-    }
-
-    /**
-     * Get an AbstractFlag by a string Returns null if flag does not exist
-     *
-     * @param string Flag Key
-     *
-     * @return AbstractFlag
-     */
-    public static AbstractFlag getFlag(final String string) {
-        for (final AbstractFlag flag : flags) {
-            if (flag.getKey().equalsIgnoreCase(string)) {
-                return flag;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Get an AbstractFlag by a string
-     *
-     * @param string Flag Key
-     * @param create If to create the flag if it does not exist
-     *
-     * @return AbstractFlag
-     */
-    public static AbstractFlag getFlag(final String string, final boolean create) {
-        if ((getFlag(string) == null) && create) {
-            final AbstractFlag flag = new AbstractFlag(string);
-            return flag;
-        }
-        return getFlag(string);
-    }
-
-    /**
-     * Remove a registered AbstractFlag
-     *
-     * @param flag Flag Key
-     *
-     * @return boolean Result of operation
-     */
-    public static boolean removeFlag(final AbstractFlag flag) {
-        return flags.remove(flag);
-    }
-
-    public static HashMap<String, Flag> parseFlags(final List<String> flagstrings) {
-        HashMap<String, Flag> map = new HashMap<String, Flag>();
-        for (String key : flagstrings) {
-            final String[] split;
-            if (key.contains(";")) {
-                split = key.split(";");
-            }
-            else {
-                split = key.split(":");
-            }
-            Flag flag;
-            if (split.length == 1) {
-                flag = new Flag(getFlag(split[0], true), "");
-            } else {
-                flag = new Flag(getFlag(split[0], true), split[1]);
-            }
-            map.put(flag.getKey(), flag);
-        }
-        return map;
-    }
-}
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// PlotSquared - A plot manager and world generator for the Bukkit API                             /
+// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
+//                                                                                                 /
+// This program is free software; you can redistribute it and/or modify                            /
+// it under the terms of the GNU General Public License as published by                            /
+// the Free Software Foundation; either version 3 of the License, or                               /
+// (at your option) any later version.                                                             /
+//                                                                                                 /
+// This program is distributed in the hope that it will be useful,                                 /
+// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
+// GNU General Public License for more details.                                                    /
+//                                                                                                 /
+// You should have received a copy of the GNU General Public License                               /
+// along with this program; if not, write to the Free Software Foundation,                         /
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
+//                                                                                                 /
+// You can contact us via: support@intellectualsites.com                                           /
+////////////////////////////////////////////////////////////////////////////////////////////////////
+package com.intellectualcrafters.plot.flag;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import com.intellectualcrafters.plot.PS;
+import com.intellectualcrafters.plot.config.C;
+import com.intellectualcrafters.plot.database.DBFunc;
+import com.intellectualcrafters.plot.object.Plot;
+import com.intellectualcrafters.plot.object.PlotCluster;
+import com.intellectualcrafters.plot.object.PlotPlayer;
+import com.intellectualcrafters.plot.object.PlotSettings;
+import com.intellectualcrafters.plot.object.PlotWorld;
+import com.intellectualcrafters.plot.util.EventUtil;
+import com.intellectualcrafters.plot.util.MainUtil;
+import com.intellectualcrafters.plot.util.Permissions;
+
+/**
+ * Flag Manager Utility
+ *


+ */
+@SuppressWarnings("unused")
+public class FlagManager
+{
+    // TODO add some flags
+    // - Plot clear interval
+    // - Mob cap
+    // - customized plot composition
+
+    private final static HashSet<String> reserved = new HashSet<>();
+
+    private final static HashSet<AbstractFlag> flags = new HashSet<>();
+
+    /**
+     * Reserve a flag so that it cannot be set by players
+     * @param flag
+     */
+    public static void reserveFlag(final String flag)
+    {
+        reserved.add(flag);
+    }
+
+    /**
+     * Get if a flag is reserved
+     * @param flag
+     * @return
+     */
+    public static boolean isReserved(final String flag)
+    {
+        return reserved.contains(flag);
+    }
+
+    /**
+     * Get the reserved flags
+     * @return
+     */
+    public static HashSet<String> getReservedFlags()
+    {
+        return (HashSet<String>) reserved.clone();
+    }
+
+    /**
+     * Unreserve a flag
+     * @param flag
+     */
+    public static void unreserveFlag(final String flag)
+    {
+        reserved.remove(flag);
+    }
+
+    /**
+     * Register an AbstractFlag with PlotSquared
+     *
+     * @param af Flag to register
+     *
+     * @return boolean success
+     */
+    public static boolean addFlag(final AbstractFlag af)
+    {
+        return addFlag(af, false);
+    }
+
+    public static boolean addFlag(final AbstractFlag af, final boolean reserved)
+    {
+        PS.debug(C.PREFIX.s() + "&8 - Adding flag: &7" + af);
+        for (final PlotWorld plotworld : PS.get().getPlotWorldObjects())
+        {
+            final Flag flag = ((HashMap<String, Flag>) plotworld.DEFAULT_FLAGS.clone()).get(af.getKey());
+            if (flag != null)
+            {
+                flag.setKey(af);
+            }
+        }
+        if (PS.get().getAllPlotsRaw() != null)
+        {
+            for (final Plot plot : PS.get().getPlotsRaw())
+            {
+                final Flag flag = plot.getSettings().flags.get(af.getKey());
+                if (flag != null)
+                {
+                    flag.setKey(af);
+                }
+            }
+        }
+        if ((getFlag(af.getKey()) == null) && flags.add(af))
+        {
+            if (reserved)
+            {
+                reserveFlag(af.getKey());
+            }
+            return true;
+        }
+        return false;
+    }
+
+    public static Flag getSettingFlag(final String world, final PlotSettings settings, final String id)
+    {
+        Flag flag;
+        if ((settings.flags.size() == 0) || ((flag = settings.flags.get(id)) == null))
+        {
+            final PlotWorld plotworld = PS.get().getPlotWorld(world);
+            if (plotworld == null) { return null; }
+            if (plotworld.DEFAULT_FLAGS.size() == 0) { return null; }
+            return ((HashMap<String, Flag>) plotworld.DEFAULT_FLAGS.clone()).get(id);
+        }
+        return flag;
+    }
+
+    public static boolean isBooleanFlag(final Plot plot, final String key, final boolean defaultValue)
+    {
+        final Flag flag = FlagManager.getPlotFlag(plot, key);
+        if (flag == null) { return defaultValue; }
+        final Object value = flag.getValue();
+        if (value instanceof Boolean) { return (boolean) value; }
+        return defaultValue;
+    }
+
+    /**
+     * Get the value of a flag for a plot (respects flag defaults)
+     * @param plot
+     * @param flag
+     * @return Flag
+     */
+    public static Flag getPlotFlag(final Plot plot, final String flag)
+    {
+        if (!plot.hasOwner()) { return null; }
+        return getSettingFlag(plot.world, plot.getSettings(), flag);
+    }
+
+    public static boolean isPlotFlagTrue(final Plot plot, final String strFlag)
+    {
+        if (plot.owner == null) { return false; }
+        final Flag flag = getPlotFlag(plot, strFlag);
+        return !((flag == null) || !((Boolean) flag.getValue()));
+    }
+
+    public static boolean isPlotFlagFalse(final Plot plot, final String strFlag)
+    {
+        if (plot.owner == null) { return false; }
+        final Flag flag = getPlotFlag(plot, strFlag);
+        if ((flag == null) || ((Boolean) flag.getValue())) { return false; }
+        return false;
+    }
+
+    /**
+     * Get the value of a flag for a plot (ignores flag defaults)
+     * @param plot
+     * @param flag
+     * @return Flag
+     */
+    public static Flag getPlotFlagAbs(final Plot plot, final String flag)
+    {
+        return getSettingFlagAbs(plot.getSettings(), flag);
+    }
+
+    public static Flag getSettingFlagAbs(final PlotSettings settings, final String flag)
+    {
+        if ((settings.flags == null) || (settings.flags.size() == 0)) { return null; }
+        return settings.flags.get(flag);
+    }
+
+    /**
+     * Add a flag to a plot
+     * @param plot
+     * @param flag
+     */
+    public static boolean addPlotFlag(final Plot plot, final Flag flag)
+    {
+        final boolean result = EventUtil.manager.callFlagAdd(flag, plot);
+        if (!result) { return false; }
+        plot.getSettings().flags.put(flag.getKey(), flag);
+        MainUtil.reEnterPlot(plot);
+        DBFunc.setFlags(plot, plot.getSettings().flags.values());
+        return true;
+    }
+
+    public static boolean addPlotFlagAbs(final Plot plot, final Flag flag)
+    {
+        final boolean result = EventUtil.manager.callFlagAdd(flag, plot);
+        if (!result) { return false; }
+        plot.getSettings().flags.put(flag.getKey(), flag);
+        return true;
+    }
+
+    public static boolean addClusterFlag(final PlotCluster cluster, final Flag flag)
+    {
+        getSettingFlag(cluster.world, cluster.settings, flag.getKey());
+        cluster.settings.flags.put(flag.getKey(), flag);
+        DBFunc.setFlags(cluster, cluster.settings.flags.values());
+        return true;
+    }
+
+    /**
+     *
+     * @param plot
+     * @return set of flags
+     */
+    public static HashMap<String, Flag> getPlotFlags(final Plot plot)
+    {
+        if (!plot.hasOwner()) { return null; }
+        return getSettingFlags(plot.world, plot.getSettings());
+    }
+
+    public static HashMap<String, Flag> getPlotFlags(final String world, final PlotSettings settings, final boolean ignorePluginflags)
+    {
+        final HashMap<String, Flag> flags = new HashMap<>();
+
+        final PlotWorld plotWorld = PS.get().getPlotWorld(world);
+        if ((plotWorld != null) && (plotWorld.DEFAULT_FLAGS.size() != 0))
+        {
+            flags.putAll(plotWorld.DEFAULT_FLAGS);
+        }
+
+        if (ignorePluginflags)
+        {
+            for (final Map.Entry<String, Flag> flag : settings.flags.entrySet())
+            {
+                if (isReserved(flag.getValue().getAbstractFlag().getKey()))
+                {
+                    continue;
+                }
+                flags.put(flag.getKey(), flag.getValue());
+            }
+        }
+        else
+        {
+            flags.putAll(settings.flags);
+        }
+
+        return flags;
+    }
+
+    public static HashMap<String, Flag> getSettingFlags(final String world, final PlotSettings settings)
+    {
+        return getPlotFlags(world, settings, false);
+    }
+
+    public static boolean removePlotFlag(final Plot plot, final String id)
+    {
+        final Flag flag = plot.getSettings().flags.remove(id);
+        if (flag == null) { return false; }
+        final boolean result = EventUtil.manager.callFlagRemove(flag, plot);
+        if (!result)
+        {
+            plot.getSettings().flags.put(id, flag);
+            return false;
+        }
+        MainUtil.reEnterPlot(plot);
+        DBFunc.setFlags(plot, plot.getSettings().flags.values());
+        return true;
+    }
+
+    public static boolean removeClusterFlag(final PlotCluster cluster, final String id)
+    {
+        final Flag flag = cluster.settings.flags.remove(id);
+        if (flag == null) { return false; }
+        final boolean result = EventUtil.manager.callFlagRemove(flag, cluster);
+        if (!result)
+        {
+            cluster.settings.flags.put(id, flag);
+            return false;
+        }
+        DBFunc.setFlags(cluster, cluster.settings.flags.values());
+        return true;
+    }
+
+    public static void setPlotFlags(final Plot plot, final Set<Flag> flags)
+    {
+        if ((flags != null) && (flags.size() != 0))
+        {
+            plot.getSettings().flags.clear();
+            for (final Flag flag : flags)
+            {
+                plot.getSettings().flags.put(flag.getKey(), flag);
+            }
+        }
+        else if (plot.getSettings().flags.size() == 0)
+        {
+            return;
+        }
+        else
+        {
+            plot.getSettings().flags.clear();
+        }
+        MainUtil.reEnterPlot(plot);
+        DBFunc.setFlags(plot, plot.getSettings().flags.values());
+    }
+
+    public static void setClusterFlags(final PlotCluster cluster, final Set<Flag> flags)
+    {
+        if ((flags != null) && (flags.size() != 0))
+        {
+            cluster.settings.flags.clear();
+            for (final Flag flag : flags)
+            {
+                cluster.settings.flags.put(flag.getKey(), flag);
+            }
+        }
+        else if (cluster.settings.flags.size() == 0)
+        {
+            return;
+        }
+        else
+        {
+            cluster.settings.flags.clear();
+        }
+        DBFunc.setFlags(cluster, cluster.settings.flags.values());
+    }
+
+    public static Flag[] removeFlag(final Flag[] flags, final String r)
+    {
+        final Flag[] f = new Flag[flags.length - 1];
+        int index = 0;
+        for (final Flag flag : flags)
+        {
+            if (!flag.getKey().equals(r))
+            {
+                f[index++] = flag;
+            }
+        }
+        return f;
+    }
+
+    public static Set<Flag> removeFlag(final Set<Flag> flags, final String r)
+    {
+        final HashSet<Flag> newflags = new HashSet<>();
+        for (final Flag flag : flags)
+        {
+            if (!flag.getKey().equalsIgnoreCase(r))
+            {
+                newflags.add(flag);
+            }
+        }
+        return newflags;
+    }
+
+    /**
+     * Get a list of registered AbstractFlag objects
+     *
+     * @return List (AbstractFlag)
+     */
+    public static HashSet<AbstractFlag> getFlags()
+    {
+        return flags;
+    }
+
+    /**
+     * Get a list of registerd AbstragFlag objects based on player permissions
+     *
+     * @param player with permissions
+     *
+     * @return List (AbstractFlag)
+     */
+    public static List<AbstractFlag> getFlags(final PlotPlayer player)
+    {
+        final List<AbstractFlag> returnFlags = new ArrayList<>();
+        for (final AbstractFlag flag : flags)
+        {
+            if (Permissions.hasPermission(player, "plots.set.flag." + flag.getKey().toLowerCase()))
+            {
+                returnFlags.add(flag);
+            }
+        }
+        return returnFlags;
+    }
+
+    /**
+     * Get an AbstractFlag by a string Returns null if flag does not exist
+     *
+     * @param string Flag Key
+     *
+     * @return AbstractFlag
+     */
+    public static AbstractFlag getFlag(final String string)
+    {
+        for (final AbstractFlag flag : flags)
+        {
+            if (flag.getKey().equalsIgnoreCase(string)) { return flag; }
+        }
+        return null;
+    }
+
+    /**
+     * Get an AbstractFlag by a string
+     *
+     * @param string Flag Key
+     * @param create If to create the flag if it does not exist
+     *
+     * @return AbstractFlag
+     */
+    public static AbstractFlag getFlag(final String string, final boolean create)
+    {
+        if ((getFlag(string) == null) && create)
+        {
+            final AbstractFlag flag = new AbstractFlag(string);
+            return flag;
+        }
+        return getFlag(string);
+    }
+
+    /**
+     * Remove a registered AbstractFlag
+     *
+     * @param flag Flag Key
+     *
+     * @return boolean Result of operation
+     */
+    public static boolean removeFlag(final AbstractFlag flag)
+    {
+        return flags.remove(flag);
+    }
+
+    public static HashMap<String, Flag> parseFlags(final List<String> flagstrings)
+    {
+        final HashMap<String, Flag> map = new HashMap<String, Flag>();
+        for (final String key : flagstrings)
+        {
+            final String[] split;
+            if (key.contains(";"))
+            {
+                split = key.split(";");
+            }
+            else
+            {
+                split = key.split(":");
+            }
+            Flag flag;
+            if (split.length == 1)
+            {
+                flag = new Flag(getFlag(split[0], true), "");
+            }
+            else
+            {
+                flag = new Flag(getFlag(split[0], true), split[1]);
+            }
+            map.put(flag.getKey(), flag);
+        }
+        return map;
+    }
+}
diff --git a/src/main/java/com/intellectualcrafters/plot/flag/FlagValue.java b/src/main/java/com/intellectualcrafters/plot/flag/FlagValue.java
index 7e93e7069..8f563c94e 100644
--- a/src/main/java/com/intellectualcrafters/plot/flag/FlagValue.java
+++ b/src/main/java/com/intellectualcrafters/plot/flag/FlagValue.java
@@ -1,506 +1,642 @@
-package com.intellectualcrafters.plot.flag;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-
-import com.intellectualcrafters.plot.object.PlotBlock;
-import com.intellectualcrafters.plot.util.StringMan;
-
-/**
- * Created 2014-11-17 for PlotSquared
- *
- * @author Citymonstret
- */
-public abstract class FlagValue<T> {
-    private final Class<T> clazz;
-
-    @SuppressWarnings("unchecked")
-    public FlagValue() {
-        this.clazz = (Class<T>) getClass();
-    }
-
-    public FlagValue(final Class<T> clazz) {
-        if (clazz == null) {
-            throw new NullPointerException();
-        }
-        this.clazz = clazz;
-    }
-
-    public boolean validValue(final Object value) {
-        return (value != null) && (value.getClass() == this.clazz);
-    }
-
-    public String toString(final Object t) {
-        return t.toString();
-    }
-
-    public abstract T getValue(Object t);
-
-    public abstract T parse(String t);
-
-    public abstract String getDescription();
-
-    public static class BooleanValue extends FlagValue<Boolean> {
-        @Override
-        public Boolean getValue(final Object t) {
-            return (Boolean) t;
-        }
-
-        @Override
-        public Boolean parse(final String t) {
-            switch (t.toLowerCase()) {
-                case "1":
-                case "yes":
-                case "allow":
-                case "true": {
-                    return true;
-                }
-                case "0":
-                case "no":
-                case "deny":
-                case "false": {
-                    return false;
-                }
-                default: {
-                    return null;
-                }
-            }
-        }
-
-        @Override
-        public String getDescription() {
-            return "Flag value must be a boolean (true|false)";
-        }
-    }
-
-    public static class IntegerValue extends FlagValue<Integer> {
-        @Override
-        public Integer getValue(final Object t) {
-            return (Integer) t;
-        }
-
-        @Override
-        public Integer parse(final String t) {
-            try {
-                return Integer.parseInt(t);
-            } catch (final IllegalArgumentException e) {
-                return null;
-            }
-        }
-
-        @Override
-        public String getDescription() {
-            return "Flag value must be a whole number";
-        }
-    }
-
-    public static class IntervalValue extends FlagValue<Integer[]> {
-        @Override
-        public String toString(final Object t) {
-            final Integer[] value = ((Integer[]) t);
-            return value[0] + " " + value[1];
-        }
-
-        @Override
-        public Integer[] getValue(final Object t) {
-            return (Integer[]) t;
-        }
-
-        @Override
-        public Integer[] parse(final String t) {
-            int seconds;
-            int amount;
-            final String[] values = t.split(" ");
-            if (values.length < 2) {
-                seconds = 1;
-                try {
-                    amount = Integer.parseInt(values[0]);
-                } catch (final Exception e) {
-                    return null;
-                }
-            } else {
-                try {
-                    amount = Integer.parseInt(values[0]);
-                    seconds = Integer.parseInt(values[1]);
-                } catch (final Exception e) {
-                    return null;
-                }
-            }
-            return new Integer[] { amount, seconds };
-        }
-
-        @Override
-        public String getDescription() {
-            return "Value(s) must be numeric. /plot set flag <flag> <interval> [amount]";
-        }
-    }
-
-    public static class UnsignedIntegerValue extends FlagValue<Integer> {
-        @Override
-        public Integer getValue(final Object t) {
-            return (Integer) t;
-        }
-
-        @Override
-        public Integer parse(final String t) {
-            try {
-                final int value = Integer.parseInt(t);
-                if (value < 0) {
-                    return null;
-                }
-                return value;
-            } catch (final IllegalArgumentException e) {
-                return null;
-            }
-        }
-
-        @Override
-        public String getDescription() {
-            return "Flag value must be a positive whole number (includes 0)";
-        }
-    }
-
-    public static class DoubleValue extends FlagValue<Double> {
-        @Override
-        public Double getValue(final Object t) {
-            return (Double) t;
-        }
-
-        @Override
-        public Double parse(final String t) {
-            try {
-                return Double.parseDouble(t);
-            } catch (final IllegalArgumentException e) {
-                return null;
-            }
-        }
-
-        @Override
-        public String getDescription() {
-            return "Flag value must be a number (negative decimals are allowed)";
-        }
-    }
-
-    public static class LongValue extends FlagValue<Long> {
-        @Override
-        public Long getValue(final Object t) {
-            return (Long) t;
-        }
-
-        @Override
-        public Long parse(final String t) {
-            try {
-                return Long.parseLong(t);
-            } catch (final IllegalArgumentException e) {
-                return null;
-            }
-        }
-
-        @Override
-        public String getDescription() {
-            return "Flag value must be a whole number (large numbers allowed)";
-        }
-    }
-
-    public static class UnsignedLongValue extends FlagValue<Long> {
-        @Override
-        public Long getValue(final Object t) {
-            return (Long) t;
-        }
-
-        @Override
-        public Long parse(final String t) {
-            try {
-                final long value = Long.parseLong(t);
-                if (value < 0) {
-                    return null;
-                }
-                return value;
-            } catch (final IllegalArgumentException e) {
-                return null;
-            }
-        }
-
-        @Override
-        public String getDescription() {
-            return "Flag value must be a positive whole number (large numbers allowed)";
-        }
-    }
-
-    public static class UnsignedDoubleValue extends FlagValue<Double> {
-        @Override
-        public Double getValue(final Object t) {
-            return (Double) t;
-        }
-
-        @Override
-        public Double parse(final String t) {
-            try {
-                final double value = Double.parseDouble(t);
-                if (value < 0) {
-                    return null;
-                }
-                return value;
-            } catch (final IllegalArgumentException e) {
-                return null;
-            }
-        }
-
-        @Override
-        public String getDescription() {
-            return "Flag value must be a positive number (decimals allowed)";
-        }
-    }
-
-    public static class PlotBlockValue extends FlagValue<PlotBlock> {
-        @Override
-        public PlotBlock getValue(final Object t) {
-            return (PlotBlock) t;
-        }
-
-        @Override
-        public PlotBlock parse(final String t) {
-            try {
-                final String[] split = t.split(":");
-                byte data;
-                if (split.length == 2) {
-                    if ("*".equals(split[1])) {
-                        data = -1;
-                    } else {
-                        data = Byte.parseByte(split[1]);
-                    }
-                } else {
-                    data = -1;
-                }
-                final short id = Short.parseShort(split[0]);
-                return new PlotBlock(id, data);
-            } catch (final Exception e) {
-                return null;
-            }
-        }
-
-        @Override
-        public String getDescription() {
-            return "Flag value must be a number (negative decimals are allowed)";
-        }
-    }
-
-    public interface ListValue {
-        void add(Object t, String value);
-
-        void remove(Object t, String value);
-    }
-
-    public static class PlotBlockListValue extends FlagValue<HashSet<PlotBlock>> implements ListValue {
-        @SuppressWarnings("unchecked")
-        @Override
-        public String toString(final Object t) {
-            return StringMan.join((HashSet<PlotBlock>) t, ",");
-        }
-
-        @SuppressWarnings("unchecked")
-        @Override
-        public HashSet<PlotBlock> getValue(final Object t) {
-            return (HashSet<PlotBlock>) t;
-        }
-
-        @Override
-        public HashSet<PlotBlock> parse(final String t) {
-            final HashSet<PlotBlock> list = new HashSet<PlotBlock>();
-            for (final String item : t.split(",")) {
-                final String[] split = item.split(":");
-                byte data;
-                if (split.length == 2) {
-                    if ("*".equals(split[1])) {
-                        data = -1;
-                    } else {
-                        data = Byte.parseByte(split[1]);
-                    }
-                } else {
-                    data = -1;
-                }
-                final short id = Short.parseShort(split[0]);
-                final PlotBlock block = new PlotBlock(id, data);
-                list.add(block);
-            }
-            return list;
-        }
-
-        @Override
-        public String getDescription() {
-            return "Flag value must be a block list";
-        }
-
-        @Override
-        public void add(final Object t, final String value) {
-            try {
-                ((HashSet<PlotBlock>) t).addAll(parse(value));
-            } catch (final Exception e) {
-            }
-        }
-
-        @Override
-        public void remove(final Object t, final String value) {
-            try {
-                for (final PlotBlock item : parse(value)) {
-                    ((HashSet<PlotBlock>) t).remove(item);
-                }
-            } catch (final Exception e) {
-            }
-        }
-    }
-    
-    public static class IntegerListValue extends FlagValue<List<Integer>> implements ListValue {
-        @SuppressWarnings("unchecked")
-        @Override
-        public String toString(final Object t) {
-            return StringMan.join((List<Integer>) t, ",");
-        }
-
-        @SuppressWarnings("unchecked")
-        @Override
-        public List<Integer> getValue(final Object t) {
-            return (List<Integer>) t;
-        }
-
-        @Override
-        public List<Integer> parse(final String t) {
-            String[] split = (t.split(","));
-            ArrayList<Integer> numbers = new ArrayList<Integer>();
-            for (String element : split) {
-                numbers.add(Integer.parseInt(element));
-            }
-            return numbers;
-        }
-
-        @Override
-        public String getDescription() {
-            return "Flag value must be a integer list";
-        }
-
-        @Override
-        public void add(final Object t, final String value) {
-            try {
-                ((List<Integer>) t).addAll(parse(value));
-            } catch (final Exception e) {
-            }
-        }
-
-        @Override
-        public void remove(final Object t, final String value) {
-            try {
-                for (final Integer item : parse(value)) {
-                    ((List<Integer>) t).remove(item);
-                }
-            } catch (final Exception e) {
-            }
-        }
-    }
-
-    @SuppressWarnings("ALL")
-    public static class StringListValue extends FlagValue<List<String>> implements ListValue {
-
-        @Override
-        public String toString(final Object t) {
-            return StringMan.join((List<String>) t, ",");
-        }
-
-        @Override
-        public List<String> getValue(final Object t) {
-            return (List<String>) t;
-        }
-
-        @Override
-        public List<String> parse(final String t) {
-            return Arrays.asList(t.split(","));
-        }
-
-        @Override
-        public String getDescription() {
-            return "Flag value must be a string list";
-        }
-
-        @Override
-        public void add(final Object t, final String value) {
-            try {
-                ((List<String>) t).addAll(parse(value));
-            } catch (final Exception ignored) {}
-        }
-
-        @Override
-        public void remove(final Object t, final String value) {
-            try {
-                for (final String item : parse(value)) {
-                    ((List<String>) t).remove(item);
-                }
-            } catch (final Exception e) {
-            }
-        }
-    }
-
-    public static class DoubleListValue extends FlagValue<List<Double>> implements ListValue {
-        @SuppressWarnings("unchecked")
-        @Override
-        public String toString(final Object t) {
-            return StringMan.join((List<Double>) t, ",");
-        }
-
-        @SuppressWarnings("unchecked")
-        @Override
-        public List<Double> getValue(final Object t) {
-            return (List<Double>) t;
-        }
-
-        @Override
-        public List<Double> parse(final String t) {
-            String[] split = (t.split(","));
-            ArrayList<Double> numbers = new ArrayList<Double>();
-            for (String element : split) {
-                numbers.add(Double.parseDouble(element));
-            }
-            return numbers;
-        }
-
-        @Override
-        public String getDescription() {
-            return "Flag value must be a integer list";
-        }
-
-        @Override
-        public void add(final Object t, final String value) {
-            try {
-                ((List<Double>) t).addAll(parse(value));
-            } catch (final Exception e) {
-            }
-        }
-
-        @Override
-        public void remove(final Object t, final String value) {
-            try {
-                for (final Double item : parse(value)) {
-                    ((List<Double>) t).remove(item);
-                }
-            } catch (final Exception e) {
-            }
-        }
-    }
-
-    public static class StringValue extends FlagValue<String> {
-        @Override
-        public String parse(final String s) {
-            return s;
-        }
-
-        @Override
-        public String getDescription() {
-            return "Flag value must be alphanumeric. Some special characters are allowed.";
-        }
-
-        @Override
-        public String getValue(final Object t) {
-            return t.toString();
-        }
-    }
-}
+package com.intellectualcrafters.plot.flag;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+
+import com.intellectualcrafters.plot.object.PlotBlock;
+import com.intellectualcrafters.plot.util.StringMan;
+
+/**
+ * Created 2014-11-17 for PlotSquared
+ *

+ */
+public abstract class FlagValue<T>
+{
+    private final Class<T> clazz;
+
+    @SuppressWarnings("unchecked")
+    public FlagValue()
+    {
+        this.clazz = (Class<T>) getClass();
+    }
+
+    public FlagValue(final Class<T> clazz)
+    {
+        if (clazz == null) { throw new NullPointerException(); }
+        this.clazz = clazz;
+    }
+
+    public boolean validValue(final Object value)
+    {
+        return (value != null) && (value.getClass() == this.clazz);
+    }
+
+    public String toString(final Object t)
+    {
+        return t.toString();
+    }
+
+    public abstract T getValue(final Object t);
+
+    public abstract T parse(final String t);
+
+    public abstract String getDescription();
+
+    public static class BooleanValue extends FlagValue<Boolean>
+    {
+        @Override
+        public Boolean getValue(final Object t)
+        {
+            return (Boolean) t;
+        }
+
+        @Override
+        public Boolean parse(final String t)
+        {
+            switch (t.toLowerCase())
+            {
+                case "1":
+                case "yes":
+                case "allow":
+                case "true":
+                {
+                    return true;
+                }
+                case "0":
+                case "no":
+                case "deny":
+                case "false":
+                {
+                    return false;
+                }
+                default:
+                {
+                    return null;
+                }
+            }
+        }
+
+        @Override
+        public String getDescription()
+        {
+            return "Flag value must be a boolean (true|false)";
+        }
+    }
+
+    public static class IntegerValue extends FlagValue<Integer>
+    {
+        @Override
+        public Integer getValue(final Object t)
+        {
+            return (Integer) t;
+        }
+
+        @Override
+        public Integer parse(final String t)
+        {
+            try
+            {
+                return Integer.parseInt(t);
+            }
+            catch (final IllegalArgumentException e)
+            {
+                return null;
+            }
+        }
+
+        @Override
+        public String getDescription()
+        {
+            return "Flag value must be a whole number";
+        }
+    }
+
+    public static class IntervalValue extends FlagValue<Integer[]>
+    {
+        @Override
+        public String toString(final Object t)
+        {
+            final Integer[] value = ((Integer[]) t);
+            return value[0] + " " + value[1];
+        }
+
+        @Override
+        public Integer[] getValue(final Object t)
+        {
+            return (Integer[]) t;
+        }
+
+        @Override
+        public Integer[] parse(final String t)
+        {
+            int seconds;
+            int amount;
+            final String[] values = t.split(" ");
+            if (values.length < 2)
+            {
+                seconds = 1;
+                try
+                {
+                    amount = Integer.parseInt(values[0]);
+                }
+                catch (final Exception e)
+                {
+                    return null;
+                }
+            }
+            else
+            {
+                try
+                {
+                    amount = Integer.parseInt(values[0]);
+                    seconds = Integer.parseInt(values[1]);
+                }
+                catch (final Exception e)
+                {
+                    return null;
+                }
+            }
+            return new Integer[] { amount, seconds };
+        }
+
+        @Override
+        public String getDescription()
+        {
+            return "Value(s) must be numeric. /plot set flag <flag> <interval> [amount]";
+        }
+    }
+
+    public static class UnsignedIntegerValue extends FlagValue<Integer>
+    {
+        @Override
+        public Integer getValue(final Object t)
+        {
+            return (Integer) t;
+        }
+
+        @Override
+        public Integer parse(final String t)
+        {
+            try
+            {
+                final int value = Integer.parseInt(t);
+                if (value < 0) { return null; }
+                return value;
+            }
+            catch (final IllegalArgumentException e)
+            {
+                return null;
+            }
+        }
+
+        @Override
+        public String getDescription()
+        {
+            return "Flag value must be a positive whole number (includes 0)";
+        }
+    }
+
+    public static class DoubleValue extends FlagValue<Double>
+    {
+        @Override
+        public Double getValue(final Object t)
+        {
+            return (Double) t;
+        }
+
+        @Override
+        public Double parse(final String t)
+        {
+            try
+            {
+                return Double.parseDouble(t);
+            }
+            catch (final IllegalArgumentException e)
+            {
+                return null;
+            }
+        }
+
+        @Override
+        public String getDescription()
+        {
+            return "Flag value must be a number (negative decimals are allowed)";
+        }
+    }
+
+    public static class LongValue extends FlagValue<Long>
+    {
+        @Override
+        public Long getValue(final Object t)
+        {
+            return (Long) t;
+        }
+
+        @Override
+        public Long parse(final String t)
+        {
+            try
+            {
+                return Long.parseLong(t);
+            }
+            catch (final IllegalArgumentException e)
+            {
+                return null;
+            }
+        }
+
+        @Override
+        public String getDescription()
+        {
+            return "Flag value must be a whole number (large numbers allowed)";
+        }
+    }
+
+    public static class UnsignedLongValue extends FlagValue<Long>
+    {
+        @Override
+        public Long getValue(final Object t)
+        {
+            return (Long) t;
+        }
+
+        @Override
+        public Long parse(final String t)
+        {
+            try
+            {
+                final long value = Long.parseLong(t);
+                if (value < 0) { return null; }
+                return value;
+            }
+            catch (final IllegalArgumentException e)
+            {
+                return null;
+            }
+        }
+
+        @Override
+        public String getDescription()
+        {
+            return "Flag value must be a positive whole number (large numbers allowed)";
+        }
+    }
+
+    public static class UnsignedDoubleValue extends FlagValue<Double>
+    {
+        @Override
+        public Double getValue(final Object t)
+        {
+            return (Double) t;
+        }
+
+        @Override
+        public Double parse(final String t)
+        {
+            try
+            {
+                final double value = Double.parseDouble(t);
+                if (value < 0) { return null; }
+                return value;
+            }
+            catch (final IllegalArgumentException e)
+            {
+                return null;
+            }
+        }
+
+        @Override
+        public String getDescription()
+        {
+            return "Flag value must be a positive number (decimals allowed)";
+        }
+    }
+
+    public static class PlotBlockValue extends FlagValue<PlotBlock>
+    {
+        @Override
+        public PlotBlock getValue(final Object t)
+        {
+            return (PlotBlock) t;
+        }
+
+        @Override
+        public PlotBlock parse(final String t)
+        {
+            try
+            {
+                final String[] split = t.split(":");
+                byte data;
+                if (split.length == 2)
+                {
+                    if ("*".equals(split[1]))
+                    {
+                        data = -1;
+                    }
+                    else
+                    {
+                        data = Byte.parseByte(split[1]);
+                    }
+                }
+                else
+                {
+                    data = -1;
+                }
+                final short id = Short.parseShort(split[0]);
+                return new PlotBlock(id, data);
+            }
+            catch (final Exception e)
+            {
+                return null;
+            }
+        }
+
+        @Override
+        public String getDescription()
+        {
+            return "Flag value must be a number (negative decimals are allowed)";
+        }
+    }
+
+    public interface ListValue
+    {
+        void add(final Object t, final String value);
+
+        void remove(final Object t, final String value);
+    }
+
+    public static class PlotBlockListValue extends FlagValue<HashSet<PlotBlock>> implements ListValue
+    {
+        @SuppressWarnings("unchecked")
+        @Override
+        public String toString(final Object t)
+        {
+            return StringMan.join((HashSet<PlotBlock>) t, ",");
+        }
+
+        @SuppressWarnings("unchecked")
+        @Override
+        public HashSet<PlotBlock> getValue(final Object t)
+        {
+            return (HashSet<PlotBlock>) t;
+        }
+
+        @Override
+        public HashSet<PlotBlock> parse(final String t)
+        {
+            final HashSet<PlotBlock> list = new HashSet<PlotBlock>();
+            for (final String item : t.split(","))
+            {
+                final String[] split = item.split(":");
+                byte data;
+                if (split.length == 2)
+                {
+                    if ("*".equals(split[1]))
+                    {
+                        data = -1;
+                    }
+                    else
+                    {
+                        data = Byte.parseByte(split[1]);
+                    }
+                }
+                else
+                {
+                    data = -1;
+                }
+                final short id = Short.parseShort(split[0]);
+                final PlotBlock block = new PlotBlock(id, data);
+                list.add(block);
+            }
+            return list;
+        }
+
+        @Override
+        public String getDescription()
+        {
+            return "Flag value must be a block list";
+        }
+
+        @Override
+        public void add(final Object t, final String value)
+        {
+            try
+            {
+                ((HashSet<PlotBlock>) t).addAll(parse(value));
+            }
+            catch (final Exception e)
+            {}
+        }
+
+        @Override
+        public void remove(final Object t, final String value)
+        {
+            try
+            {
+                for (final PlotBlock item : parse(value))
+                {
+                    ((HashSet<PlotBlock>) t).remove(item);
+                }
+            }
+            catch (final Exception e)
+            {}
+        }
+    }
+
+    public static class IntegerListValue extends FlagValue<List<Integer>> implements ListValue
+    {
+        @SuppressWarnings("unchecked")
+        @Override
+        public String toString(final Object t)
+        {
+            return StringMan.join((List<Integer>) t, ",");
+        }
+
+        @SuppressWarnings("unchecked")
+        @Override
+        public List<Integer> getValue(final Object t)
+        {
+            return (List<Integer>) t;
+        }
+
+        @Override
+        public List<Integer> parse(final String t)
+        {
+            final String[] split = (t.split(","));
+            final ArrayList<Integer> numbers = new ArrayList<Integer>();
+            for (final String element : split)
+            {
+                numbers.add(Integer.parseInt(element));
+            }
+            return numbers;
+        }
+
+        @Override
+        public String getDescription()
+        {
+            return "Flag value must be a integer list";
+        }
+
+        @Override
+        public void add(final Object t, final String value)
+        {
+            try
+            {
+                ((List<Integer>) t).addAll(parse(value));
+            }
+            catch (final Exception e)
+            {}
+        }
+
+        @Override
+        public void remove(final Object t, final String value)
+        {
+            try
+            {
+                for (final Integer item : parse(value))
+                {
+                    ((List<Integer>) t).remove(item);
+                }
+            }
+            catch (final Exception e)
+            {}
+        }
+    }
+
+    @SuppressWarnings("ALL")
+    public static class StringListValue extends FlagValue<List<String>> implements ListValue
+    {
+
+        @Override
+        public String toString(final Object t)
+        {
+            return StringMan.join((List<String>) t, ",");
+        }
+
+        @Override
+        public List<String> getValue(final Object t)
+        {
+            return (List<String>) t;
+        }
+
+        @Override
+        public List<String> parse(final String t)
+        {
+            return Arrays.asList(t.split(","));
+        }
+
+        @Override
+        public String getDescription()
+        {
+            return "Flag value must be a string list";
+        }
+
+        @Override
+        public void add(final Object t, final String value)
+        {
+            try
+            {
+                ((List<String>) t).addAll(parse(value));
+            }
+            catch (final Exception ignored)
+            {}
+        }
+
+        @Override
+        public void remove(final Object t, final String value)
+        {
+            try
+            {
+                for (final String item : parse(value))
+                {
+                    ((List<String>) t).remove(item);
+                }
+            }
+            catch (final Exception e)
+            {}
+        }
+    }
+
+    public static class DoubleListValue extends FlagValue<List<Double>> implements ListValue
+    {
+        @SuppressWarnings("unchecked")
+        @Override
+        public String toString(final Object t)
+        {
+            return StringMan.join((List<Double>) t, ",");
+        }
+
+        @SuppressWarnings("unchecked")
+        @Override
+        public List<Double> getValue(final Object t)
+        {
+            return (List<Double>) t;
+        }
+
+        @Override
+        public List<Double> parse(final String t)
+        {
+            final String[] split = (t.split(","));
+            final ArrayList<Double> numbers = new ArrayList<Double>();
+            for (final String element : split)
+            {
+                numbers.add(Double.parseDouble(element));
+            }
+            return numbers;
+        }
+
+        @Override
+        public String getDescription()
+        {
+            return "Flag value must be a integer list";
+        }
+
+        @Override
+        public void add(final Object t, final String value)
+        {
+            try
+            {
+                ((List<Double>) t).addAll(parse(value));
+            }
+            catch (final Exception e)
+            {}
+        }
+
+        @Override
+        public void remove(final Object t, final String value)
+        {
+            try
+            {
+                for (final Double item : parse(value))
+                {
+                    ((List<Double>) t).remove(item);
+                }
+            }
+            catch (final Exception e)
+            {}
+        }
+    }
+
+    public static class StringValue extends FlagValue<String>
+    {
+        @Override
+        public String parse(final String s)
+        {
+            return s;
+        }
+
+        @Override
+        public String getDescription()
+        {
+            return "Flag value must be alphanumeric. Some special characters are allowed.";
+        }
+
+        @Override
+        public String getValue(final Object t)
+        {
+            return t.toString();
+        }
+    }
+}
diff --git a/src/main/java/com/intellectualcrafters/plot/generator/ClassicPlotManager.java b/src/main/java/com/intellectualcrafters/plot/generator/ClassicPlotManager.java
index 8828db8a9..eb5058c9e 100644
--- a/src/main/java/com/intellectualcrafters/plot/generator/ClassicPlotManager.java
+++ b/src/main/java/com/intellectualcrafters/plot/generator/ClassicPlotManager.java
@@ -14,38 +14,47 @@ import com.intellectualcrafters.plot.util.SetBlockQueue;
 /**
  * A plot manager with square plots which tesselate on a square grid with the following sections: ROAD, WALL, BORDER (wall), PLOT, FLOOR (plot)
  */
-public class ClassicPlotManager extends SquarePlotManager {
+public class ClassicPlotManager extends SquarePlotManager
+{
     @Override
-    public boolean setComponent(final PlotWorld plotworld, final PlotId plotid, final String component, final PlotBlock[] blocks) {
-        switch (component) {
-            case "floor": {
+    public boolean setComponent(final PlotWorld plotworld, final PlotId plotid, final String component, final PlotBlock[] blocks)
+    {
+        switch (component)
+        {
+            case "floor":
+            {
                 setFloor(plotworld, plotid, blocks);
                 return true;
             }
-            case "wall": {
+            case "wall":
+            {
                 setWallFilling(plotworld, plotid, blocks);
                 return true;
             }
-            case "border": {
+            case "border":
+            {
                 setWall(plotworld, plotid, blocks);
                 return true;
             }
         }
         return false;
     }
-    
+
     @Override
-    public boolean unclaimPlot(PlotWorld plotworld, Plot plot, Runnable whenDone) {
+    public boolean unclaimPlot(final PlotWorld plotworld, final Plot plot, final Runnable whenDone)
+    {
         final HybridPlotWorld dpw = ((HybridPlotWorld) plotworld);
         setWallFilling(dpw, plot.id, new PlotBlock[] { dpw.WALL_FILLING });
-        if (dpw.WALL_BLOCK.id != 0 || !dpw.WALL_BLOCK.equals(dpw.CLAIMED_WALL_BLOCK)) {
+        if ((dpw.WALL_BLOCK.id != 0) || !dpw.WALL_BLOCK.equals(dpw.CLAIMED_WALL_BLOCK))
+        {
             setWall(dpw, plot.id, new PlotBlock[] { dpw.WALL_BLOCK });
         }
         SetBlockQueue.addNotify(whenDone);
         return true;
     }
-    
-    public boolean setFloor(final PlotWorld plotworld, final PlotId plotid, final PlotBlock[] blocks) {
+
+    public boolean setFloor(final PlotWorld plotworld, final PlotId plotid, final PlotBlock[] blocks)
+    {
         final ClassicPlotWorld dpw = (ClassicPlotWorld) plotworld;
         final Location pos1 = MainUtil.getPlotBottomLoc(plotworld.worldname, plotid).add(1, 0, 1);
         final Location pos2 = MainUtil.getPlotTopLoc(plotworld.worldname, plotid).add(1, 0, 1);
@@ -55,66 +64,76 @@ public class ClassicPlotManager extends SquarePlotManager {
         return true;
     }
 
-    public boolean setWallFilling(final PlotWorld plotworld, final PlotId plotid, final PlotBlock[] blocks) {
+    public boolean setWallFilling(final PlotWorld plotworld, final PlotId plotid, final PlotBlock[] blocks)
+    {
         final ClassicPlotWorld dpw = (ClassicPlotWorld) plotworld;
-        if (dpw.ROAD_WIDTH == 0) {
-            return false;
-        }
+        if (dpw.ROAD_WIDTH == 0) { return false; }
         final Location bottom = MainUtil.getPlotBottomLoc(plotworld.worldname, plotid);
         final Location top = MainUtil.getPlotTopLoc(plotworld.worldname, plotid).add(1, 0, 1);
         int x, z;
         z = bottom.getZ();
-        PseudoRandom random = new PseudoRandom();
-        for (x = bottom.getX(); x <= (top.getX() - 1); x++) {
-            for (int y = 1; y <= dpw.WALL_HEIGHT; y++) {
+        final PseudoRandom random = new PseudoRandom();
+        for (x = bottom.getX(); x <= (top.getX() - 1); x++)
+        {
+            for (int y = 1; y <= dpw.WALL_HEIGHT; y++)
+            {
                 SetBlockQueue.setBlock(plotworld.worldname, x, y, z, blocks[random.random(blocks.length)]);
             }
         }
         x = top.getX();
-        for (z = bottom.getZ(); z <= (top.getZ() - 1); z++) {
-            for (int y = 1; y <= dpw.WALL_HEIGHT; y++) {
+        for (z = bottom.getZ(); z <= (top.getZ() - 1); z++)
+        {
+            for (int y = 1; y <= dpw.WALL_HEIGHT; y++)
+            {
                 SetBlockQueue.setBlock(plotworld.worldname, x, y, z, blocks[random.random(blocks.length)]);
             }
         }
         z = top.getZ();
-        for (x = top.getX(); x >= (bottom.getX() + 1); x--) {
-            for (int y = 1; y <= dpw.WALL_HEIGHT; y++) {
+        for (x = top.getX(); x >= (bottom.getX() + 1); x--)
+        {
+            for (int y = 1; y <= dpw.WALL_HEIGHT; y++)
+            {
                 SetBlockQueue.setBlock(plotworld.worldname, x, y, z, blocks[random.random(blocks.length)]);
             }
         }
         x = bottom.getX();
-        for (z = top.getZ(); z >= (bottom.getZ() + 1); z--) {
-            for (int y = 1; y <= dpw.WALL_HEIGHT; y++) {
+        for (z = top.getZ(); z >= (bottom.getZ() + 1); z--)
+        {
+            for (int y = 1; y <= dpw.WALL_HEIGHT; y++)
+            {
                 SetBlockQueue.setBlock(plotworld.worldname, x, y, z, blocks[random.random(blocks.length)]);
             }
         }
         return true;
     }
 
-    public boolean setWall(final PlotWorld plotworld, final PlotId plotid, final PlotBlock[] blocks) {
+    public boolean setWall(final PlotWorld plotworld, final PlotId plotid, final PlotBlock[] blocks)
+    {
         final ClassicPlotWorld dpw = (ClassicPlotWorld) plotworld;
-        if (dpw.ROAD_WIDTH == 0) {
-            return false;
-        }
+        if (dpw.ROAD_WIDTH == 0) { return false; }
         final Location bottom = MainUtil.getPlotBottomLoc(plotworld.worldname, plotid);
         final Location top = MainUtil.getPlotTopLoc(plotworld.worldname, plotid).add(1, 0, 1);
         int x, z;
         z = bottom.getZ();
-        PseudoRandom random = new PseudoRandom();
+        final PseudoRandom random = new PseudoRandom();
         final int y = dpw.WALL_HEIGHT + 1;
-        for (x = bottom.getX(); x <= (top.getX() - 1); x++) {
+        for (x = bottom.getX(); x <= (top.getX() - 1); x++)
+        {
             SetBlockQueue.setBlock(plotworld.worldname, x, y, z, blocks[random.random(blocks.length)]);
         }
         x = top.getX();
-        for (z = bottom.getZ(); z <= (top.getZ() - 1); z++) {
+        for (z = bottom.getZ(); z <= (top.getZ() - 1); z++)
+        {
             SetBlockQueue.setBlock(plotworld.worldname, x, y, z, blocks[random.random(blocks.length)]);
         }
         z = top.getZ();
-        for (x = top.getX(); x >= (bottom.getX() + 1); x--) {
+        for (x = top.getX(); x >= (bottom.getX() + 1); x--)
+        {
             SetBlockQueue.setBlock(plotworld.worldname, x, y, z, blocks[random.random(blocks.length)]);
         }
         x = bottom.getX();
-        for (z = top.getZ(); z >= (bottom.getZ() + 1); z--) {
+        for (z = top.getZ(); z >= (bottom.getZ() + 1); z--)
+        {
             SetBlockQueue.setBlock(plotworld.worldname, x, y, z, blocks[random.random(blocks.length)]);
         }
         return true;
@@ -124,7 +143,8 @@ public class ClassicPlotManager extends SquarePlotManager {
      * PLOT MERGING
      */
     @Override
-    public boolean createRoadEast(final PlotWorld plotworld, final Plot plot) {
+    public boolean createRoadEast(final PlotWorld plotworld, final Plot plot)
+    {
         final ClassicPlotWorld dpw = (ClassicPlotWorld) plotworld;
         final Location pos1 = getPlotBottomLocAbs(plotworld, plot.id);
         final Location pos2 = getPlotTopLocAbs(plotworld, plot.id);
@@ -132,18 +152,23 @@ public class ClassicPlotManager extends SquarePlotManager {
         final int ex = (sx + dpw.ROAD_WIDTH) - 1;
         final int sz = pos1.getZ() - 1;
         final int ez = pos2.getZ() + 2;
-        MainUtil.setSimpleCuboidAsync(plotworld.worldname, new Location(plotworld.worldname, sx, Math.min(dpw.WALL_HEIGHT, dpw.ROAD_HEIGHT) + 1, sz + 1), new Location(plotworld.worldname, ex + 1, 257, ez), new PlotBlock((short) 0, (byte) 0));
-        MainUtil.setSimpleCuboidAsync(plotworld.worldname, new Location(plotworld.worldname, sx, 1, sz + 1), new Location(plotworld.worldname, ex + 1, dpw.PLOT_HEIGHT, ez), new PlotBlock((short) 7, (byte) 0));
+        MainUtil.setSimpleCuboidAsync(plotworld.worldname, new Location(plotworld.worldname, sx, Math.min(dpw.WALL_HEIGHT, dpw.ROAD_HEIGHT) + 1, sz + 1), new Location(plotworld.worldname, ex + 1,
+        257, ez), new PlotBlock((short) 0, (byte) 0));
+        MainUtil.setSimpleCuboidAsync(plotworld.worldname, new Location(plotworld.worldname, sx, 1, sz + 1), new Location(plotworld.worldname, ex + 1, dpw.PLOT_HEIGHT, ez), new PlotBlock((short) 7,
+        (byte) 0));
         MainUtil.setSimpleCuboidAsync(plotworld.worldname, new Location(plotworld.worldname, sx, 1, sz + 1), new Location(plotworld.worldname, sx + 1, dpw.WALL_HEIGHT + 1, ez), dpw.WALL_FILLING);
-        MainUtil.setSimpleCuboidAsync(plotworld.worldname, new Location(plotworld.worldname, sx, dpw.WALL_HEIGHT + 1, sz + 1), new Location(plotworld.worldname, sx + 1, dpw.WALL_HEIGHT + 2, ez), dpw.WALL_BLOCK);
+        MainUtil.setSimpleCuboidAsync(plotworld.worldname, new Location(plotworld.worldname, sx, dpw.WALL_HEIGHT + 1, sz + 1), new Location(plotworld.worldname, sx + 1, dpw.WALL_HEIGHT + 2, ez),
+        dpw.WALL_BLOCK);
         MainUtil.setSimpleCuboidAsync(plotworld.worldname, new Location(plotworld.worldname, ex, 1, sz + 1), new Location(plotworld.worldname, ex + 1, dpw.WALL_HEIGHT + 1, ez), dpw.WALL_FILLING);
-        MainUtil.setSimpleCuboidAsync(plotworld.worldname, new Location(plotworld.worldname, ex, dpw.WALL_HEIGHT + 1, sz + 1), new Location(plotworld.worldname, ex + 1, dpw.WALL_HEIGHT + 2, ez), dpw.WALL_BLOCK);
+        MainUtil.setSimpleCuboidAsync(plotworld.worldname, new Location(plotworld.worldname, ex, dpw.WALL_HEIGHT + 1, sz + 1), new Location(plotworld.worldname, ex + 1, dpw.WALL_HEIGHT + 2, ez),
+        dpw.WALL_BLOCK);
         MainUtil.setSimpleCuboidAsync(plotworld.worldname, new Location(plotworld.worldname, sx + 1, 1, sz + 1), new Location(plotworld.worldname, ex, dpw.ROAD_HEIGHT + 1, ez), dpw.ROAD_BLOCK);
         return true;
     }
 
     @Override
-    public boolean createRoadSouth(final PlotWorld plotworld, final Plot plot) {
+    public boolean createRoadSouth(final PlotWorld plotworld, final Plot plot)
+    {
         final ClassicPlotWorld dpw = (ClassicPlotWorld) plotworld;
         final Location pos1 = getPlotBottomLocAbs(plotworld, plot.id);
         final Location pos2 = getPlotTopLocAbs(plotworld, plot.id);
@@ -151,32 +176,38 @@ public class ClassicPlotManager extends SquarePlotManager {
         final int ez = (sz + dpw.ROAD_WIDTH) - 1;
         final int sx = pos1.getX() - 1;
         final int ex = pos2.getX() + 2;
-        MainUtil.setSimpleCuboidAsync(plotworld.worldname, new Location(plotworld.worldname, sx + 1, Math.min(dpw.WALL_HEIGHT, dpw.ROAD_HEIGHT) + 1, sz), new Location(plotworld.worldname, ex, 257, ez + 1), new PlotBlock((short) 0, (byte) 0));
+        MainUtil.setSimpleCuboidAsync(plotworld.worldname, new Location(plotworld.worldname, sx + 1, Math.min(dpw.WALL_HEIGHT, dpw.ROAD_HEIGHT) + 1, sz), new Location(plotworld.worldname, ex, 257,
+        ez + 1), new PlotBlock((short) 0, (byte) 0));
         MainUtil.setSimpleCuboidAsync(plotworld.worldname, new Location(plotworld.worldname, sx + 1, 0, sz), new Location(plotworld.worldname, ex, 1, ez + 1), new PlotBlock((short) 7, (byte) 0));
         MainUtil.setSimpleCuboidAsync(plotworld.worldname, new Location(plotworld.worldname, sx + 1, 1, sz), new Location(plotworld.worldname, ex, dpw.WALL_HEIGHT + 1, sz + 1), dpw.WALL_FILLING);
-        MainUtil.setSimpleCuboidAsync(plotworld.worldname, new Location(plotworld.worldname, sx + 1, dpw.WALL_HEIGHT + 1, sz), new Location(plotworld.worldname, ex, dpw.WALL_HEIGHT + 2, sz + 1), dpw.WALL_BLOCK);
+        MainUtil.setSimpleCuboidAsync(plotworld.worldname, new Location(plotworld.worldname, sx + 1, dpw.WALL_HEIGHT + 1, sz), new Location(plotworld.worldname, ex, dpw.WALL_HEIGHT + 2, sz + 1),
+        dpw.WALL_BLOCK);
         MainUtil.setSimpleCuboidAsync(plotworld.worldname, new Location(plotworld.worldname, sx + 1, 1, ez), new Location(plotworld.worldname, ex, dpw.WALL_HEIGHT + 1, ez + 1), dpw.WALL_FILLING);
-        MainUtil.setSimpleCuboidAsync(plotworld.worldname, new Location(plotworld.worldname, sx + 1, dpw.WALL_HEIGHT + 1, ez), new Location(plotworld.worldname, ex, dpw.WALL_HEIGHT + 2, ez + 1), dpw.WALL_BLOCK);
+        MainUtil.setSimpleCuboidAsync(plotworld.worldname, new Location(plotworld.worldname, sx + 1, dpw.WALL_HEIGHT + 1, ez), new Location(plotworld.worldname, ex, dpw.WALL_HEIGHT + 2, ez + 1),
+        dpw.WALL_BLOCK);
         MainUtil.setSimpleCuboidAsync(plotworld.worldname, new Location(plotworld.worldname, sx + 1, 1, sz + 1), new Location(plotworld.worldname, ex, dpw.ROAD_HEIGHT + 1, ez), dpw.ROAD_BLOCK);
         return true;
     }
 
     @Override
-    public boolean createRoadSouthEast(final PlotWorld plotworld, final Plot plot) {
+    public boolean createRoadSouthEast(final PlotWorld plotworld, final Plot plot)
+    {
         final ClassicPlotWorld dpw = (ClassicPlotWorld) plotworld;
         final Location pos2 = getPlotTopLocAbs(plotworld, plot.id);
         final int sx = pos2.getX() + 1;
         final int ex = (sx + dpw.ROAD_WIDTH) - 1;
         final int sz = pos2.getZ() + 1;
         final int ez = (sz + dpw.ROAD_WIDTH) - 1;
-        MainUtil.setSimpleCuboidAsync(plotworld.worldname, new Location(plotworld.worldname, sx + 1, dpw.ROAD_HEIGHT + 1, sz + 1), new Location(plotworld.worldname, ex, 257, ez), new PlotBlock((short) 0, (byte) 0));
+        MainUtil.setSimpleCuboidAsync(plotworld.worldname, new Location(plotworld.worldname, sx + 1, dpw.ROAD_HEIGHT + 1, sz + 1), new Location(plotworld.worldname, ex, 257, ez), new PlotBlock(
+        (short) 0, (byte) 0));
         MainUtil.setSimpleCuboidAsync(plotworld.worldname, new Location(plotworld.worldname, sx + 1, 0, sz + 1), new Location(plotworld.worldname, ex, 1, ez), new PlotBlock((short) 7, (byte) 0));
         MainUtil.setSimpleCuboidAsync(plotworld.worldname, new Location(plotworld.worldname, sx + 1, 1, sz + 1), new Location(plotworld.worldname, ex, dpw.ROAD_HEIGHT + 1, ez), dpw.ROAD_BLOCK);
         return true;
     }
 
     @Override
-    public boolean removeRoadEast(final PlotWorld plotworld, final Plot plot) {
+    public boolean removeRoadEast(final PlotWorld plotworld, final Plot plot)
+    {
         final ClassicPlotWorld dpw = (ClassicPlotWorld) plotworld;
         final Location pos1 = getPlotBottomLocAbs(plotworld, plot.id);
         final Location pos2 = getPlotTopLocAbs(plotworld, plot.id);
@@ -184,14 +215,16 @@ public class ClassicPlotManager extends SquarePlotManager {
         final int ex = (sx + dpw.ROAD_WIDTH) - 1;
         final int sz = pos1.getZ();
         final int ez = pos2.getZ() + 1;
-        MainUtil.setSimpleCuboidAsync(plotworld.worldname, new Location(plotworld.worldname, sx, Math.min(dpw.PLOT_HEIGHT, dpw.ROAD_HEIGHT) + 1, sz), new Location(plotworld.worldname, ex + 1, 257, ez + 1), new PlotBlock((short) 0, (byte) 0));
+        MainUtil.setSimpleCuboidAsync(plotworld.worldname, new Location(plotworld.worldname, sx, Math.min(dpw.PLOT_HEIGHT, dpw.ROAD_HEIGHT) + 1, sz), new Location(plotworld.worldname, ex + 1, 257,
+        ez + 1), new PlotBlock((short) 0, (byte) 0));
         MainUtil.setCuboidAsync(plotworld.worldname, new Location(plotworld.worldname, sx, 1, sz + 1), new Location(plotworld.worldname, ex + 1, dpw.PLOT_HEIGHT, ez), dpw.MAIN_BLOCK);
         MainUtil.setCuboidAsync(plotworld.worldname, new Location(plotworld.worldname, sx, dpw.PLOT_HEIGHT, sz + 1), new Location(plotworld.worldname, ex + 1, dpw.PLOT_HEIGHT + 1, ez), dpw.TOP_BLOCK);
         return true;
     }
 
     @Override
-    public boolean removeRoadSouth(final PlotWorld plotworld, final Plot plot) {
+    public boolean removeRoadSouth(final PlotWorld plotworld, final Plot plot)
+    {
         final ClassicPlotWorld dpw = (ClassicPlotWorld) plotworld;
         final Location pos1 = getPlotBottomLocAbs(plotworld, plot.id);
         final Location pos2 = getPlotTopLocAbs(plotworld, plot.id);
@@ -199,21 +232,24 @@ public class ClassicPlotManager extends SquarePlotManager {
         final int ez = (sz + dpw.ROAD_WIDTH) - 1;
         final int sx = pos1.getX();
         final int ex = pos2.getX() + 1;
-        MainUtil.setSimpleCuboidAsync(plotworld.worldname, new Location(plotworld.worldname, sx, Math.min(dpw.PLOT_HEIGHT, dpw.ROAD_HEIGHT) + 1, sz), new Location(plotworld.worldname, ex + 1, 257, ez + 1), new PlotBlock((short) 0, (byte) 0));
+        MainUtil.setSimpleCuboidAsync(plotworld.worldname, new Location(plotworld.worldname, sx, Math.min(dpw.PLOT_HEIGHT, dpw.ROAD_HEIGHT) + 1, sz), new Location(plotworld.worldname, ex + 1, 257,
+        ez + 1), new PlotBlock((short) 0, (byte) 0));
         MainUtil.setCuboidAsync(plotworld.worldname, new Location(plotworld.worldname, sx + 1, 1, sz), new Location(plotworld.worldname, ex, dpw.PLOT_HEIGHT, ez + 1), dpw.MAIN_BLOCK);
         MainUtil.setCuboidAsync(plotworld.worldname, new Location(plotworld.worldname, sx + 1, dpw.PLOT_HEIGHT, sz), new Location(plotworld.worldname, ex, dpw.PLOT_HEIGHT + 1, ez + 1), dpw.TOP_BLOCK);
         return true;
     }
 
     @Override
-    public boolean removeRoadSouthEast(final PlotWorld plotworld, final Plot plot) {
+    public boolean removeRoadSouthEast(final PlotWorld plotworld, final Plot plot)
+    {
         final ClassicPlotWorld dpw = (ClassicPlotWorld) plotworld;
         final Location loc = getPlotTopLocAbs(dpw, plot.id);
         final int sx = loc.getX() + 1;
         final int ex = (sx + dpw.ROAD_WIDTH) - 1;
         final int sz = loc.getZ() + 1;
         final int ez = (sz + dpw.ROAD_WIDTH) - 1;
-        MainUtil.setSimpleCuboidAsync(plotworld.worldname, new Location(plotworld.worldname, sx, dpw.ROAD_HEIGHT + 1, sz), new Location(plotworld.worldname, ex + 1, 257, ez + 1), new PlotBlock((short) 0, (byte) 0));
+        MainUtil.setSimpleCuboidAsync(plotworld.worldname, new Location(plotworld.worldname, sx, dpw.ROAD_HEIGHT + 1, sz), new Location(plotworld.worldname, ex + 1, 257, ez + 1), new PlotBlock(
+        (short) 0, (byte) 0));
         MainUtil.setCuboidAsync(plotworld.worldname, new Location(plotworld.worldname, sx, 1, sz), new Location(plotworld.worldname, ex + 1, dpw.ROAD_HEIGHT, ez + 1), dpw.MAIN_BLOCK);
         MainUtil.setCuboidAsync(plotworld.worldname, new Location(plotworld.worldname, sx, dpw.ROAD_HEIGHT, sz), new Location(plotworld.worldname, ex + 1, dpw.ROAD_HEIGHT + 1, ez + 1), dpw.TOP_BLOCK);
         return true;
@@ -223,22 +259,27 @@ public class ClassicPlotManager extends SquarePlotManager {
      * Finishing off plot merging by adding in the walls surrounding the plot (OPTIONAL)(UNFINISHED)
      */
     @Override
-    public boolean finishPlotMerge(final PlotWorld plotworld, final ArrayList<PlotId> plotIds) {
+    public boolean finishPlotMerge(final PlotWorld plotworld, final ArrayList<PlotId> plotIds)
+    {
         final PlotId pos1 = plotIds.get(0);
         final PlotBlock block = ((ClassicPlotWorld) plotworld).CLAIMED_WALL_BLOCK;
         final PlotBlock unclaim = ((ClassicPlotWorld) plotworld).WALL_BLOCK;
-        if (block.id != 0 || !block.equals(unclaim)) {
+        if ((block.id != 0) || !block.equals(unclaim))
+        {
             setWall(plotworld, pos1, new PlotBlock[] { block });
         }
         return true;
     }
 
     @Override
-    public boolean finishPlotUnlink(final PlotWorld plotworld, final ArrayList<PlotId> plotIds) {
+    public boolean finishPlotUnlink(final PlotWorld plotworld, final ArrayList<PlotId> plotIds)
+    {
         final PlotBlock block = ((ClassicPlotWorld) plotworld).CLAIMED_WALL_BLOCK;
         final PlotBlock unclaim = ((ClassicPlotWorld) plotworld).WALL_BLOCK;
-        for (final PlotId id : plotIds) {
-            if (block.id != 0 || !block.equals(unclaim)) { 
+        for (final PlotId id : plotIds)
+        {
+            if ((block.id != 0) || !block.equals(unclaim))
+            {
                 setWall(plotworld, id, new PlotBlock[] { block });
             }
         }
@@ -246,27 +287,32 @@ public class ClassicPlotManager extends SquarePlotManager {
     }
 
     @Override
-    public boolean startPlotMerge(final PlotWorld plotworld, final ArrayList<PlotId> plotIds) {
+    public boolean startPlotMerge(final PlotWorld plotworld, final ArrayList<PlotId> plotIds)
+    {
         return true;
     }
 
     @Override
-    public boolean startPlotUnlink(final PlotWorld plotworld, final ArrayList<PlotId> plotIds) {
+    public boolean startPlotUnlink(final PlotWorld plotworld, final ArrayList<PlotId> plotIds)
+    {
         return true;
     }
 
     @Override
-    public boolean claimPlot(final PlotWorld plotworld, final Plot plot) {
+    public boolean claimPlot(final PlotWorld plotworld, final Plot plot)
+    {
         final PlotBlock unclaim = ((ClassicPlotWorld) plotworld).WALL_BLOCK;
         final PlotBlock claim = ((ClassicPlotWorld) plotworld).CLAIMED_WALL_BLOCK;
-        if (claim.id != 0 || !claim.equals(unclaim)) {
+        if ((claim.id != 0) || !claim.equals(unclaim))
+        {
             setWall(plotworld, plot.id, new PlotBlock[] { claim });
         }
         return true;
     }
 
     @Override
-    public String[] getPlotComponents(final PlotWorld plotworld, final PlotId plotid) {
+    public String[] getPlotComponents(final PlotWorld plotworld, final PlotId plotid)
+    {
         return new String[] { "floor", "wall", "border" };
     }
 
@@ -274,7 +320,8 @@ public class ClassicPlotManager extends SquarePlotManager {
      * Remove sign for a plot
      */
     @Override
-    public Location getSignLoc(final PlotWorld plotworld, final Plot plot) {
+    public Location getSignLoc(final PlotWorld plotworld, final Plot plot)
+    {
         final ClassicPlotWorld dpw = (ClassicPlotWorld) plotworld;
         final Location bot = MainUtil.getPlotBottomLoc(plotworld.worldname, plot.id);
         return new com.intellectualcrafters.plot.object.Location(plotworld.worldname, bot.getX(), dpw.ROAD_HEIGHT + 1, bot.getZ() - 1);
diff --git a/src/main/java/com/intellectualcrafters/plot/generator/ClassicPlotWorld.java b/src/main/java/com/intellectualcrafters/plot/generator/ClassicPlotWorld.java
index eb2cf1002..d192bb48e 100644
--- a/src/main/java/com/intellectualcrafters/plot/generator/ClassicPlotWorld.java
+++ b/src/main/java/com/intellectualcrafters/plot/generator/ClassicPlotWorld.java
@@ -6,7 +6,8 @@ import com.intellectualcrafters.plot.config.ConfigurationNode;
 import com.intellectualcrafters.plot.object.PlotBlock;
 import com.intellectualcrafters.plot.util.StringMan;
 
-public abstract class ClassicPlotWorld extends SquarePlotWorld {
+public abstract class ClassicPlotWorld extends SquarePlotWorld
+{
     public static int ROAD_HEIGHT_DEFAULT = 64;
     public static int PLOT_HEIGHT_DEFAULT = 64;
     public static int WALL_HEIGHT_DEFAULT = 64;
@@ -29,15 +30,27 @@ public abstract class ClassicPlotWorld extends SquarePlotWorld {
 
     /**
      * CONFIG NODE | DEFAULT VALUE | DESCRIPTION | CONFIGURATION TYPE | REQUIRED FOR INITIAL SETUP
-     * 
+     *
      * Set the last boolean to false if you do not require a specific config node to be set while using the setup
      * command - this may be useful if a config value can be changed at a later date, and has no impact on the actual
      * world generation
      */
     @Override
-    public ConfigurationNode[] getSettingNodes() {
-        return new ConfigurationNode[] { new ConfigurationNode("plot.height", ClassicPlotWorld.PLOT_HEIGHT_DEFAULT, "Plot height", Configuration.INTEGER, true), new ConfigurationNode("plot.size", SquarePlotWorld.PLOT_WIDTH_DEFAULT, "Plot width", Configuration.INTEGER, true), new ConfigurationNode("plot.filling", ClassicPlotWorld.MAIN_BLOCK_DEFAULT, "Plot block", Configuration.BLOCKLIST, true), new ConfigurationNode("plot.floor", ClassicPlotWorld.TOP_BLOCK_DEFAULT, "Plot floor block", Configuration.BLOCKLIST, true), new ConfigurationNode("wall.block", ClassicPlotWorld.WALL_BLOCK_DEFAULT, "Top wall block", Configuration.BLOCK, true), new ConfigurationNode("wall.block_claimed", ClassicPlotWorld.CLAIMED_WALL_BLOCK_DEFAULT, "Wall block (claimed)", Configuration.BLOCK, true), new ConfigurationNode("road.width", SquarePlotWorld.ROAD_WIDTH_DEFAULT, "Road width", Configuration.INTEGER, true),
-                new ConfigurationNode("road.height", ClassicPlotWorld.ROAD_HEIGHT_DEFAULT, "Road height", Configuration.INTEGER, true), new ConfigurationNode("road.block", ClassicPlotWorld.ROAD_BLOCK_DEFAULT, "Road block", Configuration.BLOCK, true), new ConfigurationNode("wall.filling", ClassicPlotWorld.WALL_FILLING_DEFAULT, "Wall filling block", Configuration.BLOCK, true), new ConfigurationNode("wall.height", ClassicPlotWorld.WALL_HEIGHT_DEFAULT, "Wall height", Configuration.INTEGER, true), new ConfigurationNode("plot.bedrock", true, "Plot bedrock generation", Configuration.BOOLEAN, true) };
+    public ConfigurationNode[] getSettingNodes()
+    {
+        return new ConfigurationNode[] {
+        new ConfigurationNode("plot.height", ClassicPlotWorld.PLOT_HEIGHT_DEFAULT, "Plot height", Configuration.INTEGER, true),
+        new ConfigurationNode("plot.size", SquarePlotWorld.PLOT_WIDTH_DEFAULT, "Plot width", Configuration.INTEGER, true),
+        new ConfigurationNode("plot.filling", ClassicPlotWorld.MAIN_BLOCK_DEFAULT, "Plot block", Configuration.BLOCKLIST, true),
+        new ConfigurationNode("plot.floor", ClassicPlotWorld.TOP_BLOCK_DEFAULT, "Plot floor block", Configuration.BLOCKLIST, true),
+        new ConfigurationNode("wall.block", ClassicPlotWorld.WALL_BLOCK_DEFAULT, "Top wall block", Configuration.BLOCK, true),
+        new ConfigurationNode("wall.block_claimed", ClassicPlotWorld.CLAIMED_WALL_BLOCK_DEFAULT, "Wall block (claimed)", Configuration.BLOCK, true),
+        new ConfigurationNode("road.width", SquarePlotWorld.ROAD_WIDTH_DEFAULT, "Road width", Configuration.INTEGER, true),
+        new ConfigurationNode("road.height", ClassicPlotWorld.ROAD_HEIGHT_DEFAULT, "Road height", Configuration.INTEGER, true),
+        new ConfigurationNode("road.block", ClassicPlotWorld.ROAD_BLOCK_DEFAULT, "Road block", Configuration.BLOCK, true),
+        new ConfigurationNode("wall.filling", ClassicPlotWorld.WALL_FILLING_DEFAULT, "Wall filling block", Configuration.BLOCK, true),
+        new ConfigurationNode("wall.height", ClassicPlotWorld.WALL_HEIGHT_DEFAULT, "Wall height", Configuration.INTEGER, true),
+        new ConfigurationNode("plot.bedrock", true, "Plot bedrock generation", Configuration.BOOLEAN, true) };
     }
 
     /**
@@ -45,21 +58,23 @@ public abstract class ClassicPlotWorld extends SquarePlotWorld {
      * configuration section for that specific world.
      */
     @Override
-    public void loadConfiguration(final ConfigurationSection config) {
+    public void loadConfiguration(final ConfigurationSection config)
+    {
         super.loadConfiguration(config);
-        this.PLOT_BEDROCK = config.getBoolean("plot.bedrock");
-        this.PLOT_HEIGHT = Math.min(255, config.getInt("plot.height"));
-        this.MAIN_BLOCK = (PlotBlock[]) Configuration.BLOCKLIST.parseString(StringMan.join(config.getStringList("plot.filling"), ','));
-        this.TOP_BLOCK = (PlotBlock[]) Configuration.BLOCKLIST.parseString(StringMan.join(config.getStringList("plot.floor"), ','));
-        this.WALL_BLOCK = (PlotBlock) Configuration.BLOCK.parseString(config.getString("wall.block"));
-        this.ROAD_HEIGHT = Math.min(255, config.getInt("road.height"));
-        this.ROAD_BLOCK = (PlotBlock) Configuration.BLOCK.parseString(config.getString("road.block"));
-        this.WALL_FILLING = (PlotBlock) Configuration.BLOCK.parseString(config.getString("wall.filling"));
-        this.WALL_HEIGHT = Math.min(254, config.getInt("wall.height"));
-        this.CLAIMED_WALL_BLOCK = (PlotBlock) Configuration.BLOCK.parseString(config.getString("wall.block_claimed"));
+        PLOT_BEDROCK = config.getBoolean("plot.bedrock");
+        PLOT_HEIGHT = Math.min(255, config.getInt("plot.height"));
+        MAIN_BLOCK = Configuration.BLOCKLIST.parseString(StringMan.join(config.getStringList("plot.filling"), ','));
+        TOP_BLOCK = Configuration.BLOCKLIST.parseString(StringMan.join(config.getStringList("plot.floor"), ','));
+        WALL_BLOCK = Configuration.BLOCK.parseString(config.getString("wall.block"));
+        ROAD_HEIGHT = Math.min(255, config.getInt("road.height"));
+        ROAD_BLOCK = Configuration.BLOCK.parseString(config.getString("road.block"));
+        WALL_FILLING = Configuration.BLOCK.parseString(config.getString("wall.filling"));
+        WALL_HEIGHT = Math.min(254, config.getInt("wall.height"));
+        CLAIMED_WALL_BLOCK = Configuration.BLOCK.parseString(config.getString("wall.block_claimed"));
     }
 
-    public ClassicPlotWorld(final String worldname) {
+    public ClassicPlotWorld(final String worldname)
+    {
         super(worldname);
     }
 }
diff --git a/src/main/java/com/intellectualcrafters/plot/generator/GeneratorManager.java b/src/main/java/com/intellectualcrafters/plot/generator/GeneratorManager.java
index 13ef9766a..65181a588 100644
--- a/src/main/java/com/intellectualcrafters/plot/generator/GeneratorManager.java
+++ b/src/main/java/com/intellectualcrafters/plot/generator/GeneratorManager.java
@@ -1,5 +1,6 @@
 package com.intellectualcrafters.plot.generator;
 
-public abstract class GeneratorManager {
-    
+public abstract class GeneratorManager
+{
+
 }
diff --git a/src/main/java/com/intellectualcrafters/plot/generator/GridPlotManager.java b/src/main/java/com/intellectualcrafters/plot/generator/GridPlotManager.java
index 5d737a910..0cf861216 100644
--- a/src/main/java/com/intellectualcrafters/plot/generator/GridPlotManager.java
+++ b/src/main/java/com/intellectualcrafters/plot/generator/GridPlotManager.java
@@ -5,5 +5,5 @@ import com.intellectualcrafters.plot.object.PlotManager;
 /**
  * A plot manager where plots tessellate in a grid formation symmetrical about x=z
  */
-public abstract class GridPlotManager extends PlotManager {
-}
+public abstract class GridPlotManager extends PlotManager
+{}
diff --git a/src/main/java/com/intellectualcrafters/plot/generator/GridPlotWorld.java b/src/main/java/com/intellectualcrafters/plot/generator/GridPlotWorld.java
index 111eb644b..9197d8c9d 100644
--- a/src/main/java/com/intellectualcrafters/plot/generator/GridPlotWorld.java
+++ b/src/main/java/com/intellectualcrafters/plot/generator/GridPlotWorld.java
@@ -2,10 +2,12 @@ package com.intellectualcrafters.plot.generator;
 
 import com.intellectualcrafters.plot.object.PlotWorld;
 
-public abstract class GridPlotWorld extends PlotWorld {
+public abstract class GridPlotWorld extends PlotWorld
+{
     public short SIZE;
 
-    public GridPlotWorld(final String worldname) {
+    public GridPlotWorld(final String worldname)
+    {
         super(worldname);
     }
 }
diff --git a/src/main/java/com/intellectualcrafters/plot/generator/HybridPlotManager.java b/src/main/java/com/intellectualcrafters/plot/generator/HybridPlotManager.java
index 69028dde3..15a2e6f63 100644
--- a/src/main/java/com/intellectualcrafters/plot/generator/HybridPlotManager.java
+++ b/src/main/java/com/intellectualcrafters/plot/generator/HybridPlotManager.java
@@ -43,80 +43,100 @@ import com.intellectualcrafters.plot.util.ChunkManager;
 import com.intellectualcrafters.plot.util.MainUtil;
 import com.intellectualcrafters.plot.util.SetBlockQueue;
 
-public class HybridPlotManager extends ClassicPlotManager {
-    
+public class HybridPlotManager extends ClassicPlotManager
+{
+
     @Override
-    public void exportTemplate(final PlotWorld plotworld) throws IOException {
+    public void exportTemplate(final PlotWorld plotworld) throws IOException
+    {
         final HashSet<FileBytes> files = new HashSet<>(Arrays.asList(new FileBytes("templates/" + "tmp-data.yml", Template.getBytes(plotworld))));
         final String psRoot = PS.get().IMP.getDirectory() + File.separator;
-        final String dir =  "schematics" + File.separator + "GEN_ROAD_SCHEMATIC" + File.separator + plotworld.worldname + File.separator;
-        final String newDir =  "schematics" + File.separator + "GEN_ROAD_SCHEMATIC" + File.separator + "__TEMP_DIR__" + File.separator;
-        try {
+        final String dir = "schematics" + File.separator + "GEN_ROAD_SCHEMATIC" + File.separator + plotworld.worldname + File.separator;
+        final String newDir = "schematics" + File.separator + "GEN_ROAD_SCHEMATIC" + File.separator + "__TEMP_DIR__" + File.separator;
+        try
+        {
             final File sideroad = new File(psRoot + dir + "sideroad.schematic");
-            if (sideroad.exists()) {
+            if (sideroad.exists())
+            {
                 files.add(new FileBytes(newDir + "sideroad.schematic", Files.readAllBytes(sideroad.toPath())));
             }
             final File intersection = new File(psRoot + dir + "intersection.schematic");
-            if (intersection.exists()) {
+            if (intersection.exists())
+            {
                 files.add(new FileBytes(newDir + "intersection.schematic", Files.readAllBytes(intersection.toPath())));
             }
             final File plot = new File(psRoot + dir + "plot.schematic");
-            if (plot.exists()) {
+            if (plot.exists())
+            {
                 files.add(new FileBytes(newDir + "plot.schematic", Files.readAllBytes(plot.toPath())));
             }
         }
-        catch (final Exception e) {
+        catch (final Exception e)
+        {
             e.printStackTrace();
         }
         Template.zipAll(plotworld.worldname, files);
     }
 
     @Override
-    public boolean createRoadEast(PlotWorld plotworld, Plot plot) {
+    public boolean createRoadEast(final PlotWorld plotworld, final Plot plot)
+    {
         super.createRoadEast(plotworld, plot);
-        HybridPlotWorld hpw = (HybridPlotWorld) plotworld;
-        if (!hpw.ROAD_SCHEMATIC_ENABLED) {
-            return true;
-        }
-        PlotId id = plot.id;
-        PlotId id2 = new PlotId(id.x + 1, id.y);
-        Location bot = getPlotBottomLocAbs(hpw, id2);
-        Location top = getPlotTopLocAbs(hpw, id);
-        Location pos1 = new Location(plot.world, top.getX() + 1, 0, bot.getZ());
-        Location pos2 = new Location(plot.world, bot.getX(), 255, top.getZ() + 1);
+        final HybridPlotWorld hpw = (HybridPlotWorld) plotworld;
+        if (!hpw.ROAD_SCHEMATIC_ENABLED) { return true; }
+        final PlotId id = plot.id;
+        final PlotId id2 = new PlotId(id.x + 1, id.y);
+        final Location bot = getPlotBottomLocAbs(hpw, id2);
+        final Location top = getPlotTopLocAbs(hpw, id);
+        final Location pos1 = new Location(plot.world, top.getX() + 1, 0, bot.getZ());
+        final Location pos2 = new Location(plot.world, bot.getX(), 255, top.getZ() + 1);
         createSchemAbs(hpw, pos1, pos2, hpw.ROAD_HEIGHT, true);
         return true;
     }
-    
-    public void createSchemAbs(HybridPlotWorld hpw, Location pos1, Location pos2, int height, boolean clear) {
+
+    public void createSchemAbs(final HybridPlotWorld hpw, final Location pos1, final Location pos2, final int height, final boolean clear)
+    {
         final int size = hpw.SIZE;
-        for (int x = pos1.getX(); x <= pos2.getX(); x++) {
+        for (int x = pos1.getX(); x <= pos2.getX(); x++)
+        {
             short absX = (short) ((x - hpw.ROAD_OFFSET_X) % (size));
-            if (absX < 0) {
+            if (absX < 0)
+            {
                 absX += size;
             }
-            for (int z = pos1.getZ(); z <= pos2.getZ(); z++) {
+            for (int z = pos1.getZ(); z <= pos2.getZ(); z++)
+            {
                 short absZ = (short) ((z - hpw.ROAD_OFFSET_Z) % (size));
-                if (absZ < 0) {
+                if (absZ < 0)
+                {
                     absZ += size;
                 }
                 final PlotLoc loc = new PlotLoc(absX, absZ);
                 final HashMap<Short, Short> blocks = hpw.G_SCH.get(loc);
-                if (clear) {
-                    for (short y = (short) (height); y <= (height + hpw.SCHEMATIC_HEIGHT); y++) {
+                if (clear)
+                {
+                    for (short y = (short) (height); y <= (height + hpw.SCHEMATIC_HEIGHT); y++)
+                    {
                         SetBlockQueue.setBlock(hpw.worldname, x, y + y, z, 0);
                     }
                 }
-                if (blocks != null) {
+                if (blocks != null)
+                {
                     final HashMap<Short, Byte> datas = hpw.G_SCH_DATA.get(loc);
-                    if (datas == null) {
-                        for (final Short y : blocks.keySet()) {
+                    if (datas == null)
+                    {
+                        for (final Short y : blocks.keySet())
+                        {
                             SetBlockQueue.setBlock(hpw.worldname, x, height + y, z, blocks.get(y));
                         }
-                    } else {
-                        for (final Short y : blocks.keySet()) {
+                    }
+                    else
+                    {
+                        for (final Short y : blocks.keySet())
+                        {
                             Byte data = datas.get(y);
-                            if (data == null) {
+                            if (data == null)
+                            {
                                 data = 0;
                             }
                             SetBlockQueue.setBlock(hpw.worldname, x, height + y, z, new PlotBlock(blocks.get(y), data));
@@ -126,41 +146,39 @@ public class HybridPlotManager extends ClassicPlotManager {
             }
         }
     }
-    
+
     @Override
-    public boolean createRoadSouth(PlotWorld plotworld, Plot plot) {
+    public boolean createRoadSouth(final PlotWorld plotworld, final Plot plot)
+    {
         super.createRoadSouth(plotworld, plot);
-        HybridPlotWorld hpw = (HybridPlotWorld) plotworld;
-        if (!hpw.ROAD_SCHEMATIC_ENABLED) {
-            return true;
-        }
-        PlotId id = plot.id;
-        PlotId id2 = new PlotId(id.x, id.y + 1);
-        Location bot = getPlotBottomLocAbs(hpw, id2);
-        Location top = getPlotTopLocAbs(hpw, id);
-        Location pos1 = new Location(plot.world, bot.getX(), 0, top.getZ() + 1);
-        Location pos2 = new Location(plot.world, top.getX() + 1, 255, bot.getZ());
+        final HybridPlotWorld hpw = (HybridPlotWorld) plotworld;
+        if (!hpw.ROAD_SCHEMATIC_ENABLED) { return true; }
+        final PlotId id = plot.id;
+        final PlotId id2 = new PlotId(id.x, id.y + 1);
+        final Location bot = getPlotBottomLocAbs(hpw, id2);
+        final Location top = getPlotTopLocAbs(hpw, id);
+        final Location pos1 = new Location(plot.world, bot.getX(), 0, top.getZ() + 1);
+        final Location pos2 = new Location(plot.world, top.getX() + 1, 255, bot.getZ());
         createSchemAbs(hpw, pos1, pos2, hpw.ROAD_HEIGHT, true);
         return true;
     }
-    
+
     @Override
-    public boolean createRoadSouthEast(PlotWorld plotworld, Plot plot) {
+    public boolean createRoadSouthEast(final PlotWorld plotworld, final Plot plot)
+    {
         super.createRoadSouthEast(plotworld, plot);
-        HybridPlotWorld hpw = (HybridPlotWorld) plotworld;
-        if (!hpw.ROAD_SCHEMATIC_ENABLED) {
-            return true;
-        }
-        PlotId id = plot.id;
-        PlotId id2 = new PlotId(id.x + 1, id.y + 1);
-        Location pos1 = getPlotTopLocAbs(hpw, id).add(1, 0, 1);
-        Location pos2 = getPlotBottomLocAbs(hpw, id2);
+        final HybridPlotWorld hpw = (HybridPlotWorld) plotworld;
+        if (!hpw.ROAD_SCHEMATIC_ENABLED) { return true; }
+        final PlotId id = plot.id;
+        final PlotId id2 = new PlotId(id.x + 1, id.y + 1);
+        final Location pos1 = getPlotTopLocAbs(hpw, id).add(1, 0, 1);
+        final Location pos2 = getPlotBottomLocAbs(hpw, id2);
         pos1.setY(0);
         pos2.setY(256);
         createSchemAbs(hpw, pos1, pos2, hpw.ROAD_HEIGHT, true);
         return true;
     }
-    
+
     /**
      * Clearing the plot needs to only consider removing the blocks - This implementation has used the setCuboidAsync
      * function, as it is fast, and uses NMS code - It also makes use of the fact that deleting chunks is a lot faster
@@ -168,25 +186,29 @@ public class HybridPlotManager extends ClassicPlotManager {
      * to have 512x512 sized plots
      */
     @Override
-    public boolean clearPlot(final PlotWorld plotworld, final Plot plot, final Runnable whenDone) {
+    public boolean clearPlot(final PlotWorld plotworld, final Plot plot, final Runnable whenDone)
+    {
         final String world = plotworld.worldname;
         final HybridPlotWorld dpw = ((HybridPlotWorld) plotworld);
-        
+
         final Location pos1 = MainUtil.getPlotBottomLoc(world, plot.id).add(1, 0, 1);
         final Location pos2 = MainUtil.getPlotTopLoc(world, plot.id);
         // If augmented
-        final boolean canRegen = plotworld.TYPE == 0 && plotworld.TERRAIN == 0;
+        final boolean canRegen = (plotworld.TYPE == 0) && (plotworld.TERRAIN == 0);
         // The component blocks
         final PlotBlock[] plotfloor = dpw.TOP_BLOCK;
         final PlotBlock[] filling = dpw.MAIN_BLOCK;
         final PlotBlock[] bedrock = (dpw.PLOT_BEDROCK ? new PlotBlock[] { new PlotBlock((short) 7, (byte) 0) } : filling);
         final PlotBlock air = new PlotBlock((short) 0, (byte) 0);
-        
-        ChunkManager.chunkTask(pos1, pos2, new RunnableVal<int[]>() {
+
+        ChunkManager.chunkTask(pos1, pos2, new RunnableVal<int[]>()
+        {
             @Override
-            public void run() {
+            public void run()
+            {
                 // If the chunk isn't near the edge and it isn't an augmented world we can just regen the whole chunk
-                if (canRegen && value[6] == 0) {
+                if (canRegen && (value[6] == 0))
+                {
                     ChunkManager.CURRENT_PLOT_CLEAR = new RegionWrapper(value[2], value[4], value[3], value[5]);
                     ChunkManager.manager.regenerateChunk(world, new ChunkLoc(value[0], value[1]));
                     ChunkManager.CURRENT_PLOT_CLEAR = null;
@@ -198,8 +220,8 @@ public class HybridPlotManager extends ClassicPlotManager {
                 // Set the biome
                 MainUtil.setBiome(world, value[2], value[3], value[4], value[5], dpw.PLOT_BIOME);
                 // These two locations are for each component (e.g. bedrock, main block, floor, air)
-                Location bot = new Location(world, value[2], 0, value[3]);
-                Location top = new Location(world, value[4] + 1, 1, value[5] + 1);
+                final Location bot = new Location(world, value[2], 0, value[3]);
+                final Location top = new Location(world, value[4] + 1, 1, value[5] + 1);
                 MainUtil.setCuboidAsync(world, bot, top, bedrock);
                 // Each component has a different layer
                 bot.setY(1);
@@ -214,21 +236,22 @@ public class HybridPlotManager extends ClassicPlotManager {
                 // And finally set the schematic, the y value is unimportant for this function
                 pastePlotSchematic(dpw, bot, top);
             }
-        }, new Runnable() {
+        }, new Runnable()
+        {
             @Override
-            public void run() {
+            public void run()
+            {
                 // And notify whatever called this when plot clearing is done
                 SetBlockQueue.addNotify(whenDone);
             }
         }, 5);
         return true;
     }
-    
-    public void pastePlotSchematic(HybridPlotWorld plotworld, Location l1, Location l2) {
-        if (!plotworld.PLOT_SCHEMATIC) {
-            return;
-        }
+
+    public void pastePlotSchematic(final HybridPlotWorld plotworld, final Location l1, final Location l2)
+    {
+        if (!plotworld.PLOT_SCHEMATIC) { return; }
         createSchemAbs(plotworld, l1, l2, plotworld.PLOT_HEIGHT, false);
     }
-    
+
 }
diff --git a/src/main/java/com/intellectualcrafters/plot/generator/HybridPlotWorld.java b/src/main/java/com/intellectualcrafters/plot/generator/HybridPlotWorld.java
index 0ac05d585..f868db1f3 100644
--- a/src/main/java/com/intellectualcrafters/plot/generator/HybridPlotWorld.java
+++ b/src/main/java/com/intellectualcrafters/plot/generator/HybridPlotWorld.java
@@ -33,7 +33,8 @@ import com.intellectualcrafters.plot.util.SchematicHandler;
 import com.intellectualcrafters.plot.util.SchematicHandler.Dimension;
 import com.intellectualcrafters.plot.util.SchematicHandler.Schematic;
 
-public class HybridPlotWorld extends ClassicPlotWorld {
+public class HybridPlotWorld extends ClassicPlotWorld
+{
     public boolean ROAD_SCHEMATIC_ENABLED;
     public short SCHEMATIC_HEIGHT;
     public boolean PLOT_SCHEMATIC = false;
@@ -44,7 +45,8 @@ public class HybridPlotWorld extends ClassicPlotWorld {
     /*
      * Here we are just calling the super method, nothing special
      */
-    public HybridPlotWorld(final String worldname) {
+    public HybridPlotWorld(final String worldname)
+    {
         super(worldname);
     }
 
@@ -57,95 +59,114 @@ public class HybridPlotWorld extends ClassicPlotWorld {
      * configuration section for that specific world.
      */
     @Override
-    public void loadConfiguration(final ConfigurationSection config) {
+    public void loadConfiguration(final ConfigurationSection config)
+    {
         super.loadConfiguration(config);
-        if ((this.ROAD_WIDTH & 1) == 0) {
-            this.PATH_WIDTH_LOWER = (short) (Math.floor(this.ROAD_WIDTH / 2) - 1);
-        } else {
-            this.PATH_WIDTH_LOWER = (short) (Math.floor(this.ROAD_WIDTH / 2));
+        if ((ROAD_WIDTH & 1) == 0)
+        {
+            PATH_WIDTH_LOWER = (short) (Math.floor(ROAD_WIDTH / 2) - 1);
         }
-        this.PATH_WIDTH_UPPER = (short) (this.PATH_WIDTH_LOWER + this.PLOT_WIDTH + 1);
-        try {
+        else
+        {
+            PATH_WIDTH_LOWER = (short) (Math.floor(ROAD_WIDTH / 2));
+        }
+        PATH_WIDTH_UPPER = (short) (PATH_WIDTH_LOWER + PLOT_WIDTH + 1);
+        try
+        {
             setupSchematics();
-        } catch (final Exception e) {
+        }
+        catch (final Exception e)
+        {
             PS.debug("&c - road schematics are disabled for this world.");
         }
     }
 
-    public void setupSchematics() {
-        this.G_SCH_DATA = new HashMap<>();
-        this.G_SCH = new HashMap<>();
-        final String schem1Str = "GEN_ROAD_SCHEMATIC/" + this.worldname + "/sideroad";
-        final String schem2Str = "GEN_ROAD_SCHEMATIC/" + this.worldname + "/intersection";
-        final String schem3Str = "GEN_ROAD_SCHEMATIC/" + this.worldname + "/plot";
+    public void setupSchematics()
+    {
+        G_SCH_DATA = new HashMap<>();
+        G_SCH = new HashMap<>();
+        final String schem1Str = "GEN_ROAD_SCHEMATIC/" + worldname + "/sideroad";
+        final String schem2Str = "GEN_ROAD_SCHEMATIC/" + worldname + "/intersection";
+        final String schem3Str = "GEN_ROAD_SCHEMATIC/" + worldname + "/plot";
         final Schematic schem1 = SchematicHandler.manager.getSchematic(schem1Str);
         final Schematic schem2 = SchematicHandler.manager.getSchematic(schem2Str);
         final Schematic schem3 = SchematicHandler.manager.getSchematic(schem3Str);
-        final int shift = (int) this.ROAD_WIDTH / 2;
+        final int shift = ROAD_WIDTH / 2;
         int oddshift = 0;
-        if ((this.ROAD_WIDTH & 1) != 0) {
+        if ((ROAD_WIDTH & 1) != 0)
+        {
             oddshift = 1;
         }
-        if (schem3 != null) {
-            this.PLOT_SCHEMATIC = true;
-            short[] ids = schem3.getIds();
-            byte[] datas = schem3.getDatas();
+        if (schem3 != null)
+        {
+            PLOT_SCHEMATIC = true;
+            final short[] ids = schem3.getIds();
+            final byte[] datas = schem3.getDatas();
             final Dimension d3 = schem3.getSchematicDimension();
             final short w3 = (short) d3.getX();
             final short l3 = (short) d3.getZ();
             final short h3 = (short) d3.getY();
             int center_shift_x = 0;
             int center_shift_z = 0;
-            if (l3 < this.PLOT_WIDTH) {
-                center_shift_z = (this.PLOT_WIDTH - l3) / 2;
+            if (l3 < PLOT_WIDTH)
+            {
+                center_shift_z = (PLOT_WIDTH - l3) / 2;
             }
-            if (w3 < this.PLOT_WIDTH) {
-                center_shift_x = (this.PLOT_WIDTH - w3) / 2;
+            if (w3 < PLOT_WIDTH)
+            {
+                center_shift_x = (PLOT_WIDTH - w3) / 2;
             }
-            for (short x = 0; x < w3; x++) {
-                for (short z = 0; z < l3; z++) {
-                    for (short y = 0; y < h3; y++) {
+            for (short x = 0; x < w3; x++)
+            {
+                for (short z = 0; z < l3; z++)
+                {
+                    for (short y = 0; y < h3; y++)
+                    {
                         final int index = (y * w3 * l3) + (z * w3) + x;
                         final short id = ids[index];
                         final byte data = datas[index];
-                        if (id != 0) {
+                        if (id != 0)
+                        {
                             addOverlayBlock((short) (x + shift + oddshift + center_shift_x), (y), (short) (z + shift + oddshift + center_shift_z), id, data, false);
                         }
                     }
                 }
             }
-            HashSet<PlotItem> items = schem3.getItems();
-            if (items != null) {
+            final HashSet<PlotItem> items = schem3.getItems();
+            if (items != null)
+            {
                 G_SCH_STATE = new HashMap<>();
-                for (PlotItem item : items) {
+                for (final PlotItem item : items)
+                {
                     item.x += shift + oddshift + center_shift_x;
                     item.z += shift + oddshift + center_shift_z;
-                    item.y += this.PLOT_HEIGHT;
-                    int x = item.x;
-                    int y = item.y;
-                    int z = item.z;
-                    PlotLoc loc = new PlotLoc(x, z);
-                    if (!G_SCH_STATE.containsKey(loc)) {
+                    item.y += PLOT_HEIGHT;
+                    final int x = item.x;
+                    final int z = item.z;
+                    final PlotLoc loc = new PlotLoc(x, z);
+                    if (!G_SCH_STATE.containsKey(loc))
+                    {
                         G_SCH_STATE.put(loc, new HashSet<PlotItem>());
                     }
                     G_SCH_STATE.get(loc).add(item);
                 }
             }
         }
-        if ((schem1 == null) || (schem2 == null) || (this.ROAD_WIDTH == 0)) {
+        if ((schem1 == null) || (schem2 == null) || (ROAD_WIDTH == 0))
+        {
             PS.debug(C.PREFIX.s() + "&3 - schematic: &7false");
             return;
         }
-        this.ROAD_SCHEMATIC_ENABLED = true;
+        ROAD_SCHEMATIC_ENABLED = true;
         // Do not populate road if using schematic population
-        this.ROAD_BLOCK = new PlotBlock(this.ROAD_BLOCK.id, (byte) 0);
-        
-        short[] ids1 = schem1.getIds();
-        byte[] datas1 = schem1.getDatas();
-        
-        short[] ids2 = schem2.getIds();
-        byte[] datas2 = schem2.getDatas();
-        
+        ROAD_BLOCK = new PlotBlock(ROAD_BLOCK.id, (byte) 0);
+
+        final short[] ids1 = schem1.getIds();
+        final byte[] datas1 = schem1.getDatas();
+
+        final short[] ids2 = schem2.getIds();
+        final byte[] datas2 = schem2.getDatas();
+
         final Dimension d1 = schem1.getSchematicDimension();
         final short w1 = (short) d1.getX();
         final short l1 = (short) d1.getZ();
@@ -154,43 +175,55 @@ public class HybridPlotWorld extends ClassicPlotWorld {
         final short w2 = (short) d2.getX();
         final short l2 = (short) d2.getZ();
         final short h2 = (short) d2.getY();
-        this.SCHEMATIC_HEIGHT = (short) Math.max(h2, h1);
-        for (short x = 0; x < w1; x++) {
-            for (short z = 0; z < l1; z++) {
-                for (short y = 0; y < h1; y++) {
+        SCHEMATIC_HEIGHT = (short) Math.max(h2, h1);
+        for (short x = 0; x < w1; x++)
+        {
+            for (short z = 0; z < l1; z++)
+            {
+                for (short y = 0; y < h1; y++)
+                {
                     final int index = (y * w1 * l1) + (z * w1) + x;
                     final short id = ids1[index];
                     final byte data = datas1[index];
-                    if (id != 0) {
+                    if (id != 0)
+                    {
                         addOverlayBlock((short) (x - (shift)), (y), (short) (z + shift + oddshift), id, data, false);
                         addOverlayBlock((short) (z + shift + oddshift), (y), (short) (x - shift), id, data, true);
                     }
                 }
             }
         }
-        for (short x = 0; x < w2; x++) {
-            for (short z = 0; z < l2; z++) {
-                for (short y = 0; y < h2; y++) {
+        for (short x = 0; x < w2; x++)
+        {
+            for (short z = 0; z < l2; z++)
+            {
+                for (short y = 0; y < h2; y++)
+                {
                     final int index = (y * w2 * l2) + (z * w2) + x;
                     final short id = ids2[index];
                     final byte data = datas2[index];
-                    if (id != 0) {
+                    if (id != 0)
+                    {
                         addOverlayBlock((short) (x - shift), (y), (short) (z - shift), id, data, false);
                     }
                 }
             }
         }
     }
-    
-    public static byte wrap(byte data, int start) {
-        if (data >= start && data < start + 4) {
+
+    public static byte wrap(byte data, final int start)
+    {
+        if ((data >= start) && (data < (start + 4)))
+        {
             data = (byte) ((((data - start) + 2) & 3) + start);
         }
         return data;
     }
-    
-    public static byte wrap2(byte data, int start) {
-        if (data >= start && data < start + 2) {
+
+    public static byte wrap2(byte data, final int start)
+    {
+        if ((data >= start) && (data < (start + 2)))
+        {
             data = (byte) ((((data - start) + 1) & 1) + start);
         }
         return data;
@@ -198,14 +231,16 @@ public class HybridPlotWorld extends ClassicPlotWorld {
 
     // FIXME depends on block ids
     // Possibly make abstract?
-    public static byte rotate(final short id, byte data) {
-        switch (id) {
+    public static byte rotate(final short id, byte data)
+    {
+        switch (id)
+        {
             case 162:
-            case 17: {
-                if (data >= 4 && data < 12) {
-                    if (data >= 8) {
-                        return (byte) (data - 4);
-                    }
+            case 17:
+            {
+                if ((data >= 4) && (data < 12))
+                {
+                    if (data >= 8) { return (byte) (data - 4); }
                     return (byte) (data + 4);
                 }
                 return data;
@@ -228,14 +263,16 @@ public class HybridPlotWorld extends ClassicPlotWorld {
             case 156:
             case 163:
             case 164:
-            case 180: {
+            case 180:
+            {
                 data = wrap(data, 0);
                 data = wrap(data, 4);
                 return data;
             }
-            
+
             case 26:
-            case 86: {
+            case 86:
+            {
                 data = wrap(data, 0);
                 return data;
             }
@@ -253,7 +290,8 @@ public class HybridPlotWorld extends ClassicPlotWorld {
             case 149:
             case 150:
             case 96:
-            case 167: {
+            case 167:
+            {
                 data = wrap(data, 0);
                 data = wrap(data, 4);
                 data = wrap(data, 8);
@@ -263,18 +301,21 @@ public class HybridPlotWorld extends ClassicPlotWorld {
             case 28:
             case 66:
             case 157:
-            case 27: {
+            case 27:
+            {
                 data = wrap2(data, 0);
                 data = wrap2(data, 3);
-                if (data == 2) {
+                if (data == 2)
+                {
                     data = 5;
                 }
-                else if (data == 5) {
+                else if (data == 5)
+                {
                     data = 2;
                 }
                 return data;
             }
-            
+
             case 23:
             case 29:
             case 33:
@@ -286,12 +327,14 @@ public class HybridPlotWorld extends ClassicPlotWorld {
             case 62:
             case 65:
             case 68:
-            case 144: {
+            case 144:
+            {
                 data = wrap(data, 2);
                 return data;
             }
             case 143:
-            case 77: {
+            case 77:
+            {
                 data = wrap(data, 1);
                 return data;
             }
@@ -300,28 +343,32 @@ public class HybridPlotWorld extends ClassicPlotWorld {
         }
     }
 
-    public void addOverlayBlock(short x, final short y, short z, final short id, byte data, final boolean rotate) {
-        if (z < 0) {
-            z += this.SIZE;
+    public void addOverlayBlock(short x, final short y, short z, final short id, byte data, final boolean rotate)
+    {
+        if (z < 0)
+        {
+            z += SIZE;
         }
-        if (x < 0) {
-            x += this.SIZE;
+        if (x < 0)
+        {
+            x += SIZE;
         }
         final PlotLoc loc = new PlotLoc(x, z);
-        if (!this.G_SCH.containsKey(loc)) {
-            this.G_SCH.put(loc, new HashMap<Short, Short>());
+        if (!G_SCH.containsKey(loc))
+        {
+            G_SCH.put(loc, new HashMap<Short, Short>());
         }
-        this.G_SCH.get(loc).put(y, id);
-        if (rotate) {
-            byte newdata = rotate(id, data);
-            if (data == 0 && newdata == 0) {
-                return;
-            }
+        G_SCH.get(loc).put(y, id);
+        if (rotate)
+        {
+            final byte newdata = rotate(id, data);
+            if ((data == 0) && (newdata == 0)) { return; }
             data = newdata;
         }
-        if (!this.G_SCH_DATA.containsKey(loc)) {
-            this.G_SCH_DATA.put(loc, new HashMap<Short, Byte>());
+        if (!G_SCH_DATA.containsKey(loc))
+        {
+            G_SCH_DATA.put(loc, new HashMap<Short, Byte>());
         }
-        this.G_SCH_DATA.get(loc).put(y, data);
+        G_SCH_DATA.get(loc).put(y, data);
     }
 }
diff --git a/src/main/java/com/intellectualcrafters/plot/generator/HybridUtils.java b/src/main/java/com/intellectualcrafters/plot/generator/HybridUtils.java
index e92eb4eea..5ca0e0319 100644
--- a/src/main/java/com/intellectualcrafters/plot/generator/HybridUtils.java
+++ b/src/main/java/com/intellectualcrafters/plot/generator/HybridUtils.java
@@ -25,10 +25,11 @@ import com.intellectualcrafters.plot.util.SchematicHandler;
 import com.intellectualcrafters.plot.util.SetBlockQueue;
 import com.intellectualcrafters.plot.util.TaskManager;
 
-public abstract class HybridUtils {
+public abstract class HybridUtils
+{
 
     public static HybridUtils manager;
-    
+
     public abstract void analyzePlot(final Plot plot, final RunnableVal<PlotAnalysis> whenDone);
 
     public abstract int checkModified(final String world, final int x1, final int x2, final int y1, final int y2, final int z1, final int z2, final PlotBlock[] blocks);
@@ -37,77 +38,88 @@ public abstract class HybridUtils {
     public static List<ChunkLoc> chunks = new ArrayList<>();
     public static String world;
     public static boolean UPDATE = false;
-    
-    public final ArrayList<ChunkLoc> getChunks(ChunkLoc region) {
-        ArrayList<ChunkLoc> chunks = new ArrayList<ChunkLoc>();
+
+    public final ArrayList<ChunkLoc> getChunks(final ChunkLoc region)
+    {
+        final ArrayList<ChunkLoc> chunks = new ArrayList<ChunkLoc>();
         final int sx = region.x << 5;
         final int sz = region.z << 5;
-        for (int x = sx; x < (sx + 32); x++) {
-            for (int z = sz; z < (sz + 32); z++) {
+        for (int x = sx; x < (sx + 32); x++)
+        {
+            for (int z = sz; z < (sz + 32); z++)
+            {
                 chunks.add(new ChunkLoc(x, z));
             }
         }
         return chunks;
     }
-    
-    public void checkModified(final Plot plot, final RunnableVal<Integer> whenDone) {
-        if (whenDone == null) {
-            return;
-        }
+
+    public void checkModified(final Plot plot, final RunnableVal<Integer> whenDone)
+    {
+        if (whenDone == null) { return; }
         final Location pos1 = MainUtil.getPlotBottomLoc(plot.world, plot.id).add(1, 0, 1);
         final Location pos2 = MainUtil.getPlotTopLoc(plot.world, plot.id);
         final PlotWorld plotworld = PS.get().getPlotWorld(plot.world);
-        if (!(plotworld instanceof ClassicPlotWorld)) {
+        if (!(plotworld instanceof ClassicPlotWorld))
+        {
             whenDone.value = -1;
             TaskManager.runTask(whenDone);
             return;
         }
         whenDone.value = 0;
         final ClassicPlotWorld cpw = (ClassicPlotWorld) plotworld;
-        ChunkManager.chunkTask(pos1, pos2, new RunnableVal<int[]>() {
+        ChunkManager.chunkTask(pos1, pos2, new RunnableVal<int[]>()
+        {
             @Override
-            public void run() {
-                ChunkLoc loc = new ChunkLoc(value[0], value[1]);
+            public void run()
+            {
+                final ChunkLoc loc = new ChunkLoc(value[0], value[1]);
                 ChunkManager.manager.loadChunk(plot.world, loc, false);
-                int bx = value[2];
-                int bz = value[3];
-                int ex = value[4];
-                int ez = value[5];
+                final int bx = value[2];
+                final int bz = value[3];
+                final int ex = value[4];
+                final int ez = value[5];
                 whenDone.value += checkModified(plot.world, bx, ex, 1, cpw.PLOT_HEIGHT - 1, bz, ez, cpw.MAIN_BLOCK);
                 whenDone.value += checkModified(plot.world, bx, ex, cpw.PLOT_HEIGHT, cpw.PLOT_HEIGHT, bz, ez, cpw.TOP_BLOCK);
                 whenDone.value += checkModified(plot.world, bx, ex, cpw.PLOT_HEIGHT + 1, 255, bz, ez, new PlotBlock[] { new PlotBlock((short) 0, (byte) 0) });
             }
-        }, new Runnable() {
+        }, new Runnable()
+        {
             @Override
-            public void run() {
+            public void run()
+            {
                 TaskManager.runTask(whenDone);
             }
         }, 5);
     }
-    
-    public boolean scheduleRoadUpdate(final String world, int extend) {
-        if (HybridUtils.UPDATE) {
-            return false;
-        }
+
+    public boolean scheduleRoadUpdate(final String world, final int extend)
+    {
+        if (HybridUtils.UPDATE) { return false; }
         HybridUtils.UPDATE = true;
         final List<ChunkLoc> regions = ChunkManager.manager.getChunkChunks(world);
         return scheduleRoadUpdate(world, regions, extend);
     }
-    
-    public boolean scheduleRoadUpdate(final String world, final List<ChunkLoc> rgs, final int extend) {
+
+    public boolean scheduleRoadUpdate(final String world, final List<ChunkLoc> rgs, final int extend)
+    {
         HybridUtils.regions = rgs;
         HybridUtils.world = world;
         chunks = new ArrayList<ChunkLoc>();
         final AtomicInteger count = new AtomicInteger(0);
         final long baseTime = System.currentTimeMillis();
         final AtomicInteger last = new AtomicInteger();
-        TaskManager.runTask(new Runnable() {
+        TaskManager.runTask(new Runnable()
+        {
             @Override
-            public void run() {
-                if (UPDATE == false) {
+            public void run()
+            {
+                if (UPDATE == false)
+                {
                     last.set(0);
-                    while (chunks.size() > 0) {
-                        ChunkLoc chunk = chunks.get(0);
+                    while (chunks.size() > 0)
+                    {
+                        final ChunkLoc chunk = chunks.get(0);
                         chunks.remove(0);
                         regenerateRoad(world, chunk, extend);
                         ChunkManager.manager.unloadChunk(world, chunk, true, true);
@@ -116,25 +128,35 @@ public abstract class HybridUtils {
                     return;
                 }
                 count.incrementAndGet();
-                if (count.intValue() % 20 == 0) {
+                if ((count.intValue() % 20) == 0)
+                {
                     PS.debug("PROGRESS: " + ((100 * (2048 - chunks.size())) / 2048) + "%");
                 }
-                if (regions.size() == 0 && chunks.size() == 0) {
+                if ((regions.size() == 0) && (chunks.size() == 0))
+                {
                     HybridUtils.UPDATE = false;
                     PS.debug(C.PREFIX.s() + "Finished road conversion");
                     // CANCEL TASK
                     return;
-                } else {
+                }
+                else
+                {
                     final Runnable task = this;
-                    TaskManager.runTaskAsync(new Runnable() {
+                    TaskManager.runTaskAsync(new Runnable()
+                    {
                         @Override
-                        public void run() {
-                            try {
-                                if (last.get() == 0) {
+                        public void run()
+                        {
+                            try
+                            {
+                                if (last.get() == 0)
+                                {
                                     last.set((int) (System.currentTimeMillis() - baseTime));
                                 }
-                                if (chunks.size() < 1024) {
-                                    if (regions.size() > 0) {
+                                if (chunks.size() < 1024)
+                                {
+                                    if (regions.size() > 0)
+                                    {
                                         final ChunkLoc loc = regions.get(0);
                                         PS.debug("&3Updating .mcr: " + loc.x + ", " + loc.z + " (aprrox 1024 chunks)");
                                         PS.debug(" - Remaining: " + regions.size());
@@ -143,16 +165,20 @@ public abstract class HybridUtils {
                                         System.gc();
                                     }
                                 }
-                                if (chunks.size() > 0) {
-                                    long diff = System.currentTimeMillis() + 1;
-                                    if (System.currentTimeMillis() - baseTime - last.get() > 2000 && last.get() != 0) {
+                                if (chunks.size() > 0)
+                                {
+                                    final long diff = System.currentTimeMillis() + 1;
+                                    if (((System.currentTimeMillis() - baseTime - last.get()) > 2000) && (last.get() != 0))
+                                    {
                                         last.set(0);
                                         PS.debug(C.PREFIX.s() + "Detected low TPS. Rescheduling in 30s");
                                         final ChunkLoc chunk = chunks.get(0);
                                         chunks.remove(0);
-                                        TaskManager.runTask(new Runnable() {
+                                        TaskManager.runTask(new Runnable()
+                                        {
                                             @Override
-                                            public void run() {
+                                            public void run()
+                                            {
                                                 regenerateRoad(world, chunk, extend);
                                             }
                                         });
@@ -160,13 +186,17 @@ public abstract class HybridUtils {
                                         TaskManager.runTaskLater(task, 600);
                                         return;
                                     }
-                                    if ((System.currentTimeMillis() - baseTime) - last.get() < 1500 && last.get() != 0) {
-                                        while (System.currentTimeMillis() < diff && chunks.size() > 0) {
+                                    if ((((System.currentTimeMillis() - baseTime) - last.get()) < 1500) && (last.get() != 0))
+                                    {
+                                        while ((System.currentTimeMillis() < diff) && (chunks.size() > 0))
+                                        {
                                             final ChunkLoc chunk = chunks.get(0);
                                             chunks.remove(0);
-                                            TaskManager.runTask(new Runnable() {
+                                            TaskManager.runTask(new Runnable()
+                                            {
                                                 @Override
-                                                public void run() {
+                                                public void run()
+                                                {
                                                     regenerateRoad(world, chunk, extend);
                                                 }
                                             });
@@ -174,23 +204,29 @@ public abstract class HybridUtils {
                                     }
                                     last.set((int) (System.currentTimeMillis() - baseTime));
                                 }
-                            } catch (final Exception e) {
+                            }
+                            catch (final Exception e)
+                            {
                                 e.printStackTrace();
                                 final ChunkLoc loc = regions.get(0);
                                 PS.debug("&c[ERROR]&7 Could not update '" + world + "/region/r." + loc.x + "." + loc.z + ".mca' (Corrupt chunk?)");
                                 final int sx = loc.x << 5;
                                 final int sz = loc.z << 5;
-                                for (int x = sx; x < (sx + 32); x++) {
-                                    for (int z = sz; z < (sz + 32); z++) {
+                                for (int x = sx; x < (sx + 32); x++)
+                                {
+                                    for (int z = sz; z < (sz + 32); z++)
+                                    {
                                         ChunkManager.manager.unloadChunk(world, new ChunkLoc(x, z), true, true);
                                     }
                                 }
                                 PS.debug("&d - Potentially skipping 1024 chunks");
                                 PS.debug("&d - TODO: recommend chunkster if corrupt");
                             }
-                            SetBlockQueue.addNotify(new Runnable() {
+                            SetBlockQueue.addNotify(new Runnable()
+                            {
                                 @Override
-                                public void run() {
+                                public void run()
+                                {
                                     TaskManager.runTaskLater(task, 20);
                                 }
                             });
@@ -201,8 +237,9 @@ public abstract class HybridUtils {
         });
         return true;
     }
-    
-    public boolean setupRoadSchematic(final Plot plot) {
+
+    public boolean setupRoadSchematic(final Plot plot)
+    {
         final String world = plot.world;
         final Location bot = MainUtil.getPlotBottomLoc(world, plot.id);
         final Location top = MainUtil.getPlotTopLoc(world, plot.id);
@@ -224,13 +261,17 @@ public abstract class HybridUtils {
         final Location pos3 = new Location(world, bx, by, bz);
         final Location pos4 = new Location(world, tx, ty, tz);
         final String dir = PS.get().IMP.getDirectory() + File.separator + "schematics" + File.separator + "GEN_ROAD_SCHEMATIC" + File.separator + plot.world + File.separator;
-        SchematicHandler.manager.getCompoundTag(world, pos1, pos2, new RunnableVal<CompoundTag>() {
+        SchematicHandler.manager.getCompoundTag(world, pos1, pos2, new RunnableVal<CompoundTag>()
+        {
             @Override
-            public void run() {
+            public void run()
+            {
                 SchematicHandler.manager.save(value, dir + "sideroad.schematic");
-                SchematicHandler.manager.getCompoundTag(world, pos3, pos4, new RunnableVal<CompoundTag>() {
+                SchematicHandler.manager.getCompoundTag(world, pos3, pos4, new RunnableVal<CompoundTag>()
+                {
                     @Override
-                    public void run() {
+                    public void run()
+                    {
                         SchematicHandler.manager.save(value, dir + "intersection.schematic");
                         plotworld.ROAD_SCHEMATIC_ENABLED = true;
                         plotworld.setupSchematics();
@@ -243,24 +284,26 @@ public abstract class HybridUtils {
 
     public abstract int get_ey(final String world, final int sx, final int ex, final int sz, final int ez, final int sy);
 
-    public boolean regenerateRoad(final String world, final ChunkLoc chunk, int extend) {
+    public boolean regenerateRoad(final String world, final ChunkLoc chunk, int extend)
+    {
         int x = chunk.x << 4;
         int z = chunk.z << 4;
         final int ex = x + 15;
         final int ez = z + 15;
         final HybridPlotWorld plotworld = (HybridPlotWorld) PS.get().getPlotWorld(world);
         extend = Math.min(extend, 255 - plotworld.ROAD_HEIGHT - plotworld.SCHEMATIC_HEIGHT);
-        if (!plotworld.ROAD_SCHEMATIC_ENABLED) {
-            return false;
-        }
+        if (!plotworld.ROAD_SCHEMATIC_ENABLED) { return false; }
         boolean toCheck = false;
-        if (plotworld.TYPE == 2) {
-            boolean c1 = MainUtil.isPlotArea(new Location(plotworld.worldname, x, 1, z));
-            boolean c2 = MainUtil.isPlotArea(new Location(plotworld.worldname, ex, 1, ez));
-            if (!c1 && !c2) {
+        if (plotworld.TYPE == 2)
+        {
+            final boolean c1 = MainUtil.isPlotArea(new Location(plotworld.worldname, x, 1, z));
+            final boolean c2 = MainUtil.isPlotArea(new Location(plotworld.worldname, ex, 1, ez));
+            if (!c1 && !c2)
+            {
                 return false;
             }
-            else {
+            else
+            {
                 toCheck = c1 ^ c2;
             }
         }
@@ -269,60 +312,82 @@ public abstract class HybridUtils {
         final PlotId id2 = manager.getPlotId(plotworld, ex, 0, ez);
         x -= plotworld.ROAD_OFFSET_X;
         z -= plotworld.ROAD_OFFSET_Z;
-        if ((id1 == null) || (id2 == null) || (id1 != id2)) {
+        if ((id1 == null) || (id2 == null) || (id1 != id2))
+        {
             final boolean result = ChunkManager.manager.loadChunk(world, chunk, false);
-            if (result) {
-                if (id1 != null) {
+            if (result)
+            {
+                if (id1 != null)
+                {
                     final Plot p1 = MainUtil.getPlot(world, id1);
-                    if ((p1 != null) && p1.hasOwner() && p1.getSettings().isMerged()) {
+                    if ((p1 != null) && p1.hasOwner() && p1.getSettings().isMerged())
+                    {
                         toCheck = true;
                     }
                 }
-                if ((id2 != null) && !toCheck) {
+                if ((id2 != null) && !toCheck)
+                {
                     final Plot p2 = MainUtil.getPlot(world, id2);
-                    if ((p2 != null) && p2.hasOwner() && p2.getSettings().isMerged()) {
+                    if ((p2 != null) && p2.hasOwner() && p2.getSettings().isMerged())
+                    {
                         toCheck = true;
                     }
                 }
                 final int size = plotworld.SIZE;
-                for (int X = 0; X < 16; X++) {
+                for (int X = 0; X < 16; X++)
+                {
                     short absX = (short) ((x + X) % size);
-                    for (int Z = 0; Z < 16; Z++) {
+                    for (int Z = 0; Z < 16; Z++)
+                    {
                         short absZ = (short) ((z + Z) % size);
-                        if (absX < 0) {
+                        if (absX < 0)
+                        {
                             absX += size;
                         }
-                        if (absZ < 0) {
+                        if (absZ < 0)
+                        {
                             absZ += size;
                         }
                         boolean condition;
-                        if (toCheck) {
+                        if (toCheck)
+                        {
                             condition = manager.getPlotId(plotworld, x + X + plotworld.ROAD_OFFSET_X, 1, z + Z + plotworld.ROAD_OFFSET_Z) == null;
-//                            condition = MainUtil.isPlotRoad(new Location(plotworld.worldname, x + X, 1, z + Z));
-                        } else {
+                            //                            condition = MainUtil.isPlotRoad(new Location(plotworld.worldname, x + X, 1, z + Z));
+                        }
+                        else
+                        {
                             final boolean gx = absX > plotworld.PATH_WIDTH_LOWER;
                             final boolean gz = absZ > plotworld.PATH_WIDTH_LOWER;
                             final boolean lx = absX < plotworld.PATH_WIDTH_UPPER;
                             final boolean lz = absZ < plotworld.PATH_WIDTH_UPPER;
                             condition = (!gx || !gz || !lx || !lz);
                         }
-                        if (condition) {
+                        if (condition)
+                        {
                             final int sy = plotworld.ROAD_HEIGHT;
                             final PlotLoc loc = new PlotLoc(absX, absZ);
                             final HashMap<Short, Short> blocks = plotworld.G_SCH.get(loc);
-                            for (short y = (short) (plotworld.ROAD_HEIGHT); y <= (plotworld.ROAD_HEIGHT + plotworld.SCHEMATIC_HEIGHT + extend); y++) {
+                            for (short y = (short) (plotworld.ROAD_HEIGHT); y <= (plotworld.ROAD_HEIGHT + plotworld.SCHEMATIC_HEIGHT + extend); y++)
+                            {
                                 SetBlockQueue.setBlock(world, x + X + plotworld.ROAD_OFFSET_X, y, z + Z + plotworld.ROAD_OFFSET_Z, 0);
                             }
-                            if (blocks != null) {
+                            if (blocks != null)
+                            {
                                 final HashMap<Short, Byte> datas = plotworld.G_SCH_DATA.get(loc);
-                                if (datas == null) {
-                                    for (final Short y : blocks.keySet()) {
+                                if (datas == null)
+                                {
+                                    for (final Short y : blocks.keySet())
+                                    {
                                         SetBlockQueue.setBlock(world, x + X + plotworld.ROAD_OFFSET_X, sy + y, z + Z + plotworld.ROAD_OFFSET_Z, blocks.get(y));
                                     }
-                                } else {
-                                    for (final Short y : blocks.keySet()) {
+                                }
+                                else
+                                {
+                                    for (final Short y : blocks.keySet())
+                                    {
                                         Byte data = datas.get(y);
-                                        if (data == null) {
+                                        if (data == null)
+                                        {
                                             data = 0;
                                         }
                                         SetBlockQueue.setBlock(world, x + X + plotworld.ROAD_OFFSET_X, sy + y, z + Z + plotworld.ROAD_OFFSET_Z, new PlotBlock(blocks.get(y), data));
@@ -332,9 +397,11 @@ public abstract class HybridUtils {
                         }
                     }
                 }
-                SetBlockQueue.addNotify(new Runnable() {
+                SetBlockQueue.addNotify(new Runnable()
+                {
                     @Override
-                    public void run() {
+                    public void run()
+                    {
                         ChunkManager.manager.unloadChunk(world, chunk, true, true);
                     }
                 });
diff --git a/src/main/java/com/intellectualcrafters/plot/generator/PlotGenerator.java b/src/main/java/com/intellectualcrafters/plot/generator/PlotGenerator.java
index 8e4e81e09..c4b2e3e8a 100644
--- a/src/main/java/com/intellectualcrafters/plot/generator/PlotGenerator.java
+++ b/src/main/java/com/intellectualcrafters/plot/generator/PlotGenerator.java
@@ -5,17 +5,19 @@ import com.intellectualcrafters.plot.object.PlotManager;
 import com.intellectualcrafters.plot.object.PlotWorld;
 import com.intellectualcrafters.plot.object.SetupObject;
 
-public abstract class PlotGenerator<T> {
+public abstract class PlotGenerator<T>
+{
     public final String world;
     public T generator;
 
-    public PlotGenerator(String world, T generator) {
+    public PlotGenerator(final String world, final T generator)
+    {
         this.world = world;
         this.generator = generator;
     }
-    
-    public abstract void initialize(PlotWorld plotworld);
-    
+
+    public abstract void initialize(final PlotWorld plotworld);
+
     /**
      * TYPE = 2;
      * new AugmentedPopulator(world, generator, cluster, plotWorld.TERRAIN == 2, plotWorld.TERRAIN != 2);
@@ -25,9 +27,8 @@ public abstract class PlotGenerator<T> {
      * @param cluster Will be the cluster, or null
      * @param plotworld
      */
-    public abstract void augment(PlotCluster cluster, PlotWorld plotworld);
-    
-    
+    public abstract void augment(final PlotCluster cluster, final PlotWorld plotworld);
+
     /**
      *
                     if (gen_string == null) {
@@ -35,18 +36,18 @@ public abstract class PlotGenerator<T> {
                     } else {
                         generator = (PlotGenerator) IMP.getGenerator(world, gen_string);
                     }
-     
+
      * @param generator
      */
-    public abstract void setGenerator(String generator);
-    
-    public abstract PlotWorld getNewPlotWorld(String world);
-    
+    public abstract void setGenerator(final String generator);
+
+    public abstract PlotWorld getNewPlotWorld(final String world);
+
     public abstract PlotManager getPlotManager();
-    
+
     public abstract boolean isFull();
-    
+
     public abstract String getName();
-    
-    public abstract void processSetup(SetupObject object);
+
+    public abstract void processSetup(final SetupObject object);
 }
diff --git a/src/main/java/com/intellectualcrafters/plot/generator/SquarePlotManager.java b/src/main/java/com/intellectualcrafters/plot/generator/SquarePlotManager.java
index 895d168ab..c014d0172 100644
--- a/src/main/java/com/intellectualcrafters/plot/generator/SquarePlotManager.java
+++ b/src/main/java/com/intellectualcrafters/plot/generator/SquarePlotManager.java
@@ -11,9 +11,11 @@ import com.intellectualcrafters.plot.util.MainUtil;
 /**
  * A plot manager with a square grid layout, with square shaped plots
  */
-public abstract class SquarePlotManager extends GridPlotManager {
+public abstract class SquarePlotManager extends GridPlotManager
+{
     @Override
-    public boolean clearPlot(final PlotWorld plotworld, final Plot plot, final Runnable whenDone) {
+    public boolean clearPlot(final PlotWorld plotworld, final Plot plot, final Runnable whenDone)
+    {
         final Location pos1 = MainUtil.getPlotBottomLoc(plot.world, plot.id).add(1, 0, 1);
         final Location pos2 = MainUtil.getPlotTopLoc(plot.world, plot.id);
         ChunkManager.manager.regenerateRegion(pos1, pos2, whenDone);
@@ -21,30 +23,37 @@ public abstract class SquarePlotManager extends GridPlotManager {
     }
 
     @Override
-    public Location getPlotTopLocAbs(final PlotWorld plotworld, final PlotId plotid) {
+    public Location getPlotTopLocAbs(final PlotWorld plotworld, final PlotId plotid)
+    {
         final SquarePlotWorld dpw = ((SquarePlotWorld) plotworld);
         final int px = plotid.x;
         final int pz = plotid.y;
-        final int x = dpw.ROAD_OFFSET_X + (px * (dpw.ROAD_WIDTH + dpw.PLOT_WIDTH)) - ((int) Math.floor(dpw.ROAD_WIDTH / 2)) - 1;
-        final int z = dpw.ROAD_OFFSET_Z + (pz * (dpw.ROAD_WIDTH + dpw.PLOT_WIDTH)) - ((int) Math.floor(dpw.ROAD_WIDTH / 2)) - 1;
+        final int x = (dpw.ROAD_OFFSET_X + (px * (dpw.ROAD_WIDTH + dpw.PLOT_WIDTH))) - ((int) Math.floor(dpw.ROAD_WIDTH / 2)) - 1;
+        final int z = (dpw.ROAD_OFFSET_Z + (pz * (dpw.ROAD_WIDTH + dpw.PLOT_WIDTH))) - ((int) Math.floor(dpw.ROAD_WIDTH / 2)) - 1;
         return new Location(plotworld.worldname, x, Math.min(plotworld.MAX_BUILD_HEIGHT, 255), z);
     }
 
     @Override
-    public PlotId getPlotIdAbs(final PlotWorld plotworld, int x, final int y, int z) {
+    public PlotId getPlotIdAbs(final PlotWorld plotworld, int x, final int y, int z)
+    {
         final SquarePlotWorld dpw = ((SquarePlotWorld) plotworld);
         x -= dpw.ROAD_OFFSET_X;
         z -= dpw.ROAD_OFFSET_Z;
         int pathWidthLower;
         int end;
-        if (dpw.ROAD_WIDTH == 0) {
+        if (dpw.ROAD_WIDTH == 0)
+        {
             pathWidthLower = -1;
             end = dpw.PLOT_WIDTH;
         }
-        else {
-            if ((dpw.ROAD_WIDTH % 2) == 0) {
+        else
+        {
+            if ((dpw.ROAD_WIDTH % 2) == 0)
+            {
                 pathWidthLower = (dpw.ROAD_WIDTH / 2) - 1;
-            } else {
+            }
+            else
+            {
                 pathWidthLower = dpw.ROAD_WIDTH / 2;
             }
             end = pathWidthLower + dpw.PLOT_WIDTH;
@@ -52,49 +61,55 @@ public abstract class SquarePlotManager extends GridPlotManager {
         final int size = dpw.PLOT_WIDTH + dpw.ROAD_WIDTH;
         int idx;
         int idz;
-        if (x < 0) {
-            idx = (x/size);
+        if (x < 0)
+        {
+            idx = (x / size);
             x = size + (x % size);
         }
-        else {
-            idx = (x/size) + 1;
+        else
+        {
+            idx = (x / size) + 1;
             x = (x % size);
         }
-        if (z < 0) {
-            idz = (z/size);
+        if (z < 0)
+        {
+            idz = (z / size);
             z = size + (z % size);
         }
-        else {
-            idz = (z/size) + 1;
+        else
+        {
+            idz = (z / size) + 1;
             z = (z % size);
         }
         final boolean northSouth = (z <= pathWidthLower) || (z > end);
         final boolean eastWest = (x <= pathWidthLower) || (x > end);
-        if (northSouth || eastWest) {
-            return null;
-        }
+        if (northSouth || eastWest) { return null; }
         return new PlotId(idx, idz);
     }
 
     @Override
-    public PlotId getPlotId(final PlotWorld plotworld, int x, final int y, int z) {
+    public PlotId getPlotId(final PlotWorld plotworld, int x, final int y, int z)
+    {
         final SquarePlotWorld dpw = ((SquarePlotWorld) plotworld);
-        if (plotworld == null) {
-            return null;
-        }
+        if (plotworld == null) { return null; }
         x -= dpw.ROAD_OFFSET_X;
         z -= dpw.ROAD_OFFSET_Z;
         final int size = dpw.PLOT_WIDTH + dpw.ROAD_WIDTH;
         int pathWidthLower;
         final int end;
-        if (dpw.ROAD_WIDTH == 0) {
+        if (dpw.ROAD_WIDTH == 0)
+        {
             pathWidthLower = -1;
             end = dpw.PLOT_WIDTH;
         }
-        else {
-            if ((dpw.ROAD_WIDTH % 2) == 0) {
+        else
+        {
+            if ((dpw.ROAD_WIDTH % 2) == 0)
+            {
                 pathWidthLower = (dpw.ROAD_WIDTH / 2) - 1;
-            } else {
+            }
+            else
+            {
                 pathWidthLower = dpw.ROAD_WIDTH / 2;
             }
             end = pathWidthLower + dpw.PLOT_WIDTH;
@@ -103,68 +118,61 @@ public abstract class SquarePlotManager extends GridPlotManager {
         int dz;
         int rx;
         int rz;
-        if (x < 0) {
+        if (x < 0)
+        {
             dx = (x / size);
             rx = size + (x % size);
         }
-        else {
-            dx = (x/size) + 1;
+        else
+        {
+            dx = (x / size) + 1;
             rx = (x % size);
         }
-        if (z < 0) {
-            dz = (z/size);
+        if (z < 0)
+        {
+            dz = (z / size);
             rz = size + (z % size);
         }
-        else {
-            dz = (z/size) + 1;
+        else
+        {
+            dz = (z / size) + 1;
             rz = (z % size);
         }
         final boolean northSouth = (rz <= pathWidthLower) || (rz > end);
         final boolean eastWest = (rx <= pathWidthLower) || (rx > end);
-        if (northSouth && eastWest) {
+        if (northSouth && eastWest)
+        {
             // This means you are in the intersection
             final Location loc = new Location(plotworld.worldname, x + dpw.ROAD_WIDTH + dpw.ROAD_OFFSET_X, 0, z + dpw.ROAD_WIDTH + dpw.ROAD_OFFSET_Z);
             final PlotId id = MainUtil.getPlotAbs(loc);
             final Plot plot = PS.get().getPlot(plotworld.worldname, id);
-            if (plot == null) {
-                return null;
-            }
-            if ((plot.getMerged(0) && plot.getMerged(3))) {
-                return MainUtil.getBottomPlot(plot).id;
-            }
+            if (plot == null) { return null; }
+            if ((plot.getMerged(0) && plot.getMerged(3))) { return MainUtil.getBottomPlot(plot).id; }
             return null;
         }
-        if (northSouth) {
+        if (northSouth)
+        {
             // You are on a road running West to East (yeah, I named the var poorly)
             final Location loc = new Location(plotworld.worldname, x + dpw.ROAD_OFFSET_X, 0, z + dpw.ROAD_WIDTH + dpw.ROAD_OFFSET_Z);
             final PlotId id = MainUtil.getPlotAbs(loc);
             final Plot plot = PS.get().getPlot(plotworld.worldname, id);
-            if (plot == null) {
-                return null;
-            }
-            if (plot.getMerged(0)) {
-                return MainUtil.getBottomPlot(plot).id;
-            }
+            if (plot == null) { return null; }
+            if (plot.getMerged(0)) { return MainUtil.getBottomPlot(plot).id; }
             return null;
         }
-        if (eastWest) {
+        if (eastWest)
+        {
             // This is the road separating an Eastern and Western plot
             final Location loc = new Location(plotworld.worldname, x + dpw.ROAD_WIDTH + dpw.ROAD_OFFSET_X, 0, z + dpw.ROAD_OFFSET_Z);
             final PlotId id = MainUtil.getPlotAbs(loc);
             final Plot plot = PS.get().getPlot(plotworld.worldname, id);
-            if (plot == null) {
-                return null;
-            }
-            if (plot.getMerged(3)) {
-                return MainUtil.getBottomPlot(plot).id;
-            }
+            if (plot == null) { return null; }
+            if (plot.getMerged(3)) { return MainUtil.getBottomPlot(plot).id; }
             return null;
         }
         final PlotId id = new PlotId(dx, dz);
         final Plot plot = PS.get().getPlot(plotworld.worldname, id);
-        if (plot == null) {
-            return id;
-        }
+        if (plot == null) { return id; }
         return MainUtil.getBottomPlot(plot).id;
     }
 
@@ -172,12 +180,13 @@ public abstract class SquarePlotManager extends GridPlotManager {
      * Get the bottom plot loc (some basic math)
      */
     @Override
-    public Location getPlotBottomLocAbs(final PlotWorld plotworld, final PlotId plotid) {
+    public Location getPlotBottomLocAbs(final PlotWorld plotworld, final PlotId plotid)
+    {
         final SquarePlotWorld dpw = ((SquarePlotWorld) plotworld);
         final int px = plotid.x;
         final int pz = plotid.y;
-        final int x = dpw.ROAD_OFFSET_X + (px * (dpw.ROAD_WIDTH + dpw.PLOT_WIDTH)) - dpw.PLOT_WIDTH - ((int) Math.floor(dpw.ROAD_WIDTH / 2)) - 1;
-        final int z = dpw.ROAD_OFFSET_Z + (pz * (dpw.ROAD_WIDTH + dpw.PLOT_WIDTH)) - dpw.PLOT_WIDTH - ((int) Math.floor(dpw.ROAD_WIDTH / 2)) - 1;
+        final int x = (dpw.ROAD_OFFSET_X + (px * (dpw.ROAD_WIDTH + dpw.PLOT_WIDTH))) - dpw.PLOT_WIDTH - ((int) Math.floor(dpw.ROAD_WIDTH / 2)) - 1;
+        final int z = (dpw.ROAD_OFFSET_Z + (pz * (dpw.ROAD_WIDTH + dpw.PLOT_WIDTH))) - dpw.PLOT_WIDTH - ((int) Math.floor(dpw.ROAD_WIDTH / 2)) - 1;
         return new Location(plotworld.worldname, x, plotworld.MIN_BUILD_HEIGHT, z);
     }
 }
diff --git a/src/main/java/com/intellectualcrafters/plot/generator/SquarePlotWorld.java b/src/main/java/com/intellectualcrafters/plot/generator/SquarePlotWorld.java
index 74eac2923..0e513c9d8 100644
--- a/src/main/java/com/intellectualcrafters/plot/generator/SquarePlotWorld.java
+++ b/src/main/java/com/intellectualcrafters/plot/generator/SquarePlotWorld.java
@@ -3,7 +3,8 @@ package com.intellectualcrafters.plot.generator;
 import com.intellectualcrafters.configuration.ConfigurationSection;
 import com.intellectualcrafters.plot.PS;
 
-public abstract class SquarePlotWorld extends GridPlotWorld {
+public abstract class SquarePlotWorld extends GridPlotWorld
+{
     public static int PLOT_WIDTH_DEFAULT = 42;
     public static int ROAD_WIDTH_DEFAULT = 7;
     public static int ROAD_OFFSET_X_DEFAULT = 0;
@@ -14,18 +15,21 @@ public abstract class SquarePlotWorld extends GridPlotWorld {
     public int ROAD_OFFSET_Z;
 
     @Override
-    public void loadConfiguration(final ConfigurationSection config) {
-        if (!config.contains("plot.height")) {
+    public void loadConfiguration(final ConfigurationSection config)
+    {
+        if (!config.contains("plot.height"))
+        {
             PS.debug(" - &cConfiguration is null? (" + config.getCurrentPath() + ")");
         }
-        this.PLOT_WIDTH = config.getInt("plot.size");
-        this.ROAD_WIDTH = config.getInt("road.width");
-        this.ROAD_OFFSET_X = config.getInt("road.offset.x");
-        this.ROAD_OFFSET_Z = config.getInt("road.offset.z");
-        this.SIZE = (short) (this.PLOT_WIDTH + this.ROAD_WIDTH);
+        PLOT_WIDTH = config.getInt("plot.size");
+        ROAD_WIDTH = config.getInt("road.width");
+        ROAD_OFFSET_X = config.getInt("road.offset.x");
+        ROAD_OFFSET_Z = config.getInt("road.offset.z");
+        SIZE = (short) (PLOT_WIDTH + ROAD_WIDTH);
     }
 
-    public SquarePlotWorld(final String worldname) {
+    public SquarePlotWorld(final String worldname)
+    {
         super(worldname);
     }
 }
diff --git a/src/main/java/com/intellectualcrafters/plot/object/BO3.java b/src/main/java/com/intellectualcrafters/plot/object/BO3.java
index 716baa500..80e346022 100644
--- a/src/main/java/com/intellectualcrafters/plot/object/BO3.java
+++ b/src/main/java/com/intellectualcrafters/plot/object/BO3.java
@@ -1,46 +1,56 @@
 package com.intellectualcrafters.plot.object;
 
-public class BO3 {
+public class BO3
+{
     private final ChunkLoc chunk;
     private final StringBuilder blocks;
     private final StringBuilder children;
     private final String name;
-    
-    public BO3(String name, ChunkLoc loc) {
+
+    public BO3(final String name, final ChunkLoc loc)
+    {
         this.name = name;
-        this.chunk = loc;
-        this.blocks = new StringBuilder();
-        this.children = new StringBuilder();
+        chunk = loc;
+        blocks = new StringBuilder();
+        children = new StringBuilder();
     }
-    
-    public void addChild(BO3 child) {
-        ChunkLoc childloc = child.getLoc();
+
+    public void addChild(final BO3 child)
+    {
+        final ChunkLoc childloc = child.getLoc();
         children.append("Branch(" + (childloc.x - chunk.x) + ",0," + (childloc.z - chunk.z) + "," + name + "_" + childloc.x + "_" + childloc.z + ")\n");
     }
-    
-    public ChunkLoc getLoc() {
-        return this.chunk;
+
+    public ChunkLoc getLoc()
+    {
+        return chunk;
     }
-    
-    public String getName() {
+
+    public String getName()
+    {
         return name;
     }
 
-    public void addBlock(int x, int y, int z, PlotBlock block) {
-        if (block.data == 0) {
+    public void addBlock(final int x, final int y, final int z, final PlotBlock block)
+    {
+        if (block.data == 0)
+        {
             // Block(-3,1,-2,AIR)
             blocks.append("Block(" + x + "," + y + "," + z + "," + block.id + ")\n");
         }
-        else {
+        else
+        {
             blocks.append("Block(" + x + "," + y + "," + z + "," + block.id + ":" + block.data + ")\n");
         }
     }
 
-    public String getBlocks() {
+    public String getBlocks()
+    {
         return blocks.toString();
     }
-    
-    public String getChildren() {
+
+    public String getChildren()
+    {
         return children.toString();
     }
 }
diff --git a/src/main/java/com/intellectualcrafters/plot/object/BlockLoc.java b/src/main/java/com/intellectualcrafters/plot/object/BlockLoc.java
index 9c3bdf075..da676a975 100644
--- a/src/main/java/com/intellectualcrafters/plot/object/BlockLoc.java
+++ b/src/main/java/com/intellectualcrafters/plot/object/BlockLoc.java
@@ -1,13 +1,15 @@
 package com.intellectualcrafters.plot.object;
 
-public class BlockLoc {
+public class BlockLoc
+{
     public int x;
     public int y;
     public int z;
 
     public float yaw, pitch;
 
-    public BlockLoc(final int x, final int y, final int z, final float yaw, final float pitch) {
+    public BlockLoc(final int x, final int y, final int z, final float yaw, final float pitch)
+    {
         this.x = x;
         this.y = y;
         this.z = z;
@@ -16,57 +18,60 @@ public class BlockLoc {
         this.pitch = pitch;
     }
 
-    public BlockLoc(final int x, final int y, final int z) {
+    public BlockLoc(final int x, final int y, final int z)
+    {
         this(x, y, z, 0f, 0f);
     }
 
     @Override
-    public int hashCode() {
+    public int hashCode()
+    {
         final int prime = 31;
         int result = 1;
-        result = (prime * result) + this.x;
-        result = (prime * result) + this.y;
-        result = (prime * result) + this.z;
+        result = (prime * result) + x;
+        result = (prime * result) + y;
+        result = (prime * result) + z;
         return result;
     }
 
     @Override
-    public boolean equals(final Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
+    public boolean equals(final Object obj)
+    {
+        if (this == obj) { return true; }
+        if (obj == null) { return false; }
+        if (getClass() != obj.getClass()) { return false; }
         final BlockLoc other = (BlockLoc) obj;
-        return ((this.x == other.x) && (this.y == other.y) && (this.z == other.z));
+        return ((x == other.x) && (y == other.y) && (z == other.z));
     }
 
     @Override
-    public String toString() {
-        return
-                x + "," + y + "," + z + "," + yaw + "," + pitch;
+    public String toString()
+    {
+        return x + "," + y + "," + z + "," + yaw + "," + pitch;
     }
 
-    public static BlockLoc fromString(final String string) {
-        String[] parts = string.split(",");
+    public static BlockLoc fromString(final String string)
+    {
+        final String[] parts = string.split(",");
 
         float yaw, pitch;
-        if (parts.length == 3) {
+        if (parts.length == 3)
+        {
             yaw = 0f;
             pitch = 0f;
-        } if (parts.length == 5) {
+        }
+        if (parts.length == 5)
+        {
             yaw = Float.parseFloat(parts[3]);
             pitch = Float.parseFloat(parts[4]);
-        } else {
+        }
+        else
+        {
             return new BlockLoc(0, 0, 0);
         }
-        int x = Integer.parseInt(parts[0]);
-        int y = Integer.parseInt(parts[1]);
-        int z = Integer.parseInt(parts[2]);
+        final int x = Integer.parseInt(parts[0]);
+        final int y = Integer.parseInt(parts[1]);
+        final int z = Integer.parseInt(parts[2]);
 
         return new BlockLoc(x, y, z, yaw, pitch);
     }
diff --git a/src/main/java/com/intellectualcrafters/plot/object/BlockWrapper.java b/src/main/java/com/intellectualcrafters/plot/object/BlockWrapper.java
index d83e5c3c2..5cc2b40dc 100644
--- a/src/main/java/com/intellectualcrafters/plot/object/BlockWrapper.java
+++ b/src/main/java/com/intellectualcrafters/plot/object/BlockWrapper.java
@@ -1,70 +1,69 @@
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// PlotSquared - A plot manager and world generator for the Bukkit API                             /
-// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
-//                                                                                                 /
-// This program is free software; you can redistribute it and/or modify                            /
-// it under the terms of the GNU General Public License as published by                            /
-// the Free Software Foundation; either version 3 of the License, or                               /
-// (at your option) any later version.                                                             /
-//                                                                                                 /
-// This program is distributed in the hope that it will be useful,                                 /
-// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
-// GNU General Public License for more details.                                                    /
-//                                                                                                 /
-// You should have received a copy of the GNU General Public License                               /
-// along with this program; if not, write to the Free Software Foundation,                         /
-// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
-//                                                                                                 /
-// You can contact us via: support@intellectualsites.com                                           /
-////////////////////////////////////////////////////////////////////////////////////////////////////
-package com.intellectualcrafters.plot.object;
-
-
-/**
- * Wrapper class for blocks, using pure data rather than the object.
- * 
- * Useful for NMS
- *
- * @author Empire92
- * @author Citymonstret
- */
-public class BlockWrapper {
-    /**
-     * X Coordinate
-     */
-    public final int x;
-    /**
-     * Y Coordinate
-     */
-    public final int y;
-    /**
-     * Z Coordinate
-     */
-    public final int z;
-    /**
-     * Block ID
-     */
-    public final int id;
-    /**
-     * Block Data Value
-     */
-    public final byte data;
-
-    /**
-     * Constructor
-     *
-     * @param x    X Loc Value
-     * @param y    Y Loc Value
-     * @param z    Z Loc Value
-     * @param id   Material ID
-     * @param data Data Value
-     */
-    public BlockWrapper(final int x, final int y, final int z, final short id, final byte data) {
-        this.x = x;
-        this.y = y;
-        this.z = z;
-        this.id = id;
-        this.data = data;
-    }
-}
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// PlotSquared - A plot manager and world generator for the Bukkit API                             /
+// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
+//                                                                                                 /
+// This program is free software; you can redistribute it and/or modify                            /
+// it under the terms of the GNU General Public License as published by                            /
+// the Free Software Foundation; either version 3 of the License, or                               /
+// (at your option) any later version.                                                             /
+//                                                                                                 /
+// This program is distributed in the hope that it will be useful,                                 /
+// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
+// GNU General Public License for more details.                                                    /
+//                                                                                                 /
+// You should have received a copy of the GNU General Public License                               /
+// along with this program; if not, write to the Free Software Foundation,                         /
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
+//                                                                                                 /
+// You can contact us via: support@intellectualsites.com                                           /
+////////////////////////////////////////////////////////////////////////////////////////////////////
+package com.intellectualcrafters.plot.object;
+
+/**
+ * Wrapper class for blocks, using pure data rather than the object.
+ *
+ * Useful for NMS
+ *


+ */
+public class BlockWrapper
+{
+    /**
+     * X Coordinate
+     */
+    public final int x;
+    /**
+     * Y Coordinate
+     */
+    public final int y;
+    /**
+     * Z Coordinate
+     */
+    public final int z;
+    /**
+     * Block ID
+     */
+    public final int id;
+    /**
+     * Block Data Value
+     */
+    public final byte data;
+
+    /**
+     * Constructor
+     *
+     * @param x    X Loc Value
+     * @param y    Y Loc Value
+     * @param z    Z Loc Value
+     * @param id   Material ID
+     * @param data Data Value
+     */
+    public BlockWrapper(final int x, final int y, final int z, final short id, final byte data)
+    {
+        this.x = x;
+        this.y = y;
+        this.z = z;
+        this.id = id;
+        this.data = data;
+    }
+}
diff --git a/src/main/java/com/intellectualcrafters/plot/object/ChunkLoc.java b/src/main/java/com/intellectualcrafters/plot/object/ChunkLoc.java
index 9cfbaa290..629873ef8 100644
--- a/src/main/java/com/intellectualcrafters/plot/object/ChunkLoc.java
+++ b/src/main/java/com/intellectualcrafters/plot/object/ChunkLoc.java
@@ -1,35 +1,33 @@
 package com.intellectualcrafters.plot.object;
 
-public class ChunkLoc {
+public class ChunkLoc
+{
     public int x;
     public int z;
 
-    public ChunkLoc(final int x, final int z) {
+    public ChunkLoc(final int x, final int z)
+    {
         this.x = x;
         this.z = z;
     }
 
     @Override
-    public int hashCode() {
+    public int hashCode()
+    {
         final int prime = 31;
         int result = 1;
-        result = (prime * result) + this.x;
-        result = (prime * result) + this.z;
+        result = (prime * result) + x;
+        result = (prime * result) + z;
         return result;
     }
 
     @Override
-    public boolean equals(final Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
+    public boolean equals(final Object obj)
+    {
+        if (this == obj) { return true; }
+        if (obj == null) { return false; }
+        if (getClass() != obj.getClass()) { return false; }
         final ChunkLoc other = (ChunkLoc) obj;
-        return ((this.x == other.x) && (this.z == other.z));
+        return ((x == other.x) && (z == other.z));
     }
 }
diff --git a/src/main/java/com/intellectualcrafters/plot/object/CmdInstance.java b/src/main/java/com/intellectualcrafters/plot/object/CmdInstance.java
index ac55a321c..592e44f4d 100644
--- a/src/main/java/com/intellectualcrafters/plot/object/CmdInstance.java
+++ b/src/main/java/com/intellectualcrafters/plot/object/CmdInstance.java
@@ -1,12 +1,13 @@
 package com.intellectualcrafters.plot.object;
 
+public class CmdInstance
+{
+    public final Runnable command;
+    public final long timestamp;
 
-public class CmdInstance {
-	public final Runnable command;
-	public final long timestamp;
-	
-	public CmdInstance(Runnable command) {
-		this.command = command;
-		this.timestamp = System.currentTimeMillis();
-	}
+    public CmdInstance(final Runnable command)
+    {
+        this.command = command;
+        timestamp = System.currentTimeMillis();
+    }
 }
diff --git a/src/main/java/com/intellectualcrafters/plot/object/ConsolePlayer.java b/src/main/java/com/intellectualcrafters/plot/object/ConsolePlayer.java
index bad9f9f5a..54d331027 100644
--- a/src/main/java/com/intellectualcrafters/plot/object/ConsolePlayer.java
+++ b/src/main/java/com/intellectualcrafters/plot/object/ConsolePlayer.java
@@ -12,150 +12,184 @@ import com.intellectualcrafters.plot.util.MainUtil;
 import com.intellectualcrafters.plot.util.PlotGamemode;
 import com.intellectualcrafters.plot.util.PlotWeather;
 
-public class ConsolePlayer extends PlotPlayer {
+public class ConsolePlayer extends PlotPlayer
+{
 
     private static ConsolePlayer instance;
     private Location loc;
     private final HashMap<String, Object> meta;
-    
-    public static ConsolePlayer getConsole() {
-        if (instance == null) {
+
+    public static ConsolePlayer getConsole()
+    {
+        if (instance == null)
+        {
             instance = new ConsolePlayer();
             instance.teleport(instance.getLocation());
         }
         return instance;
     }
-    
-    private ConsolePlayer() {
+
+    private ConsolePlayer()
+    {
         String world;
-        Set<String> plotworlds = PS.get().getPlotWorlds();
-        if (plotworlds.size() > 0) {
+        final Set<String> plotworlds = PS.get().getPlotWorlds();
+        if (plotworlds.size() > 0)
+        {
             world = plotworlds.iterator().next();
         }
-        else {
+        else
+        {
             world = "world";
         }
-        this.loc = new Location(world, 0, 0, 0);
-        this.meta = new HashMap<>();
+        loc = new Location(world, 0, 0, 0);
+        meta = new HashMap<>();
     }
-    
-    public static boolean isConsole(PlotPlayer plr) {
-        return instance == plr; 
+
+    public static boolean isConsole(final PlotPlayer plr)
+    {
+        return instance == plr;
     }
-    
+
     @Override
-    public long getPreviousLogin() {
+    public long getPreviousLogin()
+    {
         return 0;
     }
 
     @Override
-    public Location getLocation() {
+    public Location getLocation()
+    {
         return loc;
     }
 
     @Override
-    public Location getLocationFull() {
+    public Location getLocationFull()
+    {
         return loc;
     }
 
     @Override
-    public UUID getUUID() {
+    public UUID getUUID()
+    {
         return DBFunc.everyone;
     }
 
     @Override
-    public boolean hasPermission(String perm) {
+    public boolean hasPermission(final String perm)
+    {
         return true;
     }
 
     @Override
-    public void sendMessage(String message) {
+    public void sendMessage(final String message)
+    {
         PS.log(message);
     }
-    
+
     @Override
-    public void sendMessage(C c, String... args) {
+    public void sendMessage(final C c, final String... args)
+    {
         MainUtil.sendMessage(this, c, args);
     }
 
     @Override
-    public void teleport(Location loc) {
-        Plot plot = MainUtil.getPlot(loc);
+    public void teleport(final Location loc)
+    {
+        final Plot plot = MainUtil.getPlot(loc);
         setMeta("lastplot", plot);
         this.loc = loc;
     }
 
     @Override
-    public boolean isOnline() {
+    public boolean isOnline()
+    {
         return true;
     }
 
     @Override
-    public String getName() {
+    public String getName()
+    {
         return "*";
     }
 
     @Override
-    public void setCompassTarget(Location loc) {}
+    public void setCompassTarget(final Location loc)
+    {}
 
     @Override
-    public void loadData() {}
+    public void loadData()
+    {}
 
     @Override
-    public void saveData() {}
+    public void saveData()
+    {}
 
     @Override
-    public void setAttribute(String key) {}
+    public void setAttribute(final String key)
+    {}
 
     @Override
-    public boolean getAttribute(String key) {
+    public boolean getAttribute(final String key)
+    {
         return false;
     }
 
     @Override
-    public void removeAttribute(String key) {}
+    public void removeAttribute(final String key)
+    {}
 
     @Override
-    public void setMeta(String key, Object value) {
-        this.meta.put(key, value);
+    public void setMeta(final String key, final Object value)
+    {
+        meta.put(key, value);
     }
 
     @Override
-    public Object getMeta(String key) {
-        return this.meta.get(key);
+    public Object getMeta(final String key)
+    {
+        return meta.get(key);
     }
 
     @Override
-    public void deleteMeta(String key) {
-        this.meta.remove(key);
+    public void deleteMeta(final String key)
+    {
+        meta.remove(key);
     }
 
     @Override
-    public RequiredType getSuperCaller() {
+    public RequiredType getSuperCaller()
+    {
         return RequiredType.CONSOLE;
     }
 
     @Override
-    public void setWeather(PlotWeather weather) {}
+    public void setWeather(final PlotWeather weather)
+    {}
 
     @Override
-    public PlotGamemode getGamemode() {
+    public PlotGamemode getGamemode()
+    {
         return PlotGamemode.CREATIVE;
     }
 
     @Override
-    public void setGamemode(PlotGamemode gamemode) {}
+    public void setGamemode(final PlotGamemode gamemode)
+    {}
 
     @Override
-    public void setTime(long time) {}
+    public void setTime(final long time)
+    {}
 
     @Override
-    public void setFlight(boolean fly) {}
+    public void setFlight(final boolean fly)
+    {}
 
     @Override
-    public void playMusic(Location loc, int id) {}
+    public void playMusic(final Location loc, final int id)
+    {}
 
     @Override
-    public void kick(String message) {}
-    
+    public void kick(final String message)
+    {}
+
 }
diff --git a/src/main/java/com/intellectualcrafters/plot/object/FileBytes.java b/src/main/java/com/intellectualcrafters/plot/object/FileBytes.java
index c79bd9798..587ab4389 100644
--- a/src/main/java/com/intellectualcrafters/plot/object/FileBytes.java
+++ b/src/main/java/com/intellectualcrafters/plot/object/FileBytes.java
@@ -1,10 +1,12 @@
 package com.intellectualcrafters.plot.object;
 
-public class FileBytes {
+public class FileBytes
+{
     public String path;
     public byte[] data;
-    
-    public FileBytes(String path, byte[] data) {
+
+    public FileBytes(final String path, final byte[] data)
+    {
         this.path = path;
         this.data = data;
     }
diff --git a/src/main/java/com/intellectualcrafters/plot/object/LazyBlock.java b/src/main/java/com/intellectualcrafters/plot/object/LazyBlock.java
index a7094a487..33d5906cc 100644
--- a/src/main/java/com/intellectualcrafters/plot/object/LazyBlock.java
+++ b/src/main/java/com/intellectualcrafters/plot/object/LazyBlock.java
@@ -1,9 +1,11 @@
 package com.intellectualcrafters.plot.object;
 
-public abstract class LazyBlock {
+public abstract class LazyBlock
+{
     public abstract PlotBlock getPlotBlock();
-    
-    public int getId() {
+
+    public int getId()
+    {
         return getPlotBlock().id;
     }
 }
diff --git a/src/main/java/com/intellectualcrafters/plot/object/Location.java b/src/main/java/com/intellectualcrafters/plot/object/Location.java
index e35cbc161..362a844d0 100644
--- a/src/main/java/com/intellectualcrafters/plot/object/Location.java
+++ b/src/main/java/com/intellectualcrafters/plot/object/Location.java
@@ -1,217 +1,245 @@
-package com.intellectualcrafters.plot.object;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-/**
- * Created 2015-02-11 for PlotSquared
- *
- * @author Citymonstret
- */
-public class Location implements Cloneable, Comparable<Location> {
-    private int x, y, z;
-    private float yaw, pitch;
-    private String world;
-    private boolean built;
-    private Object o;
-
-    @Override
-    public Location clone() {
-        return new Location(this.world, this.x, this.y, this.z, this.yaw, this.pitch);
-    }
-
-    public Location(final String world, final int x, final int y, final int z, final float yaw, final float pitch) {
-        this.world = world;
-        this.x = x;
-        this.y = y;
-        this.z = z;
-        this.yaw = yaw;
-        this.pitch = pitch;
-        this.built = false;
-        this.o = null;
-    }
-
-    public Location() {
-        this("", 0, 0, 0, 0, 0);
-    }
-
-    public Location(final String world, final int x, final int y, final int z) {
-        this(world, x, y, z, 0f, 0f);
-    }
-
-    public int getX() {
-        return this.x;
-    }
-
-    public void setX(final int x) {
-        this.x = x;
-        this.built = false;
-    }
-
-    public int getY() {
-        return this.y;
-    }
-
-    public void setY(final int y) {
-        this.y = y;
-        this.built = false;
-    }
-
-    public int getZ() {
-        return this.z;
-    }
-
-    public void setZ(final int z) {
-        this.z = z;
-        this.built = false;
-    }
-
-    public String getWorld() {
-        return this.world;
-    }
-
-    public void setWorld(final String world) {
-        this.world = world;
-        this.built = false;
-    }
-
-    public float getYaw() {
-        return this.yaw;
-    }
-
-    public void setYaw(final float yaw) {
-        this.yaw = yaw;
-        this.built = false;
-    }
-
-    public float getPitch() {
-        return this.pitch;
-    }
-
-    public void setPitch(final float pitch) {
-        this.pitch = pitch;
-        this.built = false;
-    }
-
-    public Location add(final int x, final int y, final int z) {
-        this.x += x;
-        this.y += y;
-        this.z += z;
-        this.built = false;
-        return this;
-    }
-
-    public double getEuclideanDistanceSquared(final Location l2) {
-        final double x = getX() - l2.getX();
-        final double y = getY() - l2.getY();
-        final double z = getZ() - l2.getZ();
-        return (x * x) + (y * y) + (z * z);
-    }
-
-    public double getEuclideanDistance(final Location l2) {
-        return Math.sqrt(getEuclideanDistanceSquared(l2));
-    }
-
-    public boolean isInSphere(final Location origin, final int radius) {
-        return getEuclideanDistanceSquared(origin) < (radius * radius);
-    }
-
-    @Override
-    public int hashCode() {
-        int hash = 127;
-        hash = (hash * 31) + this.x;
-        hash = (hash * 31) + this.y;
-        hash = (hash * 31) + this.z;
-        hash = (int) ((hash * 31) + getYaw());
-        hash = (int) ((hash * 31) + getPitch());
-        return (hash * 31) + (this.world == null ? 127 : this.world.hashCode());
-    }
-
-    public boolean isInAABB(final Location min, final Location max) {
-        return (this.x >= min.getX()) && (this.x <= max.getX()) && (this.y >= min.getY()) && (this.y <= max.getY()) && (this.z >= min.getX()) && (this.z < max.getZ());
-    }
-
-    public void lookTowards(final int x, final int y) {
-        final double l = this.x - x;
-        final double w = this.z - this.z;
-        final double c = Math.sqrt((l * l) + (w * w));
-        if (((Math.asin(w / c) / Math.PI) * 180) > 90) {
-            setYaw((float) (180 - ((-Math.asin(l / c) / Math.PI) * 180)));
-        } else {
-            setYaw((float) ((-Math.asin(l / c) / Math.PI) * 180));
-        }
-        this.built = false;
-    }
-
-    public Location subtract(final int x, final int y, final int z) {
-        this.x -= x;
-        this.y -= y;
-        this.z -= z;
-        this.built = false;
-        return this;
-    }
-
-    @Override
-    public boolean equals(final Object o) {
-        if (o == null) {
-            return false;
-        }
-        if (!(o instanceof Location)) {
-            return false;
-        }
-        final Location l = (Location) o;
-        return (this.x == l.getX()) && (this.y == l.getY()) && (this.z == l.getZ()) && this.world.equals(l.getWorld()) && (this.yaw == l.getY()) && (this.pitch == l.getPitch());
-    }
-
-    @Override
-    public int compareTo(final Location o) {
-        if (o == null) {
-            throw new NullPointerException("Specified object was null");
-        }
-        if (((this.x == o.getX()) && (this.y == o.getY())) || (this.z == o.getZ())) {
-            return 0;
-        }
-        if ((this.x < o.getX()) && (this.y < o.getY()) && (this.z < o.getZ())) {
-            return -1;
-        }
-        return 1;
-    }
-
-    @Override
-    public String toString() {
-        return "\"plotsquaredlocation\":{" + "\"x\":" + this.x + ",\"y\":" + this.y + ",\"z\":" + this.z + ",\"yaw\":" + this.yaw + ",\"pitch\":" + this.pitch + ",\"world\":\"" + this.world + "\"}";
-    }
-
-    private Object getBukkitWorld() {
-        try {
-            final Class clazz = Class.forName("org.bukkit.Bukkit");
-            return clazz.getMethod("getWorld", String.class).invoke(null, this.world);
-        } catch (final Exception e) {
-            return null;
-        }
-    }
-
-    public Object toBukkitLocation() {
-        if (this.built) {
-            return this.o;
-        }
-        try {
-            final Constructor constructor = Class.forName("org.bukkit.Location").getConstructor(Class.forName("org.bukkit.World"), double.class, double.class, double.class, float.class, float.class);
-            this.built = true;
-            return (this.o = constructor.newInstance(Class.forName("org.bukkit.World").cast(getBukkitWorld()), this.x, this.y, this.z, this.yaw, this.pitch));
-        } catch (IllegalAccessException | InstantiationException | InvocationTargetException | ClassNotFoundException | NoSuchMethodException e) {
-            return null;
-        }
-    }
-
-    /**
-     * Please use utility class as this is not efficient
-     */
-    public void teleport(final Object o) throws Exception {
-        if (o.getClass().getName().contains("org.bukkit.entity")) {
-            final Method m = o.getClass().getMethod("teleport", Class.forName("org.bukkit.Location"));
-            m.invoke(o, toBukkitLocation());
-        }
-    }
-}
+package com.intellectualcrafters.plot.object;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+/**
+ * Created 2015-02-11 for PlotSquared
+ *

+ */
+public class Location implements Cloneable, Comparable<Location>
+{
+    private int x, y, z;
+    private float yaw, pitch;
+    private String world;
+    private boolean built;
+    private Object o;
+
+    @Override
+    public Location clone()
+    {
+        return new Location(world, x, y, z, yaw, pitch);
+    }
+
+    public Location(final String world, final int x, final int y, final int z, final float yaw, final float pitch)
+    {
+        this.world = world;
+        this.x = x;
+        this.y = y;
+        this.z = z;
+        this.yaw = yaw;
+        this.pitch = pitch;
+        built = false;
+        o = null;
+    }
+
+    public Location()
+    {
+        this("", 0, 0, 0, 0, 0);
+    }
+
+    public Location(final String world, final int x, final int y, final int z)
+    {
+        this(world, x, y, z, 0f, 0f);
+    }
+
+    public int getX()
+    {
+        return x;
+    }
+
+    public void setX(final int x)
+    {
+        this.x = x;
+        built = false;
+    }
+
+    public int getY()
+    {
+        return y;
+    }
+
+    public void setY(final int y)
+    {
+        this.y = y;
+        built = false;
+    }
+
+    public int getZ()
+    {
+        return z;
+    }
+
+    public void setZ(final int z)
+    {
+        this.z = z;
+        built = false;
+    }
+
+    public String getWorld()
+    {
+        return world;
+    }
+
+    public void setWorld(final String world)
+    {
+        this.world = world;
+        built = false;
+    }
+
+    public float getYaw()
+    {
+        return yaw;
+    }
+
+    public void setYaw(final float yaw)
+    {
+        this.yaw = yaw;
+        built = false;
+    }
+
+    public float getPitch()
+    {
+        return pitch;
+    }
+
+    public void setPitch(final float pitch)
+    {
+        this.pitch = pitch;
+        built = false;
+    }
+
+    public Location add(final int x, final int y, final int z)
+    {
+        this.x += x;
+        this.y += y;
+        this.z += z;
+        built = false;
+        return this;
+    }
+
+    public double getEuclideanDistanceSquared(final Location l2)
+    {
+        final double x = getX() - l2.getX();
+        final double y = getY() - l2.getY();
+        final double z = getZ() - l2.getZ();
+        return (x * x) + (y * y) + (z * z);
+    }
+
+    public double getEuclideanDistance(final Location l2)
+    {
+        return Math.sqrt(getEuclideanDistanceSquared(l2));
+    }
+
+    public boolean isInSphere(final Location origin, final int radius)
+    {
+        return getEuclideanDistanceSquared(origin) < (radius * radius);
+    }
+
+    @Override
+    public int hashCode()
+    {
+        int hash = 127;
+        hash = (hash * 31) + x;
+        hash = (hash * 31) + y;
+        hash = (hash * 31) + z;
+        hash = (int) ((hash * 31) + getYaw());
+        hash = (int) ((hash * 31) + getPitch());
+        return (hash * 31) + (world == null ? 127 : world.hashCode());
+    }
+
+    public boolean isInAABB(final Location min, final Location max)
+    {
+        return (x >= min.getX()) && (x <= max.getX()) && (y >= min.getY()) && (y <= max.getY()) && (z >= min.getX()) && (z < max.getZ());
+    }
+
+    public void lookTowards(final int x, final int y)
+    {
+        final double l = this.x - x;
+        final double w = z - z;
+        final double c = Math.sqrt((l * l) + (w * w));
+        if (((Math.asin(w / c) / Math.PI) * 180) > 90)
+        {
+            setYaw((float) (180 - ((-Math.asin(l / c) / Math.PI) * 180)));
+        }
+        else
+        {
+            setYaw((float) ((-Math.asin(l / c) / Math.PI) * 180));
+        }
+        built = false;
+    }
+
+    public Location subtract(final int x, final int y, final int z)
+    {
+        this.x -= x;
+        this.y -= y;
+        this.z -= z;
+        built = false;
+        return this;
+    }
+
+    @Override
+    public boolean equals(final Object o)
+    {
+        if (o == null) { return false; }
+        if (!(o instanceof Location)) { return false; }
+        final Location l = (Location) o;
+        return (x == l.getX()) && (y == l.getY()) && (z == l.getZ()) && world.equals(l.getWorld()) && (yaw == l.getY()) && (pitch == l.getPitch());
+    }
+
+    @Override
+    public int compareTo(final Location o)
+    {
+        if (o == null) { throw new NullPointerException("Specified object was null"); }
+        if (((x == o.getX()) && (y == o.getY())) || (z == o.getZ())) { return 0; }
+        if ((x < o.getX()) && (y < o.getY()) && (z < o.getZ())) { return -1; }
+        return 1;
+    }
+
+    @Override
+    public String toString()
+    {
+        return "\"plotsquaredlocation\":{" + "\"x\":" + x + ",\"y\":" + y + ",\"z\":" + z + ",\"yaw\":" + yaw + ",\"pitch\":" + pitch + ",\"world\":\"" + world + "\"}";
+    }
+
+    private Object getBukkitWorld()
+    {
+        try
+        {
+            final Class clazz = Class.forName("org.bukkit.Bukkit");
+            return clazz.getMethod("getWorld", String.class).invoke(null, world);
+        }
+        catch (final Exception e)
+        {
+            return null;
+        }
+    }
+
+    public Object toBukkitLocation()
+    {
+        if (built) { return o; }
+        try
+        {
+            final Constructor constructor = Class.forName("org.bukkit.Location").getConstructor(Class.forName("org.bukkit.World"), double.class, double.class, double.class, float.class, float.class);
+            built = true;
+            return (o = constructor.newInstance(Class.forName("org.bukkit.World").cast(getBukkitWorld()), x, y, z, yaw, pitch));
+        }
+        catch (IllegalAccessException | InstantiationException | InvocationTargetException | ClassNotFoundException | NoSuchMethodException e)
+        {
+            return null;
+        }
+    }
+
+    /**
+     * Please use utility class as this is not efficient
+     */
+    public void teleport(final Object o) throws Exception
+    {
+        if (o.getClass().getName().contains("org.bukkit.entity"))
+        {
+            final Method m = o.getClass().getMethod("teleport", Class.forName("org.bukkit.Location"));
+            m.invoke(o, toBukkitLocation());
+        }
+    }
+}
diff --git a/src/main/java/com/intellectualcrafters/plot/object/OfflinePlotPlayer.java b/src/main/java/com/intellectualcrafters/plot/object/OfflinePlotPlayer.java
index 6743951f8..70890b6fb 100644
--- a/src/main/java/com/intellectualcrafters/plot/object/OfflinePlotPlayer.java
+++ b/src/main/java/com/intellectualcrafters/plot/object/OfflinePlotPlayer.java
@@ -1,18 +1,18 @@
-package com.intellectualcrafters.plot.object;
-
-import java.util.UUID;
-
-/**
- * Created 2015-02-20 for PlotSquared
- *
- * @author Citymonstret
- */
-public interface OfflinePlotPlayer {
-    public UUID getUUID();
-    
-    public long getLastPlayed();
-
-    public boolean isOnline();
-
-    public String getName();
-}
+package com.intellectualcrafters.plot.object;
+
+import java.util.UUID;
+
+/**
+ * Created 2015-02-20 for PlotSquared
+ *

+ */
+public interface OfflinePlotPlayer
+{
+    public UUID getUUID();
+
+    public long getLastPlayed();
+
+    public boolean isOnline();
+
+    public String getName();
+}
diff --git a/src/main/java/com/intellectualcrafters/plot/object/Plot.java b/src/main/java/com/intellectualcrafters/plot/object/Plot.java
index b5a5b126f..3bf7705eb 100644
--- a/src/main/java/com/intellectualcrafters/plot/object/Plot.java
+++ b/src/main/java/com/intellectualcrafters/plot/object/Plot.java
@@ -1,965 +1,1088 @@
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// PlotSquared - A plot manager and world generator for the Bukkit API                             /
-// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
-//                                                                                                 /
-// This program is free software; you can redistribute it and/or modify                            /
-// it under the terms of the GNU General Public License as published by                            /
-// the Free Software Foundation; either version 3 of the License, or                               /
-// (at your option) any later version.                                                             /
-//                                                                                                 /
-// This program is distributed in the hope that it will be useful,                                 /
-// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
-// GNU General Public License for more details.                                                    /
-//                                                                                                 /
-// You should have received a copy of the GNU General Public License                               /
-// along with this program; if not, write to the Free Software Foundation,                         /
-// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
-//                                                                                                 /
-// You can contact us via: support@intellectualsites.com                                           /
-////////////////////////////////////////////////////////////////////////////////////////////////////
-package com.intellectualcrafters.plot.object;
-
-import java.io.File;
-import java.net.URL;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.UUID;
-
-import com.intellectualcrafters.jnbt.CompoundTag;
-import com.intellectualcrafters.plot.PS;
-import com.intellectualcrafters.plot.config.C;
-import com.intellectualcrafters.plot.config.Configuration;
-import com.intellectualcrafters.plot.config.Settings;
-import com.intellectualcrafters.plot.database.DBFunc;
-import com.intellectualcrafters.plot.flag.Flag;
-import com.intellectualcrafters.plot.flag.FlagManager;
-import com.intellectualcrafters.plot.util.BO3Handler;
-import com.intellectualcrafters.plot.util.BlockManager;
-import com.intellectualcrafters.plot.util.ChunkManager;
-import com.intellectualcrafters.plot.util.ClusterManager;
-import com.intellectualcrafters.plot.util.MainUtil;
-import com.intellectualcrafters.plot.util.SchematicHandler;
-import com.intellectualcrafters.plot.util.StringMan;
-import com.intellectualcrafters.plot.util.TaskManager;
-
-/**
- * The plot class
- *
- * @author Citymonstret
- * @author Empire92
- */
-@SuppressWarnings("javadoc")
-public class Plot {
-    /**
-     * plot ID
-     * Direct access is Deprecated: use getId()
-     */
-    @Deprecated
-    public final PlotId id;
-    /**
-     * plot world
-     * Direct access is Deprecated: use getWorld()
-     */
-    @Deprecated
-    public final String world;
-    /**
-     * plot owner
-     * Direct access is Deprecated: use getOwners()
-     */
-    @Deprecated
-    public UUID owner;
-    
-    /**
-     * Plot creation timestamp (rough)
-     * Direct access is Deprecated: use getTimestamp()
-     */
-    @Deprecated
-    public long timestamp;
-    
-    /**
-     * List of trusted (with plot permissions)
-     * Direct access is Deprecated: use getTrusted()
-     */
-    @Deprecated
-    public HashSet<UUID> trusted;
-    /**
-     * List of members users (with plot permissions)
-     * Direct access is Deprecated: use getMembers()
-     */
-    @Deprecated
-    public HashSet<UUID> members;
-    /**
-     * List of denied players
-     * Direct access is Deprecated: use getDenied()
-     */
-    @Deprecated
-    public HashSet<UUID> denied;
-    /**
-     * External settings class<br>
-     *  - Please favor the methods over direct access to this class<br>
-     *  - The methods are more likely to be left unchanged from version changes<br>
-     *  Direct access is Deprecated: use getSettings()
-     */
-    @Deprecated
-    public PlotSettings settings;
-    /**
-     * Has the plot changed since the last save cycle?
-     */
-    public boolean countsTowardsMax = true;
-    /**
-     * Represents whatever the database manager needs it to: <br>
-     *  - A value of -1 usually indicates the plot will not be stored in the DB<br>
-     *  - A value of 0 usually indicates that the DB manager hasn't set a value<br>
-     * @deprecated magical
-     */
-    @Deprecated
-    public int temp;
-    
-    /**
-     * Session only plot metadata (session is until the server stops)<br>
-     * <br>
-     *  For persistent metadata use the flag system
-     *  @see FlagManager
-     */
-    private ConcurrentHashMap<String, Object> meta;
-
-    /**
-     * Constructor for a new plot<br>
-     * (Only changes after plot.create() will be properly set in the database)
-     * 
-     * @param world
-     * @param id
-     * @param owner
-     */
-    public Plot(String world, PlotId id, UUID owner) {
-        this.world = world;
-        this.id = id;
-        this.owner = owner;
-    }
-    
-    /**
-     * Constructor for a temporary plot (use -1 for temp)<br>
-     * The database will ignore any queries regarding temporary plots. 
-     * Please note that some bulk plot management functions may still affect temporary plots (TODO: fix this)
-     * 
-     * @param world
-     * @param id
-     * @param owner
-     * @param temp
-     */
-    public Plot(String world, PlotId id, UUID owner, int temp) {
-        this.world = world;
-        this.id = id;
-        this.owner = owner;
-        this.temp = temp;
-    }
-    
-    /**
-     * Constructor for a saved plots (Used by the database manager when plots are fetched)
-     *
-     * @param id
-     * @param owner
-     * @param trusted
-     * @param denied
-     * @param merged
-     */
-    public Plot(final PlotId id, final UUID owner, final HashSet<UUID> trusted, final HashSet<UUID> members, final HashSet<UUID> denied, final String alias, final BlockLoc position, final Collection<Flag> flags, final String world, final boolean[] merged, final long timestamp, final int temp) {
-        this.id = id;
-        this.world = world;
-        this.owner = owner;
-        this.settings = new PlotSettings(this);
-        this.members = members;
-        this.trusted = trusted;
-        this.denied = denied;
-        this.settings.setAlias(alias);
-        this.settings.setPosition(position);
-        this.settings.setMerged(merged);
-        if (flags != null) {
-            for (Flag flag : flags) {
-                this.settings.flags.put(flag.getKey(), flag);
-            }
-        }
-        this.timestamp = timestamp;
-        this.temp = temp;
-    }
-    
-    /**
-     * Session only plot metadata (session is until the server stops)<br>
-     * <br>
-     * For persistent metadata use the flag system
-     * @see FlagManager
-     * @param key
-     * @param value
-     */
-    public void setMeta(String key, Object value) {
-        if (this.meta == null) {
-            this.meta = new ConcurrentHashMap<String, Object>();
-        }
-        this.meta.put(key, value);
-    }
-
-    /**
-     * Get the metadata for a key
-     * @param key
-     * @return
-     */
-    public Object getMeta(String key) {
-        if (this.meta != null) {
-            return this.meta.get(key);
-        }
-        return null;
-    }
-
-    /**
-     * Delete the metadata for a key<br>
-     *  - metadata is session only
-     *  - deleting other plugin's metadata may cause issues
-     * @param key
-     */
-    public void deleteMeta(String key) {
-        if (this.meta != null) {
-            this.meta.remove(key);
-        }
-    }
-    
-    /**
-     * Get the cluster this plot is associated with
-     * @return
-     */
-    public PlotCluster getCluster() {
-        if (!Settings.ENABLE_CLUSTERS) {
-            return null;
-        }
-        if (owner == null) {
-            return ClusterManager.getCluster(this);
-        }
-        Flag flag = FlagManager.getPlotFlag(this, "cluster");
-        if (flag != null) {
-            PlotCluster cluster = (PlotCluster) flag.getValue();
-            cluster = ClusterManager.getCluster(cluster.world, cluster.getName());
-            if (cluster != null) {
-                return cluster;
-            }
-            cluster = ClusterManager.getCluster(this);
-            if (cluster == null) {
-                FlagManager.removePlotFlag(this, "cluster");
-                return null;
-            }
-            else {
-                flag = new Flag(flag.getAbstractFlag(), cluster);
-                FlagManager.addPlotFlag(this, flag);
-                return cluster;
-            }
-        }
-        PlotCluster cluster = ClusterManager.getCluster(this);
-        if (cluster != null) {
-            flag = new Flag(FlagManager.getFlag("cluster"), cluster);
-            FlagManager.addPlotFlag(this, flag);
-            return cluster;
-        }
-        return null;
-    }
-
-    /**
-     * Get the players currently inside this plot
-     * @return
-     */
-    public List<PlotPlayer> getPlayersInPlot() {
-        return MainUtil.getPlayersInPlot(this);
-    }
-    
-    /**
-     * Check if the plot has a set owner
-     *
-     * @return false if there is no owner
-     */
-    public boolean hasOwner() {
-        return this.owner != null;
-    }
-    
-    public boolean isOwner(UUID uuid) {
-        return PlotHandler.isOwner(this, uuid);
-    }
-    
-    /**
-     * Get a list of owner UUIDs for a plot (supports multi-owner mega-plots)
-     * @return
-     */
-    public HashSet<UUID> getOwners() {
-        return PlotHandler.getOwners(this);
-    }
-
-    /**
-     * Check if the player is either the owner or on the trusted/added list
-     *
-     * @param uuid
-     *
-     * @return true if the player is added/trusted or is the owner
-     */
-    public boolean isAdded(final UUID uuid) {
-        return PlotHandler.isAdded(this, uuid);
-    }
-
-    /**
-     * Should the player be denied from entering?
-     *
-     * @param uuid
-     *
-     * @return boolean false if the player is allowed to enter
-     */
-    public boolean isDenied(final UUID uuid) {
-        return (this.getDenied() != null) && ((this.denied.contains(DBFunc.everyone) && !this.isAdded(uuid)) || (!this.isAdded(uuid) && this.denied.contains(uuid)));
-    }
-    
-    /**
-     * Get the plot ID
-     */
-    public PlotId getId() {
-        return this.id;
-    }
-    
-    /**
-     * Get the world
-     * @return
-     */
-    public String getWorld() {
-        return this.world;
-    }
-    
-    /**
-     * Get or create plot settings
-     * @return PlotSettings
-     */
-    public PlotSettings getSettings() {
-        if (settings == null) {
-            settings = new PlotSettings(this);
-        }
-        return settings;
-    }
-    
-    /**
-     * Returns true if the plot is not merged, or it is the base plot of multiple merged plots
-     * @return
-     */
-    public boolean isBasePlot() {
-        if (settings == null) {
-            return true;
-        }
-        return !settings.getMerged(0) && !settings.getMerged(3);
-    }
-    
-    /**
-     * Check if the plot is merged
-     * @return
-     */
-    public boolean isMerged() {
-        if (settings == null) {
-            return false;
-        }
-        return settings.getMerged(0) || settings.getMerged(2) || settings.getMerged(1) || settings.getMerged(3);
-    }
-    
-    /**
-     * Get the timestamp in milliseconds of when the plot was created (unreliable)
-     * @return
-     */
-    public long getTimestamp() {
-        if (timestamp == 0) {
-            timestamp = System.currentTimeMillis();
-        }
-        return timestamp;
-    }
-    
-    /**
-     * Get if the plot is merged in a direction
-     * @param direction
-     * @return
-     */
-    public boolean getMerged(int direction) {
-        if (settings == null) {
-            return false;
-        }
-        return settings.getMerged(direction);
-    }
-    
-    /**
-     * Get the denied users
-     * @return
-     */
-    public HashSet<UUID> getDenied() {
-        if (this.denied == null) {
-            this.denied = new HashSet<>();
-        }
-        return this.denied;
-    }
-    
-    /**
-     * Get the trusted users
-     * @return
-     */
-    public HashSet<UUID> getTrusted() {
-        if (this.trusted == null) {
-            this.trusted = new HashSet<>();
-        }
-        return this.trusted;
-    }
-    
-    /**
-     * Get the members
-     * @return
-     */
-    public HashSet<UUID> getMembers() {
-        if (this.members == null) {
-            this.members = new HashSet<>();
-        }
-        return this.members;
-    }
-
-    /**
-     * Deny someone (updates database as well)
-     *
-     * @param uuid
-     */
-    public void addDenied(final UUID uuid) {
-        if (this.getDenied().add(uuid)) DBFunc.setDenied(this, uuid);
-    }
-
-    /**
-     * Add someone as a helper (updates database as well)
-     *
-     * @param uuid
-     */
-    public void addTrusted(final UUID uuid) {
-        if (this.getTrusted().add(uuid)) DBFunc.setTrusted(this, uuid);
-    }
-    
-    /**
-     * Add someone as a trusted user (updates database as well)
-     *
-     * @param uuid
-     */
-    public void addMember(final UUID uuid) {
-        if (this.getMembers().add(uuid)) DBFunc.setMember(this, uuid);
-    }
-    
-    /**
-     * Set the plot owner (and update the database)
-     * @param owner
-     */
-    public void setOwner(final UUID owner) {
-        if (!this.owner.equals(owner)) {
-            this.owner = owner;
-            DBFunc.setOwner(this, owner);
-        }
-    }
-    
-    /**
-     * Set the trusted users for this plot
-     * @param uuids
-     */
-    public void setTrusted(Set<UUID> uuids) {
-        if (uuids.size() == 0) {
-            return;
-        }
-        if (trusted != null && trusted.size() > 0) {
-            trusted.removeAll(uuids);
-            for (UUID uuid : trusted) {
-                DBFunc.removeTrusted(this, uuid);
-            }
-            trusted.clear();
-        }
-        for (UUID uuid : uuids) {
-            addTrusted(uuid);
-        }
-    }
-    
-    /**
-     * Set the members for this plot
-     * @param uuids
-     */
-    public void setMembers(Set<UUID> uuids) {
-        if (uuids.size() == 0) {
-            return;
-        }
-        if (members != null && members.size() > 0) {
-            members.removeAll(uuids);
-            for (UUID uuid : members) {
-                DBFunc.removeMember(this, uuid);
-            }
-            members.clear();
-        }
-        for (UUID uuid : uuids) {
-            addMember(uuid);
-        }
-    }
-    
-    /**
-     * Set the denied users for this plot
-     * @param uuids
-     */
-    public void setDenied(Set<UUID> uuids) {
-        if (uuids.size() == 0) {
-            return;
-        }
-        if (denied != null && denied.size() > 0) {
-            denied.removeAll(uuids);
-            for (UUID uuid : denied) {
-                DBFunc.removeDenied(this, uuid);
-            }
-            denied.clear();
-        }
-        for (UUID uuid : uuids) {
-            addDenied(uuid);
-        }
-    }
-    
-    /**
-     * Clear a plot
-     * @see MainUtil#clear(Plot, boolean, Runnable)
-     * @see MainUtil#clearAsPlayer(Plot, boolean, Runnable)
-     * @see #deletePlot() to clear and delete a plot
-     * @param whenDone A runnable to execute when clearing finishes, or null
-     */
-    public void clear(Runnable whenDone) {
-        MainUtil.clear(this, false, whenDone);
-    }
-    
-    /**
-     * This will return null if the plot hasn't been analyzed
-     * @return analysis of plot
-     */
-    public PlotAnalysis getComplexity() {
-        return PlotAnalysis.getAnalysis(this);
-    }
-    
-    public void analyze(RunnableVal<PlotAnalysis> whenDone) {
-        PlotAnalysis.analyzePlot(this, whenDone);
-    }
-    
-    /**
-     * Set a flag for this plot
-     * @param flag
-     * @param value
-     */
-    public void setFlag(String flag, Object value) {
-        FlagManager.addPlotFlag(this, new Flag(FlagManager.getFlag(flag), value));
-    }
-    
-    /**
-     * Remove a flag from this plot
-     * @param flag
-     */
-    public void removeFlag(String flag) {
-        FlagManager.removePlotFlag(this, flag);
-    }
-    
-    /**
-     * Get the flag for a given key
-     * @param flag
-     */
-    public Flag getFlag(String key) {
-        return FlagManager.getPlotFlag(this, key);
-    }
-    
-    /**
-     * Delete a plot
-     * @see PS#removePlot(String, PlotId, boolean)
-     * @see #clear(Runnable) to simply clear a plot
-     */
-    public void deletePlot(final Runnable whenDone) {
-        MainUtil.removeSign(this);
-        MainUtil.clear(this, true, new Runnable() {
-            @Override
-            public void run() {
-                if (PS.get().removePlot(world, id, true)) {
-                    DBFunc.delete(Plot.this);
-                    TaskManager.runTask(whenDone);
-                }
-            }
-        });
-    }
-    
-    public boolean unclaim() {
-        if (PS.get().removePlot(world, id, true)) {
-            DBFunc.delete(Plot.this);
-            return true;
-        }
-        return false;
-    }
-    
-    /**
-     * Unlink a plot and remove the roads
-     * @see MainUtil#unlinkPlot(Plot, boolean removeRoad)
-     * @return true if plot was linked
-     */
-    public boolean unlink() {
-        return MainUtil.unlinkPlot(this, true);
-    }
-    
-    /**
-     * Return the home location for the plot
-     * @see MainUtil#getPlotHome(Plot)
-     * @return Home location
-     */
-    public Location getHome() {
-        return MainUtil.getPlotHome(this);
-    }
-    
-    /**
-     * Get the average rating of the plot
-     * @return average rating as double
-     */
-    public double getAverageRating() {
-        double sum = 0;
-        Collection<Rating> ratings = getRatings().values();
-        for (Rating rating : ratings) {
-            sum += rating.getAverageRating();
-        }
-        return (sum / ratings.size());
-    }
-    
-    /**
-     * Get the ratings associated with a plot<br>
-     *  - The rating object may contain multiple categories
-     * @return Map of user who rated to the rating
-     */
-    public HashMap<UUID, Rating> getRatings() {
-        HashMap<UUID, Rating> map = new HashMap<UUID, Rating>();
-        if (getSettings().ratings == null) {
-            return map;
-        }
-        for (Entry<UUID, Integer> entry : getSettings().ratings.entrySet()) {
-            map.put(entry.getKey(), new Rating(entry.getValue()));
-        }
-        return map;
-    }
-    
-    /**
-     * Set the home location
-     * @param loc
-     */
-    public void setHome(BlockLoc loc) {
-        BlockLoc pos = this.getSettings().getPosition();
-        if ((pos == null && loc == null) || (pos != null && pos.equals(loc))) {
-            return;
-        }
-        this.getSettings().setPosition(loc);
-        if (this.getSettings().getPosition() == null) {
-            DBFunc.setPosition(this, "");
-        }
-        else {
-            DBFunc.setPosition(this, this.getSettings().getPosition().toString());
-        }
-    }
-    
-    /**
-     * Set the plot alias
-     * @param alias
-     */
-    public void setAlias(String alias) {
-        String name = this.getSettings().getAlias();
-        if (alias == null) {
-            alias = "";
-        }
-        if (name.equals(alias)) {
-            return;
-        }
-        this.getSettings().setAlias(alias);
-        DBFunc.setAlias(this, alias);
-    }
-    
-    /**
-     * Resend all chunks inside the plot to nearby players<br>
-     * This should not need to be called
-     * @see MainUtil#update(Plot) 
-     */
-    public void refreshChunks() {
-        MainUtil.update(this);
-    }
-    
-    /**
-     * Remove the plot sign if it is set
-     */
-    public void removeSign() {
-        MainUtil.removeSign(this);
-    }
-    
-    /**
-     * Set the plot sign if plot signs are enabled
-     */
-    public void setSign() {
-        MainUtil.setSign(this);
-    }
-    
-    /**
-     * Register a plot and create it in the database<br>
-     *  - The plot will not be created if the owner is null<br>
-     *  - This will not save any trusted etc in the DB, those should be set after plot creation
-     * @return true if plot was created successfully
-     */
-    public boolean create() {
-        return MainUtil.createPlot(owner, this);
-    }
-    
-    /**
-     * Auto merge the plot with any adjacent plots of the same owner
-     * @see MainUtil#autoMerge(Plot, UUID) to specify the owner
-     * @param removeRoads If to remove roads when merging  
-     */
-    public void autoMerge(boolean removeRoads) {
-        MainUtil.autoMerge(this, owner, removeRoads);
-    }
-    
-    /**
-     * Set the plot biome
-     */
-    public void setBiome(String biome, Runnable whenDone) {
-        MainUtil.setBiome(this, biome, whenDone);
-    }
-    
-    /**
-     * Set components such as border, wall, floor
-     *  (components are generator specific)
-     */
-    public void setComponent(String component, PlotBlock... blocks) {
-        MainUtil.setComponent(this, component, blocks);
-    }
-    
-    /**
-     * Set components such as border, wall, floor
-     *  (components are generator specific)
-     */
-    public void setComponent(String component, String blocks) {
-        MainUtil.setComponent(this, component, Configuration.BLOCKLIST.parseString(blocks));
-    }
-    
-    /**
-     * Get the biome (String)
-     */
-    public String getBiome() {
-        final Location loc = getBottom();
-        return BlockManager.manager.getBiome(loc.getWorld(), loc.getX(), loc.getZ());
-    }
-    
-    /**
-     * Return the top location for the plot
-     * @return
-     */
-    public Location getTop() {
-        return MainUtil.getPlotTopLoc(world, id);
-    }
-    
-    /**
-     * Return the bottom location for the plot
-     * @return
-     */
-    public Location getBottom() {
-        return MainUtil.getPlotBottomLoc(world, id).add(1, 0, 1);
-    }
-    
-    /**
-     * Get the top plot, or this plot if it is not part of a mega plot
-     * @return The bottom plot
-     */
-    public Plot getTopPlot() {
-        return MainUtil.getTopPlot(this);
-    }
-    
-    /**
-     * Get the bottom plot, or this plot if it is not part of a mega plot
-     * @return The bottom plot
-     */
-    public Plot getBottomPlot() {
-        return MainUtil.getBottomPlot(this);
-    }
-    
-    /**
-     * Swap the plot contents and settings with another location<br>
-     *  - The destination must correspond to a valid plot of equal dimensions
-     * @see ChunkManager#swap(String, bot1, top1, bot2, top2) to swap terrain
-     * @see MainUtil#getPlotSelectionIds(PlotId, PlotId) to get the plots inside a selection
-     * @see MainUtil#swapData(String, PlotId, PlotId, Runnable) to swap plot settings
-     * @param other The other plot id to swap with
-     * @param whenDone A task to run when finished, or null
-     * @see MainUtil#swapData(String, PlotId, PlotId, Runnable)
-     * @return boolean if swap was successful
-     */
-    public boolean swap(PlotId destination, Runnable whenDone) {
-        return MainUtil.swap(world, id, destination, whenDone);
-    }
-    
-    /**
-     * Move the plot to an empty location<br>
-     *  - The location must be empty
-     * @param destination Where to move the plot
-     * @param whenDone A task to run when done, or null
-     * @return if the move was successful
-     */
-    public boolean move(Plot destination, Runnable whenDone) {
-        return MainUtil.move(this, destination, whenDone);
-    }
-    
-    /**
-     * Copy the plot contents and settings to another location<br>
-     *  - The destination must correspond to an empty location
-     * @param destination The location to copy to
-     * @param whenDone The task to run when done
-     * @return If the copy was successful
-     */
-    public boolean copy(PlotId destination, Runnable whenDone) {
-        return MainUtil.copy(world, id, destination, whenDone);
-    }
-    
-    /**
-     * Get plot display name
-     *
-     * @return alias if set, else id
-     */
-    @Override
-    public String toString() {
-        if (this.settings != null && this.settings.getAlias().length() > 1) {
-            return this.settings.getAlias();
-        }
-        return this.world + ";" + this.getId().x + ";" + this.getId().y;
-    }
-
-    /**
-     * Remove a denied player (use DBFunc as well)
-     *
-     * @param uuid
-     */
-    public boolean removeDenied(final UUID uuid) {
-        if (this.getDenied().remove(uuid)) {
-            DBFunc.removeDenied(this, uuid);
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Remove a helper (use DBFunc as well)
-     *
-     * @param uuid
-     */
-    public boolean removeTrusted(final UUID uuid) {
-        if (this.getTrusted().remove(uuid)) {
-            DBFunc.removeTrusted(this, uuid);
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Remove a trusted user (use DBFunc as well)
-     *
-     * @param uuid
-     */
-    public boolean removeMember(final UUID uuid) {
-        if (this.getMembers().remove(uuid)) {
-            DBFunc.removeMember(this, uuid);
-            return true;
-        }
-        return false;
-    }
-    
-    /**
-     * Export the plot as a schematic to the configured output directory
-     * @return
-     */
-    public void export(final RunnableVal<Boolean> whenDone) {
-        SchematicHandler.manager.getCompoundTag(world, id, new RunnableVal<CompoundTag>() {
-            @Override
-            public void run() {
-                if (value == null) {
-                    if (whenDone != null) {
-                        whenDone.value = false; 
-                        TaskManager.runTask(whenDone);
-                    }
-                }
-                else {
-                    TaskManager.runTaskAsync(new Runnable() {
-                        @Override
-                        public void run() {
-                            String name = id+ "," + world + "," + MainUtil.getName(owner);
-                            final boolean result = SchematicHandler.manager.save(value, Settings.SCHEMATIC_SAVE_PATH + File.separator + name + ".schematic");
-                            if (whenDone != null) {
-                                whenDone.value = result; 
-                                TaskManager.runTask(whenDone);
-                            }
-                        }
-                    });
-                }
-            }
-        });
-    }
-    
-    /**
-     * Export the plot as a BO3 object
-     * @param whenDone value will be false if exporting fails
-     */
-    public void exportBO3(final RunnableVal<Boolean> whenDone) {
-        boolean result = BO3Handler.saveBO3(this);
-        if (whenDone != null) {
-            whenDone.value = result;
-        }
-        TaskManager.runTask(whenDone);
-    }
-    
-    /**
-     * Upload the plot to the configured web interface 
-     * @param whenDone value will be null if uploading fails
-     */
-    public void upload(final RunnableVal<URL> whenDone) {
-        SchematicHandler.manager.getCompoundTag(world, id, new RunnableVal<CompoundTag>() {
-            @Override
-            public void run() {
-                TaskManager.runTaskAsync(new Runnable() {
-                    @Override
-                    public void run() {
-                        URL url = SchematicHandler.manager.upload(value, null, null);
-                        if (whenDone != null) {
-                            whenDone.value = url;
-                        }
-                        TaskManager.runTask(whenDone);
-                    }
-                });
-            }
-        });
-    }
-    
-    @Override
-    public boolean equals(final Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        final Plot other = (Plot) obj;
-        if (this.hashCode() != other.hashCode()) {
-            return false;
-        }
-        return ((this.id.x.equals(other.id.x)) && (this.id.y.equals(other.id.y)) && (StringMan.isEqual(this.world, other.world)));
-    }
-
-    
-    /**
-     * Get the plot hashcode
-     *
-     * @return integer.
-     */
-    @Override
-    public int hashCode() {
-        return this.id.hashCode();
-    }
-}
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// PlotSquared - A plot manager and world generator for the Bukkit API                             /
+// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
+//                                                                                                 /
+// This program is free software; you can redistribute it and/or modify                            /
+// it under the terms of the GNU General Public License as published by                            /
+// the Free Software Foundation; either version 3 of the License, or                               /
+// (at your option) any later version.                                                             /
+//                                                                                                 /
+// This program is distributed in the hope that it will be useful,                                 /
+// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
+// GNU General Public License for more details.                                                    /
+//                                                                                                 /
+// You should have received a copy of the GNU General Public License                               /
+// along with this program; if not, write to the Free Software Foundation,                         /
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
+//                                                                                                 /
+// You can contact us via: support@intellectualsites.com                                           /
+////////////////////////////////////////////////////////////////////////////////////////////////////
+package com.intellectualcrafters.plot.object;
+
+import java.io.File;
+import java.net.URL;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+
+import com.intellectualcrafters.jnbt.CompoundTag;
+import com.intellectualcrafters.plot.PS;
+import com.intellectualcrafters.plot.config.Configuration;
+import com.intellectualcrafters.plot.config.Settings;
+import com.intellectualcrafters.plot.database.DBFunc;
+import com.intellectualcrafters.plot.flag.Flag;
+import com.intellectualcrafters.plot.flag.FlagManager;
+import com.intellectualcrafters.plot.util.BO3Handler;
+import com.intellectualcrafters.plot.util.BlockManager;
+import com.intellectualcrafters.plot.util.ChunkManager;
+import com.intellectualcrafters.plot.util.ClusterManager;
+import com.intellectualcrafters.plot.util.MainUtil;
+import com.intellectualcrafters.plot.util.SchematicHandler;
+import com.intellectualcrafters.plot.util.StringMan;
+import com.intellectualcrafters.plot.util.TaskManager;
+
+/**
+ * The plot class
+ *


+ */
+@SuppressWarnings("javadoc")
+public class Plot
+{
+    /**
+     * plot ID
+     * Direct access is Deprecated: use getId()
+     */
+    @Deprecated
+    public final PlotId id;
+    /**
+     * plot world
+     * Direct access is Deprecated: use getWorld()
+     */
+    @Deprecated
+    public final String world;
+    /**
+     * plot owner
+     * (Merged plots can have multiple owners)
+     * Direct access is Deprecated: use getOwners()
+     */
+    @Deprecated
+    public UUID owner;
+
+    /**
+     * Plot creation timestamp (rough)
+     * Direct access is Deprecated: use getTimestamp()
+     */
+    @Deprecated
+    public long timestamp;
+
+    /**
+     * List of trusted (with plot permissions)
+     * Direct access is Deprecated: use getTrusted()
+     */
+    @Deprecated
+    public HashSet<UUID> trusted;
+    /**
+     * List of members users (with plot permissions)
+     * Direct access is Deprecated: use getMembers()
+     */
+    @Deprecated
+    public HashSet<UUID> members;
+    /**
+     * List of denied players
+     * Direct access is Deprecated: use getDenied()
+     */
+    @Deprecated
+    public HashSet<UUID> denied;
+    /**
+     * External settings class<br>
+     *  - Please favor the methods over direct access to this class<br>
+     *  - The methods are more likely to be left unchanged from version changes<br>
+     *  Direct access is Deprecated: use getSettings()
+     */
+    @Deprecated
+    public PlotSettings settings;
+    /**
+     * Has the plot changed since the last save cycle?
+     */
+    public boolean countsTowardsMax = true;
+    /**
+     * Represents whatever the database manager needs it to: <br>
+     *  - A value of -1 usually indicates the plot will not be stored in the DB<br>
+     *  - A value of 0 usually indicates that the DB manager hasn't set a value<br>
+     * @deprecated magical
+     */
+    @Deprecated
+    public int temp;
+
+    /**
+     * Session only plot metadata (session is until the server stops)<br>
+     * <br>
+     *  For persistent metadata use the flag system
+     *  @see FlagManager
+     */
+    private ConcurrentHashMap<String, Object> meta;
+
+    /**
+     * Constructor for a new plot<br>
+     * (Only changes after plot.create() will be properly set in the database)
+     *
+     *@see MainUtil#getPlot(String, PlotId) for existing plots
+     *
+     * @param world
+     * @param id
+     * @param owner
+     */
+    public Plot(final String world, final PlotId id, final UUID owner)
+    {
+        this.world = world;
+        this.id = id;
+        this.owner = owner;
+    }
+    
+    /**
+     * Return a new/cached plot object at a given world/plot id
+     * 
+     * @see MainUtil#getPlotSelectionOwned(String world, PlotId bottom, PlotId top) return a list of owned plots between (inclusive) two plot ids.
+     * 
+     * @param world
+     * @param id
+     * @return
+     */
+    public static Plot getPlot(String world, PlotId id) {
+        return MainUtil.getPlot(world, id);
+    }
+    
+    /**
+     * Return a new/cached plot object at a given location
+     * 
+     * @see PlotPlayer#getCurrentPlot() if a player is expected here.
+     * 
+     * @param loc
+     * @return
+     */
+    public static Plot getPlot(Location loc) {
+        return MainUtil.getPlot(loc);
+    }
+
+    /**
+     * Constructor for a temporary plot (use -1 for temp)<br>
+     * The database will ignore any queries regarding temporary plots.
+     * Please note that some bulk plot management functions may still affect temporary plots (TODO: fix this)
+     *
+     * @see MainUtil#getPlot(String, PlotId) for existing plots
+     *
+     * @param world
+     * @param id
+     * @param owner
+     * @param temp
+     */
+    public Plot(final String world, final PlotId id, final UUID owner, final int temp)
+    {
+        this.world = world;
+        this.id = id;
+        this.owner = owner;
+        this.temp = temp;
+    }
+
+    /**
+     * Constructor for a saved plots (Used by the database manager when plots are fetched)
+     * 
+     * @see MainUtil#getPlot(String, PlotId) for existing plots
+     *
+     * @param id
+     * @param owner
+     * @param trusted
+     * @param denied
+     * @param merged
+     */
+    public Plot(final PlotId id, final UUID owner, final HashSet<UUID> trusted, final HashSet<UUID> members, final HashSet<UUID> denied, final String alias, final BlockLoc position,
+    final Collection<Flag> flags, final String world, final boolean[] merged, final long timestamp, final int temp)
+    {
+        this.id = id;
+        this.world = world;
+        this.owner = owner;
+        settings = new PlotSettings(this);
+        this.members = members;
+        this.trusted = trusted;
+        this.denied = denied;
+        settings.setAlias(alias);
+        settings.setPosition(position);
+        settings.setMerged(merged);
+        if (flags != null)
+        {
+            for (final Flag flag : flags)
+            {
+                settings.flags.put(flag.getKey(), flag);
+            }
+        }
+        this.timestamp = timestamp;
+        this.temp = temp;
+    }
+
+    /**
+     * Session only plot metadata (session is until the server stops)<br>
+     * <br>
+     * For persistent metadata use the flag system
+     * @see FlagManager
+     * @param key
+     * @param value
+     */
+    public void setMeta(final String key, final Object value)
+    {
+        if (meta == null)
+        {
+            meta = new ConcurrentHashMap<String, Object>();
+        }
+        meta.put(key, value);
+    }
+
+    /**
+     * Get the metadata for a key
+     * @param key
+     * @return
+     */
+    public Object getMeta(final String key)
+    {
+        if (meta != null) { return meta.get(key); }
+        return null;
+    }
+
+    /**
+     * Delete the metadata for a key<br>
+     *  - metadata is session only
+     *  - deleting other plugin's metadata may cause issues
+     * @param key
+     */
+    public void deleteMeta(final String key)
+    {
+        if (meta != null)
+        {
+            meta.remove(key);
+        }
+    }
+
+    /**
+     * Get the cluster this plot is associated with
+     * @return
+     */
+    public PlotCluster getCluster()
+    {
+        if (!Settings.ENABLE_CLUSTERS) { return null; }
+        if (owner == null) { return ClusterManager.getCluster(this); }
+        Flag flag = FlagManager.getPlotFlag(this, "cluster");
+        if (flag != null)
+        {
+            PlotCluster cluster = (PlotCluster) flag.getValue();
+            cluster = ClusterManager.getCluster(cluster.world, cluster.getName());
+            if (cluster != null) { return cluster; }
+            cluster = ClusterManager.getCluster(this);
+            if (cluster == null)
+            {
+                FlagManager.removePlotFlag(this, "cluster");
+                return null;
+            }
+            else
+            {
+                flag = new Flag(flag.getAbstractFlag(), cluster);
+                FlagManager.addPlotFlag(this, flag);
+                return cluster;
+            }
+        }
+        final PlotCluster cluster = ClusterManager.getCluster(this);
+        if (cluster != null)
+        {
+            flag = new Flag(FlagManager.getFlag("cluster"), cluster);
+            FlagManager.addPlotFlag(this, flag);
+            return cluster;
+        }
+        return null;
+    }
+
+    /**
+     * Efficiently get the players currently inside this plot
+     * @return
+     */
+    public List<PlotPlayer> getPlayersInPlot()
+    {
+        return MainUtil.getPlayersInPlot(this);
+    }
+
+    /**
+     * Check if the plot has a set owner
+     *
+     * @return false if there is no owner
+     */
+    public boolean hasOwner()
+    {
+        return owner != null;
+    }
+
+    public boolean isOwner(final UUID uuid)
+    {
+        return PlotHandler.isOwner(this, uuid);
+    }
+
+    /**
+     * Get a list of owner UUIDs for a plot (supports multi-owner mega-plots)
+     * @return
+     */
+    public HashSet<UUID> getOwners()
+    {
+        return PlotHandler.getOwners(this);
+    }
+
+    /**
+     * Check if the player is either the owner or on the trusted/added list
+     *
+     * @param uuid
+     *
+     * @return true if the player is added/trusted or is the owner
+     */
+    public boolean isAdded(final UUID uuid)
+    {
+        return PlotHandler.isAdded(this, uuid);
+    }
+
+    /**
+     * Should the player be denied from entering?
+     *
+     * @param uuid
+     *
+     * @return boolean false if the player is allowed to enter
+     */
+    public boolean isDenied(final UUID uuid)
+    {
+        return (getDenied() != null) && ((denied.contains(DBFunc.everyone) && !isAdded(uuid)) || (!isAdded(uuid) && denied.contains(uuid)));
+    }
+
+    /**
+     * Get the plot ID
+     */
+    public PlotId getId()
+    {
+        return id;
+    }
+
+    /**
+     * Get the world
+     * @return
+     */
+    public String getWorld()
+    {
+        return world;
+    }
+
+    /**
+     * Get or create plot settings
+     * @return PlotSettings
+     */
+    public PlotSettings getSettings()
+    {
+        if (settings == null)
+        {
+            settings = new PlotSettings(this);
+        }
+        return settings;
+    }
+
+    /**
+     * Returns true if the plot is not merged, or it is the base plot of multiple merged plots
+     * @return
+     */
+    public boolean isBasePlot()
+    {
+        if (settings == null) { return true; }
+        return !settings.getMerged(0) && !settings.getMerged(3);
+    }
+
+    /**
+     * Check if the plot is merged
+     * @return
+     */
+    public boolean isMerged()
+    {
+        if (settings == null) { return false; }
+        return settings.getMerged(0) || settings.getMerged(2) || settings.getMerged(1) || settings.getMerged(3);
+    }
+
+    /**
+     * Get the timestamp in milliseconds of when the plot was created (unreliable)
+     * @return
+     */
+    public long getTimestamp()
+    {
+        if (timestamp == 0)
+        {
+            timestamp = System.currentTimeMillis();
+        }
+        return timestamp;
+    }
+
+    /**
+     * Get if the plot is merged in a direction
+     * @param direction
+     * @return
+     */
+    public boolean getMerged(final int direction)
+    {
+        if (settings == null) { return false; }
+        return settings.getMerged(direction);
+    }
+
+    /**
+     * Get the denied users
+     * @return
+     */
+    public HashSet<UUID> getDenied()
+    {
+        if (denied == null)
+        {
+            denied = new HashSet<>();
+        }
+        return denied;
+    }
+
+    /**
+     * Get the trusted users
+     * @return
+     */
+    public HashSet<UUID> getTrusted()
+    {
+        if (trusted == null)
+        {
+            trusted = new HashSet<>();
+        }
+        return trusted;
+    }
+
+    /**
+     * Get the members
+     * @return
+     */
+    public HashSet<UUID> getMembers()
+    {
+        if (members == null)
+        {
+            members = new HashSet<>();
+        }
+        return members;
+    }
+
+    /**
+     * Deny someone (updates database as well)
+     *
+     * @param uuid
+     */
+    public void addDenied(final UUID uuid)
+    {
+        if (getDenied().add(uuid))
+        {
+            DBFunc.setDenied(this, uuid);
+        }
+    }
+
+    /**
+     * Add someone as a helper (updates database as well)
+     *
+     * @param uuid
+     */
+    public void addTrusted(final UUID uuid)
+    {
+        if (getTrusted().add(uuid))
+        {
+            DBFunc.setTrusted(this, uuid);
+        }
+    }
+
+    /**
+     * Add someone as a trusted user (updates database as well)
+     *
+     * @param uuid
+     */
+    public void addMember(final UUID uuid)
+    {
+        if (getMembers().add(uuid))
+        {
+            DBFunc.setMember(this, uuid);
+        }
+    }
+
+    /**
+     * Set the plot owner (and update the database)
+     * @param owner
+     */
+    public void setOwner(final UUID owner)
+    {
+        if (!this.owner.equals(owner))
+        {
+            this.owner = owner;
+            DBFunc.setOwner(this, owner);
+        }
+    }
+
+    /**
+     * Set the trusted users for this plot
+     * @param uuids
+     */
+    public void setTrusted(final Set<UUID> uuids)
+    {
+        if (uuids.size() == 0) { return; }
+        if ((trusted != null) && (trusted.size() > 0))
+        {
+            trusted.removeAll(uuids);
+            for (final UUID uuid : trusted)
+            {
+                DBFunc.removeTrusted(this, uuid);
+            }
+            trusted.clear();
+        }
+        for (final UUID uuid : uuids)
+        {
+            addTrusted(uuid);
+        }
+    }
+
+    /**
+     * Set the members for this plot
+     * @param uuids
+     */
+    public void setMembers(final Set<UUID> uuids)
+    {
+        if (uuids.size() == 0) { return; }
+        if ((members != null) && (members.size() > 0))
+        {
+            members.removeAll(uuids);
+            for (final UUID uuid : members)
+            {
+                DBFunc.removeMember(this, uuid);
+            }
+            members.clear();
+        }
+        for (final UUID uuid : uuids)
+        {
+            addMember(uuid);
+        }
+    }
+
+    /**
+     * Set the denied users for this plot
+     * @param uuids
+     */
+    public void setDenied(final Set<UUID> uuids)
+    {
+        if (uuids.size() == 0) { return; }
+        if ((denied != null) && (denied.size() > 0))
+        {
+            denied.removeAll(uuids);
+            for (final UUID uuid : denied)
+            {
+                DBFunc.removeDenied(this, uuid);
+            }
+            denied.clear();
+        }
+        for (final UUID uuid : uuids)
+        {
+            addDenied(uuid);
+        }
+    }
+
+    /**
+     * Clear a plot
+     * @see MainUtil#clear(Plot, boolean, Runnable)
+     * @see MainUtil#clearAsPlayer(Plot, boolean, Runnable)
+     * @see #deletePlot() to clear and delete a plot
+     * @param whenDone A runnable to execute when clearing finishes, or null
+     */
+    public void clear(final Runnable whenDone)
+    {
+        MainUtil.clear(this, false, whenDone);
+    }
+
+    /**
+     * This will return null if the plot hasn't been analyzed
+     * @return analysis of plot
+     */
+    public PlotAnalysis getComplexity()
+    {
+        return PlotAnalysis.getAnalysis(this);
+    }
+
+    public void analyze(final RunnableVal<PlotAnalysis> whenDone)
+    {
+        PlotAnalysis.analyzePlot(this, whenDone);
+    }
+
+    /**
+     * Set a flag for this plot
+     * @param flag
+     * @param value
+     */
+    public void setFlag(final String flag, final Object value)
+    {
+        FlagManager.addPlotFlag(this, new Flag(FlagManager.getFlag(flag), value));
+    }
+
+    /**
+     * Remove a flag from this plot
+     * @param flag
+     */
+    public void removeFlag(final String flag)
+    {
+        FlagManager.removePlotFlag(this, flag);
+    }
+
+    /**
+     * Get the flag for a given key
+     * @param flag
+     */
+    public Flag getFlag(final String key)
+    {
+        return FlagManager.getPlotFlag(this, key);
+    }
+
+    /**
+     * Delete a plot (use null for the runnable if you don't need to be notified on completion)
+     * @see PS#removePlot(String, PlotId, boolean)
+     * @see #clear(Runnable) to simply clear a plot
+     */
+    public void deletePlot(final Runnable whenDone)
+    {
+        MainUtil.removeSign(this);
+        MainUtil.clear(this, true, new Runnable()
+        {
+            @Override
+            public void run()
+            {
+                if (PS.get().removePlot(world, id, true))
+                {
+                    DBFunc.delete(Plot.this);
+                    TaskManager.runTask(whenDone);
+                }
+            }
+        });
+    }
+
+    public boolean unclaim()
+    {
+        if (PS.get().removePlot(world, id, true))
+        {
+            DBFunc.delete(Plot.this);
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Unlink a plot and remove the roads
+     * @see MainUtil#unlinkPlot(Plot, boolean removeRoad)
+     * @return true if plot was linked
+     */
+    public boolean unlink()
+    {
+        return MainUtil.unlinkPlot(this, true);
+    }
+
+    /**
+     * Return the home location for the plot
+     * @see MainUtil#getPlotHome(Plot)
+     * @return Home location
+     */
+    public Location getHome()
+    {
+        return MainUtil.getPlotHome(this);
+    }
+
+    /**
+     * Get the average rating of the plot
+     * @return average rating as double
+     */
+    public double getAverageRating()
+    {
+        double sum = 0;
+        final Collection<Rating> ratings = getRatings().values();
+        for (final Rating rating : ratings)
+        {
+            sum += rating.getAverageRating();
+        }
+        return (sum / ratings.size());
+    }
+
+    /**
+     * Get the ratings associated with a plot<br>
+     *  - The rating object may contain multiple categories
+     * @return Map of user who rated to the rating
+     */
+    public HashMap<UUID, Rating> getRatings()
+    {
+        final HashMap<UUID, Rating> map = new HashMap<UUID, Rating>();
+        if (getSettings().ratings == null) { return map; }
+        for (final Entry<UUID, Integer> entry : getSettings().ratings.entrySet())
+        {
+            map.put(entry.getKey(), new Rating(entry.getValue()));
+        }
+        return map;
+    }
+
+    /**
+     * Set the home location
+     * @param loc
+     */
+    public void setHome(final BlockLoc loc)
+    {
+        final BlockLoc pos = getSettings().getPosition();
+        if (((pos == null) && (loc == null)) || ((pos != null) && pos.equals(loc))) { return; }
+        getSettings().setPosition(loc);
+        if (getSettings().getPosition() == null)
+        {
+            DBFunc.setPosition(this, "");
+        }
+        else
+        {
+            DBFunc.setPosition(this, getSettings().getPosition().toString());
+        }
+    }
+
+    /**
+     * Set the plot alias
+     * @param alias
+     */
+    public void setAlias(String alias)
+    {
+        final String name = getSettings().getAlias();
+        if (alias == null)
+        {
+            alias = "";
+        }
+        if (name.equals(alias)) { return; }
+        getSettings().setAlias(alias);
+        DBFunc.setAlias(this, alias);
+    }
+
+    /**
+     * Resend all chunks inside the plot to nearby players<br>
+     * This should not need to be called
+     * @see MainUtil#update(Plot)
+     */
+    public void refreshChunks()
+    {
+        MainUtil.update(this);
+    }
+
+    /**
+     * Remove the plot sign if it is set
+     */
+    public void removeSign()
+    {
+        MainUtil.removeSign(this);
+    }
+
+    /**
+     * Set the plot sign if plot signs are enabled
+     */
+    public void setSign()
+    {
+        MainUtil.setSign(this);
+    }
+
+    /**
+     * Register a plot and create it in the database<br>
+     *  - The plot will not be created if the owner is null<br>
+     *  - Any setting from before plot creation will not be saved until the server is stopped properly. i.e. Set any values/options after plot creation. 
+     * @return true if plot was created successfully
+     */
+    public boolean create()
+    {
+        return MainUtil.createPlot(owner, this);
+    }
+
+    /**
+     * Auto merge the plot with any adjacent plots of the same owner
+     * @see MainUtil#autoMerge(Plot, UUID) to specify the owner
+     * @param removeRoads If to remove roads when merging
+     */
+    public void autoMerge(final boolean removeRoads)
+    {
+        MainUtil.autoMerge(this, owner, removeRoads);
+    }
+
+    /**
+     * Set the plot biome (this does not set the terrain, @see BiomeGenerator plugin for terrain)
+     */
+    public void setBiome(final String biome, final Runnable whenDone)
+    {
+        MainUtil.setBiome(this, biome, whenDone);
+    }
+
+    /**
+     * Set components such as border, wall, floor
+     *  (components are generator specific)
+     */
+    public void setComponent(final String component, final PlotBlock... blocks)
+    {
+        MainUtil.setComponent(this, component, blocks);
+    }
+
+    /**
+     * Set components such as border, wall, floor
+     *  (components are generator specific)
+     */
+    public void setComponent(final String component, final String blocks)
+    {
+        MainUtil.setComponent(this, component, Configuration.BLOCKLIST.parseString(blocks));
+    }
+
+    /**
+     * Get the biome (String)
+     */
+    public String getBiome()
+    {
+        final Location loc = getBottom();
+        return BlockManager.manager.getBiome(loc.getWorld(), loc.getX(), loc.getZ());
+    }
+
+    /**
+     * Return the top location for the plot
+     * @return
+     */
+    public Location getTop()
+    {
+        return MainUtil.getPlotTopLoc(world, id);
+    }
+
+    /**
+     * Return the bottom location for the plot
+     * @return
+     */
+    public Location getBottom()
+    {
+        return MainUtil.getPlotBottomLoc(world, id).add(1, 0, 1);
+    }
+
+    /**
+     * Get the top plot, or this plot if it is not part of a mega plot
+     * @return The bottom plot
+     */
+    public Plot getTopPlot()
+    {
+        return MainUtil.getTopPlot(this);
+    }
+
+    /**
+     * Get the bottom plot, or this plot if it is not part of a mega plot
+     * @return The bottom plot
+     */
+    public Plot getBottomPlot()
+    {
+        return MainUtil.getBottomPlot(this);
+    }
+
+    /**
+     * Swap the plot contents and settings with another location<br>
+     *  - The destination must correspond to a valid plot of equal dimensions
+     * @see ChunkManager#swap(String, bot1, top1, bot2, top2) to swap terrain
+     * @see MainUtil#getPlotSelectionIds(PlotId, PlotId) to get the plots inside a selection
+     * @see MainUtil#swapData(String, PlotId, PlotId, Runnable) to swap plot settings
+     * @param other The other plot id to swap with
+     * @param whenDone A task to run when finished, or null
+     * @see MainUtil#swapData(String, PlotId, PlotId, Runnable)
+     * @return boolean if swap was successful
+     */
+    public boolean swap(final PlotId destination, final Runnable whenDone)
+    {
+        return MainUtil.swap(world, id, destination, whenDone);
+    }
+
+    /**
+     * Move the plot to an empty location<br>
+     *  - The location must be empty
+     * @param destination Where to move the plot
+     * @param whenDone A task to run when done, or null
+     * @return if the move was successful
+     */
+    public boolean move(final Plot destination, final Runnable whenDone)
+    {
+        return MainUtil.move(this, destination, whenDone);
+    }
+
+    /**
+     * Copy the plot contents and settings to another location<br>
+     *  - The destination must correspond to an empty location
+     * @param destination The location to copy to
+     * @param whenDone The task to run when done
+     * @return If the copy was successful
+     */
+    public boolean copy(final PlotId destination, final Runnable whenDone)
+    {
+        return MainUtil.copy(world, id, destination, whenDone);
+    }
+
+    /**
+     * Get plot display name
+     *
+     * @return alias if set, else id
+     */
+    @Override
+    public String toString()
+    {
+        if ((settings != null) && (settings.getAlias().length() > 1)) { return settings.getAlias(); }
+        return world + ";" + getId().x + ";" + getId().y;
+    }
+
+    /**
+     * Remove a denied player (use DBFunc as well)
+     *
+     * @param uuid
+     */
+    public boolean removeDenied(final UUID uuid)
+    {
+        if (getDenied().remove(uuid))
+        {
+            DBFunc.removeDenied(this, uuid);
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Remove a helper (use DBFunc as well)
+     *
+     * @param uuid
+     */
+    public boolean removeTrusted(final UUID uuid)
+    {
+        if (getTrusted().remove(uuid))
+        {
+            DBFunc.removeTrusted(this, uuid);
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Remove a trusted user (use DBFunc as well)
+     *
+     * @param uuid
+     */
+    public boolean removeMember(final UUID uuid)
+    {
+        if (getMembers().remove(uuid))
+        {
+            DBFunc.removeMember(this, uuid);
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Export the plot as a schematic to the configured output directory
+     * @return
+     */
+    public void export(final RunnableVal<Boolean> whenDone)
+    {
+        SchematicHandler.manager.getCompoundTag(world, id, new RunnableVal<CompoundTag>()
+        {
+            @Override
+            public void run()
+            {
+                if (value == null)
+                {
+                    if (whenDone != null)
+                    {
+                        whenDone.value = false;
+                        TaskManager.runTask(whenDone);
+                    }
+                }
+                else
+                {
+                    TaskManager.runTaskAsync(new Runnable()
+                    {
+                        @Override
+                        public void run()
+                        {
+                            final String name = id + "," + world + "," + MainUtil.getName(owner);
+                            final boolean result = SchematicHandler.manager.save(value, Settings.SCHEMATIC_SAVE_PATH + File.separator + name + ".schematic");
+                            if (whenDone != null)
+                            {
+                                whenDone.value = result;
+                                TaskManager.runTask(whenDone);
+                            }
+                        }
+                    });
+                }
+            }
+        });
+    }
+
+    /**
+     * Export the plot as a BO3 object<br>
+     *  - bedrock, floor and main block are ignored in their respective sections
+     *  - air is ignored
+     *  - The center is considered to be on top of the plot in the center
+     * @param whenDone value will be false if exporting fails
+     */
+    public void exportBO3(final RunnableVal<Boolean> whenDone)
+    {
+        final boolean result = BO3Handler.saveBO3(this);
+        if (whenDone != null)
+        {
+            whenDone.value = result;
+        }
+        TaskManager.runTask(whenDone);
+    }
+
+    /**
+     * Upload the plot to the configured web interface
+     * @param whenDone value will be null if uploading fails
+     */
+    public void upload(final RunnableVal<URL> whenDone)
+    {
+        SchematicHandler.manager.getCompoundTag(world, id, new RunnableVal<CompoundTag>()
+        {
+            @Override
+            public void run()
+            {
+                TaskManager.runTaskAsync(new Runnable()
+                {
+                    @Override
+                    public void run()
+                    {
+                        final URL url = SchematicHandler.manager.upload(value, null, null);
+                        if (whenDone != null)
+                        {
+                            whenDone.value = url;
+                        }
+                        TaskManager.runTask(whenDone);
+                    }
+                });
+            }
+        });
+    }
+
+    @Override
+    public boolean equals(final Object obj)
+    {
+        if (this == obj) { return true; }
+        if (obj == null) { return false; }
+        if (getClass() != obj.getClass()) { return false; }
+        final Plot other = (Plot) obj;
+        if (hashCode() != other.hashCode()) { return false; }
+        return ((id.x.equals(other.id.x)) && (id.y.equals(other.id.y)) && (StringMan.isEqual(world, other.world)));
+    }
+
+    /**
+     * Get the plot hashcode
+     *
+     * @return integer.
+     */
+    @Override
+    public int hashCode()
+    {
+        return id.hashCode();
+    }
+}
diff --git a/src/main/java/com/intellectualcrafters/plot/object/PlotAnalysis.java b/src/main/java/com/intellectualcrafters/plot/object/PlotAnalysis.java
index db70b9664..1cb504beb 100644
--- a/src/main/java/com/intellectualcrafters/plot/object/PlotAnalysis.java
+++ b/src/main/java/com/intellectualcrafters/plot/object/PlotAnalysis.java
@@ -13,170 +13,198 @@ import com.intellectualcrafters.configuration.file.YamlConfiguration;
 import com.intellectualcrafters.plot.PS;
 import com.intellectualcrafters.plot.flag.Flag;
 import com.intellectualcrafters.plot.flag.FlagManager;
+import com.intellectualcrafters.plot.generator.HybridUtils;
 import com.intellectualcrafters.plot.util.MainUtil;
 import com.intellectualcrafters.plot.util.MathMan;
 import com.intellectualcrafters.plot.util.TaskManager;
-import com.plotsquared.bukkit.util.BukkitHybridUtils;
 
-public class PlotAnalysis {
+public class PlotAnalysis
+{
     public int changes;
     public int faces;
     public int data;
     public int air;
     public int variety;
-    
+
     public int changes_sd;
     public int faces_sd;
     public int data_sd;
     public int air_sd;
     public int variety_sd;
-    
+
     private int complexity;
-    
+
     public static PlotAnalysis MODIFIERS = new PlotAnalysis();
 
-    public static PlotAnalysis getAnalysis(Plot plot) {
-        Flag flag = FlagManager.getPlotFlag(plot, "analysis");
-        if (flag != null) {
-            PlotAnalysis analysis = new PlotAnalysis();
-            List<Integer> values = (List<Integer>) flag.getValue();
+    public static PlotAnalysis getAnalysis(final Plot plot)
+    {
+        final Flag flag = FlagManager.getPlotFlag(plot, "analysis");
+        if (flag != null)
+        {
+            final PlotAnalysis analysis = new PlotAnalysis();
+            final List<Integer> values = (List<Integer>) flag.getValue();
             analysis.changes = values.get(0); // 2126
             analysis.faces = values.get(1); // 90
             analysis.data = values.get(2); // 0
             analysis.air = values.get(3); // 19100
             analysis.variety = values.get(4); // 266
-            
+
             analysis.changes_sd = values.get(5); // 2104
             analysis.faces_sd = values.get(6); // 89
             analysis.data_sd = values.get(7); // 0
             analysis.air_sd = values.get(8); // 18909
             analysis.variety_sd = values.get(9); // 263
-            
+
             analysis.complexity = analysis.getComplexity();
             return analysis;
         }
         return null;
     }
-    
-    public List<Integer> asList() {
+
+    public List<Integer> asList()
+    {
         return Arrays.asList(changes, faces, data, air, variety, changes_sd, faces_sd, data_sd, air_sd, variety_sd);
     }
-    
-    public int getComplexity() {
-        if (complexity != 0) {
-            return complexity;
-        }
-        complexity = (this.changes) * MODIFIERS.changes
-                + (this.faces) * MODIFIERS.faces
-                + (this.data) * MODIFIERS.data
-                + (this.air) * MODIFIERS.air
-                + (this.variety) * MODIFIERS.variety
-                + (this.changes_sd) * MODIFIERS.changes_sd
-                + (this.faces_sd) * MODIFIERS.faces_sd
-                + (this.data_sd) * MODIFIERS.data_sd
-                + (this.air_sd) * MODIFIERS.air_sd
-                + (this.variety_sd) * MODIFIERS.variety_sd;
+
+    public int getComplexity()
+    {
+        if (complexity != 0) { return complexity; }
+        complexity = ((changes) * MODIFIERS.changes)
+        + ((faces) * MODIFIERS.faces)
+        + ((data) * MODIFIERS.data)
+        + ((air) * MODIFIERS.air)
+        + ((variety) * MODIFIERS.variety)
+        + ((changes_sd) * MODIFIERS.changes_sd)
+        + ((faces_sd) * MODIFIERS.faces_sd)
+        + ((data_sd) * MODIFIERS.data_sd)
+        + ((air_sd) * MODIFIERS.air_sd)
+        + ((variety_sd) * MODIFIERS.variety_sd);
         return complexity;
     }
-    
-    public static void analyzePlot(Plot plot, RunnableVal<PlotAnalysis> whenDone) {
-        BukkitHybridUtils.manager.analyzePlot(plot, whenDone);
+
+    public static void analyzePlot(final Plot plot, final RunnableVal<PlotAnalysis> whenDone)
+    {
+        HybridUtils.manager.analyzePlot(plot, whenDone);
     }
-    
+
     public static boolean running = false;
-    
+
     /**
      * This will set the optimal modifiers for the plot analysis based on the current plot ratings<br>
      *  - Will be used to calibrate the threshold for plot clearing
      * @param whenDone
      */
-    public static void calcOptimalModifiers(final Runnable whenDone, final double threshold) {
-        if (running) {
+    public static void calcOptimalModifiers(final Runnable whenDone, final double threshold)
+    {
+        if (running)
+        {
             PS.debug("Calibration task already in progress!");
             return;
         }
-        if (threshold <= 0 || threshold >= 1) {
+        if ((threshold <= 0) || (threshold >= 1))
+        {
             PS.debug("Invalid threshold provided! (Cannot be 0 or 100 as then there's no point calibrating)");
             return;
         }
         running = true;
         PS.debug(" - Fetching all plots");
         final ArrayList<Plot> plots = new ArrayList<>(PS.get().getPlots());
-        TaskManager.runTaskAsync(new Runnable() {
+        TaskManager.runTaskAsync(new Runnable()
+        {
             @Override
-            public void run() {
-                Iterator<Plot> iter = plots.iterator();
+            public void run()
+            {
+                final Iterator<Plot> iter = plots.iterator();
                 PS.debug(" - $1Reducing " + plots.size() + " plots to those with sufficient data");
-                while (iter.hasNext()) {
-                    Plot plot = iter.next();
-                    if (plot.getSettings().ratings == null || plot.getSettings().ratings.size() == 0) {
+                while (iter.hasNext())
+                {
+                    final Plot plot = iter.next();
+                    if ((plot.getSettings().ratings == null) || (plot.getSettings().ratings.size() == 0))
+                    {
                         iter.remove();
                     }
-                    else {
+                    else
+                    {
                         MainUtil.runners.put(plot, 1);
                     }
                 }
                 PS.debug(" - | Reduced to " + plots.size() + " plots");
-                
-                if (plots.size() < 3) {
+
+                if (plots.size() < 3)
+                {
                     PS.debug("Calibration cancelled due to insufficient comparison data, please try again later");
                     running = false;
-                    for (Plot plot : plots) {
+                    for (final Plot plot : plots)
+                    {
                         MainUtil.runners.remove(plot);
                     }
                     return;
                 }
-                
+
                 PS.debug(" - $1Analyzing plot contents (this may take a while)");
-                
+
                 final int[] changes = new int[plots.size()];
                 final int[] faces = new int[plots.size()];
                 final int[] data = new int[plots.size()];
                 final int[] air = new int[plots.size()];
                 final int[] variety = new int[plots.size()];
-                
+
                 final int[] changes_sd = new int[plots.size()];
                 final int[] faces_sd = new int[plots.size()];
                 final int[] data_sd = new int[plots.size()];
                 final int[] air_sd = new int[plots.size()];
                 final int[] variety_sd = new int[plots.size()];
-                
+
                 final int[] ratings = new int[plots.size()];
-                
+
                 final AtomicInteger mi = new AtomicInteger(0);
-                
-                Thread ratingAnalysis = new Thread(new Runnable() {
+
+                final Thread ratingAnalysis = new Thread(new Runnable()
+                {
                     @Override
-                    public void run() {
-                        for (;mi.intValue() < plots.size(); mi.incrementAndGet()) {
-                            int i = mi.intValue();
-                            Plot plot = plots.get(i);
+                    public void run()
+                    {
+                        for (; mi.intValue() < plots.size(); mi.incrementAndGet())
+                        {
+                            final int i = mi.intValue();
+                            final Plot plot = plots.get(i);
                             ratings[i] = (int) ((plot.getAverageRating() + plot.getSettings().ratings.size()) * 100);
                             PS.debug(" | " + plot + " (rating) " + (ratings[i]));
                         }
                     }
                 });
                 ratingAnalysis.start();
-                
+
                 final ArrayDeque<Plot> plotsQueue = new ArrayDeque<>(plots);
-                while (true) {
+                while (true)
+                {
                     final Plot queuePlot = plotsQueue.poll();
-                    if (queuePlot == null) {
+                    if (queuePlot == null)
+                    {
                         break;
                     }
                     PS.debug(" | " + queuePlot);
                     final Object lock = new Object();
-                    TaskManager.runTask(new Runnable() {
+                    TaskManager.runTask(new Runnable()
+                    {
                         @Override
-                        public void run() {
-                            analyzePlot(queuePlot, new RunnableVal<PlotAnalysis>() {
-                                public void run() {
-                                    try {
+                        public void run()
+                        {
+                            analyzePlot(queuePlot, new RunnableVal<PlotAnalysis>()
+                            {
+                                @Override
+                                public void run()
+                                {
+                                    try
+                                    {
                                         wait(10000);
-                                    } catch (InterruptedException e) {
+                                    }
+                                    catch (final InterruptedException e)
+                                    {
                                         e.printStackTrace();
                                     }
-                                    synchronized (lock) {
+                                    synchronized (lock)
+                                    {
                                         MainUtil.runners.remove(queuePlot);
                                         lock.notify();
                                     }
@@ -184,153 +212,167 @@ public class PlotAnalysis {
                             });
                         }
                     });
-                    try {
-                        synchronized (lock) {
+                    try
+                    {
+                        synchronized (lock)
+                        {
                             lock.wait();
                         }
-                    } catch (InterruptedException e) {
+                    }
+                    catch (final InterruptedException e)
+                    {
                         e.printStackTrace();
                     }
                 }
-                
+
                 PS.debug(" - $1Waiting on plot rating thread: " + ((mi.intValue() * 100) / plots.size()) + "%");
-                try {
+                try
+                {
                     ratingAnalysis.join();
-                } catch (InterruptedException e) {
+                }
+                catch (final InterruptedException e)
+                {
                     e.printStackTrace();
                 }
-                
+
                 PS.debug(" - $1Processing and grouping single plot analysis for bulk processing");
-                for (int i = 0; i < plots.size(); i++) {
-                    Plot plot = plots.get(i);
+                for (int i = 0; i < plots.size(); i++)
+                {
+                    final Plot plot = plots.get(i);
                     PS.debug(" | " + plot);
-                    PlotAnalysis analysis = plot.getComplexity();
-                  
+                    final PlotAnalysis analysis = plot.getComplexity();
+
                     changes[i] = analysis.changes;
                     faces[i] = analysis.faces;
                     data[i] = analysis.data;
                     air[i] = analysis.air;
                     variety[i] = analysis.variety;
-                    
+
                     changes_sd[i] = analysis.changes_sd;
                     faces_sd[i] = analysis.faces_sd;
                     data_sd[i] = analysis.data_sd;
                     air_sd[i] = analysis.air_sd;
                     variety_sd[i] = analysis.variety_sd;
                 }
-                
+
                 PS.debug(" - $1Calculating rankings");
-                
-                int[] rank_ratings = rank(ratings);
-                int n = rank_ratings.length;
-                
-                int optimal_index = (int) Math.round((1 - threshold) * (n - 1));
-                
+
+                final int[] rank_ratings = rank(ratings);
+                final int n = rank_ratings.length;
+
+                final int optimal_index = (int) Math.round((1 - threshold) * (n - 1));
+
                 PS.debug(" - $1Calculating rank correlation: ");
                 PS.debug(" - The analyzed plots which were processed and put into bulk data will be compared and correlated to the plot ranking");
                 PS.debug(" - The calculated correlation constant will then be used to calibrate the threshold for auto plot clearing");
-                
-                int[] rank_changes = rank(changes);
-                int[] sd_changes = getSD(rank_changes, rank_ratings);
-                int[] variance_changes = square(sd_changes);
-                int sum_changes = sum(variance_changes);
-                double factor_changes = getCC(n, sum_changes);
-                PlotAnalysis.MODIFIERS.changes = factor_changes == 1 ? 0 : (int) (factor_changes * 1000 / MathMan.getMean(changes));
+
+                final int[] rank_changes = rank(changes);
+                final int[] sd_changes = getSD(rank_changes, rank_ratings);
+                final int[] variance_changes = square(sd_changes);
+                final int sum_changes = sum(variance_changes);
+                final double factor_changes = getCC(n, sum_changes);
+                PlotAnalysis.MODIFIERS.changes = factor_changes == 1 ? 0 : (int) ((factor_changes * 1000) / MathMan.getMean(changes));
                 PS.debug(" - | changes " + factor_changes);
-                
-                int[] rank_faces = rank(faces);
-                int[] sd_faces = getSD(rank_faces, rank_ratings);
-                int[] variance_faces = square(sd_faces);
-                int sum_faces = sum(variance_faces);
-                double factor_faces = getCC(n, sum_faces);
-                PlotAnalysis.MODIFIERS.faces = factor_faces == 1 ? 0 : (int) (factor_faces * 1000 / MathMan.getMean(faces));
+
+                final int[] rank_faces = rank(faces);
+                final int[] sd_faces = getSD(rank_faces, rank_ratings);
+                final int[] variance_faces = square(sd_faces);
+                final int sum_faces = sum(variance_faces);
+                final double factor_faces = getCC(n, sum_faces);
+                PlotAnalysis.MODIFIERS.faces = factor_faces == 1 ? 0 : (int) ((factor_faces * 1000) / MathMan.getMean(faces));
                 PS.debug(" - | faces " + factor_faces);
-                
-                int[] rank_data = rank(data);
-                int[] sd_data = getSD(rank_data, rank_ratings);
-                int[] variance_data = square(sd_data);
-                int sum_data = sum(variance_data);
-                double factor_data = getCC(n, sum_data);
-                PlotAnalysis.MODIFIERS.data = factor_data == 1 ? 0 : (int) (factor_data * 1000 / MathMan.getMean(data));
+
+                final int[] rank_data = rank(data);
+                final int[] sd_data = getSD(rank_data, rank_ratings);
+                final int[] variance_data = square(sd_data);
+                final int sum_data = sum(variance_data);
+                final double factor_data = getCC(n, sum_data);
+                PlotAnalysis.MODIFIERS.data = factor_data == 1 ? 0 : (int) ((factor_data * 1000) / MathMan.getMean(data));
                 PS.debug(" - | data " + factor_data);
-                
-                int[] rank_air = rank(air);
-                int[] sd_air = getSD(rank_air, rank_ratings);
-                int[] variance_air = square(sd_air);
-                int sum_air = sum(variance_air);
-                double factor_air = getCC(n, sum_air);
-                PlotAnalysis.MODIFIERS.air = factor_air == 1 ? 0 : (int) (factor_air * 1000 / MathMan.getMean(air));
+
+                final int[] rank_air = rank(air);
+                final int[] sd_air = getSD(rank_air, rank_ratings);
+                final int[] variance_air = square(sd_air);
+                final int sum_air = sum(variance_air);
+                final double factor_air = getCC(n, sum_air);
+                PlotAnalysis.MODIFIERS.air = factor_air == 1 ? 0 : (int) ((factor_air * 1000) / MathMan.getMean(air));
                 PS.debug(" - | air " + factor_air);
-                
-                int[] rank_variety = rank(variety);
-                int[] sd_variety = getSD(rank_variety, rank_ratings);
-                int[] variance_variety = square(sd_variety);
-                int sum_variety = sum(variance_variety);
-                double factor_variety = getCC(n, sum_variety);
-                PlotAnalysis.MODIFIERS.variety = factor_variety == 1 ? 0 : (int) (factor_variety * 1000 / MathMan.getMean(variety));
+
+                final int[] rank_variety = rank(variety);
+                final int[] sd_variety = getSD(rank_variety, rank_ratings);
+                final int[] variance_variety = square(sd_variety);
+                final int sum_variety = sum(variance_variety);
+                final double factor_variety = getCC(n, sum_variety);
+                PlotAnalysis.MODIFIERS.variety = factor_variety == 1 ? 0 : (int) ((factor_variety * 1000) / MathMan.getMean(variety));
                 PS.debug(" - | variety " + factor_variety);
-                
-                int[] rank_changes_sd = rank(changes_sd);
-                int[] sd_changes_sd = getSD(rank_changes_sd, rank_ratings);
-                int[] variance_changes_sd = square(sd_changes_sd);
-                int sum_changes_sd = sum(variance_changes_sd);
-                double factor_changes_sd = getCC(n, sum_changes_sd);
-                PlotAnalysis.MODIFIERS.changes_sd = factor_changes_sd == 1 ? 0 : (int) (factor_changes_sd * 1000 / MathMan.getMean(changes_sd));
+
+                final int[] rank_changes_sd = rank(changes_sd);
+                final int[] sd_changes_sd = getSD(rank_changes_sd, rank_ratings);
+                final int[] variance_changes_sd = square(sd_changes_sd);
+                final int sum_changes_sd = sum(variance_changes_sd);
+                final double factor_changes_sd = getCC(n, sum_changes_sd);
+                PlotAnalysis.MODIFIERS.changes_sd = factor_changes_sd == 1 ? 0 : (int) ((factor_changes_sd * 1000) / MathMan.getMean(changes_sd));
                 PS.debug(" - | changes_sd " + factor_changes_sd);
-                
-                int[] rank_faces_sd = rank(faces_sd);
-                int[] sd_faces_sd = getSD(rank_faces_sd, rank_ratings);
-                int[] variance_faces_sd = square(sd_faces_sd);
-                int sum_faces_sd = sum(variance_faces_sd);
-                double factor_faces_sd = getCC(n, sum_faces_sd);
-                PlotAnalysis.MODIFIERS.faces_sd = factor_faces_sd == 1 ? 0 : (int) (factor_faces_sd * 1000 / MathMan.getMean(faces_sd));
+
+                final int[] rank_faces_sd = rank(faces_sd);
+                final int[] sd_faces_sd = getSD(rank_faces_sd, rank_ratings);
+                final int[] variance_faces_sd = square(sd_faces_sd);
+                final int sum_faces_sd = sum(variance_faces_sd);
+                final double factor_faces_sd = getCC(n, sum_faces_sd);
+                PlotAnalysis.MODIFIERS.faces_sd = factor_faces_sd == 1 ? 0 : (int) ((factor_faces_sd * 1000) / MathMan.getMean(faces_sd));
                 PS.debug(" - | faces_sd " + factor_faces_sd);
-                
-                int[] rank_data_sd = rank(data_sd);
-                int[] sd_data_sd = getSD(rank_data_sd, rank_ratings);
-                int[] variance_data_sd = square(sd_data_sd);
-                int sum_data_sd = sum(variance_data_sd);
-                double factor_data_sd = getCC(n, sum_data_sd);
-                PlotAnalysis.MODIFIERS.data_sd = factor_data_sd == 1 ? 0 : (int) (factor_data_sd * 1000 / MathMan.getMean(data_sd));
+
+                final int[] rank_data_sd = rank(data_sd);
+                final int[] sd_data_sd = getSD(rank_data_sd, rank_ratings);
+                final int[] variance_data_sd = square(sd_data_sd);
+                final int sum_data_sd = sum(variance_data_sd);
+                final double factor_data_sd = getCC(n, sum_data_sd);
+                PlotAnalysis.MODIFIERS.data_sd = factor_data_sd == 1 ? 0 : (int) ((factor_data_sd * 1000) / MathMan.getMean(data_sd));
                 PS.debug(" - | data_sd " + factor_data_sd);
-                
-                int[] rank_air_sd = rank(air_sd);
-                int[] sd_air_sd = getSD(rank_air_sd, rank_ratings);
-                int[] variance_air_sd = square(sd_air_sd);
-                int sum_air_sd = sum(variance_air_sd);
-                double factor_air_sd = getCC(n, sum_air_sd);
-                PlotAnalysis.MODIFIERS.air_sd = factor_air_sd == 1 ? 0 : (int) (factor_air_sd * 1000 / MathMan.getMean(air_sd));
+
+                final int[] rank_air_sd = rank(air_sd);
+                final int[] sd_air_sd = getSD(rank_air_sd, rank_ratings);
+                final int[] variance_air_sd = square(sd_air_sd);
+                final int sum_air_sd = sum(variance_air_sd);
+                final double factor_air_sd = getCC(n, sum_air_sd);
+                PlotAnalysis.MODIFIERS.air_sd = factor_air_sd == 1 ? 0 : (int) ((factor_air_sd * 1000) / MathMan.getMean(air_sd));
                 PS.debug(" - | air_sd " + factor_air_sd);
-                
-                int[] rank_variety_sd = rank(variety_sd);
-                int[] sd_variety_sd = getSD(rank_variety_sd, rank_ratings);
-                int[] variance_variety_sd = square(sd_variety_sd);
-                int sum_variety_sd = sum(variance_variety_sd);
-                double factor_variety_sd = getCC(n, sum_variety_sd);
-                PlotAnalysis.MODIFIERS.variety_sd = factor_variety_sd == 1 ? 0 : (int) (factor_variety_sd * 1000 / MathMan.getMean(variety_sd));
+
+                final int[] rank_variety_sd = rank(variety_sd);
+                final int[] sd_variety_sd = getSD(rank_variety_sd, rank_ratings);
+                final int[] variance_variety_sd = square(sd_variety_sd);
+                final int sum_variety_sd = sum(variance_variety_sd);
+                final double factor_variety_sd = getCC(n, sum_variety_sd);
+                PlotAnalysis.MODIFIERS.variety_sd = factor_variety_sd == 1 ? 0 : (int) ((factor_variety_sd * 1000) / MathMan.getMean(variety_sd));
                 PS.debug(" - | variety_sd " + factor_variety_sd);
-                
-                int[] complexity = new int[n];
-                
+
+                final int[] complexity = new int[n];
+
                 PS.debug(" $1Calculating threshold");
                 int max = 0;
                 int min = 0;
-                for (int i = 0; i < n; i++) {
-                    Plot plot = plots.get(i);
-                    PlotAnalysis analysis = plot.getComplexity();
+                for (int i = 0; i < n; i++)
+                {
+                    final Plot plot = plots.get(i);
+                    final PlotAnalysis analysis = plot.getComplexity();
                     complexity[i] = analysis.complexity;
-                    if (analysis.complexity < min) {
+                    if (analysis.complexity < min)
+                    {
                         min = analysis.complexity;
                     }
-                    else if (analysis.complexity > max) {
+                    else if (analysis.complexity > max)
+                    {
                         max = analysis.complexity;
                     }
                 }
-                int optimal_complexity = Integer.MAX_VALUE; 
-                if (min > 0 && max < 102400) { // If low size, use my fast ranking algorithm
-                    int[] rank_complexity = rank(complexity, max + 1);
-                    for (int i = 0; i < n; i++) {
-                        if (rank_complexity[i] == optimal_index) {
+                int optimal_complexity = Integer.MAX_VALUE;
+                if ((min > 0) && (max < 102400))
+                { // If low size, use my fast ranking algorithm
+                    final int[] rank_complexity = rank(complexity, max + 1);
+                    for (int i = 0; i < n; i++)
+                    {
+                        if (rank_complexity[i] == optimal_index)
+                        {
                             optimal_complexity = complexity[i];
                             break;
                         }
@@ -341,17 +383,20 @@ public class PlotAnalysis {
                     logln(rank_ratings);
                     logln("Correlation: ");
                     logln(getCC(n, sum(square(getSD(rank_complexity, rank_ratings)))));
-                    if (optimal_complexity == Integer.MAX_VALUE) {
+                    if (optimal_complexity == Integer.MAX_VALUE)
+                    {
                         PS.debug("Insufficient data to determine correlation! " + optimal_index + " | " + n);
                         running = false;
-                        for (Plot plot : plots) {
+                        for (final Plot plot : plots)
+                        {
                             MainUtil.runners.remove(plot);
                         }
                         return;
                     }
                 }
-                else { // Use the fast radix sort algorithm
-                    int[] sorted = complexity.clone();
+                else
+                { // Use the fast radix sort algorithm
+                    final int[] sorted = complexity.clone();
                     sort(sorted);
                     optimal_complexity = sorted[optimal_index];
                     logln("Complexity: ");
@@ -359,10 +404,10 @@ public class PlotAnalysis {
                     logln("Ratings: ");
                     logln(rank_ratings);
                 }
-                
+
                 // Save calibration
                 PS.debug(" $1Saving calibration");
-                YamlConfiguration config = PS.get().config;
+                final YamlConfiguration config = PS.get().config;
                 config.set("clear.auto.threshold", optimal_complexity);
                 config.set("clear.auto.calibration.changes", PlotAnalysis.MODIFIERS.changes);
                 config.set("clear.auto.calibration.faces", PlotAnalysis.MODIFIERS.faces);
@@ -374,113 +419,131 @@ public class PlotAnalysis {
                 config.set("clear.auto.calibration.data_sd", PlotAnalysis.MODIFIERS.data_sd);
                 config.set("clear.auto.calibration.air_sd", PlotAnalysis.MODIFIERS.air_sd);
                 config.set("clear.auto.calibration.variety_sd", PlotAnalysis.MODIFIERS.variety_sd);
-                try {
+                try
+                {
                     PS.get().config.save(PS.get().configFile);
-                } catch (IOException e) {
+                }
+                catch (final IOException e)
+                {
                     e.printStackTrace();
                 }
-                
+
                 PS.debug("$1Done!");
                 running = false;
-                for (Plot plot : plots) {
+                for (final Plot plot : plots)
+                {
                     MainUtil.runners.remove(plot);
                 }
                 whenDone.run();
             }
         });
     }
-    
-    public static void logln(Object obj) {
+
+    public static void logln(final Object obj)
+    {
         PS.debug(log(obj));
     }
-    
-    public static String log(Object obj) {
+
+    public static String log(final Object obj)
+    {
         String result = "";
-        if (obj.getClass().isArray()) {
+        if (obj.getClass().isArray())
+        {
             String prefix = "";
-            
-            for(int i=0; i<Array.getLength(obj); i++){
+
+            for (int i = 0; i < Array.getLength(obj); i++)
+            {
                 result += prefix + log(Array.get(obj, i));
                 prefix = ",";
             }
             return "( " + result + " )";
         }
-        else if (obj instanceof List<?>) {
+        else if (obj instanceof List<?>)
+        {
             String prefix = "";
-            for (Object element : (List<?>) obj) {
+            for (final Object element : (List<?>) obj)
+            {
                 result += prefix + log(element);
                 prefix = ",";
             }
             return "[ " + result + " ]";
         }
-        else {
+        else
+        {
             return obj.toString();
         }
     }
-    
+
     /**
      * Get correllation coefficient
      * @return
      */
-    public static double getCC(int n, int sum) {
-        return 1 - (6 * (double) sum) / (n * (n*n - 1)); 
+    public static double getCC(final int n, final int sum)
+    {
+        return 1 - ((6 * (double) sum) / (n * ((n * n) - 1)));
     }
-    
+
     /**
      * Sum of an array
      * @param array
      * @return
      */
-    public static int sum(int[] array) {
+    public static int sum(final int[] array)
+    {
         int sum = 0;
-        for (int value : array ) {
+        for (final int value : array)
+        {
             sum += value;
         }
         return sum;
     }
-    
+
     /**
      * A simple array squaring algorithm<br>
      *  - Used for calculating the variance
      * @param array
      * @return
      */
-    public static int[] square(int[] array) {
+    public static int[] square(int[] array)
+    {
         array = array.clone();
-        for (int i = 0; i < array.length; i++) {
+        for (int i = 0; i < array.length; i++)
+        {
             array[i] *= array[i];
         }
         return array;
     }
-    
+
     /**
      * An optimized lossy standard deviation algorithm
      * @param ranks
      * @return
      */
-    public static int[] getSD(int[]...ranks) {
-        if (ranks.length == 0) {
-            return null;
-        }
-        int size = ranks[0].length;
-        int arrays = ranks.length;
-        int[] result = new int[size];
-        for (int j = 0; j < size; j++) {
+    public static int[] getSD(final int[]... ranks)
+    {
+        if (ranks.length == 0) { return null; }
+        final int size = ranks[0].length;
+        final int arrays = ranks.length;
+        final int[] result = new int[size];
+        for (int j = 0; j < size; j++)
+        {
             int sum = 0;
-            for (int i = 0; i < ranks.length; i++) {
-                sum += ranks[i][j];
+            for (final int[] rank : ranks)
+            {
+                sum += rank[j];
             }
-            int mean = sum / arrays;
+            final int mean = sum / arrays;
             int sd = 0;
-            for (int i = 0; i < ranks.length; i++) {
-                int value = ranks[i][j];
+            for (final int[] rank : ranks)
+            {
+                final int value = rank[j];
                 sd += value < mean ? mean - value : value - mean;
             }
             result[j] = sd;
         }
         return result;
     }
-    
+
     /**
      * An optimized algorithm for ranking a very specific set of inputs<br>
      *  - Input is an array of int with a max size of 102400<br>
@@ -488,72 +551,90 @@ public class PlotAnalysis {
      * @param input
      * @return
      */
-    public static int[] rank(final int[] input) {
+    public static int[] rank(final int[] input)
+    {
         return rank(input, 102400);
     }
-    
+
     /**
      * An optimized algorithm for ranking a very specific set of inputs
      * @param input
      * @return
      */
-    public static int[] rank(final int[] input, int size) {
-        int[] cache = new int[size];
+    public static int[] rank(final int[] input, final int size)
+    {
+        final int[] cache = new int[size];
         int max = 0;
-        if (input.length < size) {
-            for (int value : input) {
-                if (value > max) {
+        if (input.length < size)
+        {
+            for (final int value : input)
+            {
+                if (value > max)
+                {
                     max = value;
                 }
                 cache[value]++;
             }
         }
-        else {
-           max = cache.length - 1;
-           for (int value : input) {
-               cache[value]++;
-           }
+        else
+        {
+            max = cache.length - 1;
+            for (final int value : input)
+            {
+                cache[value]++;
+            }
         }
         int last = 0;
-        for (int i = max; i >= 0; i--) {
-            if (cache[i] != 0) {
+        for (int i = max; i >= 0; i--)
+        {
+            if (cache[i] != 0)
+            {
                 cache[i] += last;
                 last = cache[i];
-                if (last == input.length) {
+                if (last == input.length)
+                {
                     break;
                 }
             }
         }
-        
-        int[] ranks = new int[input.length];
-        for (int i = 0; i < input.length; i++) {
-            int index = input[i];
+
+        final int[] ranks = new int[input.length];
+        for (int i = 0; i < input.length; i++)
+        {
+            final int index = input[i];
             ranks[i] = cache[index];
             cache[index]--;
         }
         return ranks;
     }
-    
-    public static void sort(int[] input) {
+
+    public static void sort(final int[] input)
+    {
         final int SIZE = 10;
-        List<Integer>[] bucket = new ArrayList[SIZE];
-        for (int i = 0; i < bucket.length; i++) {
+        final List<Integer>[] bucket = new ArrayList[SIZE];
+        for (int i = 0; i < bucket.length; i++)
+        {
             bucket[i] = new ArrayList<Integer>();
         }
         boolean maxLength = false;
         int tmp = -1, placement = 1;
-        while (!maxLength) {
+        while (!maxLength)
+        {
             maxLength = true;
-            for (Integer i : input) {
+            for (final Integer i : input)
+            {
                 tmp = i / placement;
                 bucket[tmp % SIZE].add(i);
-                if (maxLength && tmp > 0) {
+                if (maxLength && (tmp > 0))
+                {
                     maxLength = false;
                 }
             }
             int a = 0;
-            for (int b = 0; b < SIZE; b++) {
-                for (Integer i : bucket[b]) {
+            for (int b = 0; b < SIZE; b++)
+            {
+                for (final Integer i : bucket[b])
+                {
                     input[a++] = i;
                 }
                 bucket[b].clear();
diff --git a/src/main/java/com/intellectualcrafters/plot/object/PlotBlock.java b/src/main/java/com/intellectualcrafters/plot/object/PlotBlock.java
index 7b7984c45..ce9a2a777 100644
--- a/src/main/java/com/intellectualcrafters/plot/object/PlotBlock.java
+++ b/src/main/java/com/intellectualcrafters/plot/object/PlotBlock.java
@@ -1,65 +1,61 @@
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// PlotSquared - A plot manager and world generator for the Bukkit API                             /
-// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
-//                                                                                                 /
-// This program is free software; you can redistribute it and/or modify                            /
-// it under the terms of the GNU General Public License as published by                            /
-// the Free Software Foundation; either version 3 of the License, or                               /
-// (at your option) any later version.                                                             /
-//                                                                                                 /
-// This program is distributed in the hope that it will be useful,                                 /
-// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
-// GNU General Public License for more details.                                                    /
-//                                                                                                 /
-// You should have received a copy of the GNU General Public License                               /
-// along with this program; if not, write to the Free Software Foundation,                         /
-// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
-//                                                                                                 /
-// You can contact us via: support@intellectualsites.com                                           /
-////////////////////////////////////////////////////////////////////////////////////////////////////
-package com.intellectualcrafters.plot.object;
-
-/**
- * @author Empire92
- */
-public class PlotBlock {
-    
-    public static PlotBlock EVERYTHING = new PlotBlock((short) 0, (byte) 0);
-    
-    public final short id;
-    public final byte data;
-
-    public PlotBlock(final short id, final byte data) {
-        this.id = id;
-        this.data = data;
-    }
-
-    @Override
-    public boolean equals(final Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        final PlotBlock other = (PlotBlock) obj;
-        return ((this.id == other.id) && ((this.data == other.data) || (this.data == -1) || (other.data == -1)));
-    }
-
-    @Override
-    public int hashCode() {
-        return this.id;
-    }
-
-    @Override
-    public String toString() {
-        if (this.data == -1) {
-            return this.id + "";
-        }
-        return this.id + ":" + this.data;
-    }
-}
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// PlotSquared - A plot manager and world generator for the Bukkit API                             /
+// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
+//                                                                                                 /
+// This program is free software; you can redistribute it and/or modify                            /
+// it under the terms of the GNU General Public License as published by                            /
+// the Free Software Foundation; either version 3 of the License, or                               /
+// (at your option) any later version.                                                             /
+//                                                                                                 /
+// This program is distributed in the hope that it will be useful,                                 /
+// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
+// GNU General Public License for more details.                                                    /
+//                                                                                                 /
+// You should have received a copy of the GNU General Public License                               /
+// along with this program; if not, write to the Free Software Foundation,                         /
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
+//                                                                                                 /
+// You can contact us via: support@intellectualsites.com                                           /
+////////////////////////////////////////////////////////////////////////////////////////////////////
+package com.intellectualcrafters.plot.object;
+
+/**

+ */
+public class PlotBlock
+{
+
+    public static PlotBlock EVERYTHING = new PlotBlock((short) 0, (byte) 0);
+
+    public final short id;
+    public final byte data;
+
+    public PlotBlock(final short id, final byte data)
+    {
+        this.id = id;
+        this.data = data;
+    }
+
+    @Override
+    public boolean equals(final Object obj)
+    {
+        if (this == obj) { return true; }
+        if (obj == null) { return false; }
+        if (getClass() != obj.getClass()) { return false; }
+        final PlotBlock other = (PlotBlock) obj;
+        return ((id == other.id) && ((data == other.data) || (data == -1) || (other.data == -1)));
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return id;
+    }
+
+    @Override
+    public String toString()
+    {
+        if (data == -1) { return id + ""; }
+        return id + ":" + data;
+    }
+}
diff --git a/src/main/java/com/intellectualcrafters/plot/object/PlotCluster.java b/src/main/java/com/intellectualcrafters/plot/object/PlotCluster.java
index 657152225..d5d807cf3 100644
--- a/src/main/java/com/intellectualcrafters/plot/object/PlotCluster.java
+++ b/src/main/java/com/intellectualcrafters/plot/object/PlotCluster.java
@@ -5,7 +5,8 @@ import java.util.UUID;
 
 import com.intellectualcrafters.plot.database.DBFunc;
 
-public class PlotCluster {
+public class PlotCluster
+{
     public final String world;
     public PlotSettings settings;
     public UUID owner;
@@ -14,72 +15,78 @@ public class PlotCluster {
     private PlotId pos1;
     private PlotId pos2;
 
-    public PlotId getP1() {
-        return this.pos1;
+    public PlotId getP1()
+    {
+        return pos1;
     }
 
-    public PlotId getP2() {
-        return this.pos2;
+    public PlotId getP2()
+    {
+        return pos2;
     }
 
-    public void setP1(final PlotId id) {
-        this.pos1 = id;
+    public void setP1(final PlotId id)
+    {
+        pos1 = id;
     }
 
-    public void setP2(final PlotId id) {
-        this.pos2 = id;
+    public void setP2(final PlotId id)
+    {
+        pos2 = id;
     }
-    
-    public PlotCluster(final String world, final PlotId pos1, final PlotId pos2, final UUID owner) {
+
+    public PlotCluster(final String world, final PlotId pos1, final PlotId pos2, final UUID owner)
+    {
         this.world = world;
         this.pos1 = pos1;
         this.pos2 = pos2;
         this.owner = owner;
-        this.settings = new PlotSettings(null);
+        settings = new PlotSettings(null);
     }
 
-    public boolean isAdded(final UUID uuid) {
-        return (this.owner.equals(uuid) || this.invited.contains(uuid) || this.invited.contains(DBFunc.everyone) || this.helpers.contains(uuid) || this.helpers.contains(DBFunc.everyone));
+    public boolean isAdded(final UUID uuid)
+    {
+        return (owner.equals(uuid) || invited.contains(uuid) || invited.contains(DBFunc.everyone) || helpers.contains(uuid) || helpers.contains(DBFunc.everyone));
     }
 
-    public boolean hasHelperRights(final UUID uuid) {
-        return (this.owner.equals(uuid) || this.helpers.contains(uuid) || this.helpers.contains(DBFunc.everyone));
+    public boolean hasHelperRights(final UUID uuid)
+    {
+        return (owner.equals(uuid) || helpers.contains(uuid) || helpers.contains(DBFunc.everyone));
     }
 
-    public String getName() {
-        return this.settings.getAlias();
+    public String getName()
+    {
+        return settings.getAlias();
     }
-    
+
     /**
      * Get the area (in plots)
      * @return
      */
-    public int getArea() {
-        return (1 + pos2.x - pos1.x) * (1 + pos2.y - pos1.y);
+    public int getArea()
+    {
+        return ((1 + pos2.x) - pos1.x) * ((1 + pos2.y) - pos1.y);
     }
 
     @Override
-    public int hashCode() {
-        return this.pos1.hashCode();
+    public int hashCode()
+    {
+        return pos1.hashCode();
     }
 
     @Override
-    public boolean equals(final Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
+    public boolean equals(final Object obj)
+    {
+        if (this == obj) { return true; }
+        if (obj == null) { return false; }
+        if (getClass() != obj.getClass()) { return false; }
         final PlotCluster other = (PlotCluster) obj;
-        return (this.world.equals(other.world) && this.pos1.equals(other.pos1) && this.pos2.equals(other.pos2));
+        return (world.equals(other.world) && pos1.equals(other.pos1) && pos2.equals(other.pos2));
     }
 
     @Override
-    public String toString() {
-        return this.world + ";" + this.pos1.x + ";" + this.pos1.y + ";" + this.pos2.x + ";" + this.pos2.y;
+    public String toString()
+    {
+        return world + ";" + pos1.x + ";" + pos1.y + ";" + pos2.x + ";" + pos2.y;
     }
 }
diff --git a/src/main/java/com/intellectualcrafters/plot/object/PlotClusterId.java b/src/main/java/com/intellectualcrafters/plot/object/PlotClusterId.java
index 010308d00..4fff497aa 100644
--- a/src/main/java/com/intellectualcrafters/plot/object/PlotClusterId.java
+++ b/src/main/java/com/intellectualcrafters/plot/object/PlotClusterId.java
@@ -1,10 +1,12 @@
 package com.intellectualcrafters.plot.object;
 
-public class PlotClusterId {
+public class PlotClusterId
+{
     public final PlotId pos1;
     public final PlotId pos2;
 
-    public PlotClusterId(final PlotId pos1, final PlotId pos2) {
+    public PlotClusterId(final PlotId pos1, final PlotId pos2)
+    {
         this.pos1 = pos1;
         this.pos2 = pos2;
     }
diff --git a/src/main/java/com/intellectualcrafters/plot/object/PlotFilter.java b/src/main/java/com/intellectualcrafters/plot/object/PlotFilter.java
index 520ecb182..44d0c269b 100644
--- a/src/main/java/com/intellectualcrafters/plot/object/PlotFilter.java
+++ b/src/main/java/com/intellectualcrafters/plot/object/PlotFilter.java
@@ -1,10 +1,14 @@
 package com.intellectualcrafters.plot.object;
 
-public abstract class PlotFilter {
-    public boolean allowsWorld(String world) {
+public abstract class PlotFilter
+{
+    public boolean allowsWorld(final String world)
+    {
         return true;
     }
-    public boolean allowsPlot(Plot plot) {
+
+    public boolean allowsPlot(final Plot plot)
+    {
         return true;
     }
 }
diff --git a/src/main/java/com/intellectualcrafters/plot/object/PlotHandler.java b/src/main/java/com/intellectualcrafters/plot/object/PlotHandler.java
index 46f7021da..b9ab315ac 100644
--- a/src/main/java/com/intellectualcrafters/plot/object/PlotHandler.java
+++ b/src/main/java/com/intellectualcrafters/plot/object/PlotHandler.java
@@ -9,18 +9,21 @@ import com.intellectualcrafters.plot.database.DBFunc;
 import com.intellectualcrafters.plot.util.MainUtil;
 import com.intellectualcrafters.plot.util.UUIDHandler;
 
-public class PlotHandler {
-    public static HashSet<UUID> getOwners(Plot plot) {
-        if (plot.owner == null) {
-            return new HashSet<UUID>();
-        }
-        if (plot.isMerged()) {
-            HashSet<UUID> owners = new HashSet<UUID>();
-            Plot top = MainUtil.getTopPlot(plot);
-            ArrayList<PlotId> ids = MainUtil.getPlotSelectionIds(plot.id, top.id);
-            for (PlotId id : ids) {
-                UUID owner = MainUtil.getPlot(plot.world, id).owner;
-                if (owner != null) {
+public class PlotHandler
+{
+    public static HashSet<UUID> getOwners(final Plot plot)
+    {
+        if (plot.owner == null) { return new HashSet<UUID>(); }
+        if (plot.isMerged())
+        {
+            final HashSet<UUID> owners = new HashSet<UUID>();
+            final Plot top = MainUtil.getTopPlot(plot);
+            final ArrayList<PlotId> ids = MainUtil.getPlotSelectionIds(plot.id, top.id);
+            for (final PlotId id : ids)
+            {
+                final UUID owner = MainUtil.getPlot(plot.world, id).owner;
+                if (owner != null)
+                {
                     owners.add(owner);
                 }
             }
@@ -28,79 +31,69 @@ public class PlotHandler {
         }
         return new HashSet<>(Arrays.asList(plot.owner));
     }
-    
-    public static boolean isOwner(Plot plot, UUID uuid) {
-        if (plot.owner == null) {
-            return false;
-        }
-        if (plot.isMerged()) {
-            Plot top = MainUtil.getTopPlot(plot);
-            ArrayList<PlotId> ids = MainUtil.getPlotSelectionIds(plot.id, top.id);
-            for (PlotId id : ids) {
-                UUID owner = MainUtil.getPlot(plot.world, id).owner;
-                if (owner != null && owner.equals(uuid)) {
-                    return true;
-                }
+
+    public static boolean isOwner(final Plot plot, final UUID uuid)
+    {
+        if (plot.owner == null) { return false; }
+        if (plot.isMerged())
+        {
+            final Plot top = MainUtil.getTopPlot(plot);
+            final ArrayList<PlotId> ids = MainUtil.getPlotSelectionIds(plot.id, top.id);
+            for (final PlotId id : ids)
+            {
+                final UUID owner = MainUtil.getPlot(plot.world, id).owner;
+                if ((owner != null) && owner.equals(uuid)) { return true; }
             }
         }
         return plot.owner.equals(uuid);
     }
-    
-    public static boolean isOnline(Plot plot) {
-        if (plot.owner == null) {
-            return false;
-        }
-        if (plot.isMerged()) {
-            Plot top = MainUtil.getTopPlot(plot);
-            ArrayList<PlotId> ids = MainUtil.getPlotSelectionIds(plot.id, top.id);
-            for (PlotId id : ids) {
-                UUID owner = MainUtil.getPlot(plot.world, id).owner;
-                if (owner != null) {
-                    if (UUIDHandler.getPlayer(owner) != null) {
-                        return true;
-                    }
+
+    public static boolean isOnline(final Plot plot)
+    {
+        if (plot.owner == null) { return false; }
+        if (plot.isMerged())
+        {
+            final Plot top = MainUtil.getTopPlot(plot);
+            final ArrayList<PlotId> ids = MainUtil.getPlotSelectionIds(plot.id, top.id);
+            for (final PlotId id : ids)
+            {
+                final UUID owner = MainUtil.getPlot(plot.world, id).owner;
+                if (owner != null)
+                {
+                    if (UUIDHandler.getPlayer(owner) != null) { return true; }
                 }
             }
             return false;
         }
         return UUIDHandler.getPlayer(plot.owner) != null;
     }
-    
-    public static boolean sameOwners(Plot plot1, Plot plot2) {
-        if (plot1.owner == null || plot2.owner == null) {
-            return false;
-        }
-        HashSet<UUID> owners = getOwners(plot1);
+
+    public static boolean sameOwners(final Plot plot1, final Plot plot2)
+    {
+        if ((plot1.owner == null) || (plot2.owner == null)) { return false; }
+        final HashSet<UUID> owners = getOwners(plot1);
         owners.retainAll(getOwners(plot2));
         return owners.size() > 0;
     }
-    
-    public static boolean isAdded(Plot plot, final UUID uuid) {
-        if (plot.owner == null) {
-            return false;
+
+    public static boolean isAdded(final Plot plot, final UUID uuid)
+    {
+        if (plot.owner == null) { return false; }
+        if (isOwner(plot, uuid)) { return true; }
+        if (plot.getDenied().contains(uuid)) { return false; }
+        if (plot.getTrusted().contains(uuid) || plot.getTrusted().contains(DBFunc.everyone)) { return true; }
+        if (plot.getMembers().contains(uuid) || plot.getMembers().contains(DBFunc.everyone))
+        {
+            if (PlotHandler.isOnline(plot)) { return true; }
         }
-        if (isOwner(plot, uuid)) {
-            return true;
-        }
-        if (plot.getDenied().contains(uuid)) {
-            return false;
-        }
-        if (plot.getTrusted().contains(uuid) || plot.getTrusted().contains(DBFunc.everyone)) {
-            return true;
-        }
-        if (plot.getMembers().contains(uuid) || plot.getMembers().contains(DBFunc.everyone)) {
-            if (PlotHandler.isOnline(plot)) {
-                return true;
-            }
-        }
-        if (plot.isMerged()) {
-            Plot top = MainUtil.getTopPlot(plot);
-            ArrayList<PlotId> ids = MainUtil.getPlotSelectionIds(plot.id, top.id);
-            for (PlotId id : ids) {
-                UUID owner = MainUtil.getPlot(plot.world, id).owner;
-                if (owner != null && owner.equals(uuid)) {
-                    return true;
-                }
+        if (plot.isMerged())
+        {
+            final Plot top = MainUtil.getTopPlot(plot);
+            final ArrayList<PlotId> ids = MainUtil.getPlotSelectionIds(plot.id, top.id);
+            for (final PlotId id : ids)
+            {
+                final UUID owner = MainUtil.getPlot(plot.world, id).owner;
+                if ((owner != null) && owner.equals(uuid)) { return true; }
             }
         }
         return false;
diff --git a/src/main/java/com/intellectualcrafters/plot/object/PlotId.java b/src/main/java/com/intellectualcrafters/plot/object/PlotId.java
index c1644801e..b48a03a69 100644
--- a/src/main/java/com/intellectualcrafters/plot/object/PlotId.java
+++ b/src/main/java/com/intellectualcrafters/plot/object/PlotId.java
@@ -20,7 +20,8 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 package com.intellectualcrafters.plot.object;
 
-public class PlotId {
+public class PlotId
+{
     /**
      * x value
      */
@@ -36,7 +37,8 @@ public class PlotId {
      * @param x The plot x coordinate
      * @param y The plot y coordinate
      */
-    public PlotId(final int x, final int y) {
+    public PlotId(final int x, final int y)
+    {
         this.x = x;
         this.y = y;
     }
@@ -48,104 +50,121 @@ public class PlotId {
      *
      * @return null if the string is invalid
      */
-    public static PlotId fromString(final String string) {
+    public static PlotId fromString(final String string)
+    {
         int x, y;
         final String[] parts = string.split(";");
-        if (parts.length < 2) {
-            return null;
-        }
-        try {
+        if (parts.length < 2) { return null; }
+        try
+        {
             x = Integer.parseInt(parts[0]);
             y = Integer.parseInt(parts[1]);
-        } catch (final Exception e) {
+        }
+        catch (final Exception e)
+        {
             return null;
         }
         return new PlotId(x, y);
     }
 
     @Override
-    public boolean equals(final Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
+    public boolean equals(final Object obj)
+    {
+        if (this == obj) { return true; }
+        if (obj == null) { return false; }
+        if (getClass() != obj.getClass()) { return false; }
         final PlotId other = (PlotId) obj;
-        return ((this.x.equals(other.x)) && (this.y.equals(other.y)));
+        return ((x.equals(other.x)) && (y.equals(other.y)));
     }
 
     @Override
-    public String toString() {
-        return this.x + ";" + this.y;
+    public String toString()
+    {
+        return x + ";" + y;
     }
-    
-    public static PlotId unpair(int hash) {
-        if (hash >= 0) {
-            if (hash % 2 == 0) {
+
+    public static PlotId unpair(int hash)
+    {
+        if (hash >= 0)
+        {
+            if ((hash % 2) == 0)
+            {
                 // + +
                 hash /= 2;
-                int i = (int) (Math.abs(-1 + Math.sqrt(1 + 8 * hash)) / 2);
-                int idx = hash - ((i * (1 + i)) / 2);
-                int idy = ((i * (3 + i)) / 2) - hash;
+                final int i = (int) (Math.abs(-1 + Math.sqrt(1 + (8 * hash))) / 2);
+                final int idx = hash - ((i * (1 + i)) / 2);
+                final int idy = ((i * (3 + i)) / 2) - hash;
                 return new PlotId(idx, idy);
             }
-            else {
+            else
+            {
                 // + -
                 hash -= 1;
                 hash /= 2;
-                int i = (int) (Math.abs(-1 + Math.sqrt(1 + 8 * hash)) / 2);
-                int idx = hash - ((i * (1 + i)) / 2);
-                int idy = ((i * (3 + i)) / 2) - hash;
+                final int i = (int) (Math.abs(-1 + Math.sqrt(1 + (8 * hash))) / 2);
+                final int idx = hash - ((i * (1 + i)) / 2);
+                final int idy = ((i * (3 + i)) / 2) - hash;
                 return new PlotId(idx, -idy);
             }
         }
-        else {
-            if (hash % 2 == 0) {
+        else
+        {
+            if ((hash % 2) == 0)
+            {
                 // - +
                 hash /= -2;
-                int i = (int) (Math.abs(-1 + Math.sqrt(1 + 8 * hash)) / 2);
-                int idx = hash - ((i * (1 + i)) / 2);
-                int idy = ((i * (3 + i)) / 2) - hash;
+                final int i = (int) (Math.abs(-1 + Math.sqrt(1 + (8 * hash))) / 2);
+                final int idx = hash - ((i * (1 + i)) / 2);
+                final int idy = ((i * (3 + i)) / 2) - hash;
                 return new PlotId(-idx, idy);
             }
-            else {
+            else
+            {
                 // - -
                 hash += 1;
                 hash /= -2;
-                int i = (int) (Math.abs(-1 + Math.sqrt(1 + 8 * hash)) / 2);
-                int idx = hash - ((i * (1 + i)) / 2);
-                int idy = ((i * (3 + i)) / 2) - hash;
+                final int i = (int) (Math.abs(-1 + Math.sqrt(1 + (8 * hash))) / 2);
+                final int idx = hash - ((i * (1 + i)) / 2);
+                final int idy = ((i * (3 + i)) / 2) - hash;
                 return new PlotId(-idx, -idy);
             }
         }
     }
 
     private int hash;
-    
-    public void recalculateHash() {
-        this.hash = 0;
+
+    public void recalculateHash()
+    {
+        hash = 0;
         hashCode();
     }
-    
+
     @Override
-    public int hashCode() {
-        if (hash == 0) {
-            if (x >= 0) {
-                if (y >= 0) {
+    public int hashCode()
+    {
+        if (hash == 0)
+        {
+            if (x >= 0)
+            {
+                if (y >= 0)
+                {
                     hash = (x * x) + (3 * x) + (2 * x * y) + y + (y * y);
-                } else {
+                }
+                else
+                {
                     final int y1 = -y;
                     hash = (x * x) + (3 * x) + (2 * x * y1) + y1 + (y1 * y1) + 1;
                 }
-            } else {
+            }
+            else
+            {
                 final int x1 = -x;
-                if (y >= 0) {
+                if (y >= 0)
+                {
                     hash = -((x1 * x1) + (3 * x1) + (2 * x1 * y) + y + (y * y));
-                } else {
+                }
+                else
+                {
                     final int y1 = -y;
                     hash = -((x1 * x1) + (3 * x1) + (2 * x1 * y1) + y1 + (y1 * y1) + 1);
                 }
diff --git a/src/main/java/com/intellectualcrafters/plot/object/PlotInventory.java b/src/main/java/com/intellectualcrafters/plot/object/PlotInventory.java
index dcf854dfa..e6b1a5445 100644
--- a/src/main/java/com/intellectualcrafters/plot/object/PlotInventory.java
+++ b/src/main/java/com/intellectualcrafters/plot/object/PlotInventory.java
@@ -2,83 +2,88 @@ package com.intellectualcrafters.plot.object;
 
 import com.intellectualcrafters.plot.util.InventoryUtil;
 
-public class PlotInventory {
+public class PlotInventory
+{
 
     public final PlotPlayer player;
     public final int size;
     private String title;
     private final PlotItemStack[] items;
-    
+
     private boolean open = false;
-    
-    public PlotInventory(PlotPlayer player) {
-        this.size = 4;
-        this.title = null;
+
+    public PlotInventory(final PlotPlayer player)
+    {
+        size = 4;
+        title = null;
         this.player = player;
         items = InventoryUtil.manager.getItems(player);
     }
 
-    public PlotInventory(PlotPlayer player, int size, String name) {
+    public PlotInventory(final PlotPlayer player, final int size, final String name)
+    {
         this.size = size;
-        this.title = name == null ? "" : name;
+        title = name == null ? "" : name;
         this.player = player;
         items = new PlotItemStack[size * 9];
     }
-    
-    public boolean onClick(int index) {
+
+    public boolean onClick(final int index)
+    {
         return true;
     }
-    
-    public void openInventory() {
-        if (title == null) {
-            return;
-        }
+
+    public void openInventory()
+    {
+        if (title == null) { return; }
         open = true;
         InventoryUtil.manager.open(this);
     }
-    
-    public void close() {
-        if (title == null) {
-            return;
-        }
+
+    public void close()
+    {
+        if (title == null) { return; }
         InventoryUtil.manager.close(this);
         open = false;
     }
-    
-    public void setItem(int index, PlotItemStack item) {
+
+    public void setItem(final int index, final PlotItemStack item)
+    {
         items[index] = item;
         InventoryUtil.manager.setItem(this, index, item);
     }
-    
-    public PlotItemStack getItem(int index) {
-        if (index < 0 || index >= items.length) {
-            return null;
-        }
+
+    public PlotItemStack getItem(final int index)
+    {
+        if ((index < 0) || (index >= items.length)) { return null; }
         return items[index];
     }
-    
-    public void setTitle(String title) {
-        if (title == null) {
-            return;
-        }
-        boolean tmp = open;
+
+    public void setTitle(final String title)
+    {
+        if (title == null) { return; }
+        final boolean tmp = open;
         close();
         this.title = title;
-        if (tmp) {
+        if (tmp)
+        {
             openInventory();
         }
     }
-    
-    public PlotItemStack[] getItems() {
+
+    public PlotItemStack[] getItems()
+    {
         return items;
     }
-    
-    public String getTitle() {
-        return this.title;
+
+    public String getTitle()
+    {
+        return title;
     }
-    
-    public boolean isOpen() {
+
+    public boolean isOpen()
+    {
         return open;
     }
-    
+
 }
diff --git a/src/main/java/com/intellectualcrafters/plot/object/PlotItemStack.java b/src/main/java/com/intellectualcrafters/plot/object/PlotItemStack.java
index 597cbb0e2..2ce0fbb77 100644
--- a/src/main/java/com/intellectualcrafters/plot/object/PlotItemStack.java
+++ b/src/main/java/com/intellectualcrafters/plot/object/PlotItemStack.java
@@ -2,26 +2,29 @@ package com.intellectualcrafters.plot.object;
 
 import com.intellectualcrafters.plot.util.BlockManager;
 
-public class PlotItemStack {
+public class PlotItemStack
+{
     public final int id;
     public final short data;
     public final int amount;
     public final String name;
     public final String[] lore;
-    
+
     @Deprecated
-    public PlotItemStack(int id, short data, int amount, String name, String... lore) {
+    public PlotItemStack(final int id, final short data, final int amount, final String name, final String... lore)
+    {
         this.id = id;
         this.data = data;
         this.amount = amount;
         this.name = name;
         this.lore = lore;
     }
-    
-    public PlotItemStack(String id, int amount, String name, String... lore) {
-        PlotBlock block = BlockManager.manager.getPlotBlockFromString(id);
+
+    public PlotItemStack(final String id, final int amount, final String name, final String... lore)
+    {
+        final PlotBlock block = BlockManager.manager.getPlotBlockFromString(id);
         this.id = block.id;
-        this.data = block.data;
+        data = block.data;
         this.amount = amount;
         this.name = name;
         this.lore = lore;
diff --git a/src/main/java/com/intellectualcrafters/plot/object/PlotLoc.java b/src/main/java/com/intellectualcrafters/plot/object/PlotLoc.java
index a413f9358..33a9688b3 100644
--- a/src/main/java/com/intellectualcrafters/plot/object/PlotLoc.java
+++ b/src/main/java/com/intellectualcrafters/plot/object/PlotLoc.java
@@ -1,35 +1,33 @@
 package com.intellectualcrafters.plot.object;
 
-public class PlotLoc {
+public class PlotLoc
+{
     public int x;
     public int z;
 
-    public PlotLoc(final int x, final int z) {
+    public PlotLoc(final int x, final int z)
+    {
         this.x = x;
         this.z = z;
     }
 
     @Override
-    public int hashCode() {
+    public int hashCode()
+    {
         final int prime = 31;
         int result = 1;
-        result = (prime * result) + this.x;
-        result = (prime * result) + this.z;
+        result = (prime * result) + x;
+        result = (prime * result) + z;
         return result;
     }
 
     @Override
-    public boolean equals(final Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
+    public boolean equals(final Object obj)
+    {
+        if (this == obj) { return true; }
+        if (obj == null) { return false; }
+        if (getClass() != obj.getClass()) { return false; }
         final PlotLoc other = (PlotLoc) obj;
-        return ((this.x == other.x) && (this.z == other.z));
+        return ((x == other.x) && (z == other.z));
     }
 }
diff --git a/src/main/java/com/intellectualcrafters/plot/object/PlotManager.java b/src/main/java/com/intellectualcrafters/plot/object/PlotManager.java
index ed3748744..9081a6c1a 100644
--- a/src/main/java/com/intellectualcrafters/plot/object/PlotManager.java
+++ b/src/main/java/com/intellectualcrafters/plot/object/PlotManager.java
@@ -27,7 +27,8 @@ import java.util.HashSet;
 
 import com.intellectualcrafters.plot.commands.Template;
 
-public abstract class PlotManager {
+public abstract class PlotManager
+{
     /*
      * Plot locations (methods with Abs in them will not need to consider mega
      * plots)
@@ -45,11 +46,11 @@ public abstract class PlotManager {
     /*
      * Plot clearing (return false if you do not support some method)
      */
-    public abstract boolean clearPlot(final PlotWorld plotworld, final Plot plot, Runnable whenDone);
+    public abstract boolean clearPlot(final PlotWorld plotworld, final Plot plot, final Runnable whenDone);
 
     public abstract boolean claimPlot(final PlotWorld plotworld, final Plot plot);
-    
-    public abstract boolean unclaimPlot(final PlotWorld plotworld, final Plot plot, Runnable whenDone);
+
+    public abstract boolean unclaimPlot(final PlotWorld plotworld, final Plot plot, final Runnable whenDone);
 
     public abstract Location getSignLoc(final PlotWorld plotworld, final Plot plot);
 
@@ -84,10 +85,11 @@ public abstract class PlotManager {
     public abstract boolean finishPlotMerge(final PlotWorld plotworld, final ArrayList<PlotId> plotIds);
 
     public abstract boolean finishPlotUnlink(final PlotWorld plotworld, final ArrayList<PlotId> plotIds);
-    
-    public void exportTemplate(PlotWorld plotworld) throws IOException {
-        HashSet<FileBytes> files = new HashSet<>(Arrays.asList(new FileBytes("templates/" + "tmp-data.yml", Template.getBytes(plotworld))));
+
+    public void exportTemplate(final PlotWorld plotworld) throws IOException
+    {
+        final HashSet<FileBytes> files = new HashSet<>(Arrays.asList(new FileBytes("templates/" + "tmp-data.yml", Template.getBytes(plotworld))));
         Template.zipAll(plotworld.worldname, files);
     }
-    
+
 }
diff --git a/src/main/java/com/intellectualcrafters/plot/object/PlotMessage.java b/src/main/java/com/intellectualcrafters/plot/object/PlotMessage.java
index 7c1471ebb..82ff45ef6 100644
--- a/src/main/java/com/intellectualcrafters/plot/object/PlotMessage.java
+++ b/src/main/java/com/intellectualcrafters/plot/object/PlotMessage.java
@@ -3,53 +3,64 @@ package com.intellectualcrafters.plot.object;
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.util.ChatManager;
 
-public class PlotMessage {
-    
-    private Object builder;
+public class PlotMessage
+{
 
-    public PlotMessage() {
-        this.builder = ChatManager.manager.builder();
+    private final Object builder;
+
+    public PlotMessage()
+    {
+        builder = ChatManager.manager.builder();
     }
-    
-    public <T> T $(ChatManager<T> manager) {
+
+    public <T> T $(final ChatManager<T> manager)
+    {
         return (T) builder;
     }
-    
-    public PlotMessage(String text) {
+
+    public PlotMessage(final String text)
+    {
         this();
         text(text);
     }
-    
-    public PlotMessage text(String text) {
+
+    public PlotMessage text(final String text)
+    {
         ChatManager.manager.text(this, text);
         return this;
     }
-    
-    public PlotMessage tooltip(PlotMessage... tooltip) {
+
+    public PlotMessage tooltip(final PlotMessage... tooltip)
+    {
         ChatManager.manager.tooltip(this, tooltip);
         return this;
     }
-    
-    public PlotMessage tooltip(String tooltip) {
+
+    public PlotMessage tooltip(final String tooltip)
+    {
         return tooltip(new PlotMessage(tooltip));
     }
-    
-    public PlotMessage command(String command) {
+
+    public PlotMessage command(final String command)
+    {
         ChatManager.manager.command(this, command);
         return this;
     }
-    
-    public PlotMessage suggest(String command) {
+
+    public PlotMessage suggest(final String command)
+    {
         ChatManager.manager.suggest(this, command);
         return this;
     }
-    
-    public PlotMessage color(String color) {
+
+    public PlotMessage color(final String color)
+    {
         ChatManager.manager.color(this, C.color(color));
         return this;
     }
-    
-    public void send(PlotPlayer player) {
+
+    public void send(final PlotPlayer player)
+    {
         ChatManager.manager.send(this, player);
     }
 }
diff --git a/src/main/java/com/intellectualcrafters/plot/object/PlotPlayer.java b/src/main/java/com/intellectualcrafters/plot/object/PlotPlayer.java
index 77d6577fe..1ac4b6559 100644
--- a/src/main/java/com/intellectualcrafters/plot/object/PlotPlayer.java
+++ b/src/main/java/com/intellectualcrafters/plot/object/PlotPlayer.java
@@ -1,295 +1,322 @@
-package com.intellectualcrafters.plot.object;
-
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.ConcurrentHashMap;
-
-import com.intellectualcrafters.plot.PS;
-import com.intellectualcrafters.plot.commands.RequiredType;
-import com.intellectualcrafters.plot.util.MainUtil;
-import com.intellectualcrafters.plot.util.PlotGamemode;
-import com.intellectualcrafters.plot.util.PlotWeather;
-import com.intellectualcrafters.plot.util.UUIDHandler;
-import com.plotsquared.general.commands.CommandCaller;
-
-/**
- * Created 2015-02-20 for PlotSquared
- *
- * @author Citymonstret
- */
-public abstract class PlotPlayer implements CommandCaller {
-    
-    /**
-     * The metadata map
-     */
-    private ConcurrentHashMap<String, Object> meta;
-
-    /**
-     * Wrap a Player object to get a PlotPlayer<br>
-     *  - This will usually be cached, so no new object creation
-     * @param obj
-     * @return
-     */
-    public static PlotPlayer wrap(Object obj) {
-        return PS.get().IMP.wrapPlayer(obj);
-    }
-    
-    /**
-     * Get the cached PlotPlayer from a username<br>
-     *  - This will return null if the player has just logged in or is not online
-     * @param name
-     * @return
-     */
-    public static PlotPlayer get(String name) {
-        return UUIDHandler.getPlayer(name);
-    }
-    
-    /**
-     * Set some session only metadata for the player
-     * @param key
-     * @param value
-     */
-    public void setMeta(String key, Object value) {
-        if (this.meta == null) {
-            this.meta = new ConcurrentHashMap<String, Object>();
-        }
-        this.meta.put(key, value);
-    }
-
-    /**
-     * Get the metadata for a key
-     * @param key
-     * @return
-     */
-    public Object getMeta(String key) {
-        if (this.meta != null) {
-            return this.meta.get(key);
-        }
-        return null;
-    }
-
-    /**
-     * Delete the metadata for a key<br>
-     *  - metadata is session only
-     *  - deleting other plugin's metadata may cause issues
-     * @param key
-     */
-    public void deleteMeta(String key) {
-        if (this.meta != null) {
-            this.meta.remove(key);
-        }
-    }
-    
-    /**
-     * Returns the player's name
-     * @see #getName()
-     */
-    public String toString() {
-        return getName();
-    }
-    
-    /**
-     * Get the player's current plot<br>
-     *  - This is cached
-     * @return
-     */
-    public Plot getCurrentPlot() {
-        return (Plot) getMeta("lastplot");
-    }
-    
-    /**
-     * Get the total number of allowed plots
-     * @return
-     */
-    public int getAllowedPlots() {
-        return MainUtil.getAllowedPlots(this);
-    }
-    
-    /**
-     * Get the number of plots the player owns
-     * @return
-     */
-    public int getPlotCount() {
-        return MainUtil.getPlayerPlotCount(this);
-    }
-    
-    /**
-     * Get the number of plots the player owns in the world
-     * @param world
-     * @return
-     */
-    public int getPlotCount(String world) {
-        return MainUtil.getPlayerPlotCount(world, this);
-    }
-    
-    /**
-     * Get the plots the player owns
-     * @see #PS.java for more searching functions
-     * @return Set of plots
-     */
-    public Set<Plot> getPlots() {
-        return PS.get().getPlots(this);
-    }
-    
-    /**
-     * Return the PlotWorld the player is currently in, or null
-     * @return
-     */
-    public PlotWorld getPlotWorld() {
-        return PS.get().getPlotWorld(getLocation().getWorld());
-    }
-    
-    @Override
-    public RequiredType getSuperCaller() {
-        return RequiredType.PLAYER;
-    }
-
-    /////////////// PLAYER META ///////////////
-    
-    ////////////// PARTIALLY IMPLEMENTED ///////////
-    /**
-     * Get the player's last recorded location
-     * @return
-     */
-    public Location getLocation() {
-        Location loc = (Location) getMeta("location");
-        if (loc != null) {
-            return loc;
-        }
-        return null;
-    }
-    
-    ////////////////////////////////////////////////
-    
-    /**
-     * Get the previous time the player logged in
-     * @return
-     */
-    public abstract long getPreviousLogin();
-    
-    
-    
-    /**
-     * Get the player's full location (including yaw/pitch)
-     * @return
-     */
-    public abstract Location getLocationFull();
-    
-    /**
-     * Get the player's UUID<br>
-     *  === !IMPORTANT ===<br> 
-     *  The UUID is dependent on the mode chosen in the settings.yml and may not be the same as Bukkit has 
-     *  (especially if using an old version of Bukkit that does not support UUIDs)
-     *  
-     * @return UUID
-     */
-    public abstract UUID getUUID();
-    
-    /**
-     * Check the player's permissions<br>
-     *  - Will be cached if permission caching is enabled
-     */
-    public abstract boolean hasPermission(final String perm);
-    
-    /**
-     * Send the player a message
-     */
-    public abstract void sendMessage(final String message);
-
-    /**
-     * Teleport the player to a location
-     * @param loc
-     */
-    public abstract void teleport(final Location loc);
-
-    /**
-     * Is the player online
-     * @return
-     */
-    public abstract boolean isOnline();
-
-    /**
-     * Get the player's name
-     * @return
-     */
-    public abstract String getName();
-    
-    /**
-     * Set the compass target
-     * @param loc
-     */
-    public abstract void setCompassTarget(Location loc);
-    
-    /**
-     * Load the player data from disk (if applicable)
-     */
-    public abstract void loadData();
-    
-    /**
-     * Save the player data from disk (if applicable)
-     */
-    public abstract void saveData();
-    
-    /**
-     * Set player data that will persist restarts
-     *  - Please note that this is not intended to store large values
-     *  - For session only data use meta
-     * @param key
-     */
-    public abstract void setAttribute(String key);
-    
-    /**
-     * The attribute will be either true or false
-     * @param key
-     */
-    public abstract boolean getAttribute(String key);
-    
-    /**
-     * Remove an attribute from a player
-     * @param key
-     */
-    public abstract void removeAttribute(String key);
-    
-    /**
-     * Set the player's local weather
-     * @param weather
-     */
-    public abstract void setWeather(PlotWeather weather);
-    
-    /**
-     * Get the player's gamemode
-     * @return
-     */
-    public abstract PlotGamemode getGamemode();
-    
-    /**
-     * Set the player's gamemode
-     * @param gamemode
-     */
-    public abstract void setGamemode(PlotGamemode gamemode);
-    
-    /**
-     * Set the player's local time
-     * @param time
-     */
-    public abstract void setTime(long time);
-    
-    /**
-     * Set the player's fly mode
-     * @param fly
-     */
-    public abstract void setFlight(boolean fly);
-    
-    /**
-     * Play music at a location for the player
-     * @param loc
-     * @param id
-     */
-    public abstract void playMusic(Location loc, int id);
-    
-    /**
-     * Kick the player from the game
-     * @param message
-     */
-    public abstract void kick(String message);
-}
+package com.intellectualcrafters.plot.object;
+
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+
+import com.intellectualcrafters.plot.PS;
+import com.intellectualcrafters.plot.commands.RequiredType;
+import com.intellectualcrafters.plot.util.MainUtil;
+import com.intellectualcrafters.plot.util.PlotGamemode;
+import com.intellectualcrafters.plot.util.PlotWeather;
+import com.intellectualcrafters.plot.util.UUIDHandler;
+import com.plotsquared.general.commands.CommandCaller;
+
+/**
+ * Created 2015-02-20 for PlotSquared
+ *

+ */
+public abstract class PlotPlayer implements CommandCaller
+{
+
+    /**
+     * The metadata map
+     */
+    private ConcurrentHashMap<String, Object> meta;
+
+    /**
+     * Efficiently wrap a Player object to get a PlotPlayer (or fetch if it's already cached)<br>
+     *  - Accepts sponge/bukkit Player (online)
+     *  - Accepts player name (online)
+     *  - Accepts UUID
+     *  - Accepts bukkit OfflinePlayer (offline)
+     * @param obj
+     * @return
+     */
+    public static PlotPlayer wrap(final Object obj)
+    {
+        return PS.get().IMP.wrapPlayer(obj);
+    }
+
+    /**
+     * Get the cached PlotPlayer from a username<br>
+     *  - This will return null if the player has just logged in or is not online
+     * @param name
+     * @return
+     */
+    public static PlotPlayer get(final String name)
+    {
+        return UUIDHandler.getPlayer(name);
+    }
+
+    /**
+     * Set some session only metadata for the player
+     * @param key
+     * @param value
+     */
+    public void setMeta(final String key, final Object value)
+    {
+        if (meta == null)
+        {
+            meta = new ConcurrentHashMap<String, Object>();
+        }
+        meta.put(key, value);
+    }
+
+    /**
+     * Get the metadata for a key
+     * @param key
+     * @return
+     */
+    public Object getMeta(final String key)
+    {
+        if (meta != null) { return meta.get(key); }
+        return null;
+    }
+
+    /**
+     * Delete the metadata for a key<br>
+     *  - metadata is session only
+     *  - deleting other plugin's metadata may cause issues
+     * @param key
+     */
+    public void deleteMeta(final String key)
+    {
+        if (meta != null)
+        {
+            meta.remove(key);
+        }
+    }
+
+    /**
+     * Returns the player's name
+     * @see #getName()
+     */
+    @Override
+    public String toString()
+    {
+        return getName();
+    }
+
+    /**
+     * Get the player's current plot<br>
+     *  - This will return null if the player is standing in the road, or not in a plot world/area
+     *  - An unowned plot is still a plot, it just doesn't have any settings
+     * @return
+     */
+    public Plot getCurrentPlot()
+    {
+        return (Plot) getMeta("lastplot");
+    }
+
+    /**
+     * Get the total number of allowed plots
+     * Possibly relevant: (To increment the player's allowed plots, see the example script on the wiki)
+     * @return number of allowed plots within the scope (globally, or in the player's current world as defined in the settings.yml)
+     */
+    public int getAllowedPlots()
+    {
+        return MainUtil.getAllowedPlots(this);
+    }
+
+    /**
+     * Get the number of plots the player owns  
+     * 
+     * @see #getPlotCount(String);
+     * @see #getPlots()
+     * 
+     * @return number of plots within the scope (globally, or in the player's current world as defined in the settings.yml)
+     */
+    public int getPlotCount()
+    {
+        return MainUtil.getPlayerPlotCount(this);
+    }
+
+    /**
+     * Get the number of plots the player owns in the world
+     * @param world
+     * @return
+     */
+    public int getPlotCount(final String world)
+    {
+        return MainUtil.getPlayerPlotCount(world, this);
+    }
+
+    /**
+     * Get the plots the player owns
+     * @see #PS.java for more searching functions
+     * @see #getPlotCount() for the number of plots
+     * @return Set of plots
+     */
+    public Set<Plot> getPlots()
+    {
+        return PS.get().getPlots(this);
+    }
+
+    /**
+     * Return the PlotWorld the player is currently in, or null
+     * @return
+     */
+    public PlotWorld getPlotWorld()
+    {
+        return PS.get().getPlotWorld(getLocation().getWorld());
+    }
+
+    @Override
+    public RequiredType getSuperCaller()
+    {
+        return RequiredType.PLAYER;
+    }
+
+    /////////////// PLAYER META ///////////////
+
+    ////////////// PARTIALLY IMPLEMENTED ///////////
+    /**
+     * Get the player's last recorded location or null if they don't any plot relevant location
+     * @return
+     */
+    public Location getLocation()
+    {
+        final Location loc = (Location) getMeta("location");
+        if (loc != null) { return loc; }
+        return null;
+    }
+
+    ////////////////////////////////////////////////
+
+    /**
+     * Get the previous time the player logged in
+     * @return
+     */
+    public abstract long getPreviousLogin();
+
+    /**
+     * Get the player's full location (including yaw/pitch)
+     * @return
+     */
+    public abstract Location getLocationFull();
+
+    /**
+     * Get the player's UUID<br>
+     *  === !IMPORTANT ===<br>
+     *  The UUID is dependent on the mode chosen in the settings.yml and may not be the same as Bukkit has
+     *  (especially if using an old version of Bukkit that does not support UUIDs)
+     *
+     * @return UUID
+     */
+    public abstract UUID getUUID();
+
+    /**
+     * Check the player's permissions<br>
+     *  - Will be cached if permission caching is enabled
+     */
+    @Override
+    public abstract boolean hasPermission(final String perm);
+
+    /**
+     * Send the player a message
+     */
+    @Override
+    public abstract void sendMessage(final String message);
+
+    /**
+     * Teleport the player to a location
+     * @param loc
+     */
+    public abstract void teleport(final Location loc);
+
+    /**
+     * Is the player online
+     * @return
+     */
+    public abstract boolean isOnline();
+
+    /**
+     * Get the player's name
+     * @return
+     */
+    public abstract String getName();
+
+    /**
+     * Set the compass target
+     * @param loc
+     */
+    public abstract void setCompassTarget(final Location loc);
+
+    /**
+     * Load the player data from disk (if applicable)
+     * @deprecated hacky
+     */
+    @Deprecated
+    public abstract void loadData();
+
+    /**
+     * Save the player data from disk (if applicable)
+     * @deprecated hacky
+     */
+    @Deprecated
+    public abstract void saveData();
+
+    /**
+     * Set player data that will persist restarts
+     *  - Please note that this is not intended to store large values
+     *  - For session only data use meta
+     * @param key
+     */
+    public abstract void setAttribute(final String key);
+
+    /**
+     * The attribute will be either true or false
+     * @param key
+     */
+    public abstract boolean getAttribute(final String key);
+
+    /**
+     * Remove an attribute from a player
+     * @param key
+     */
+    public abstract void removeAttribute(final String key);
+
+    /**
+     * Set the player's local weather
+     * @param weather
+     */
+    public abstract void setWeather(final PlotWeather weather);
+
+    /**
+     * Get the player's gamemode
+     * @return
+     */
+    public abstract PlotGamemode getGamemode();
+
+    /**
+     * Set the player's gamemode
+     * @param gamemode
+     */
+    public abstract void setGamemode(final PlotGamemode gamemode);
+
+    /**
+     * Set the player's local time (ticks)
+     * @param time
+     */
+    public abstract void setTime(final long time);
+
+    /**
+     * Set the player's fly mode
+     * @param fly
+     */
+    public abstract void setFlight(final boolean fly);
+
+    /**
+     * Play music at a location for the player
+     * @param loc
+     * @param id
+     */
+    public abstract void playMusic(final Location loc, final int id);
+
+    /**
+     * Kick the player from the game
+     * @param message
+     */
+    public abstract void kick(final String message);
+}
diff --git a/src/main/java/com/intellectualcrafters/plot/object/PlotSettings.java b/src/main/java/com/intellectualcrafters/plot/object/PlotSettings.java
index f1fc57a37..3e678272e 100644
--- a/src/main/java/com/intellectualcrafters/plot/object/PlotSettings.java
+++ b/src/main/java/com/intellectualcrafters/plot/object/PlotSettings.java
@@ -1,192 +1,205 @@
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// PlotSquared - A plot manager and world generator for the Bukkit API                             /
-// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
-//                                                                                                 /
-// This program is free software; you can redistribute it and/or modify                            /
-// it under the terms of the GNU General Public License as published by                            /
-// the Free Software Foundation; either version 3 of the License, or                               /
-// (at your option) any later version.                                                             /
-//                                                                                                 /
-// This program is distributed in the hope that it will be useful,                                 /
-// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
-// GNU General Public License for more details.                                                    /
-//                                                                                                 /
-// You should have received a copy of the GNU General Public License                               /
-// along with this program; if not, write to the Free Software Foundation,                         /
-// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
-//                                                                                                 /
-// You can contact us via: support@intellectualsites.com                                           /
-////////////////////////////////////////////////////////////////////////////////////////////////////
-package com.intellectualcrafters.plot.object;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.UUID;
-
-import com.intellectualcrafters.plot.flag.Flag;
-import com.intellectualcrafters.plot.flag.FlagManager;
-import com.intellectualcrafters.plot.object.comment.PlotComment;
-
-/**
- * plot settings
- *
- * @author Citymonstret
- * @author Empire92
- */
-@SuppressWarnings("unused")
-public class PlotSettings {
-    /**
-     * Plot
-     */
-    private final Plot plot;
-    /**
-     * merged plots
-     */
-    private boolean[] merged = new boolean[] { false, false, false, false };
-    /**
-     * plot alias
-     */
-    private String alias;
-    /**
-     * Comments
-     */
-    private List<PlotComment> comments = null;
-    
-    /**
-     * The ratings for a plot
-     */
-    public HashMap<UUID, Integer> ratings;
-    
-    /**
-     * Flags
-     */
-    public HashMap<String, Flag> flags;
-    /**
-     * Home Position
-     */
-    private BlockLoc position;
-
-    /**
-     * Constructor
-     *
-     * @param plot object
-     */
-    public PlotSettings(final Plot plot) {
-        this.alias = "";
-        this.plot = plot;
-        this.flags = new HashMap<>();
-    }
-
-    /**
-     * <b>Check if the plot is merged in a direction</b><br> 0 = North<br> 1 = East<br> 2 = South<br> 3 = West<br>
-     *
-     * @param direction Direction to check
-     *
-     * @return boolean merged
-     */
-    public boolean getMerged(final int direction) {
-        return this.merged[direction];
-    }
-
-    /**
-     * Returns true if the plot is merged (i.e. if it's a mega plot)
-     */
-    public boolean isMerged() {
-        return (this.merged[0] || this.merged[1] || this.merged[2] || this.merged[3]);
-    }
-
-    public boolean[] getMerged() {
-        return this.merged;
-    }
-
-    public void setMerged(final boolean[] merged) {
-        this.merged = merged;
-    }
-
-    public void setMerged(final int direction, final boolean merged) {
-        this.merged[direction] = merged;
-    }
-
-    public BlockLoc getPosition() {
-        if (this.position == null) {
-            return new BlockLoc(0, 0, 0);
-        }
-        return this.position;
-    }
-
-    public void setPosition(final BlockLoc position) {
-        this.position = position;
-    }
-
-    public String getAlias() {
-        return this.alias;
-    }
-
-    /**
-     * Set the plot alias
-     *
-     * @param alias alias to be used
-     */
-    public void setAlias(final String alias) {
-        this.alias = alias;
-    }
-
-    public String getJoinMessage() {
-        final Flag greeting = FlagManager.getPlotFlag(this.plot, "greeting");
-        if (greeting != null) {
-            return greeting.getValueString();
-        }
-        return "";
-    }
-
-    /**
-     * Get the "farewell" flag value
-     *
-     * @return Farewell flag
-     */
-    public String getLeaveMessage() {
-        final Flag farewell = FlagManager.getPlotFlag(this.plot, "farewell");
-        if (farewell != null) {
-            return farewell.getValueString();
-        }
-        return "";
-    }
-
-    public ArrayList<PlotComment> getComments(final String inbox) {
-        final ArrayList<PlotComment> c = new ArrayList<>();
-        if (this.comments == null) {
-            return null;
-        }
-        for (final PlotComment comment : this.comments) {
-            if (comment.inbox.equals(inbox)) {
-                c.add(comment);
-            }
-        }
-        return c;
-    }
-
-    public void setComments(final List<PlotComment> comments) {
-        this.comments = comments;
-    }
-
-    public void removeComment(final PlotComment comment) {
-        if (this.comments.contains(comment)) {
-            this.comments.remove(comment);
-        }
-    }
-
-    public void removeComments(final List<PlotComment> comments) {
-        for (final PlotComment comment : comments) {
-            removeComment(comment);
-        }
-    }
-
-    public void addComment(final PlotComment comment) {
-        if (this.comments == null) {
-            this.comments = new ArrayList<>();
-        }
-        this.comments.add(comment);
-    }
-}
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// PlotSquared - A plot manager and world generator for the Bukkit API                             /
+// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
+//                                                                                                 /
+// This program is free software; you can redistribute it and/or modify                            /
+// it under the terms of the GNU General Public License as published by                            /
+// the Free Software Foundation; either version 3 of the License, or                               /
+// (at your option) any later version.                                                             /
+//                                                                                                 /
+// This program is distributed in the hope that it will be useful,                                 /
+// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
+// GNU General Public License for more details.                                                    /
+//                                                                                                 /
+// You should have received a copy of the GNU General Public License                               /
+// along with this program; if not, write to the Free Software Foundation,                         /
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
+//                                                                                                 /
+// You can contact us via: support@intellectualsites.com                                           /
+////////////////////////////////////////////////////////////////////////////////////////////////////
+package com.intellectualcrafters.plot.object;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.UUID;
+
+import com.intellectualcrafters.plot.flag.Flag;
+import com.intellectualcrafters.plot.flag.FlagManager;
+import com.intellectualcrafters.plot.object.comment.PlotComment;
+
+/**
+ * plot settings
+ *


+ */
+@SuppressWarnings("unused")
+public class PlotSettings
+{
+    /**
+     * Plot
+     */
+    private final Plot plot;
+    /**
+     * merged plots
+     */
+    private boolean[] merged = new boolean[] { false, false, false, false };
+    /**
+     * plot alias
+     */
+    private String alias;
+    /**
+     * Comments
+     */
+    private List<PlotComment> comments = null;
+
+    /**
+     * The ratings for a plot
+     */
+    public HashMap<UUID, Integer> ratings;
+
+    /**
+     * Flags
+     */
+    public HashMap<String, Flag> flags;
+    /**
+     * Home Position
+     */
+    private BlockLoc position;
+
+    /**
+     * Constructor
+     *
+     * @param plot object
+     */
+    public PlotSettings(final Plot plot)
+    {
+        alias = "";
+        this.plot = plot;
+        flags = new HashMap<>();
+    }
+
+    /**
+     * <b>Check if the plot is merged in a direction</b><br> 0 = North<br> 1 = East<br> 2 = South<br> 3 = West<br>
+     *
+     * @param direction Direction to check
+     *
+     * @return boolean merged
+     */
+    public boolean getMerged(final int direction)
+    {
+        return merged[direction];
+    }
+
+    /**
+     * Returns true if the plot is merged (i.e. if it's a mega plot)
+     */
+    public boolean isMerged()
+    {
+        return (merged[0] || merged[1] || merged[2] || merged[3]);
+    }
+
+    public boolean[] getMerged()
+    {
+        return merged;
+    }
+
+    public void setMerged(final boolean[] merged)
+    {
+        this.merged = merged;
+    }
+
+    public void setMerged(final int direction, final boolean merged)
+    {
+        this.merged[direction] = merged;
+    }
+
+    public BlockLoc getPosition()
+    {
+        if (position == null) { return new BlockLoc(0, 0, 0); }
+        return position;
+    }
+
+    public void setPosition(final BlockLoc position)
+    {
+        this.position = position;
+    }
+
+    public String getAlias()
+    {
+        return alias;
+    }
+
+    /**
+     * Set the plot alias
+     *
+     * @param alias alias to be used
+     */
+    public void setAlias(final String alias)
+    {
+        this.alias = alias;
+    }
+
+    public String getJoinMessage()
+    {
+        final Flag greeting = FlagManager.getPlotFlag(plot, "greeting");
+        if (greeting != null) { return greeting.getValueString(); }
+        return "";
+    }
+
+    /**
+     * Get the "farewell" flag value
+     *
+     * @return Farewell flag
+     */
+    public String getLeaveMessage()
+    {
+        final Flag farewell = FlagManager.getPlotFlag(plot, "farewell");
+        if (farewell != null) { return farewell.getValueString(); }
+        return "";
+    }
+
+    public ArrayList<PlotComment> getComments(final String inbox)
+    {
+        final ArrayList<PlotComment> c = new ArrayList<>();
+        if (comments == null) { return null; }
+        for (final PlotComment comment : comments)
+        {
+            if (comment.inbox.equals(inbox))
+            {
+                c.add(comment);
+            }
+        }
+        return c;
+    }
+
+    public void setComments(final List<PlotComment> comments)
+    {
+        this.comments = comments;
+    }
+
+    public void removeComment(final PlotComment comment)
+    {
+        if (comments.contains(comment))
+        {
+            comments.remove(comment);
+        }
+    }
+
+    public void removeComments(final List<PlotComment> comments)
+    {
+        for (final PlotComment comment : comments)
+        {
+            removeComment(comment);
+        }
+    }
+
+    public void addComment(final PlotComment comment)
+    {
+        if (comments == null)
+        {
+            comments = new ArrayList<>();
+        }
+        comments.add(comment);
+    }
+}
diff --git a/src/main/java/com/intellectualcrafters/plot/object/PlotWorld.java b/src/main/java/com/intellectualcrafters/plot/object/PlotWorld.java
index 181abcf24..5e4dbe1cf 100644
--- a/src/main/java/com/intellectualcrafters/plot/object/PlotWorld.java
+++ b/src/main/java/com/intellectualcrafters/plot/object/PlotWorld.java
@@ -39,7 +39,8 @@ import com.intellectualcrafters.plot.util.StringMan;
 /**
  * @author Jesse Boyd
  */
-public abstract class PlotWorld {
+public abstract class PlotWorld
+{
     public final static boolean AUTO_MERGE_DEFAULT = false;
     public final static boolean ALLOW_SIGNS_DEFAULT = true;
     public final static boolean MOB_SPAWNING_DEFAULT = false;
@@ -68,8 +69,75 @@ public abstract class PlotWorld {
     // TODO make this configurable
     // make non static and static_default_valu + add config option
     public static int[] BLOCKS;
-    static {
-        BLOCKS = new int[] { 1, 2, 3, 4, 5, 7, 14, 15, 16, 17, 19, 21, 22, 23, 24, 25, 35, 41, 42, 43, 45, 47, 48, 49, 52, 56, 57, 58, 61, 62, 73, 74, 80, 82, 84, 86, 87, 88, 91, 97, 98, 99, 100, 103, 110, 112, 120, 121, 123, 124, 125, 129, 133, 153, 155, 159, 162, 165, 166, 168, 170, 172, 173, 174, 179, 181 };
+    static
+    {
+        BLOCKS = new int[] {
+        1,
+        2,
+        3,
+        4,
+        5,
+        7,
+        14,
+        15,
+        16,
+        17,
+        19,
+        21,
+        22,
+        23,
+        24,
+        25,
+        35,
+        41,
+        42,
+        43,
+        45,
+        47,
+        48,
+        49,
+        52,
+        56,
+        57,
+        58,
+        61,
+        62,
+        73,
+        74,
+        80,
+        82,
+        84,
+        86,
+        87,
+        88,
+        91,
+        97,
+        98,
+        99,
+        100,
+        103,
+        110,
+        112,
+        120,
+        121,
+        123,
+        124,
+        125,
+        129,
+        133,
+        153,
+        155,
+        159,
+        162,
+        165,
+        166,
+        168,
+        170,
+        172,
+        173,
+        174,
+        179,
+        181 };
     }
     public final String worldname;
     public int MAX_PLOT_MEMBERS;
@@ -101,31 +169,24 @@ public abstract class PlotWorld {
     public int MIN_BUILD_HEIGHT;
     public PlotGamemode GAMEMODE = PlotGamemode.CREATIVE;
 
-    public PlotWorld(final String worldname) {
+    public PlotWorld(final String worldname)
+    {
         this.worldname = worldname;
     }
-    
+
     @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        PlotWorld plotworld = (PlotWorld) obj;
-        ConfigurationSection section = PS.get().config.getConfigurationSection("worlds");
-        for (ConfigurationNode setting : plotworld.getSettingNodes()) {
-            Object constant = section.get(plotworld.worldname + "." + setting.getConstant());
-            if (constant == null) {
-                return false;
-            }
-            if (!constant.equals(section.get(this.worldname + "." + setting.getConstant())))  {
-                return false;
-            }
+    public boolean equals(final Object obj)
+    {
+        if (this == obj) { return true; }
+        if (obj == null) { return false; }
+        if (getClass() != obj.getClass()) { return false; }
+        final PlotWorld plotworld = (PlotWorld) obj;
+        final ConfigurationSection section = PS.get().config.getConfigurationSection("worlds");
+        for (final ConfigurationNode setting : plotworld.getSettingNodes())
+        {
+            final Object constant = section.get(plotworld.worldname + "." + setting.getConstant());
+            if (constant == null) { return false; }
+            if (!constant.equals(section.get(worldname + "." + setting.getConstant()))) { return false; }
         }
         return true;
     }
@@ -135,98 +196,113 @@ public abstract class PlotWorld {
      *
      * @param config Configuration Section
      */
-    public void loadDefaultConfiguration(final ConfigurationSection config) {
-        if (config.contains("generator.terrain")) {
-            this.TERRAIN = config.getInt("generator.terrain");
-            this.TYPE = config.getInt("generator.type");
+    public void loadDefaultConfiguration(final ConfigurationSection config)
+    {
+        if (config.contains("generator.terrain"))
+        {
+            TERRAIN = config.getInt("generator.terrain");
+            TYPE = config.getInt("generator.type");
         }
-        this.MOB_SPAWNING = config.getBoolean("natural_mob_spawning");
-        this.AUTO_MERGE = config.getBoolean("plot.auto_merge");
-        this.MAX_PLOT_MEMBERS = config.getInt("limits.max-members");
-        this.ALLOW_SIGNS = config.getBoolean("plot.create_signs");
-        this.PLOT_BIOME = (String) Configuration.BIOME.parseString(config.getString("plot.biome"));
-        this.SCHEMATIC_ON_CLAIM = config.getBoolean("schematic.on_claim");
-        this.SCHEMATIC_FILE = config.getString("schematic.file");
-        this.SCHEMATIC_CLAIM_SPECIFY = config.getBoolean("schematic.specify_on_claim");
-        this.SCHEMATICS = config.getStringList("schematic.schematics");
-        this.USE_ECONOMY = config.getBoolean("economy.use") && (EconHandler.manager != null);
-        this.PLOT_PRICE = config.getDouble("economy.prices.claim");
-        this.MERGE_PRICE = config.getDouble("economy.prices.merge");
-        this.SELL_PRICE = config.getDouble("economy.prices.sell");
-        this.PLOT_CHAT = config.getBoolean("chat.enabled");
-        this.WORLD_BORDER = config.getBoolean("world.border");
-        this.MAX_BUILD_HEIGHT = config.getInt("world.max_height");
-        this.MIN_BUILD_HEIGHT = config.getInt("min.max_height");
-        
-        switch (config.getString("world.gamemode").toLowerCase()) {
+        MOB_SPAWNING = config.getBoolean("natural_mob_spawning");
+        AUTO_MERGE = config.getBoolean("plot.auto_merge");
+        MAX_PLOT_MEMBERS = config.getInt("limits.max-members");
+        ALLOW_SIGNS = config.getBoolean("plot.create_signs");
+        PLOT_BIOME = Configuration.BIOME.parseString(config.getString("plot.biome"));
+        SCHEMATIC_ON_CLAIM = config.getBoolean("schematic.on_claim");
+        SCHEMATIC_FILE = config.getString("schematic.file");
+        SCHEMATIC_CLAIM_SPECIFY = config.getBoolean("schematic.specify_on_claim");
+        SCHEMATICS = config.getStringList("schematic.schematics");
+        USE_ECONOMY = config.getBoolean("economy.use") && (EconHandler.manager != null);
+        PLOT_PRICE = config.getDouble("economy.prices.claim");
+        MERGE_PRICE = config.getDouble("economy.prices.merge");
+        SELL_PRICE = config.getDouble("economy.prices.sell");
+        PLOT_CHAT = config.getBoolean("chat.enabled");
+        WORLD_BORDER = config.getBoolean("world.border");
+        MAX_BUILD_HEIGHT = config.getInt("world.max_height");
+        MIN_BUILD_HEIGHT = config.getInt("min.max_height");
+
+        switch (config.getString("world.gamemode").toLowerCase())
+        {
             case "survival":
             case "s":
             case "0":
-                this.GAMEMODE = PlotGamemode.SURVIVAL;
+                GAMEMODE = PlotGamemode.SURVIVAL;
                 break;
             case "creative":
             case "c":
             case "1":
-                this.GAMEMODE = PlotGamemode.CREATIVE;
+                GAMEMODE = PlotGamemode.CREATIVE;
                 break;
             case "adventure":
             case "a":
             case "2":
-                this.GAMEMODE = PlotGamemode.ADVENTURE;
+                GAMEMODE = PlotGamemode.ADVENTURE;
                 break;
             case "spectator":
             case "3":
-                this.GAMEMODE = PlotGamemode.SPECTATOR;
+                GAMEMODE = PlotGamemode.SPECTATOR;
                 break;
             default:
                 PS.debug("&cInvalid gamemode set for: " + worldname);
                 break;
         }
-        
-        this.HOME_ALLOW_NONMEMBER = config.getBoolean("home.allow-nonmembers");
-        String homeDefault = config.getString("home.default");
-        if (homeDefault.equalsIgnoreCase("side")) {
+
+        HOME_ALLOW_NONMEMBER = config.getBoolean("home.allow-nonmembers");
+        final String homeDefault = config.getString("home.default");
+        if (homeDefault.equalsIgnoreCase("side"))
+        {
             DEFAULT_HOME = null;
         }
-        else if (homeDefault.equalsIgnoreCase("center")) {
+        else if (homeDefault.equalsIgnoreCase("center"))
+        {
             DEFAULT_HOME = new PlotLoc(Integer.MAX_VALUE, Integer.MAX_VALUE);
         }
-        else {
-            try {
-                String[] split = homeDefault.split(",");
+        else
+        {
+            try
+            {
+                final String[] split = homeDefault.split(",");
                 DEFAULT_HOME = new PlotLoc(Integer.parseInt(split[0]), Integer.parseInt(split[1]));
             }
-            catch (Exception e) {
+            catch (final Exception e)
+            {
                 DEFAULT_HOME = null;
             }
         }
-        
+
         List<String> flags = config.getStringList("flags.default");
-        if (flags == null || flags.size() == 0) {
+        if ((flags == null) || (flags.size() == 0))
+        {
             flags = config.getStringList("flags");
-            if (flags == null || flags.size() == 0) {
+            if ((flags == null) || (flags.size() == 0))
+            {
                 flags = new ArrayList<String>();
-                ConfigurationSection section = config.getConfigurationSection("flags");
-                Set<String> keys = section.getKeys(false);
-                for (String key : keys) {
-                    if (!key.equals("default")) {
+                final ConfigurationSection section = config.getConfigurationSection("flags");
+                final Set<String> keys = section.getKeys(false);
+                for (final String key : keys)
+                {
+                    if (!key.equals("default"))
+                    {
                         flags.add(key + ";" + section.get(key));
                     }
                 }
             }
         }
-        try {
-            this.DEFAULT_FLAGS = FlagManager.parseFlags(flags);
-        } catch (final Exception e) {
-            e.printStackTrace();
-            PS.debug("&cInvalid default flags for " + this.worldname + ": " + StringMan.join(flags, ","));
-            this.DEFAULT_FLAGS = new HashMap<>();
+        try
+        {
+            DEFAULT_FLAGS = FlagManager.parseFlags(flags);
         }
-        this.PVP = config.getBoolean("event.pvp");
-        this.PVE = config.getBoolean("event.pve");
-        this.SPAWN_EGGS = config.getBoolean("event.spawn.egg");
-        this.SPAWN_CUSTOM = config.getBoolean("event.spawn.custom");
-        this.SPAWN_BREEDING = config.getBoolean("event.spawn.breeding");
+        catch (final Exception e)
+        {
+            e.printStackTrace();
+            PS.debug("&cInvalid default flags for " + worldname + ": " + StringMan.join(flags, ","));
+            DEFAULT_FLAGS = new HashMap<>();
+        }
+        PVP = config.getBoolean("event.pvp");
+        PVE = config.getBoolean("event.pve");
+        SPAWN_EGGS = config.getBoolean("event.spawn.egg");
+        SPAWN_CUSTOM = config.getBoolean("event.spawn.custom");
+        SPAWN_BREEDING = config.getBoolean("event.spawn.breeding");
         loadConfiguration(config);
     }
 
@@ -237,7 +313,8 @@ public abstract class PlotWorld {
      *
      * @param config Configuration Section
      */
-    public void saveConfiguration(final ConfigurationSection config) {
+    public void saveConfiguration(final ConfigurationSection config)
+    {
         final HashMap<String, Object> options = new HashMap<>();
         options.put("natural_mob_spawning", PlotWorld.MOB_SPAWNING_DEFAULT);
         options.put("plot.auto_merge", PlotWorld.AUTO_MERGE_DEFAULT);
@@ -266,19 +343,23 @@ public abstract class PlotWorld {
         options.put("world.min_height", PlotWorld.MIN_BUILD_HEIGHT_DEFAULT);
         options.put("world.gamemode", PlotWorld.GAMEMODE_DEFAULT.name().toLowerCase());
 
-        if (Settings.ENABLE_CLUSTERS && (this.TYPE != 0)) {
-            options.put("generator.terrain", this.TERRAIN);
-            options.put("generator.type", this.TYPE);
+        if (Settings.ENABLE_CLUSTERS && (TYPE != 0))
+        {
+            options.put("generator.terrain", TERRAIN);
+            options.put("generator.type", TYPE);
         }
         final ConfigurationNode[] settings = getSettingNodes();
         /*
          * Saving generator specific settings
          */
-        for (final ConfigurationNode setting : settings) {
+        for (final ConfigurationNode setting : settings)
+        {
             options.put(setting.getConstant(), setting.getValue());
         }
-        for (final String option : options.keySet()) {
-            if (!config.contains(option)) {
+        for (final String option : options.keySet())
+        {
+            if (!config.contains(option))
+            {
                 config.set(option, options.get(option));
             }
         }
diff --git a/src/main/java/com/intellectualcrafters/plot/object/PseudoRandom.java b/src/main/java/com/intellectualcrafters/plot/object/PseudoRandom.java
index aa3682d90..f4444714f 100644
--- a/src/main/java/com/intellectualcrafters/plot/object/PseudoRandom.java
+++ b/src/main/java/com/intellectualcrafters/plot/object/PseudoRandom.java
@@ -1,25 +1,27 @@
 package com.intellectualcrafters.plot.object;
 
-public class PseudoRandom {
+public class PseudoRandom
+{
     public long state = System.nanoTime();
-    
-    public long nextLong() {
+
+    public long nextLong()
+    {
         final long a = state;
         state = xorShift64(a);
         return a;
     }
 
-    public long xorShift64(long a) {
+    public long xorShift64(long a)
+    {
         a ^= (a << 21);
         a ^= (a >>> 35);
         a ^= (a << 4);
         return a;
     }
 
-    public int random(final int n) {
-        if (n == 1) {
-            return 0;
-        }
+    public int random(final int n)
+    {
+        if (n == 1) { return 0; }
         final long r = ((nextLong() >>> 32) * n) >> 32;
         return (int) r;
     }
diff --git a/src/main/java/com/intellectualcrafters/plot/object/Rating.java b/src/main/java/com/intellectualcrafters/plot/object/Rating.java
index f904750d0..756963278 100644
--- a/src/main/java/com/intellectualcrafters/plot/object/Rating.java
+++ b/src/main/java/com/intellectualcrafters/plot/object/Rating.java
@@ -7,80 +7,89 @@ import java.util.Map.Entry;
 
 import com.intellectualcrafters.plot.config.Settings;
 
-public class Rating {
-    
+public class Rating
+{
+
     /**
      * This is a map of the rating category to the rating value
      */
     private HashMap<String, Integer> ratingMap;
-    
+
     private boolean changed;
     private int initial;
-    
-    public Rating(int value) {
-        this.initial = value;
+
+    public Rating(int value)
+    {
+        initial = value;
         ratingMap = new HashMap<>();
-        if (Settings.RATING_CATEGORIES != null && Settings.RATING_CATEGORIES.size() > 1) {
-            if (value < 10) {
-                for (int i = 0 ; i < Settings.RATING_CATEGORIES.size(); i++) {
+        if ((Settings.RATING_CATEGORIES != null) && (Settings.RATING_CATEGORIES.size() > 1))
+        {
+            if (value < 10)
+            {
+                for (int i = 0; i < Settings.RATING_CATEGORIES.size(); i++)
+                {
                     ratingMap.put(Settings.RATING_CATEGORIES.get(i), value);
                 }
                 changed = true;
                 return;
             }
-            for (int i = 0 ; i < Settings.RATING_CATEGORIES.size(); i++) {
+            for (int i = 0; i < Settings.RATING_CATEGORIES.size(); i++)
+            {
                 ratingMap.put(Settings.RATING_CATEGORIES.get(i), (value % 10) - 1);
                 value /= 10;
             }
         }
-        else {
+        else
+        {
             ratingMap.put(null, value);
         }
     }
-    
-    public List<String> getCategories() {
-        if (ratingMap.size() == 1) {
-            return new ArrayList<>();
-        }
+
+    public List<String> getCategories()
+    {
+        if (ratingMap.size() == 1) { return new ArrayList<>(); }
         return new ArrayList<>(ratingMap.keySet());
     }
-    
-    public double getAverageRating() {
+
+    public double getAverageRating()
+    {
         double total = 0;
-        for (Entry<String, Integer> entry : ratingMap.entrySet()) {
+        for (final Entry<String, Integer> entry : ratingMap.entrySet())
+        {
             total += entry.getValue();
         }
-        return total / (double) ratingMap.size();
+        return total / ratingMap.size();
     }
-    
-    public Integer getRating(String category) {
+
+    public Integer getRating(final String category)
+    {
         return ratingMap.get(category);
     }
-    
-    public boolean setRating(String category, int value) {
+
+    public boolean setRating(final String category, final int value)
+    {
         changed = true;
-        if (!this.ratingMap.containsKey(category)) {
-            return false;
-        }
-        return this.ratingMap.put(category, value) != null;
+        if (!ratingMap.containsKey(category)) { return false; }
+        return ratingMap.put(category, value) != null;
     }
-    
-    public int getAggregate() {
-        if (!changed) {
-            return initial;
-        }
-        if (Settings.RATING_CATEGORIES != null && Settings.RATING_CATEGORIES.size() > 1) {
+
+    public int getAggregate()
+    {
+        if (!changed) { return initial; }
+        if ((Settings.RATING_CATEGORIES != null) && (Settings.RATING_CATEGORIES.size() > 1))
+        {
             int val = 0;
-            for (int i = 0; i < Settings.RATING_CATEGORIES.size(); i++) {
+            for (int i = 0; i < Settings.RATING_CATEGORIES.size(); i++)
+            {
                 val += (i + 1) * Math.pow(10, ratingMap.get(Settings.RATING_CATEGORIES.get(i)));
             }
             return val;
         }
-        else {
+        else
+        {
             return ratingMap.get(null);
         }
-        
+
     }
-    
-    
+
 }
diff --git a/src/main/java/com/intellectualcrafters/plot/object/RegionWrapper.java b/src/main/java/com/intellectualcrafters/plot/object/RegionWrapper.java
index 533fcd4f6..286dccd5d 100644
--- a/src/main/java/com/intellectualcrafters/plot/object/RegionWrapper.java
+++ b/src/main/java/com/intellectualcrafters/plot/object/RegionWrapper.java
@@ -1,6 +1,7 @@
 package com.intellectualcrafters.plot.object;
 
-public class RegionWrapper {
+public class RegionWrapper
+{
     public final int minX;
     public final int maxX;
     public final int minY;
@@ -8,16 +9,18 @@ public class RegionWrapper {
     public final int minZ;
     public final int maxZ;
 
-    public RegionWrapper(final int minX, final int maxX, final int minZ, final int maxZ) {
+    public RegionWrapper(final int minX, final int maxX, final int minZ, final int maxZ)
+    {
         this.maxX = maxX;
         this.minX = minX;
         this.maxZ = maxZ;
         this.minZ = minZ;
-        this.minY = 0;
-        this.maxY = 256;
+        minY = 0;
+        maxY = 256;
     }
-    
-    public RegionWrapper(final int minX, final int maxX, final int minY, final int maxY, final int minZ, final int maxZ) {
+
+    public RegionWrapper(final int minX, final int maxX, final int minY, final int maxY, final int minZ, final int maxZ)
+    {
         this.maxX = maxX;
         this.minX = minX;
         this.maxZ = maxZ;
@@ -25,12 +28,14 @@ public class RegionWrapper {
         this.minY = minY;
         this.maxY = maxY;
     }
-    
-    public boolean isIn(final int x, final int y, final int z) {
-        return ((x >= this.minX) && (x <= this.maxX) && (z >= this.minZ) && (z <= this.maxZ) && (y >= this.minY) && (y <= this.maxY));
+
+    public boolean isIn(final int x, final int y, final int z)
+    {
+        return ((x >= minX) && (x <= maxX) && (z >= minZ) && (z <= maxZ) && (y >= minY) && (y <= maxY));
     }
-    
-    public boolean isIn(final int x, final int z) {
-        return ((x >= this.minX) && (x <= this.maxX) && (z >= this.minZ) && (z <= this.maxZ));
+
+    public boolean isIn(final int x, final int z)
+    {
+        return ((x >= minX) && (x <= maxX) && (z >= minZ) && (z <= maxZ));
     }
 }
diff --git a/src/main/java/com/intellectualcrafters/plot/object/RunnableVal.java b/src/main/java/com/intellectualcrafters/plot/object/RunnableVal.java
index 01dfc3a30..fae2c5956 100644
--- a/src/main/java/com/intellectualcrafters/plot/object/RunnableVal.java
+++ b/src/main/java/com/intellectualcrafters/plot/object/RunnableVal.java
@@ -1,6 +1,9 @@
 package com.intellectualcrafters.plot.object;
 
-public abstract class RunnableVal<T> implements Runnable {
+public abstract class RunnableVal<T> implements Runnable
+{
     public T value;
+
+    @Override
     public abstract void run();
 }
diff --git a/src/main/java/com/intellectualcrafters/plot/object/SetupObject.java b/src/main/java/com/intellectualcrafters/plot/object/SetupObject.java
index 6e8cdbacd..0348c3d2b 100644
--- a/src/main/java/com/intellectualcrafters/plot/object/SetupObject.java
+++ b/src/main/java/com/intellectualcrafters/plot/object/SetupObject.java
@@ -3,48 +3,49 @@ package com.intellectualcrafters.plot.object;
 import com.intellectualcrafters.plot.config.ConfigurationNode;
 import com.intellectualcrafters.plot.util.SetupUtils;
 
-public class SetupObject {
-    
+public class SetupObject
+{
+
     /**
      * Specify a SetupUtils object here to override the existing
      */
     public SetupUtils setupManager;
-    
+
     /**
      * The current state
      */
     public int current = 0;
-    
+
     /**
      * The index in generator specific settings
      */
     public int setup_index = 0;
-    
+
     /**
      * The name of the world
      */
     public String world = null;
-    
+
     /**
      * The name of the plot manager
      */
     public String plotManager = null;
-    
+
     /**
      * The name of the generator to use for world creation
      */
     public String setupGenerator = null;
-    
+
     /**
      * The management type
      */
     public int type;
-    
+
     /**
      * The terrain type
      */
     public int terrain;
-    
+
     /**
      * Generator specific configuration steps
      */
diff --git a/src/main/java/com/intellectualcrafters/plot/object/StringWrapper.java b/src/main/java/com/intellectualcrafters/plot/object/StringWrapper.java
index d6b9688b1..dbff44074 100644
--- a/src/main/java/com/intellectualcrafters/plot/object/StringWrapper.java
+++ b/src/main/java/com/intellectualcrafters/plot/object/StringWrapper.java
@@ -1,93 +1,86 @@
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// PlotSquared - A plot manager and world generator for the Bukkit API                             /
-// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
-//                                                                                                 /
-// This program is free software; you can redistribute it and/or modify                            /
-// it under the terms of the GNU General Public License as published by                            /
-// the Free Software Foundation; either version 3 of the License, or                               /
-// (at your option) any later version.                                                             /
-//                                                                                                 /
-// This program is distributed in the hope that it will be useful,                                 /
-// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
-// GNU General Public License for more details.                                                    /
-//                                                                                                 /
-// You should have received a copy of the GNU General Public License                               /
-// along with this program; if not, write to the Free Software Foundation,                         /
-// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
-//                                                                                                 /
-// You can contact us via: support@intellectualsites.com                                           /
-////////////////////////////////////////////////////////////////////////////////////////////////////
-package com.intellectualcrafters.plot.object;
-
-/**
- * @author Empire92
- */
-public class StringWrapper {
-    public final String value;
-
-    /**
-     * Constructor
-     *
-     * @param value to wrap
-     */
-    public StringWrapper(final String value) {
-        this.value = value;
-    }
-
-    /**
-     * Check if a wrapped string equals another one
-     *
-     * @param obj to compare
-     *
-     * @return true if obj equals the stored value
-     */
-    @Override
-    public boolean equals(final Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        if (obj.hashCode() != hashCode()) {
-            return false;
-        }
-        final StringWrapper other = (StringWrapper) obj;
-        if ((other.value == null) || (this.value == null)) {
-            return false;
-        }
-        return other.value.equalsIgnoreCase(this.value.toLowerCase());
-    }
-
-    /**
-     * Get the string value
-     *
-     * @return string value
-     */
-    @Override
-    public String toString() {
-        return this.value;
-    }
-
-    private int hash;
-    
-    /**
-     * Get the hash value
-     *
-     * @return has value
-     */
-    @Override
-    public int hashCode() {
-        if (this.value == null) {
-            return 0;
-        }
-        if (this.hash == 0) {
-            this.hash = this.value.toLowerCase().hashCode();
-        }
-        return hash;
-    }
-}
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// PlotSquared - A plot manager and world generator for the Bukkit API                             /
+// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
+//                                                                                                 /
+// This program is free software; you can redistribute it and/or modify                            /
+// it under the terms of the GNU General Public License as published by                            /
+// the Free Software Foundation; either version 3 of the License, or                               /
+// (at your option) any later version.                                                             /
+//                                                                                                 /
+// This program is distributed in the hope that it will be useful,                                 /
+// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
+// GNU General Public License for more details.                                                    /
+//                                                                                                 /
+// You should have received a copy of the GNU General Public License                               /
+// along with this program; if not, write to the Free Software Foundation,                         /
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
+//                                                                                                 /
+// You can contact us via: support@intellectualsites.com                                           /
+////////////////////////////////////////////////////////////////////////////////////////////////////
+package com.intellectualcrafters.plot.object;
+
+/**

+ */
+public class StringWrapper
+{
+    public final String value;
+
+    /**
+     * Constructor
+     *
+     * @param value to wrap
+     */
+    public StringWrapper(final String value)
+    {
+        this.value = value;
+    }
+
+    /**
+     * Check if a wrapped string equals another one
+     *
+     * @param obj to compare
+     *
+     * @return true if obj equals the stored value
+     */
+    @Override
+    public boolean equals(final Object obj)
+    {
+        if (this == obj) { return true; }
+        if (obj == null) { return false; }
+        if (getClass() != obj.getClass()) { return false; }
+        if (obj.hashCode() != hashCode()) { return false; }
+        final StringWrapper other = (StringWrapper) obj;
+        if ((other.value == null) || (value == null)) { return false; }
+        return other.value.equalsIgnoreCase(value.toLowerCase());
+    }
+
+    /**
+     * Get the string value
+     *
+     * @return string value
+     */
+    @Override
+    public String toString()
+    {
+        return value;
+    }
+
+    private int hash;
+
+    /**
+     * Get the hash value
+     *
+     * @return has value
+     */
+    @Override
+    public int hashCode()
+    {
+        if (value == null) { return 0; }
+        if (hash == 0)
+        {
+            hash = value.toLowerCase().hashCode();
+        }
+        return hash;
+    }
+}
diff --git a/src/main/java/com/intellectualcrafters/plot/object/comment/CommentInbox.java b/src/main/java/com/intellectualcrafters/plot/object/comment/CommentInbox.java
index 43dca0965..1fd650ef4 100644
--- a/src/main/java/com/intellectualcrafters/plot/object/comment/CommentInbox.java
+++ b/src/main/java/com/intellectualcrafters/plot/object/comment/CommentInbox.java
@@ -4,32 +4,33 @@ import com.intellectualcrafters.plot.object.Plot;
 import com.intellectualcrafters.plot.object.PlotPlayer;
 import com.intellectualcrafters.plot.object.RunnableVal;
 
-public abstract class CommentInbox {
-    
+public abstract class CommentInbox
+{
+
     @Override
     public abstract String toString();
-    
-    public abstract boolean canRead(Plot plot, PlotPlayer player);
-    
-    public abstract boolean canWrite(Plot plot, PlotPlayer player);
-    
-    public abstract boolean canModify(Plot plot, PlotPlayer player);
-    
+
+    public abstract boolean canRead(final Plot plot, final PlotPlayer player);
+
+    public abstract boolean canWrite(final Plot plot, final PlotPlayer player);
+
+    public abstract boolean canModify(final Plot plot, final PlotPlayer player);
+
     /**
      * The plot may be null if the user is not standing in a plot. Return false if this is not a plot-less inbox.
      * <br>
      * The `whenDone` parameter should be executed when it's done fetching the comments.
      * The value should be set to List of comments
-     * 
+     *
      * @param plot
      * @param whenDone
      * @return
      */
-    public abstract boolean getComments(Plot plot, RunnableVal whenDone);
-    
-    public abstract boolean addComment(Plot plot, PlotComment comment);
-    
-    public abstract boolean removeComment(Plot plot, PlotComment comment);
-    
-    public abstract boolean clearInbox(Plot plot);
+    public abstract boolean getComments(final Plot plot, final RunnableVal whenDone);
+
+    public abstract boolean addComment(final Plot plot, final PlotComment comment);
+
+    public abstract boolean removeComment(final Plot plot, final PlotComment comment);
+
+    public abstract boolean clearInbox(final Plot plot);
 }
diff --git a/src/main/java/com/intellectualcrafters/plot/object/comment/InboxOwner.java b/src/main/java/com/intellectualcrafters/plot/object/comment/InboxOwner.java
index 34b6777e8..7091eab02 100644
--- a/src/main/java/com/intellectualcrafters/plot/object/comment/InboxOwner.java
+++ b/src/main/java/com/intellectualcrafters/plot/object/comment/InboxOwner.java
@@ -10,53 +10,62 @@ import com.intellectualcrafters.plot.object.RunnableVal;
 import com.intellectualcrafters.plot.util.Permissions;
 import com.intellectualcrafters.plot.util.TaskManager;
 
-public class InboxOwner extends CommentInbox {
+public class InboxOwner extends CommentInbox
+{
 
     @Override
-    public boolean canRead(Plot plot, PlotPlayer player) {
-        if (plot == null) {
-            return Permissions.hasPermission(player, "plots.inbox.read." + toString());
-        }
-        return (Permissions.hasPermission(player, "plots.inbox.read." + toString()) && (PlotHandler.isOwner(plot, player.getUUID()) || Permissions.hasPermission(player, "plots.inbox.read." + toString() + ".other")));
+    public boolean canRead(final Plot plot, final PlotPlayer player)
+    {
+        if (plot == null) { return Permissions.hasPermission(player, "plots.inbox.read." + toString()); }
+        return (Permissions.hasPermission(player, "plots.inbox.read." + toString()) && (PlotHandler.isOwner(plot, player.getUUID()) || Permissions.hasPermission(player, "plots.inbox.read."
+        + toString()
+        + ".other")));
     }
 
     @Override
-    public boolean canWrite(Plot plot, PlotPlayer player) {
-        if (plot == null) {
-            return Permissions.hasPermission(player, "plots.inbox.write." + toString());
-        }
-        return (Permissions.hasPermission(player, "plots.inbox.write." + toString()) && (PlotHandler.isOwner(plot, player.getUUID()) || Permissions.hasPermission(player, "plots.inbox.write." + toString() + ".other")));
+    public boolean canWrite(final Plot plot, final PlotPlayer player)
+    {
+        if (plot == null) { return Permissions.hasPermission(player, "plots.inbox.write." + toString()); }
+        return (Permissions.hasPermission(player, "plots.inbox.write." + toString()) && (PlotHandler.isOwner(plot, player.getUUID()) || Permissions.hasPermission(player, "plots.inbox.write."
+        + toString()
+        + ".other")));
     }
 
     @Override
-    public boolean canModify(Plot plot, PlotPlayer player) {
-        if (plot == null) {
-            return Permissions.hasPermission(player, "plots.inbox.modify." + toString());
-        }
-        return (Permissions.hasPermission(player, "plots.inbox.modify." + toString()) && (PlotHandler.isOwner(plot, player.getUUID()) || Permissions.hasPermission(player, "plots.inbox.modify." + toString() + ".other")));
+    public boolean canModify(final Plot plot, final PlotPlayer player)
+    {
+        if (plot == null) { return Permissions.hasPermission(player, "plots.inbox.modify." + toString()); }
+        return (Permissions.hasPermission(player, "plots.inbox.modify." + toString()) && (PlotHandler.isOwner(plot, player.getUUID()) || Permissions.hasPermission(player, "plots.inbox.modify."
+        + toString()
+        + ".other")));
     }
 
     @Override
-    public boolean getComments(final Plot plot, final RunnableVal whenDone) {
-        if (plot == null || plot.owner == null) {
-            return false;
-        }
-        ArrayList<PlotComment> comments = plot.getSettings().getComments(toString());
-        if (comments != null) {
+    public boolean getComments(final Plot plot, final RunnableVal whenDone)
+    {
+        if ((plot == null) || (plot.owner == null)) { return false; }
+        final ArrayList<PlotComment> comments = plot.getSettings().getComments(toString());
+        if (comments != null)
+        {
             whenDone.value = comments;
             TaskManager.runTask(whenDone);
             return true;
         }
-        DBFunc.getComments(plot, toString(), new RunnableVal() {
+        DBFunc.getComments(plot, toString(), new RunnableVal()
+        {
             @Override
-            public void run() {
+            public void run()
+            {
                 whenDone.value = value;
-                if (value != null) {
-                    for (PlotComment comment : (ArrayList<PlotComment>) value) {
+                if (value != null)
+                {
+                    for (final PlotComment comment : (ArrayList<PlotComment>) value)
+                    {
                         plot.getSettings().addComment(comment);
                     }
                 }
-                else {
+                else
+                {
                     plot.getSettings().setComments(new ArrayList<PlotComment>());
                 }
                 TaskManager.runTask(whenDone);
@@ -66,34 +75,32 @@ public class InboxOwner extends CommentInbox {
     }
 
     @Override
-    public boolean addComment(Plot plot, PlotComment comment) {
-        if (plot == null || plot.owner == null) {
-            return false;
-        }
+    public boolean addComment(final Plot plot, final PlotComment comment)
+    {
+        if ((plot == null) || (plot.owner == null)) { return false; }
         plot.getSettings().addComment(comment);
         DBFunc.setComment(plot, comment);
         return true;
     }
 
     @Override
-    public String toString() {
+    public String toString()
+    {
         return "owner";
     }
 
     @Override
-    public boolean removeComment(Plot plot, PlotComment comment) {
-        if (plot == null || plot.owner == null) {
-            return false;
-        }
+    public boolean removeComment(final Plot plot, final PlotComment comment)
+    {
+        if ((plot == null) || (plot.owner == null)) { return false; }
         DBFunc.removeComment(plot, comment);
         return false;
     }
 
     @Override
-    public boolean clearInbox(Plot plot) {
-        if (plot == null || plot.owner == null) {
-            return false;
-        }
+    public boolean clearInbox(final Plot plot)
+    {
+        if ((plot == null) || (plot.owner == null)) { return false; }
         DBFunc.clearInbox(plot, toString());
         return false;
     }
diff --git a/src/main/java/com/intellectualcrafters/plot/object/comment/InboxPublic.java b/src/main/java/com/intellectualcrafters/plot/object/comment/InboxPublic.java
index 62890fb89..bf592d5e6 100644
--- a/src/main/java/com/intellectualcrafters/plot/object/comment/InboxPublic.java
+++ b/src/main/java/com/intellectualcrafters/plot/object/comment/InboxPublic.java
@@ -10,49 +10,57 @@ import com.intellectualcrafters.plot.object.RunnableVal;
 import com.intellectualcrafters.plot.util.Permissions;
 import com.intellectualcrafters.plot.util.TaskManager;
 
-public class InboxPublic extends CommentInbox {
+public class InboxPublic extends CommentInbox
+{
 
     @Override
-    public boolean canRead(Plot plot, PlotPlayer player) {
-        if (plot == null) {
-            return Permissions.hasPermission(player, "plots.inbox.read." + toString());
-        }
-        return (Permissions.hasPermission(player, "plots.inbox.read." + toString()) && (PlotHandler.isOwner(plot, player.getUUID()) || Permissions.hasPermission(player, "plots.inbox.read." + toString() + ".other")));
+    public boolean canRead(final Plot plot, final PlotPlayer player)
+    {
+        if (plot == null) { return Permissions.hasPermission(player, "plots.inbox.read." + toString()); }
+        return (Permissions.hasPermission(player, "plots.inbox.read." + toString()) && (PlotHandler.isOwner(plot, player.getUUID()) || Permissions.hasPermission(player, "plots.inbox.read."
+        + toString()
+        + ".other")));
     }
 
     @Override
-    public boolean canWrite(Plot plot, PlotPlayer player) {
-        if (plot == null) {
-            return Permissions.hasPermission(player, "plots.inbox.write." + toString());
-        }
-        return (Permissions.hasPermission(player, "plots.inbox.write." + toString()) && (PlotHandler.isOwner(plot, player.getUUID()) || Permissions.hasPermission(player, "plots.inbox.write." + toString() + ".other")));
+    public boolean canWrite(final Plot plot, final PlotPlayer player)
+    {
+        if (plot == null) { return Permissions.hasPermission(player, "plots.inbox.write." + toString()); }
+        return (Permissions.hasPermission(player, "plots.inbox.write." + toString()) && (PlotHandler.isOwner(plot, player.getUUID()) || Permissions.hasPermission(player, "plots.inbox.write."
+        + toString()
+        + ".other")));
     }
 
     @Override
-    public boolean canModify(Plot plot, PlotPlayer player) {
-        if (plot == null) {
-            return Permissions.hasPermission(player, "plots.inbox.modify." + toString());
-        }
-        return (Permissions.hasPermission(player, "plots.inbox.modify." + toString()) && (PlotHandler.isOwner(plot, player.getUUID()) || Permissions.hasPermission(player, "plots.inbox.modify." + toString() + ".other")));
+    public boolean canModify(final Plot plot, final PlotPlayer player)
+    {
+        if (plot == null) { return Permissions.hasPermission(player, "plots.inbox.modify." + toString()); }
+        return (Permissions.hasPermission(player, "plots.inbox.modify." + toString()) && (PlotHandler.isOwner(plot, player.getUUID()) || Permissions.hasPermission(player, "plots.inbox.modify."
+        + toString()
+        + ".other")));
     }
 
     @Override
-    public boolean getComments(final Plot plot, final RunnableVal whenDone) {
-        if (plot == null || plot.owner == null) {
-            return false;
-        }
-        ArrayList<PlotComment> comments = plot.getSettings().getComments(toString());
-        if (comments != null) {
+    public boolean getComments(final Plot plot, final RunnableVal whenDone)
+    {
+        if ((plot == null) || (plot.owner == null)) { return false; }
+        final ArrayList<PlotComment> comments = plot.getSettings().getComments(toString());
+        if (comments != null)
+        {
             whenDone.value = comments;
             TaskManager.runTask(whenDone);
             return true;
         }
-        DBFunc.getComments(plot, toString(), new RunnableVal() {
+        DBFunc.getComments(plot, toString(), new RunnableVal()
+        {
             @Override
-            public void run() {
+            public void run()
+            {
                 whenDone.value = value;
-                if (value != null) {
-                    for (PlotComment comment : (ArrayList<PlotComment>) value) {
+                if (value != null)
+                {
+                    for (final PlotComment comment : (ArrayList<PlotComment>) value)
+                    {
                         plot.getSettings().addComment(comment);
                     }
                 }
@@ -63,34 +71,32 @@ public class InboxPublic extends CommentInbox {
     }
 
     @Override
-    public boolean addComment(Plot plot, PlotComment comment) {
-        if (plot == null || plot.owner == null) {
-            return false;
-        }
+    public boolean addComment(final Plot plot, final PlotComment comment)
+    {
+        if ((plot == null) || (plot.owner == null)) { return false; }
         plot.getSettings().addComment(comment);
         DBFunc.setComment(plot, comment);
         return true;
     }
 
     @Override
-    public String toString() {
+    public String toString()
+    {
         return "public";
     }
 
     @Override
-    public boolean removeComment(Plot plot, PlotComment comment) {
-        if (plot == null || plot.owner == null) {
-            return false;
-        }
+    public boolean removeComment(final Plot plot, final PlotComment comment)
+    {
+        if ((plot == null) || (plot.owner == null)) { return false; }
         DBFunc.removeComment(plot, comment);
         return false;
     }
 
     @Override
-    public boolean clearInbox(Plot plot) {
-        if (plot == null || plot.owner == null) {
-            return false;
-        }
+    public boolean clearInbox(final Plot plot)
+    {
+        if ((plot == null) || (plot.owner == null)) { return false; }
         DBFunc.clearInbox(plot, toString());
         return false;
     }
diff --git a/src/main/java/com/intellectualcrafters/plot/object/comment/InboxReport.java b/src/main/java/com/intellectualcrafters/plot/object/comment/InboxReport.java
index d0e8f8179..0e2174728 100644
--- a/src/main/java/com/intellectualcrafters/plot/object/comment/InboxReport.java
+++ b/src/main/java/com/intellectualcrafters/plot/object/comment/InboxReport.java
@@ -8,37 +8,44 @@ import com.intellectualcrafters.plot.object.RunnableVal;
 import com.intellectualcrafters.plot.util.Permissions;
 import com.intellectualcrafters.plot.util.TaskManager;
 
-public class InboxReport extends CommentInbox {
+public class InboxReport extends CommentInbox
+{
 
     @Override
-    public boolean canRead(Plot plot, PlotPlayer player) {
-        if (plot == null) {
-            return Permissions.hasPermission(player, "plots.inbox.read." + toString());
-        }
-        return (Permissions.hasPermission(player, "plots.inbox.read." + toString()) && (PlotHandler.isOwner(plot, player.getUUID()) || Permissions.hasPermission(player, "plots.inbox.read." + toString() + ".other")));
+    public boolean canRead(final Plot plot, final PlotPlayer player)
+    {
+        if (plot == null) { return Permissions.hasPermission(player, "plots.inbox.read." + toString()); }
+        return (Permissions.hasPermission(player, "plots.inbox.read." + toString()) && (PlotHandler.isOwner(plot, player.getUUID()) || Permissions.hasPermission(player, "plots.inbox.read."
+        + toString()
+        + ".other")));
     }
 
     @Override
-    public boolean canWrite(Plot plot, PlotPlayer player) {
-        if (plot == null) {
-            return Permissions.hasPermission(player, "plots.inbox.write." + toString());
-        }
-        return (Permissions.hasPermission(player, "plots.inbox.write." + toString()) && (PlotHandler.isOwner(plot, player.getUUID()) || Permissions.hasPermission(player, "plots.inbox.write." + toString() + ".other")));
+    public boolean canWrite(final Plot plot, final PlotPlayer player)
+    {
+        if (plot == null) { return Permissions.hasPermission(player, "plots.inbox.write." + toString()); }
+        return (Permissions.hasPermission(player, "plots.inbox.write." + toString()) && (PlotHandler.isOwner(plot, player.getUUID()) || Permissions.hasPermission(player, "plots.inbox.write."
+        + toString()
+        + ".other")));
     }
 
     @Override
-    public boolean canModify(Plot plot, PlotPlayer player) {
-        if (plot == null) {
-            return Permissions.hasPermission(player, "plots.inbox.modify." + toString());
-        }
-        return (Permissions.hasPermission(player, "plots.inbox.modify." + toString()) && (PlotHandler.isOwner(plot, player.getUUID()) || Permissions.hasPermission(player, "plots.inbox.modify." + toString() + ".other")));
+    public boolean canModify(final Plot plot, final PlotPlayer player)
+    {
+        if (plot == null) { return Permissions.hasPermission(player, "plots.inbox.modify." + toString()); }
+        return (Permissions.hasPermission(player, "plots.inbox.modify." + toString()) && (PlotHandler.isOwner(plot, player.getUUID()) || Permissions.hasPermission(player, "plots.inbox.modify."
+        + toString()
+        + ".other")));
     }
 
     @Override
-    public boolean getComments(final Plot plot, final RunnableVal whenDone) {
-        DBFunc.getComments(null, toString(), new RunnableVal() {
+    public boolean getComments(final Plot plot, final RunnableVal whenDone)
+    {
+        DBFunc.getComments(null, toString(), new RunnableVal()
+        {
             @Override
-            public void run() {
+            public void run()
+            {
                 whenDone.value = value;
                 TaskManager.runTask(whenDone);
             }
@@ -47,33 +54,31 @@ public class InboxReport extends CommentInbox {
     }
 
     @Override
-    public boolean addComment(Plot plot, PlotComment comment) {
-        if (plot == null || plot.owner == null) {
-            return false;
-        }
+    public boolean addComment(final Plot plot, final PlotComment comment)
+    {
+        if ((plot == null) || (plot.owner == null)) { return false; }
         DBFunc.setComment(plot, comment);
         return true;
     }
 
     @Override
-    public String toString() {
+    public String toString()
+    {
         return "report";
     }
 
     @Override
-    public boolean removeComment(Plot plot, PlotComment comment) {
-        if (plot == null || plot.owner == null) {
-            return false;
-        }
+    public boolean removeComment(final Plot plot, final PlotComment comment)
+    {
+        if ((plot == null) || (plot.owner == null)) { return false; }
         DBFunc.removeComment(plot, comment);
         return false;
     }
 
     @Override
-    public boolean clearInbox(Plot plot) {
-        if (plot == null || plot.owner == null) {
-            return false;
-        }
+    public boolean clearInbox(final Plot plot)
+    {
+        if ((plot == null) || (plot.owner == null)) { return false; }
         DBFunc.clearInbox(plot, toString());
         return false;
     }
diff --git a/src/main/java/com/intellectualcrafters/plot/object/comment/PlotComment.java b/src/main/java/com/intellectualcrafters/plot/object/comment/PlotComment.java
index cd52aa9b4..72bc9e779 100644
--- a/src/main/java/com/intellectualcrafters/plot/object/comment/PlotComment.java
+++ b/src/main/java/com/intellectualcrafters/plot/object/comment/PlotComment.java
@@ -1,44 +1,45 @@
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// PlotSquared - A plot manager and world generator for the Bukkit API                             /
-// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
-//                                                                                                 /
-// This program is free software; you can redistribute it and/or modify                            /
-// it under the terms of the GNU General Public License as published by                            /
-// the Free Software Foundation; either version 3 of the License, or                               /
-// (at your option) any later version.                                                             /
-//                                                                                                 /
-// This program is distributed in the hope that it will be useful,                                 /
-// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
-// GNU General Public License for more details.                                                    /
-//                                                                                                 /
-// You should have received a copy of the GNU General Public License                               /
-// along with this program; if not, write to the Free Software Foundation,                         /
-// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
-//                                                                                                 /
-// You can contact us via: support@intellectualsites.com                                           /
-////////////////////////////////////////////////////////////////////////////////////////////////////
-package com.intellectualcrafters.plot.object.comment;
-
-import com.intellectualcrafters.plot.object.PlotId;
-
-/**
- * @author Empire92
- */
-public class PlotComment {
-    public final String comment;
-    public final String inbox;
-    public final String senderName;
-    public final PlotId id;
-    public final String world;
-    public final long timestamp;
-
-    public PlotComment(final String world, final PlotId id, final String comment, final String senderName, final String inbox, final long timestamp) {
-        this.world = world;
-    	this.id = id;
-        this.comment = comment;
-        this.senderName = senderName;
-        this.inbox = inbox;
-        this.timestamp = timestamp;
-    }
-}
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// PlotSquared - A plot manager and world generator for the Bukkit API                             /
+// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
+//                                                                                                 /
+// This program is free software; you can redistribute it and/or modify                            /
+// it under the terms of the GNU General Public License as published by                            /
+// the Free Software Foundation; either version 3 of the License, or                               /
+// (at your option) any later version.                                                             /
+//                                                                                                 /
+// This program is distributed in the hope that it will be useful,                                 /
+// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
+// GNU General Public License for more details.                                                    /
+//                                                                                                 /
+// You should have received a copy of the GNU General Public License                               /
+// along with this program; if not, write to the Free Software Foundation,                         /
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
+//                                                                                                 /
+// You can contact us via: support@intellectualsites.com                                           /
+////////////////////////////////////////////////////////////////////////////////////////////////////
+package com.intellectualcrafters.plot.object.comment;
+
+import com.intellectualcrafters.plot.object.PlotId;
+
+/**

+ */
+public class PlotComment
+{
+    public final String comment;
+    public final String inbox;
+    public final String senderName;
+    public final PlotId id;
+    public final String world;
+    public final long timestamp;
+
+    public PlotComment(final String world, final PlotId id, final String comment, final String senderName, final String inbox, final long timestamp)
+    {
+        this.world = world;
+        this.id = id;
+        this.comment = comment;
+        this.senderName = senderName;
+        this.inbox = inbox;
+        this.timestamp = timestamp;
+    }
+}
diff --git a/src/main/java/com/intellectualcrafters/plot/object/entity/AgeableStats.java b/src/main/java/com/intellectualcrafters/plot/object/entity/AgeableStats.java
index 829a201d1..a24166636 100644
--- a/src/main/java/com/intellectualcrafters/plot/object/entity/AgeableStats.java
+++ b/src/main/java/com/intellectualcrafters/plot/object/entity/AgeableStats.java
@@ -1,6 +1,7 @@
 package com.intellectualcrafters.plot.object.entity;
 
-public class AgeableStats {
+public class AgeableStats
+{
     public int age;
     public boolean locked;
     public boolean adult;
diff --git a/src/main/java/com/intellectualcrafters/plot/object/entity/ArmorStandStats.java b/src/main/java/com/intellectualcrafters/plot/object/entity/ArmorStandStats.java
index 87cb4a971..455e55a41 100644
--- a/src/main/java/com/intellectualcrafters/plot/object/entity/ArmorStandStats.java
+++ b/src/main/java/com/intellectualcrafters/plot/object/entity/ArmorStandStats.java
@@ -1,6 +1,7 @@
 package com.intellectualcrafters.plot.object.entity;
 
-public class ArmorStandStats {
+public class ArmorStandStats
+{
     public float[] head = new float[3];
     public float[] body = new float[3];
     public float[] leftLeg = new float[3];
diff --git a/src/main/java/com/intellectualcrafters/plot/object/entity/EntityBaseStats.java b/src/main/java/com/intellectualcrafters/plot/object/entity/EntityBaseStats.java
index 27ea6090e..2cd327e45 100644
--- a/src/main/java/com/intellectualcrafters/plot/object/entity/EntityBaseStats.java
+++ b/src/main/java/com/intellectualcrafters/plot/object/entity/EntityBaseStats.java
@@ -2,7 +2,8 @@ package com.intellectualcrafters.plot.object.entity;
 
 import com.plotsquared.bukkit.object.entity.EntityWrapper;
 
-public class EntityBaseStats {
+public class EntityBaseStats
+{
     public EntityWrapper passenger;
     public float fall;
     public short fire;
diff --git a/src/main/java/com/intellectualcrafters/plot/object/entity/HorseStats.java b/src/main/java/com/intellectualcrafters/plot/object/entity/HorseStats.java
index 9265667f2..6c2477bf9 100644
--- a/src/main/java/com/intellectualcrafters/plot/object/entity/HorseStats.java
+++ b/src/main/java/com/intellectualcrafters/plot/object/entity/HorseStats.java
@@ -1,6 +1,7 @@
 package com.intellectualcrafters.plot.object.entity;
 
-public class HorseStats {
+public class HorseStats
+{
     public double jump;
     public boolean chest;
     public int variant;
diff --git a/src/main/java/com/intellectualcrafters/plot/object/schematic/ItemType.java b/src/main/java/com/intellectualcrafters/plot/object/schematic/ItemType.java
index 30bcc84ab..70980000d 100644
--- a/src/main/java/com/intellectualcrafters/plot/object/schematic/ItemType.java
+++ b/src/main/java/com/intellectualcrafters/plot/object/schematic/ItemType.java
@@ -4,7 +4,8 @@ import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.Map;
 
-public enum ItemType {
+public enum ItemType
+{
     AIR("air", 0),
     STONE("stone", 1),
     GRANITE("stone", 1, 1),
@@ -599,7 +600,7 @@ public enum ItemType {
     WARD_DISC("record_ward", 2265),
     DISC_11("record_11", 2266),
     WAIT_DISC("record_wait", 2267);
-    
+
     private static final Map<String, Integer> ids = new HashMap<String, Integer>();
     private static final Map<String, Byte> datas = new HashMap<String, Byte>();
 
@@ -607,37 +608,40 @@ public enum ItemType {
     private final byte data;
     private final String name;
 
-    static {
-        for (ItemType type : EnumSet.allOf(ItemType.class)) {
+    static
+    {
+        for (final ItemType type : EnumSet.allOf(ItemType.class))
+        {
             ids.put(type.name, type.id);
             datas.put(type.name, type.data);
         }
     }
 
-    ItemType(String name, int id) {
+    ItemType(final String name, final int id)
+    {
         this.id = id;
-        this.data = 0;
+        data = 0;
         this.name = name;
     }
-    
-    ItemType(String name, int id, int data) {
+
+    ItemType(final String name, final int id, final int data)
+    {
         this.id = id;
         this.data = (byte) data;
         this.name = name;
     }
 
-    public static int getId(String name) {
-        Integer value = ids.get(name);
-        if (value == null) {
-            return 0;
-        }
+    public static int getId(final String name)
+    {
+        final Integer value = ids.get(name);
+        if (value == null) { return 0; }
         return value;
     }
-    public static byte getData(String name) {
-        Byte value = datas.get(name);
-        if (value == null) {
-            return 0;
-        }
+
+    public static byte getData(final String name)
+    {
+        final Byte value = datas.get(name);
+        if (value == null) { return 0; }
         return value;
     }
 }
diff --git a/src/main/java/com/intellectualcrafters/plot/object/schematic/PlotItem.java b/src/main/java/com/intellectualcrafters/plot/object/schematic/PlotItem.java
index 3fb4c8b88..614895325 100644
--- a/src/main/java/com/intellectualcrafters/plot/object/schematic/PlotItem.java
+++ b/src/main/java/com/intellectualcrafters/plot/object/schematic/PlotItem.java
@@ -1,14 +1,16 @@
 package com.intellectualcrafters.plot.object.schematic;
 
-public class PlotItem {
+public class PlotItem
+{
     public int x;
     public int y;
     public int z;
     public short[] id;
     public byte[] data;
     public byte[] amount;
-    
-    public PlotItem(short x, short y, short z, short[] id, byte[] data, byte[] amount) {
+
+    public PlotItem(final short x, final short y, final short z, final short[] id, final byte[] data, final byte[] amount)
+    {
         this.x = x;
         this.y = y;
         this.z = z;
diff --git a/src/main/java/com/intellectualcrafters/plot/util/AbstractTitle.java b/src/main/java/com/intellectualcrafters/plot/util/AbstractTitle.java
index f13731b6f..9e1368af5 100644
--- a/src/main/java/com/intellectualcrafters/plot/util/AbstractTitle.java
+++ b/src/main/java/com/intellectualcrafters/plot/util/AbstractTitle.java
@@ -3,17 +3,18 @@ package com.intellectualcrafters.plot.util;
 import com.intellectualcrafters.plot.object.ConsolePlayer;
 import com.intellectualcrafters.plot.object.PlotPlayer;
 
-public abstract class AbstractTitle {
+public abstract class AbstractTitle
+{
     public static AbstractTitle TITLE_CLASS;
-    
-    public static void sendTitle(PlotPlayer player, String head, String sub) {
-        if (ConsolePlayer.isConsole(player)) {
-            return;
-        }
-        if (TITLE_CLASS != null && !player.getAttribute("disabletitles")) {
+
+    public static void sendTitle(final PlotPlayer player, final String head, final String sub)
+    {
+        if (ConsolePlayer.isConsole(player)) { return; }
+        if ((TITLE_CLASS != null) && !player.getAttribute("disabletitles"))
+        {
             TITLE_CLASS.sendTitle(player, head, sub, 1, 2, 1);
         }
     }
 
-    public abstract void sendTitle(PlotPlayer player, String head, String sub, int in, int delay, int out);
+    public abstract void sendTitle(final PlotPlayer player, final String head, final String sub, final int in, final int delay, final int out);
 }
diff --git a/src/main/java/com/intellectualcrafters/plot/util/BO3Handler.java b/src/main/java/com/intellectualcrafters/plot/util/BO3Handler.java
index d9b7a904e..5a8362a87 100644
--- a/src/main/java/com/intellectualcrafters/plot/util/BO3Handler.java
+++ b/src/main/java/com/intellectualcrafters/plot/util/BO3Handler.java
@@ -19,28 +19,29 @@ import com.intellectualcrafters.plot.object.Plot;
 import com.intellectualcrafters.plot.object.PlotBlock;
 import com.intellectualcrafters.plot.object.PlotPlayer;
 import com.intellectualcrafters.plot.object.PlotWorld;
-import com.intellectualcrafters.plot.util.SchematicHandler.Dimension;
 
-public class BO3Handler {
-    
+public class BO3Handler
+{
+
     /**
      * @see #saveBO3(null, Plot)
      * @param plot
-     * @return if successfully exported 
+     * @return if successfully exported
      */
-    public static boolean saveBO3(Plot plot) {
+    public static boolean saveBO3(final Plot plot)
+    {
         return saveBO3(null, plot);
     }
-    
-    public static boolean contains(PlotBlock[] blocks, PlotBlock block) {
-        for (PlotBlock item : blocks) {
-            if (item.equals(block)) {
-                return true;
-            }
+
+    public static boolean contains(final PlotBlock[] blocks, final PlotBlock block)
+    {
+        for (final PlotBlock item : blocks)
+        {
+            if (item.equals(block)) { return true; }
         }
         return false;
     }
-    
+
     /**
      * Save a plot as a BO3 file<br>
      *  - Use null for the player object if no player is applicable
@@ -48,36 +49,43 @@ public class BO3Handler {
      * @param plot
      * @return
      */
-    public static boolean saveBO3(PlotPlayer plr, Plot plot) {
-        PlotWorld plotworld = PS.get().getPlotWorld(plot.world);
-        if (!(plotworld instanceof ClassicPlotWorld) || plotworld.TYPE != 0) {
+    public static boolean saveBO3(final PlotPlayer plr, final Plot plot)
+    {
+        final PlotWorld plotworld = PS.get().getPlotWorld(plot.world);
+        if (!(plotworld instanceof ClassicPlotWorld) || (plotworld.TYPE != 0))
+        {
             MainUtil.sendMessage(plr, "BO3 exporting only supports type 0 classic generation.");
             return false;
         }
-        String alias = plot.toString();
-        Location pos1 = plot.getBottom();
-        Location pos2 = plot.getTop();
-        ClassicPlotWorld cpw = (ClassicPlotWorld) plotworld;
-        int height = cpw.PLOT_HEIGHT;
-        
-        int cx = (pos1.getX() + pos2.getX()) / 2;
-        int cz = (pos1.getZ() + pos2.getZ()) / 2;
-        
-        HashMap<ChunkLoc, BO3> map = new HashMap<>();
-        
+        final String alias = plot.toString();
+        final Location pos1 = plot.getBottom();
+        final Location pos2 = plot.getTop();
+        final ClassicPlotWorld cpw = (ClassicPlotWorld) plotworld;
+        final int height = cpw.PLOT_HEIGHT;
+
+        final int cx = (pos1.getX() + pos2.getX()) / 2;
+        final int cz = (pos1.getZ() + pos2.getZ()) / 2;
+
+        final HashMap<ChunkLoc, BO3> map = new HashMap<>();
+
         boolean content = false;
-        for (int x = pos1.getX(); x <= pos2.getX(); x++) {
-            int X = ((x + 7) - cx) >> 4;
-            int xx = (x - cx) % 16;
-            for (int z = pos1.getZ(); z <= pos2.getZ(); z++) {
-                int Z = ((z + 7) - cz) >> 4;
-                int zz = (z - cz) % 16;
-                ChunkLoc loc = new ChunkLoc(X, Z);
+        for (int x = pos1.getX(); x <= pos2.getX(); x++)
+        {
+            final int X = ((x + 7) - cx) >> 4;
+            final int xx = (x - cx) % 16;
+            for (int z = pos1.getZ(); z <= pos2.getZ(); z++)
+            {
+                final int Z = ((z + 7) - cz) >> 4;
+                final int zz = (z - cz) % 16;
+                final ChunkLoc loc = new ChunkLoc(X, Z);
                 BO3 bo3 = map.get(loc);
-                for (int y = 1; y < height; y++) {
-                    PlotBlock block = BlockManager.manager.getBlock(new Location(plot.world, x, y, z));
-                    if (block != null && !contains(cpw.MAIN_BLOCK, block)) {
-                        if (bo3 == null) {
+                for (int y = 1; y < height; y++)
+                {
+                    final PlotBlock block = BlockManager.manager.getBlock(new Location(plot.world, x, y, z));
+                    if ((block != null) && !contains(cpw.MAIN_BLOCK, block))
+                    {
+                        if (bo3 == null)
+                        {
                             bo3 = new BO3(alias, loc);
                             map.put(loc, bo3);
                             content = true;
@@ -85,19 +93,24 @@ public class BO3Handler {
                         bo3.addBlock(xx, y - height - 1, zz, block);
                     }
                 }
-                PlotBlock floor = BlockManager.manager.getBlock(new Location(plot.world, x, height, z));
-                if (floor != null && !contains(cpw.TOP_BLOCK, floor)) {
-                    if (bo3 == null) {
+                final PlotBlock floor = BlockManager.manager.getBlock(new Location(plot.world, x, height, z));
+                if ((floor != null) && !contains(cpw.TOP_BLOCK, floor))
+                {
+                    if (bo3 == null)
+                    {
                         bo3 = new BO3(alias, loc);
                         map.put(loc, bo3);
                         content = true;
                     }
                     bo3.addBlock(xx, -1, zz, floor);
                 }
-                for (int y = height + 1; y < 256; y++) {
-                    PlotBlock block = BlockManager.manager.getBlock(new Location(plot.world, x, y, z));
-                    if (block != null && block.id != 0) {
-                        if (bo3 == null) {
+                for (int y = height + 1; y < 256; y++)
+                {
+                    final PlotBlock block = BlockManager.manager.getBlock(new Location(plot.world, x, y, z));
+                    if ((block != null) && (block.id != 0))
+                    {
+                        if (bo3 == null)
+                        {
                             bo3 = new BO3(alias, loc);
                             map.put(loc, bo3);
                             content = true;
@@ -107,82 +120,102 @@ public class BO3Handler {
                 }
             }
         }
-        
-        if (!content) {
+
+        if (!content)
+        {
             MainUtil.sendMessage(plr, "No content found!");
             return false;
         }
-        
-        for (Entry<ChunkLoc, BO3> entry : map.entrySet()) {
-            ChunkLoc chunk = entry.getKey();
-            BO3 bo3 = entry.getValue();
-            if (chunk.x == 0 && chunk.z == 0) {
+
+        for (final Entry<ChunkLoc, BO3> entry : map.entrySet())
+        {
+            final ChunkLoc chunk = entry.getKey();
+            final BO3 bo3 = entry.getValue();
+            if ((chunk.x == 0) && (chunk.z == 0))
+            {
                 continue;
             }
             int x = chunk.x;
             int z = chunk.z;
-            if (Math.abs(chunk.x) > Math.abs(chunk.z)) {
+            if (Math.abs(chunk.x) > Math.abs(chunk.z))
+            {
                 x += chunk.x > 0 ? -1 : 1;
             }
-            else {
+            else
+            {
                 z += chunk.z > 0 ? -1 : 1;
             }
             ChunkLoc parentLoc = new ChunkLoc(x, z);
-            if (!map.containsKey(parentLoc)) {
+            if (!map.containsKey(parentLoc))
+            {
                 parentLoc = null;
-                for (Entry<ChunkLoc, BO3> entry2 : map.entrySet()) {
-                    ChunkLoc other = entry2.getKey();
-                    if ((other.x == chunk.x - 1 && other.z == chunk.z) || (other.z == chunk.z - 1 && other.x == chunk.x)) {
+                for (final Entry<ChunkLoc, BO3> entry2 : map.entrySet())
+                {
+                    final ChunkLoc other = entry2.getKey();
+                    if (((other.x == (chunk.x - 1)) && (other.z == chunk.z)) || ((other.z == (chunk.z - 1)) && (other.x == chunk.x)))
+                    {
                         parentLoc = other;
                     }
                 }
-                if (parentLoc == null) {
+                if (parentLoc == null)
+                {
                     MainUtil.sendMessage(plr, "Exporting BO3 cancelled due to detached chunk: " + chunk + " - Make sure you only have one object per plot");
                     return false;
                 }
             }
             map.get(parentLoc).addChild(bo3);
         }
-        
-        for (Entry<ChunkLoc, BO3> entry : map.entrySet()) {
+
+        for (final Entry<ChunkLoc, BO3> entry : map.entrySet())
+        {
             save(plot, entry.getValue());
         }
-        
+
         MainUtil.sendMessage(plr, "BO3 exporting was successful!");
         return true;
     }
-    
-    public static boolean save(Plot plot, BO3 bo3) {
-        File base = getBaseFile(plot.world);
-        try {
-            List<String> lines = Files.readAllLines(base.toPath(), StandardCharsets.UTF_8);
-            for (int i = 0; i < lines.size(); i++) {
-                String line = lines.get(i).trim();
-                String result = StringMan.replaceAll(line, "%owner%", MainUtil.getName(plot.owner), "%alias%", plot.toString(), "%blocks%", bo3.getBlocks(), "%branches%", bo3.getChildren(), "%flags%", StringMan.join(FlagManager.getPlotFlags(plot).values(), ","));
-                if (!StringMan.isEqual(result, line)) {
+
+    public static boolean save(final Plot plot, final BO3 bo3)
+    {
+        final File base = getBaseFile(plot.world);
+        try
+        {
+            final List<String> lines = Files.readAllLines(base.toPath(), StandardCharsets.UTF_8);
+            for (int i = 0; i < lines.size(); i++)
+            {
+                final String line = lines.get(i).trim();
+                final String result = StringMan.replaceAll(line, "%owner%", MainUtil.getName(plot.owner), "%alias%", plot.toString(), "%blocks%", bo3.getBlocks(), "%branches%", bo3.getChildren(),
+                "%flags%", StringMan.join(FlagManager.getPlotFlags(plot).values(), ","));
+                if (!StringMan.isEqual(result, line))
+                {
                     lines.set(i, result);
                 }
             }
             File bo3File;
-            if (bo3.getLoc().x == 0 && bo3.getLoc().z == 0) {
+            if ((bo3.getLoc().x == 0) && (bo3.getLoc().z == 0))
+            {
                 bo3File = new File(base.getParentFile(), bo3.getName() + ".bo3");
             }
-            else {
+            else
+            {
                 bo3File = new File(base.getParentFile(), bo3.getName() + "_" + bo3.getLoc().x + "_" + bo3.getLoc().z + ".bo3");
             }
             bo3File.createNewFile();
             Files.write(bo3File.toPath(), StringMan.join(lines, System.getProperty("line.separator")).getBytes(), StandardOpenOption.WRITE);
             return true;
         }
-        catch (Exception e) {
+        catch (final Exception e)
+        {
             e.printStackTrace();
             return false;
         }
     }
-    
-    public static File getBaseFile(String category) {
-        File base = new File(PS.get().IMP.getDirectory(), Settings.BO3_SAVE_PATH + File.separator + category + File.separator + "base.yml");
-        if (!base.exists()) {
+
+    public static File getBaseFile(final String category)
+    {
+        final File base = new File(PS.get().IMP.getDirectory(), Settings.BO3_SAVE_PATH + File.separator + category + File.separator + "base.yml");
+        if (!base.exists())
+        {
             PS.get().copyFile("base.yml", Settings.BO3_SAVE_PATH + File.separator + category);
         }
         return base;
diff --git a/src/main/java/com/intellectualcrafters/plot/util/BlockManager.java b/src/main/java/com/intellectualcrafters/plot/util/BlockManager.java
index ff214913e..50ff1117d 100644
--- a/src/main/java/com/intellectualcrafters/plot/util/BlockManager.java
+++ b/src/main/java/com/intellectualcrafters/plot/util/BlockManager.java
@@ -4,51 +4,55 @@ import com.intellectualcrafters.plot.object.Location;
 import com.intellectualcrafters.plot.object.PlotBlock;
 import com.intellectualcrafters.plot.object.schematic.PlotItem;
 
-public abstract class BlockManager {
+public abstract class BlockManager
+{
     public static BlockManager manager;
-    
-    public abstract boolean isBlockSolid(PlotBlock block);
-    
-    public abstract StringComparison<PlotBlock>.ComparisonResult getClosestBlock(String name);
-    
-    public abstract String getClosestMatchingName(PlotBlock block);
+
+    public abstract boolean isBlockSolid(final PlotBlock block);
+
+    public abstract StringComparison<PlotBlock>.ComparisonResult getClosestBlock(final String name);
+
+    public abstract String getClosestMatchingName(final PlotBlock block);
 
     public abstract String[] getBiomeList();
-    
-    public abstract boolean addItems(String world, PlotItem items);
 
-    public abstract int getBiomeFromString(String biome);
+    public abstract boolean addItems(final String world, final PlotItem items);
 
-    public abstract PlotBlock getPlotBlockFromString(String block);
+    public abstract int getBiomeFromString(final String biome);
 
-    public abstract int getHeighestBlock(String world, int x, int z);
+    public abstract PlotBlock getPlotBlockFromString(final String block);
 
-    public abstract String getBiome(String world, int x, int z);
-    
-    public abstract PlotBlock getBlock(Location loc);
+    public abstract int getHeighestBlock(final String world, final int x, final int z);
 
-    public abstract Location getSpawn(String world);
+    public abstract String getBiome(final String world, final int x, final int z);
 
-    public abstract String[] getSign(Location loc);
+    public abstract PlotBlock getBlock(final Location loc);
 
-    public abstract boolean isWorld(String world);
+    public abstract Location getSpawn(final String world);
 
-    public abstract void functionSetBlocks(String worldname, int[] x, int[] y, int[] z, int[] id, byte[] data);
+    public abstract String[] getSign(final Location loc);
 
-    public abstract void functionSetSign(String worldname, int x, int y, int z, String[] lines);
+    public abstract boolean isWorld(final String world);
 
-    public abstract void functionSetBlock(String worldname, int x, int y, int z, int id, byte data);
+    public abstract void functionSetBlocks(final String worldname, final int[] x, final int[] y, final int[] z, final int[] id, final byte[] data);
+
+    public abstract void functionSetSign(final String worldname, final int x, final int y, final int z, final String[] lines);
+
+    public abstract void functionSetBlock(final String worldname, final int x, final int y, final int z, final int id, final byte data);
 
     public abstract void functionSetBiomes(final String worldname, final int[] x, final int z[], final String biome);
 
-    public static void setBiomes(final String worldname, final int[] x, final int z[], final String biome) {
+    public static void setBiomes(final String worldname, final int[] x, final int z[], final String biome)
+    {
         manager.functionSetBiomes(worldname, x, z, biome);
     }
 
-    public static void setBlocks(final String worldname, final int[] x, final int y[], final int z[], final PlotBlock[][] blocks) {
+    public static void setBlocks(final String worldname, final int[] x, final int y[], final int z[], final PlotBlock[][] blocks)
+    {
         final int[] id = new int[blocks.length];
         final byte[] data = new byte[blocks.length];
-        for (int i = 0; i < blocks.length; i++) {
+        for (int i = 0; i < blocks.length; i++)
+        {
             final PlotBlock[] current = blocks[i];
             final int n = MainUtil.random.random(current.length);
             id[i] = current[n].id;
@@ -57,10 +61,12 @@ public abstract class BlockManager {
         setBlocks(worldname, x, y, z, id, data);
     }
 
-    public static void setBlocks(final String worldname, final int[] x, final int y[], final int z[], final PlotBlock[] blocks) {
+    public static void setBlocks(final String worldname, final int[] x, final int y[], final int z[], final PlotBlock[] blocks)
+    {
         final int[] id = new int[blocks.length];
         final byte[] data = new byte[blocks.length];
-        for (int i = 0; i < blocks.length; i++) {
+        for (int i = 0; i < blocks.length; i++)
+        {
             final PlotBlock current = blocks[i];
             id[i] = current.id;
             data[i] = current.data;
@@ -68,11 +74,13 @@ public abstract class BlockManager {
         setBlocks(worldname, x, y, z, id, data);
     }
 
-    public static void setSign(final String worldname, final int x, final int y, final int z, final String[] lines) {
+    public static void setSign(final String worldname, final int x, final int y, final int z, final String[] lines)
+    {
         manager.functionSetSign(worldname, x, y, z, lines);
     }
 
-    public static void setBlocks(final String worldname, final int[] x, final int[] y, final int[] z, final int[] id, final byte[] data) {
+    public static void setBlocks(final String worldname, final int[] x, final int[] y, final int[] z, final int[] id, final byte[] data)
+    {
         manager.functionSetBlocks(worldname, x, y, z, id, data);
     }
 }
diff --git a/src/main/java/com/intellectualcrafters/plot/util/BlockUpdateUtil.java b/src/main/java/com/intellectualcrafters/plot/util/BlockUpdateUtil.java
index 09b982afb..60f6fdd3f 100644
--- a/src/main/java/com/intellectualcrafters/plot/util/BlockUpdateUtil.java
+++ b/src/main/java/com/intellectualcrafters/plot/util/BlockUpdateUtil.java
@@ -4,8 +4,9 @@ import java.util.Collection;
 
 import com.intellectualcrafters.plot.object.ChunkLoc;
 
-public abstract class BlockUpdateUtil {
+public abstract class BlockUpdateUtil
+{
     public static BlockUpdateUtil setBlockManager = null;
 
-    public abstract void update(String worldname, Collection<ChunkLoc> chunkLocs);
+    public abstract void update(final String worldname, final Collection<ChunkLoc> chunkLocs);
 }
diff --git a/src/main/java/com/intellectualcrafters/plot/util/ChatManager.java b/src/main/java/com/intellectualcrafters/plot/util/ChatManager.java
index 1a37332f3..977dd6dbf 100644
--- a/src/main/java/com/intellectualcrafters/plot/util/ChatManager.java
+++ b/src/main/java/com/intellectualcrafters/plot/util/ChatManager.java
@@ -3,20 +3,21 @@ package com.intellectualcrafters.plot.util;
 import com.intellectualcrafters.plot.object.PlotMessage;
 import com.intellectualcrafters.plot.object.PlotPlayer;
 
-public abstract class ChatManager<T> {
+public abstract class ChatManager<T>
+{
     public static ChatManager<?> manager;
-    
+
     public abstract T builder();
-    
-    public abstract void color(PlotMessage message, String color);
-    
-    public abstract void tooltip(PlotMessage message, PlotMessage... tooltip);
-    
-    public abstract void command(PlotMessage message, String command);
-    
-    public abstract void text(PlotMessage message, String text);
 
-    public abstract void send(PlotMessage plotMessage, PlotPlayer player);
+    public abstract void color(final PlotMessage message, final String color);
 
-    public abstract void suggest(PlotMessage plotMessage, String command);
+    public abstract void tooltip(final PlotMessage message, final PlotMessage... tooltip);
+
+    public abstract void command(final PlotMessage message, final String command);
+
+    public abstract void text(final PlotMessage message, final String text);
+
+    public abstract void send(final PlotMessage plotMessage, final PlotPlayer player);
+
+    public abstract void suggest(final PlotMessage plotMessage, final String command);
 }
diff --git a/src/main/java/com/intellectualcrafters/plot/util/ChunkManager.java b/src/main/java/com/intellectualcrafters/plot/util/ChunkManager.java
index 125b3153e..a688ce484 100644
--- a/src/main/java/com/intellectualcrafters/plot/util/ChunkManager.java
+++ b/src/main/java/com/intellectualcrafters/plot/util/ChunkManager.java
@@ -14,21 +14,23 @@ import com.intellectualcrafters.plot.object.RegionWrapper;
 import com.intellectualcrafters.plot.object.RunnableVal;
 import com.intellectualcrafters.plot.util.SetBlockQueue.ChunkWrapper;
 
-public abstract class ChunkManager {
-    
+public abstract class ChunkManager
+{
+
     public static ChunkManager manager = null;
     public static RegionWrapper CURRENT_PLOT_CLEAR = null;
     public static boolean FORCE_PASTE = false;
-    
+
     public static HashMap<PlotLoc, HashMap<Short, Short>> GENERATE_BLOCKS = new HashMap<>();
     public static HashMap<PlotLoc, HashMap<Short, Byte>> GENERATE_DATA = new HashMap<>();
 
-    public static ChunkLoc getChunkChunk(final Location loc) {
+    public static ChunkLoc getChunkChunk(final Location loc)
+    {
         final int x = loc.getX() >> 9;
         final int z = loc.getZ() >> 9;
         return new ChunkLoc(x, z);
     }
-    
+
     /**
      * The int[] will be in the form: [chunkx, chunkz, pos1x, pos1z, pos2x, pos2z, isedge] and will represent the bottom and top parts of the chunk
      * @param pos1
@@ -36,7 +38,8 @@ public abstract class ChunkManager {
      * @param task
      * @param whenDone
      */
-    public static void chunkTask(Location pos1, Location pos2, final RunnableVal<int[]> task, final Runnable whenDone, final int allocate) {
+    public static void chunkTask(final Location pos1, final Location pos2, final RunnableVal<int[]> task, final Runnable whenDone, final int allocate)
+    {
         final int p1x = pos1.getX();
         final int p1z = pos1.getZ();
         final int p2x = pos2.getX();
@@ -45,21 +48,26 @@ public abstract class ChunkManager {
         final int bcz = p1z >> 4;
         final int tcx = p2x >> 4;
         final int tcz = p2z >> 4;
-        
+
         final ArrayList<ChunkLoc> chunks = new ArrayList<ChunkLoc>();
-        
-        for (int x = bcx; x <= tcx; x++) {
-            for (int z = bcz; z <= tcz; z++) {
+
+        for (int x = bcx; x <= tcx; x++)
+        {
+            for (int z = bcz; z <= tcz; z++)
+            {
                 chunks.add(new ChunkLoc(x, z));
             }
         }
-        
-        TaskManager.runTask(new Runnable() {
+
+        TaskManager.runTask(new Runnable()
+        {
             @Override
-            public void run() {
-                long start = System.currentTimeMillis();
-                while (chunks.size() > 0 && System.currentTimeMillis() - start < allocate) {
-                    ChunkLoc chunk = chunks.remove(0);
+            public void run()
+            {
+                final long start = System.currentTimeMillis();
+                while ((chunks.size() > 0) && ((System.currentTimeMillis() - start) < allocate))
+                {
+                    final ChunkLoc chunk = chunks.remove(0);
                     task.value = new int[7];
                     task.value[0] = chunk.x;
                     task.value[1] = chunk.z;
@@ -67,51 +75,57 @@ public abstract class ChunkManager {
                     task.value[3] = task.value[1] << 4;
                     task.value[4] = task.value[2] + 15;
                     task.value[5] = task.value[3] + 15;
-                    if (task.value[0] == bcx) {
-                        task.value[2] = p1x; 
+                    if (task.value[0] == bcx)
+                    {
+                        task.value[2] = p1x;
                         task.value[6] = 1;
                     }
-                    if (task.value[0] == tcx) {
+                    if (task.value[0] == tcx)
+                    {
                         task.value[4] = p2x;
                         task.value[6] = 1;
                     }
-                    if (task.value[1] == bcz) {
+                    if (task.value[1] == bcz)
+                    {
                         task.value[3] = p1z;
                         task.value[6] = 1;
                     }
-                    if (task.value[1] == tcz) {
+                    if (task.value[1] == tcz)
+                    {
                         task.value[5] = p2z;
                         task.value[6] = 1;
                     }
                     task.run();
                 }
-                if (chunks.size() != 0) {
+                if (chunks.size() != 0)
+                {
                     TaskManager.runTaskLater(this, 1);
                 }
-                else {
+                else
+                {
                     TaskManager.runTask(whenDone);
                 }
             }
         });
     }
-    
-    public abstract void setChunk(ChunkWrapper loc, PlotBlock[][] result);
-    
-    public abstract int[] countEntities(Plot plot);
 
-    public abstract boolean loadChunk(String world, ChunkLoc loc, boolean force);
-    
-    public abstract boolean unloadChunk(String world, ChunkLoc loc, boolean save, boolean safe);
+    public abstract void setChunk(final ChunkWrapper loc, final PlotBlock[][] result);
 
-    public abstract List<ChunkLoc> getChunkChunks(String world);
+    public abstract int[] countEntities(final Plot plot);
 
-    public abstract void regenerateChunk(String world, ChunkLoc loc);
+    public abstract boolean loadChunk(final String world, final ChunkLoc loc, final boolean force);
+
+    public abstract boolean unloadChunk(final String world, final ChunkLoc loc, final boolean save, final boolean safe);
+
+    public abstract List<ChunkLoc> getChunkChunks(final String world);
+
+    public abstract void regenerateChunk(final String world, final ChunkLoc loc);
 
     public abstract void deleteRegionFile(final String world, final ChunkLoc loc);
-    
+
     public abstract void deleteRegionFiles(final String world, final List<ChunkLoc> chunks);
 
-    public abstract Plot hasPlot(String world, ChunkLoc chunk);
+    public abstract Plot hasPlot(final String world, final ChunkLoc chunk);
 
     public abstract boolean copyRegion(final Location pos1, final Location pos2, final Location newPos, final Runnable whenDone);
 
@@ -127,8 +141,8 @@ public abstract class ChunkManager {
     public abstract boolean regenerateRegion(final Location pos1, final Location pos2, final Runnable whenDone);
 
     public abstract void clearAllEntities(final Location pos1, final Location pos2);
-    
-    public abstract void swap(String world, PlotId id, PlotId plotid);
 
-    public abstract void swap(String worldname, Location bot1, Location top1, Location bot2, Location top2);
+    public abstract void swap(final String world, final PlotId id, final PlotId plotid);
+
+    public abstract void swap(final String worldname, final Location bot1, final Location top1, final Location bot2, final Location top2);
 }
diff --git a/src/main/java/com/intellectualcrafters/plot/util/ClusterManager.java b/src/main/java/com/intellectualcrafters/plot/util/ClusterManager.java
index a1532258f..8a0144567 100644
--- a/src/main/java/com/intellectualcrafters/plot/util/ClusterManager.java
+++ b/src/main/java/com/intellectualcrafters/plot/util/ClusterManager.java
@@ -4,7 +4,6 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Random;
-import java.util.Set;
 import java.util.UUID;
 
 import org.bukkit.Bukkit;
@@ -14,7 +13,6 @@ import org.bukkit.generator.BlockPopulator;
 
 import com.intellectualcrafters.plot.PS;
 import com.intellectualcrafters.plot.config.C;
-import com.intellectualcrafters.plot.config.Settings;
 import com.intellectualcrafters.plot.object.BlockLoc;
 import com.intellectualcrafters.plot.object.ChunkLoc;
 import com.intellectualcrafters.plot.object.Location;
@@ -27,101 +25,116 @@ import com.intellectualcrafters.plot.object.PlotPlayer;
 import com.intellectualcrafters.plot.object.PlotWorld;
 import com.plotsquared.bukkit.generator.AugmentedPopulator;
 
-public class ClusterManager {
+public class ClusterManager
+{
     public static HashMap<String, HashSet<PlotCluster>> clusters;
     public static PlotCluster last;
     private static HashSet<String> regenerating = new HashSet<>();
 
-    public static boolean contains(final PlotCluster cluster, final PlotId id) {
+    public static boolean contains(final PlotCluster cluster, final PlotId id)
+    {
         return (cluster.getP1().x <= id.x) && (cluster.getP1().y <= id.y) && (cluster.getP2().x >= id.x) && (cluster.getP2().y >= id.y);
     }
 
-    public static HashSet<PlotCluster> getClusters(final World world) {
+    public static HashSet<PlotCluster> getClusters(final World world)
+    {
         return getClusters(world.getName());
     }
 
-    public static HashSet<PlotCluster> getClusters(final String world) {
-        if (clusters.containsKey(world)) {
-            return clusters.get(world);
-        }
+    public static HashSet<PlotCluster> getClusters(final String world)
+    {
+        if (clusters.containsKey(world)) { return clusters.get(world); }
         return new HashSet<>();
     }
-    
-    public static int getPlayerClusterCount(String world, PlotPlayer player) {
+
+    public static int getPlayerClusterCount(final String world, final PlotPlayer player)
+    {
         final UUID uuid = player.getUUID();
         int count = 0;
-        for (PlotCluster cluster : ClusterManager.getClusters(world)) {
-            if (uuid.equals(cluster.owner)) {
+        for (final PlotCluster cluster : ClusterManager.getClusters(world))
+        {
+            if (uuid.equals(cluster.owner))
+            {
                 count += cluster.getArea();
             }
         }
         return count;
     }
-    
-    public static int getPlayerClusterCount(final PlotPlayer plr) {
+
+    public static int getPlayerClusterCount(final PlotPlayer plr)
+    {
         int count = 0;
-        for (final String world : PS.get().getPlotWorldsString()) {
+        for (final String world : PS.get().getPlotWorldsString())
+        {
             count += getPlayerClusterCount(world, plr);
         }
         return count;
     }
-    
-    public static Location getHome(final PlotCluster cluster) {
+
+    public static Location getHome(final PlotCluster cluster)
+    {
         final BlockLoc home = cluster.settings.getPosition();
         Location toReturn;
-        if (home.y == 0) {
+        if (home.y == 0)
+        {
             // default pos
             final PlotId center = getCenterPlot(cluster);
             toReturn = MainUtil.getPlotHome(cluster.world, center);
-            if (toReturn.getY() == 0) {
+            if (toReturn.getY() == 0)
+            {
                 final PlotManager manager = PS.get().getPlotManager(cluster.world);
                 final PlotWorld plotworld = PS.get().getPlotWorld(cluster.world);
                 final Location loc = manager.getSignLoc(plotworld, MainUtil.getPlot(cluster.world, center));
                 toReturn.setY(loc.getY());
             }
-        } else {
+        }
+        else
+        {
             toReturn = getClusterBottom(cluster).add(home.x, home.y, home.z);
         }
         final int max = MainUtil.getHeighestBlock(cluster.world, toReturn.getX(), toReturn.getZ());
-        if (max > toReturn.getY()) {
+        if (max > toReturn.getY())
+        {
             toReturn.setY(max);
         }
         return toReturn;
     }
 
-    public static PlotId getCenterPlot(final PlotCluster cluster) {
+    public static PlotId getCenterPlot(final PlotCluster cluster)
+    {
         final PlotId bot = cluster.getP1();
         final PlotId top = cluster.getP2();
         return new PlotId((bot.x + top.x) / 2, (bot.y + top.y) / 2);
     }
 
-    public static Location getClusterBottom(final PlotCluster cluster) {
+    public static Location getClusterBottom(final PlotCluster cluster)
+    {
         final String world = cluster.world;
         final PlotWorld plotworld = PS.get().getPlotWorld(world);
         final PlotManager manager = PS.get().getPlotManager(world);
         return manager.getPlotBottomLocAbs(plotworld, cluster.getP1());
     }
 
-    public static Location getClusterTop(final PlotCluster cluster) {
+    public static Location getClusterTop(final PlotCluster cluster)
+    {
         final String world = cluster.world;
         final PlotWorld plotworld = PS.get().getPlotWorld(world);
         final PlotManager manager = PS.get().getPlotManager(world);
         return manager.getPlotTopLocAbs(plotworld, cluster.getP2());
     }
 
-    public static PlotCluster getCluster(final String world, final String name) {
-        if (!clusters.containsKey(world)) {
-            return null;
-        }
-        for (final PlotCluster cluster : clusters.get(world)) {
-            if (cluster.getName().equals(name)) {
-                return cluster;
-            }
+    public static PlotCluster getCluster(final String world, final String name)
+    {
+        if (!clusters.containsKey(world)) { return null; }
+        for (final PlotCluster cluster : clusters.get(world))
+        {
+            if (cluster.getName().equals(name)) { return cluster; }
         }
         return null;
     }
 
-    public static boolean contains(final PlotCluster cluster, final Location loc) {
+    public static boolean contains(final PlotCluster cluster, final Location loc)
+    {
         final String world = loc.getWorld();
         final PlotManager manager = PS.get().getPlotManager(world);
         final PlotWorld plotworld = PS.get().getPlotWorld(world);
@@ -130,80 +143,76 @@ public class ClusterManager {
         return (bot.getX() < loc.getX()) && (bot.getZ() < loc.getZ()) && (top.getX() > loc.getX()) && (top.getZ() > loc.getZ());
     }
 
-    public static HashSet<PlotCluster> getIntersects(final String world, final PlotClusterId id) {
-        if (!clusters.containsKey(world)) {
-            return new HashSet<>();
-        }
+    public static HashSet<PlotCluster> getIntersects(final String world, final PlotClusterId id)
+    {
+        if (!clusters.containsKey(world)) { return new HashSet<>(); }
         final HashSet<PlotCluster> list = new HashSet<PlotCluster>();
-        for (final PlotCluster cluster : clusters.get(world)) {
-            if (intersects(cluster, id)) {
+        for (final PlotCluster cluster : clusters.get(world))
+        {
+            if (intersects(cluster, id))
+            {
                 list.add(cluster);
             }
         }
         return list;
     }
 
-    public static boolean intersects(final PlotCluster cluster, final PlotClusterId id) {
+    public static boolean intersects(final PlotCluster cluster, final PlotClusterId id)
+    {
         final PlotId pos1 = cluster.getP1();
         final PlotId pos2 = cluster.getP2();
         return (pos1.x <= id.pos2.x) && (pos2.x >= id.pos1.x) && (pos1.y <= id.pos2.y) && (pos2.y >= id.pos1.y);
     }
 
-    public static PlotCluster getCluster(final Plot plot) {
+    public static PlotCluster getCluster(final Plot plot)
+    {
         return getCluster(plot.world, plot.id);
     }
-    
-    public static PlotCluster getClusterAbs(final Location loc) {
-        String world = loc.getWorld();
-        if ((last != null) && last.world.equals(world)) {
-            if (contains(last, loc)) {
-                return last;
-            }
-        }
-        if (clusters == null) {
-            return null;
+
+    public static PlotCluster getClusterAbs(final Location loc)
+    {
+        final String world = loc.getWorld();
+        if ((last != null) && last.world.equals(world))
+        {
+            if (contains(last, loc)) { return last; }
         }
+        if (clusters == null) { return null; }
         final HashSet<PlotCluster> local = clusters.get(world);
-        if (local == null) {
-            return null;
-        }
-        for (final PlotCluster cluster : local) {
-            if (contains(cluster, loc)) {
+        if (local == null) { return null; }
+        for (final PlotCluster cluster : local)
+        {
+            if (contains(cluster, loc))
+            {
                 last = cluster;
                 return cluster;
             }
         }
         return null;
     }
-    
-    public static PlotCluster getCluster(final Location loc) {
+
+    public static PlotCluster getCluster(final Location loc)
+    {
         final String world = loc.getWorld();
-        PlotManager manager = PS.get().getPlotManager(world);
-        if (manager == null) {
-            return null;
-        }
-        PlotId id = manager.getPlotIdAbs(PS.get().getPlotWorld(world), loc.getX(), loc.getY(), loc.getZ());
-        if (id != null) {
-            return getCluster(world, id);
-        }
+        final PlotManager manager = PS.get().getPlotManager(world);
+        if (manager == null) { return null; }
+        final PlotId id = manager.getPlotIdAbs(PS.get().getPlotWorld(world), loc.getX(), loc.getY(), loc.getZ());
+        if (id != null) { return getCluster(world, id); }
         return getClusterAbs(loc);
     }
 
-    public static PlotCluster getCluster(final String world, final PlotId id) {
-        if ((last != null) && last.world.equals(world)) {
-            if (contains(last, id)) {
-                return last;
-            }
-        }
-        if (clusters == null) {
-            return null;
+    public static PlotCluster getCluster(final String world, final PlotId id)
+    {
+        if ((last != null) && last.world.equals(world))
+        {
+            if (contains(last, id)) { return last; }
         }
+        if (clusters == null) { return null; }
         final HashSet<PlotCluster> local = clusters.get(world);
-        if (local == null) {
-            return null;
-        }
-        for (final PlotCluster cluster : local) {
-            if (contains(cluster, id)) {
+        if (local == null) { return null; }
+        for (final PlotCluster cluster : local)
+        {
+            if (contains(cluster, id))
+            {
                 last = cluster;
                 return cluster;
             }
@@ -211,9 +220,12 @@ public class ClusterManager {
         return null;
     }
 
-    public static boolean removeCluster(final PlotCluster cluster) {
-        if (clusters != null) {
-            if (clusters.containsKey(cluster.world)) {
+    public static boolean removeCluster(final PlotCluster cluster)
+    {
+        if (clusters != null)
+        {
+            if (clusters.containsKey(cluster.world))
+            {
                 clusters.get(cluster.world).remove(cluster);
                 return true;
             }
@@ -221,37 +233,41 @@ public class ClusterManager {
         return false;
     }
 
-    public static PlotClusterId getClusterId(final PlotCluster cluster) {
+    public static PlotClusterId getClusterId(final PlotCluster cluster)
+    {
         return new PlotClusterId(cluster.getP1(), cluster.getP2());
     }
 
-    public static AugmentedPopulator getPopulator(final PlotCluster cluster) {
+    public static AugmentedPopulator getPopulator(final PlotCluster cluster)
+    {
         final World world = Bukkit.getWorld(cluster.world);
-        for (final BlockPopulator populator : world.getPopulators()) {
-            if (populator instanceof AugmentedPopulator) {
-                if (((AugmentedPopulator) populator).cluster.equals(cluster)) {
-                    return (AugmentedPopulator) populator;
-                }
+        for (final BlockPopulator populator : world.getPopulators())
+        {
+            if (populator instanceof AugmentedPopulator)
+            {
+                if (((AugmentedPopulator) populator).cluster.equals(cluster)) { return (AugmentedPopulator) populator; }
             }
         }
         return null;
     }
 
-    public static PlotId estimatePlotId(final Location loc) {
-        Plot plot = MainUtil.getPlot(loc);
-        if (plot != null) {
-            return plot.id;
-        }
+    public static PlotId estimatePlotId(final Location loc)
+    {
+        final Plot plot = MainUtil.getPlot(loc);
+        if (plot != null) { return plot.id; }
         final PlotId a = new PlotId(0, 0);
         final PlotId b = new PlotId(1, 1);
         int xw;
         int zw;
         final String world = loc.getWorld();
         final PlotWorld plotworld = PS.get().getPlotWorld(world);
-        if (plotworld == null) {
+        if (plotworld == null)
+        {
             xw = 39;
             zw = 39;
-        } else {
+        }
+        else
+        {
             final PlotManager manager = PS.get().getPlotManager(world);
             final Location al = manager.getPlotBottomLocAbs(plotworld, a);
             final Location bl = manager.getPlotBottomLocAbs(plotworld, b);
@@ -263,10 +279,9 @@ public class ClusterManager {
         return new PlotId((x / xw) + 1, (z / zw) + 1);
     }
 
-    public static void regenCluster(final PlotCluster cluster) {
-        if (regenerating.contains(cluster.world + ":" + cluster.getName())) {
-            return;
-        }
+    public static void regenCluster(final PlotCluster cluster)
+    {
+        if (regenerating.contains(cluster.world + ":" + cluster.getName())) { return; }
         regenerating.add(cluster.world + ":" + cluster.getName());
         final int interval = 1;
         int i = 0;
@@ -281,33 +296,44 @@ public class ClusterManager {
         final int maxChunkZ = (top.getZ() >> 4) + 1;
         final AugmentedPopulator populator = getPopulator(cluster);
         final ArrayList<Chunk> chunks = new ArrayList<>();
-        TaskManager.runTaskLater(new Runnable() {
+        TaskManager.runTaskLater(new Runnable()
+        {
             @Override
-            public void run() {
+            public void run()
+            {
                 ClusterManager.regenerating.remove(cluster.world + ":" + cluster.getName());
                 final PlotPlayer owner = UUIDHandler.getPlayer(cluster.owner);
-                if (owner != null) {
+                if (owner != null)
+                {
                     MainUtil.sendMessage(owner, C.CLEARING_DONE);
                 }
             }
         }, (interval * chunks.size()) + 20);
         // chunks
-        for (int x = minChunkX; x <= maxChunkX; x++) {
-            for (int z = minChunkZ; z <= maxChunkZ; z++) {
+        for (int x = minChunkX; x <= maxChunkX; x++)
+        {
+            for (int z = minChunkZ; z <= maxChunkZ; z++)
+            {
                 final Chunk chunk = world.getChunkAt(x, z);
                 chunks.add(chunk);
             }
         }
-        for (final Chunk chunk : chunks) {
+        for (final Chunk chunk : chunks)
+        {
             i += interval;
-            TaskManager.runTaskLater(new Runnable() {
+            TaskManager.runTaskLater(new Runnable()
+            {
                 @Override
-                public void run() {
-                    if ((populator == null) || (plotworld.TYPE == 0)) {
-                        ChunkLoc loc = new ChunkLoc(chunk.getX(), chunk.getZ());
+                public void run()
+                {
+                    if ((populator == null) || (plotworld.TYPE == 0))
+                    {
+                        final ChunkLoc loc = new ChunkLoc(chunk.getX(), chunk.getZ());
                         ChunkManager.manager.regenerateChunk(world.getName(), loc);
                         MainUtil.update(world.getName(), loc);
-                    } else {
+                    }
+                    else
+                    {
                         populator.populate(world, rand, chunk);
                     }
                 }
diff --git a/src/main/java/com/intellectualcrafters/plot/util/CmdConfirm.java b/src/main/java/com/intellectualcrafters/plot/util/CmdConfirm.java
index b238e91b0..32050a5a0 100644
--- a/src/main/java/com/intellectualcrafters/plot/util/CmdConfirm.java
+++ b/src/main/java/com/intellectualcrafters/plot/util/CmdConfirm.java
@@ -6,39 +6,46 @@ import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.object.CmdInstance;
 import com.intellectualcrafters.plot.object.PlotPlayer;
 
-public class CmdConfirm {
-	private static HashMap<String, CmdInstance> pending = new HashMap<>();
-	
-	public static CmdInstance getPending(PlotPlayer player) {
-	    if (player == null) {
-	        return pending.get("__CONSOLE__");
-	    }
-	    return pending.get(player.getName());
-	}
-	
-	public static void removePending(PlotPlayer player) {
-        if (player == null) {
+public class CmdConfirm
+{
+    private static HashMap<String, CmdInstance> pending = new HashMap<>();
+
+    public static CmdInstance getPending(final PlotPlayer player)
+    {
+        if (player == null) { return pending.get("__CONSOLE__"); }
+        return pending.get(player.getName());
+    }
+
+    public static void removePending(final PlotPlayer player)
+    {
+        if (player == null)
+        {
             pending.remove("__CONSOLE__");
         }
-        else {
+        else
+        {
             pending.remove(player.getName());
         }
     }
-	
-	public static void removePending(String name) {
-	    pending.remove(name); 
+
+    public static void removePending(final String name)
+    {
+        pending.remove(name);
+    }
+
+    public static void addPending(final PlotPlayer player, final String commandStr, final Runnable runnable)
+    {
+        MainUtil.sendMessage(player, C.REQUIRES_CONFIRM, commandStr);
+        final CmdInstance cmd = new CmdInstance(runnable);
+        String name;
+        if (player == null)
+        {
+            name = "__CONSOLE__";
+        }
+        else
+        {
+            name = player.getName();
+        }
+        pending.put(name, cmd);
     }
-	
-	public static void addPending(PlotPlayer player, String commandStr, Runnable runnable) {
-	    MainUtil.sendMessage(player, C.REQUIRES_CONFIRM, commandStr);
-	    CmdInstance cmd = new CmdInstance(runnable);
-	    String name;
-	    if (player == null) {
-	        name = "__CONSOLE__";
-	    }
-	    else {
-	        name = player.getName();
-	    }
-	    pending.put(name, cmd);
-	}
 }
diff --git a/src/main/java/com/intellectualcrafters/plot/util/CommentManager.java b/src/main/java/com/intellectualcrafters/plot/util/CommentManager.java
index 4803b4e23..a8e4e20d7 100644
--- a/src/main/java/com/intellectualcrafters/plot/util/CommentManager.java
+++ b/src/main/java/com/intellectualcrafters/plot/util/CommentManager.java
@@ -16,41 +16,48 @@ import com.intellectualcrafters.plot.object.comment.InboxPublic;
 import com.intellectualcrafters.plot.object.comment.InboxReport;
 import com.intellectualcrafters.plot.object.comment.PlotComment;
 
-
-public class CommentManager {
+public class CommentManager
+{
     public static HashMap<String, CommentInbox> inboxes = new HashMap<>();
-    
-    public static void sendTitle(final PlotPlayer player, final Plot plot) {
-        if (!Settings.COMMENT_NOTIFICATIONS) {
-            return;
-        }
-        if (!plot.isOwner(player.getUUID())) {
-            return;
-        }
-        TaskManager.runTaskLaterAsync(new Runnable() {
+
+    public static void sendTitle(final PlotPlayer player, final Plot plot)
+    {
+        if (!Settings.COMMENT_NOTIFICATIONS) { return; }
+        if (!plot.isOwner(player.getUUID())) { return; }
+        TaskManager.runTaskLaterAsync(new Runnable()
+        {
             @Override
-            public void run() {
-                Collection<CommentInbox> boxes = CommentManager.inboxes.values();
+            public void run()
+            {
+                final Collection<CommentInbox> boxes = CommentManager.inboxes.values();
                 final AtomicInteger count = new AtomicInteger(0);
                 final AtomicInteger size = new AtomicInteger(boxes.size());
-                for (final CommentInbox inbox : inboxes.values()) {
-                    inbox.getComments(plot, new RunnableVal() {
+                for (final CommentInbox inbox : inboxes.values())
+                {
+                    inbox.getComments(plot, new RunnableVal()
+                    {
                         @Override
-                        public void run() {
+                        public void run()
+                        {
                             int total;
-                            if (value != null) {
+                            if (value != null)
+                            {
                                 int num = 0;
-                                for (PlotComment comment : (ArrayList<PlotComment>) value) {
-                                    if (comment.timestamp > getTimestamp(player, inbox.toString())) {
+                                for (final PlotComment comment : (ArrayList<PlotComment>) value)
+                                {
+                                    if (comment.timestamp > getTimestamp(player, inbox.toString()))
+                                    {
                                         num++;
                                     }
                                 }
                                 total = count.addAndGet(num);
                             }
-                            else {
+                            else
+                            {
                                 total = count.get();
                             }
-                            if (size.decrementAndGet() == 0 && total > 0) {
+                            if ((size.decrementAndGet() == 0) && (total > 0))
+                            {
                                 AbstractTitle.sendTitle(player, "", C.INBOX_NOTIFICATION.s().replaceAll("%s", "" + total));
                             }
                         }
@@ -59,22 +66,23 @@ public class CommentManager {
             }
         }, 20);
     }
-    
-    public static long getTimestamp(PlotPlayer player, String inbox) {
-        Object meta = player.getMeta("inbox:"+inbox);
-        if (meta == null) {
-            return player.getPreviousLogin();
-        }
+
+    public static long getTimestamp(final PlotPlayer player, final String inbox)
+    {
+        final Object meta = player.getMeta("inbox:" + inbox);
+        if (meta == null) { return player.getPreviousLogin(); }
         return (Long) meta;
     }
-    
-    public static void addInbox(CommentInbox inbox) {
+
+    public static void addInbox(final CommentInbox inbox)
+    {
         inboxes.put(inbox.toString().toLowerCase(), inbox);
     }
-    
-    public static void registerDefaultInboxes() {
+
+    public static void registerDefaultInboxes()
+    {
         addInbox(new InboxReport());
         addInbox(new InboxPublic());
         addInbox(new InboxOwner());
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/intellectualcrafters/plot/util/ConsoleColors.java b/src/main/java/com/intellectualcrafters/plot/util/ConsoleColors.java
index b3758cad5..6a723ecf2 100644
--- a/src/main/java/com/intellectualcrafters/plot/util/ConsoleColors.java
+++ b/src/main/java/com/intellectualcrafters/plot/util/ConsoleColors.java
@@ -20,10 +20,15 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 package com.intellectualcrafters.plot.util;
 
-public class ConsoleColors {
-    public static String fromString(String input) {
-        input = input.replaceAll("&0", fromChatColor("&0")).replaceAll("&1", fromChatColor("&1")).replaceAll("&2", fromChatColor("&2")).replaceAll("&3", fromChatColor("&3")).replaceAll("&4", fromChatColor("&4")).replaceAll("&5", fromChatColor("&5")).replaceAll("&6", fromChatColor("&6")).replaceAll("&7", fromChatColor("&7")).replaceAll("&8", fromChatColor("&8")).replaceAll("&9", fromChatColor("&9")).replaceAll("&a", fromChatColor("&a")).replaceAll("&b", fromChatColor("&b")).replaceAll("&c", fromChatColor("&c")).replaceAll("&d", fromChatColor("&d")).replaceAll("&e", fromChatColor("&e")).replaceAll("&f", fromChatColor("&f")).replaceAll("&k", fromChatColor("&k")).replaceAll("&l", fromChatColor("&l")).replaceAll("&m", fromChatColor("&m"))
-                .replaceAll("&n", fromChatColor("&n")).replaceAll("&o", fromChatColor("&o")).replaceAll("&r", fromChatColor("&r"));
+public class ConsoleColors
+{
+    public static String fromString(String input)
+    {
+        input = input.replaceAll("&0", fromChatColor("&0")).replaceAll("&1", fromChatColor("&1")).replaceAll("&2", fromChatColor("&2")).replaceAll("&3", fromChatColor("&3"))
+        .replaceAll("&4", fromChatColor("&4")).replaceAll("&5", fromChatColor("&5")).replaceAll("&6", fromChatColor("&6")).replaceAll("&7", fromChatColor("&7")).replaceAll("&8", fromChatColor("&8"))
+        .replaceAll("&9", fromChatColor("&9")).replaceAll("&a", fromChatColor("&a")).replaceAll("&b", fromChatColor("&b")).replaceAll("&c", fromChatColor("&c")).replaceAll("&d", fromChatColor("&d"))
+        .replaceAll("&e", fromChatColor("&e")).replaceAll("&f", fromChatColor("&f")).replaceAll("&k", fromChatColor("&k")).replaceAll("&l", fromChatColor("&l")).replaceAll("&m", fromChatColor("&m"))
+        .replaceAll("&n", fromChatColor("&n")).replaceAll("&o", fromChatColor("&o")).replaceAll("&r", fromChatColor("&r"));
         return input + "\u001B[0m";
     }
 
@@ -39,12 +44,15 @@ public class ConsoleColors {
      * String ANSI_UNDERLINE = "\033[0m"; public static final String ANSI_ITALIC
      * = "\033[3m]";
      */
-    public static String fromChatColor(final String color) {
+    public static String fromChatColor(final String color)
+    {
         return chatColor(color).getLin();
     }
 
-    public static ConsoleColor chatColor(final String color) {
-        switch (color) {
+    public static ConsoleColor chatColor(final String color)
+    {
+        switch (color)
+        {
             case "&r":
                 return ConsoleColor.RESET;
             case "&7":
@@ -81,7 +89,8 @@ public class ConsoleColors {
         }
     }
 
-    static enum ConsoleColor {
+    static enum ConsoleColor
+    {
         RESET("\u001B[0m"),
         BLACK("\u001B[30m"),
         RED("\u001B[31m"),
@@ -97,18 +106,21 @@ public class ConsoleColors {
         private final String win;
         private final String lin;
 
-        ConsoleColor(final String lin) {
+        ConsoleColor(final String lin)
+        {
             this.lin = lin;
-            this.win = lin;
+            win = lin;
         }
 
         @SuppressWarnings("unused")
-        public String getWin() {
-            return this.win;
+        public String getWin()
+        {
+            return win;
         }
 
-        public String getLin() {
-            return this.lin;
+        public String getLin()
+        {
+            return lin;
         }
     }
 }
diff --git a/src/main/java/com/intellectualcrafters/plot/util/EconHandler.java b/src/main/java/com/intellectualcrafters/plot/util/EconHandler.java
index 064cf546b..76af4f0cf 100644
--- a/src/main/java/com/intellectualcrafters/plot/util/EconHandler.java
+++ b/src/main/java/com/intellectualcrafters/plot/util/EconHandler.java
@@ -4,28 +4,33 @@ import com.intellectualcrafters.plot.object.ConsolePlayer;
 import com.intellectualcrafters.plot.object.OfflinePlotPlayer;
 import com.intellectualcrafters.plot.object.PlotPlayer;
 
-public abstract class EconHandler {
+public abstract class EconHandler
+{
     public static EconHandler manager;
-    
-    public double getMoney(PlotPlayer player) {
-        if (ConsolePlayer.isConsole(player)) {
-            return Double.MAX_VALUE;
-        }
+
+    public double getMoney(final PlotPlayer player)
+    {
+        if (ConsolePlayer.isConsole(player)) { return Double.MAX_VALUE; }
         return Double.NaN;
     }
-    public abstract void withdrawMoney(PlotPlayer player, double amount);
-    public abstract void depositMoney(PlotPlayer player, double amount);
-    public abstract void depositMoney(OfflinePlotPlayer player, double amount);
-    
-    public void setPermission(String player, String perm, boolean value) {
+
+    public abstract void withdrawMoney(final PlotPlayer player, final double amount);
+
+    public abstract void depositMoney(final PlotPlayer player, final double amount);
+
+    public abstract void depositMoney(final OfflinePlotPlayer player, final double amount);
+
+    public void setPermission(final String player, final String perm, final boolean value)
+    {
         setPermission(null, player, perm, value);
     }
-    
-    public abstract void setPermission(String world, String player, String perm, boolean value);
-    
-    public abstract boolean hasPermission(String world, String player, String perm);
-    
-    public boolean hasPermission(String player, String perm) {
+
+    public abstract void setPermission(final String world, final String player, final String perm, final boolean value);
+
+    public abstract boolean hasPermission(final String world, final String player, final String perm);
+
+    public boolean hasPermission(final String player, final String perm)
+    {
         return hasPermission(null, player, perm);
     }
 }
diff --git a/src/main/java/com/intellectualcrafters/plot/util/EventUtil.java b/src/main/java/com/intellectualcrafters/plot/util/EventUtil.java
index 4521db6ea..485730979 100644
--- a/src/main/java/com/intellectualcrafters/plot/util/EventUtil.java
+++ b/src/main/java/com/intellectualcrafters/plot/util/EventUtil.java
@@ -18,290 +18,222 @@ import com.intellectualcrafters.plot.object.PlotPlayer;
 import com.intellectualcrafters.plot.object.Rating;
 import com.plotsquared.bukkit.listeners.PlayerBlockEventType;
 
-public abstract class EventUtil {
-    
+public abstract class EventUtil
+{
+
     public static EventUtil manager = null;
-    
-    public static void unregisterPlayer(PlotPlayer player) {
-        String name = player.getName();
-        if (SetupUtils.setupMap.containsKey(name)) {
+
+    public static void unregisterPlayer(final PlotPlayer player)
+    {
+        final String name = player.getName();
+        if (SetupUtils.setupMap.containsKey(name))
+        {
             SetupUtils.setupMap.remove(name);
         }
         CmdConfirm.removePending(name);
         PS.get().IMP.unregister(player);
     }
-    
+
     public abstract Rating callRating(final PlotPlayer player, final Plot plot, final Rating rating);
-    
+
     public abstract boolean callClaim(final PlotPlayer player, final Plot plot, final boolean auto);
-    
-    public abstract boolean callTeleport(final PlotPlayer player, Location from, final Plot plot);
-    
+
+    public abstract boolean callTeleport(final PlotPlayer player, final Location from, final Plot plot);
+
     public abstract boolean callClear(final String world, final PlotId id);
-    
+
     public abstract void callDelete(final String world, final PlotId id);
-    
+
     public abstract boolean callFlagAdd(final Flag flag, final Plot plot);
-    
+
     public abstract boolean callFlagRemove(final Flag flag, final Plot plot);
-    
+
     public abstract boolean callFlagRemove(final Flag flag, final PlotCluster cluster);
-    
+
     public abstract boolean callMerge(final String world, final Plot plot, final ArrayList<PlotId> plots);
-    
+
     public abstract boolean callUnlink(final String world, final ArrayList<PlotId> plots);
-    
+
     public abstract void callEntry(final PlotPlayer player, final Plot plot);
-    
+
     public abstract void callLeave(final PlotPlayer player, final Plot plot);
-    
+
     public abstract void callDenied(final PlotPlayer initiator, final Plot plot, final UUID player, final boolean added);
-    
+
     public abstract void callTrusted(final PlotPlayer initiator, final Plot plot, final UUID player, final boolean added);
-    
+
     public abstract void callMember(final PlotPlayer initiator, final Plot plot, final UUID player, final boolean added);
-    
-    public boolean checkPlayerBlockEvent(PlotPlayer pp, PlayerBlockEventType type, Location loc, LazyBlock block, boolean notifyPerms) {
-        Plot plot = MainUtil.getPlot(loc);
-        UUID uuid = pp.getUUID();
-        if (plot == null) {
-            if (!MainUtil.isPlotAreaAbs(loc)) {
-                return true;
-            }
+
+    public boolean checkPlayerBlockEvent(final PlotPlayer pp, final PlayerBlockEventType type, final Location loc, final LazyBlock block, final boolean notifyPerms)
+    {
+        final Plot plot = MainUtil.getPlot(loc);
+        final UUID uuid = pp.getUUID();
+        if (plot == null)
+        {
+            if (!MainUtil.isPlotAreaAbs(loc)) { return true; }
         }
-        else if (plot.isAdded(uuid)) {
-            return true;
-        }
-        switch (type) {
-            case TELEPORT_OBJECT: {
+        else if (plot.isAdded(uuid)) { return true; }
+        switch (type)
+        {
+            case TELEPORT_OBJECT:
+            {
                 return false;
             }
             case EAT:
-            case READ: {
+            case READ:
+            {
                 return true;
             }
-            case BREAK_BLOCK: {
-                if (plot == null) {
-                    return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_ROAD.s(), notifyPerms);
+            case BREAK_BLOCK:
+            {
+                if (plot == null) { return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_ROAD.s(), notifyPerms); }
+                if (!plot.hasOwner()) { return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_UNOWNED.s(), notifyPerms); }
+                final Flag use = FlagManager.getPlotFlag(plot, "use");
+                if (use != null)
+                {
+                    final HashSet<PlotBlock> value = (HashSet<PlotBlock>) use.getValue();
+                    if (value.contains(PlotBlock.EVERYTHING) || value.contains(block.getPlotBlock())) { return true; }
                 }
-                if (!plot.hasOwner()) {
-                    return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_UNOWNED.s(), notifyPerms);
-                }
-                Flag use = FlagManager.getPlotFlag(plot, "use");
-                if (use != null) {
-                    HashSet<PlotBlock> value = (HashSet<PlotBlock>) use.getValue();
-                    if (value.contains(PlotBlock.EVERYTHING) || value.contains(block.getPlotBlock())) {
-                        return true;
-                    }
-                }
-                Flag destroy = FlagManager.getPlotFlag(plot, "break");
-                if (destroy != null) {
-                    HashSet<PlotBlock> value = (HashSet<PlotBlock>) destroy.getValue();
-                    if (value.contains(PlotBlock.EVERYTHING) || value.contains(block.getPlotBlock())) {
-                        return true;
-                    }
+                final Flag destroy = FlagManager.getPlotFlag(plot, "break");
+                if (destroy != null)
+                {
+                    final HashSet<PlotBlock> value = (HashSet<PlotBlock>) destroy.getValue();
+                    if (value.contains(PlotBlock.EVERYTHING) || value.contains(block.getPlotBlock())) { return true; }
                 }
                 return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), notifyPerms);
             }
             case BREAK_HANGING:
-                if (plot == null) {
-                    return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_ROAD.s(), notifyPerms);
-                }
-                if (FlagManager.isPlotFlagTrue(plot, "hanging-break")) {
-                    return true;
-                }
-                if (plot.hasOwner()) {
-                    return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), notifyPerms);
-                }
+                if (plot == null) { return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_ROAD.s(), notifyPerms); }
+                if (FlagManager.isPlotFlagTrue(plot, "hanging-break")) { return true; }
+                if (plot.hasOwner()) { return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), notifyPerms); }
                 return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_UNOWNED.s(), notifyPerms);
             case BREAK_MISC:
-                if (plot == null) {
-                    return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_ROAD.s(), notifyPerms);
-                }
-                if (FlagManager.isPlotFlagTrue(plot, "misc-break")) {
-                    return true;
-                }
-                if (plot.hasOwner()) {
-                    return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), notifyPerms);
-                }
+                if (plot == null) { return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_ROAD.s(), notifyPerms); }
+                if (FlagManager.isPlotFlagTrue(plot, "misc-break")) { return true; }
+                if (plot.hasOwner()) { return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), notifyPerms); }
                 return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_UNOWNED.s(), notifyPerms);
             case BREAK_VEHICLE:
-                if (plot == null) {
-                    return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_ROAD.s(), notifyPerms);
-                }
-                if (FlagManager.isPlotFlagTrue(plot, "vehicle-break")) {
-                    return true;
-                }
-                if (plot.hasOwner()) {
-                    return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), notifyPerms);
-                }
+                if (plot == null) { return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_ROAD.s(), notifyPerms); }
+                if (FlagManager.isPlotFlagTrue(plot, "vehicle-break")) { return true; }
+                if (plot.hasOwner()) { return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), notifyPerms); }
                 return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_UNOWNED.s(), notifyPerms);
-            case INTERACT_BLOCK: {
-                if (plot == null) {
-                    return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_ROAD.s(), notifyPerms);
-                }
-                if (!plot.hasOwner()) {
-                    return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_UNOWNED.s(), notifyPerms);
-                }
-                Flag flag = FlagManager.getPlotFlag(plot, "use");
-                HashSet<PlotBlock> value = flag == null ? null : (HashSet<PlotBlock>) flag.getValue();
-                if (value == null || (!value.contains(PlotBlock.EVERYTHING) && !value.contains(block.getPlotBlock()))) {
-                    return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), notifyPerms);
-                }
+            case INTERACT_BLOCK:
+            {
+                if (plot == null) { return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_ROAD.s(), notifyPerms); }
+                if (!plot.hasOwner()) { return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_UNOWNED.s(), notifyPerms); }
+                final Flag flag = FlagManager.getPlotFlag(plot, "use");
+                final HashSet<PlotBlock> value = flag == null ? null : (HashSet<PlotBlock>) flag.getValue();
+                if ((value == null) || (!value.contains(PlotBlock.EVERYTHING) && !value.contains(block.getPlotBlock()))) { return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_OTHER.s(),
+                notifyPerms); }
                 return true;
             }
-            case PLACE_BLOCK: {
-                if (plot == null) {
-                    return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_ROAD.s(), notifyPerms);
-                }
-                if (!plot.hasOwner()) {
-                    return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_UNOWNED.s(), notifyPerms);
-                }
-                Flag flag = FlagManager.getPlotFlag(plot, "place");
-                HashSet<PlotBlock> value = flag == null ? null : (HashSet<PlotBlock>) flag.getValue();
-                if (value == null || (!value.contains(PlotBlock.EVERYTHING) && !value.contains(block.getPlotBlock()))) {
-                    return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_OTHER.s(), notifyPerms);
-                }
+            case PLACE_BLOCK:
+            {
+                if (plot == null) { return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_ROAD.s(), notifyPerms); }
+                if (!plot.hasOwner()) { return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_UNOWNED.s(), notifyPerms); }
+                final Flag flag = FlagManager.getPlotFlag(plot, "place");
+                final HashSet<PlotBlock> value = flag == null ? null : (HashSet<PlotBlock>) flag.getValue();
+                if ((value == null) || (!value.contains(PlotBlock.EVERYTHING) && !value.contains(block.getPlotBlock()))) { return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_OTHER.s(),
+                notifyPerms); }
                 return true;
             }
-            case TRIGGER_PHYSICAL: {
-                if (plot == null) {
-                    return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_ROAD.s(), false);
-                }
-                if (!plot.hasOwner()) {
-                    return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_UNOWNED.s(), false);
-                }
-                if (FlagManager.isPlotFlagTrue(plot, "device-interact")) {
-                    return true;
-                }
-                Flag flag = FlagManager.getPlotFlag(plot, "use");
-                HashSet<PlotBlock> value = flag == null ? null : (HashSet<PlotBlock>) flag.getValue();
-                if (value == null || (!value.contains(PlotBlock.EVERYTHING) && !value.contains(block.getPlotBlock()))) {
-                    return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), notifyPerms);
-                }
+            case TRIGGER_PHYSICAL:
+            {
+                if (plot == null) { return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_ROAD.s(), false); }
+                if (!plot.hasOwner()) { return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_UNOWNED.s(), false); }
+                if (FlagManager.isPlotFlagTrue(plot, "device-interact")) { return true; }
+                final Flag flag = FlagManager.getPlotFlag(plot, "use");
+                final HashSet<PlotBlock> value = flag == null ? null : (HashSet<PlotBlock>) flag.getValue();
+                if ((value == null) || (!value.contains(PlotBlock.EVERYTHING) && !value.contains(block.getPlotBlock()))) { return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_OTHER.s(),
+                notifyPerms); }
                 return true;
             }
-            case INTERACT_HANGING: {
-                if (plot == null) {
-                    return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_ROAD.s(), notifyPerms);
-                }
-                if (!plot.hasOwner()) {
-                    return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_UNOWNED.s(), notifyPerms);
-                }
-                if (FlagManager.isPlotFlagTrue(plot, "hanging-interact")) {
-                    return true;
-                }
-                Flag flag = FlagManager.getPlotFlag(plot, "use");
-                HashSet<PlotBlock> value = flag == null ? null : (HashSet<PlotBlock>) flag.getValue();
-                if (value == null || (!value.contains(PlotBlock.EVERYTHING) && !value.contains(block.getPlotBlock()))) {
-                    return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), notifyPerms);
-                }
+            case INTERACT_HANGING:
+            {
+                if (plot == null) { return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_ROAD.s(), notifyPerms); }
+                if (!plot.hasOwner()) { return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_UNOWNED.s(), notifyPerms); }
+                if (FlagManager.isPlotFlagTrue(plot, "hanging-interact")) { return true; }
+                final Flag flag = FlagManager.getPlotFlag(plot, "use");
+                final HashSet<PlotBlock> value = flag == null ? null : (HashSet<PlotBlock>) flag.getValue();
+                if ((value == null) || (!value.contains(PlotBlock.EVERYTHING) && !value.contains(block.getPlotBlock()))) { return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_OTHER.s(),
+                notifyPerms); }
                 return true;
             }
-            case INTERACT_MISC: {
-                if (plot == null) {
-                    return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_ROAD.s(), notifyPerms);
-                }
-                if (!plot.hasOwner()) {
-                    return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_UNOWNED.s(), notifyPerms);
-                }
-                if (FlagManager.isPlotFlagTrue(plot, "misc-interact")) {
-                    return true;
-                }
-                Flag flag = FlagManager.getPlotFlag(plot, "use");
-                HashSet<PlotBlock> value = flag == null ? null : (HashSet<PlotBlock>) flag.getValue();
-                if (value == null || (!value.contains(PlotBlock.EVERYTHING) && !value.contains(block.getPlotBlock()))) {
-                    return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), notifyPerms);
-                }
+            case INTERACT_MISC:
+            {
+                if (plot == null) { return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_ROAD.s(), notifyPerms); }
+                if (!plot.hasOwner()) { return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_UNOWNED.s(), notifyPerms); }
+                if (FlagManager.isPlotFlagTrue(plot, "misc-interact")) { return true; }
+                final Flag flag = FlagManager.getPlotFlag(plot, "use");
+                final HashSet<PlotBlock> value = flag == null ? null : (HashSet<PlotBlock>) flag.getValue();
+                if ((value == null) || (!value.contains(PlotBlock.EVERYTHING) && !value.contains(block.getPlotBlock()))) { return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_OTHER.s(),
+                notifyPerms); }
                 return true;
             }
-            case INTERACT_VEHICLE: {
-                if (plot == null) {
-                    return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_ROAD.s(), notifyPerms);
-                }
-                if (!plot.hasOwner()) {
-                    return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_UNOWNED.s(), notifyPerms);
-                }
-                if (FlagManager.isPlotFlagTrue(plot, "vehicle-use")) {
-                    return true;
-                }
-                Flag flag = FlagManager.getPlotFlag(plot, "use");
-                HashSet<PlotBlock> value = flag == null ? null : (HashSet<PlotBlock>) flag.getValue();
-                if (value == null || (!value.contains(PlotBlock.EVERYTHING) && !value.contains(block.getPlotBlock()))) {
-                    return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), notifyPerms);
-                }
+            case INTERACT_VEHICLE:
+            {
+                if (plot == null) { return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_ROAD.s(), notifyPerms); }
+                if (!plot.hasOwner()) { return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_UNOWNED.s(), notifyPerms); }
+                if (FlagManager.isPlotFlagTrue(plot, "vehicle-use")) { return true; }
+                final Flag flag = FlagManager.getPlotFlag(plot, "use");
+                final HashSet<PlotBlock> value = flag == null ? null : (HashSet<PlotBlock>) flag.getValue();
+                if ((value == null) || (!value.contains(PlotBlock.EVERYTHING) && !value.contains(block.getPlotBlock()))) { return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_OTHER.s(),
+                notifyPerms); }
                 return true;
             }
-            case SPAWN_MOB: {
-                if (plot == null) {
-                    return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), notifyPerms);
-                }
-                if (!plot.hasOwner()) {
-                    return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_UNOWNED.s(), notifyPerms);
-                }
-                
-                if (FlagManager.isPlotFlagTrue(plot, "mob-place")) {
-                    return true;
-                }
-                Flag flag = FlagManager.getPlotFlag(plot, "place");
-                HashSet<PlotBlock> value = flag == null ? null : (HashSet<PlotBlock>) flag.getValue();
-                if (value == null || (!value.contains(PlotBlock.EVERYTHING) && !value.contains(block.getPlotBlock()))) {
-                    return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), notifyPerms);
-                }
+            case SPAWN_MOB:
+            {
+                if (plot == null) { return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), notifyPerms); }
+                if (!plot.hasOwner()) { return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_UNOWNED.s(), notifyPerms); }
+
+                if (FlagManager.isPlotFlagTrue(plot, "mob-place")) { return true; }
+                final Flag flag = FlagManager.getPlotFlag(plot, "place");
+                final HashSet<PlotBlock> value = flag == null ? null : (HashSet<PlotBlock>) flag.getValue();
+                if ((value == null) || (!value.contains(PlotBlock.EVERYTHING) && !value.contains(block.getPlotBlock()))) { return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_OTHER.s(),
+                notifyPerms); }
                 return true;
             }
-            case PLACE_HANGING: {
-//                if (plot == null) {
-//                    return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), notifyPerms);
-//                }
-//                if (!plot.hasOwner()) {
-//                    return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_UNOWNED.s(), notifyPerms);
-//                }
-//                
-//                if (FlagManager.isPlotFlagTrue(plot, "hanging-place")) {
-//                    return true;
-//                }
-//                Flag flag = FlagManager.getPlotFlag(plot, "place");
-//                HashSet<PlotBlock> value = flag == null ? null : (HashSet<PlotBlock>) flag.getValue();
-//                if (value == null || (!value.contains(PlotBlock.EVERYTHING) && !value.contains(block.getPlotBlock()))) {
-//                    return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), notifyPerms);
-//                }
+            case PLACE_HANGING:
+            {
+                //                if (plot == null) {
+                //                    return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), notifyPerms);
+                //                }
+                //                if (!plot.hasOwner()) {
+                //                    return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_UNOWNED.s(), notifyPerms);
+                //                }
+                //
+                //                if (FlagManager.isPlotFlagTrue(plot, "hanging-place")) {
+                //                    return true;
+                //                }
+                //                Flag flag = FlagManager.getPlotFlag(plot, "place");
+                //                HashSet<PlotBlock> value = flag == null ? null : (HashSet<PlotBlock>) flag.getValue();
+                //                if (value == null || (!value.contains(PlotBlock.EVERYTHING) && !value.contains(block.getPlotBlock()))) {
+                //                    return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), notifyPerms);
+                //                }
                 return true;
             }
-            case PLACE_MISC: {
-                if (plot == null) {
-                    return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), notifyPerms);
-                }
-                if (!plot.hasOwner()) {
-                    return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_UNOWNED.s(), notifyPerms);
-                }
-                
-                if (FlagManager.isPlotFlagTrue(plot, "misc-place")) {
-                    return true;
-                }
-                Flag flag = FlagManager.getPlotFlag(plot, "place");
-                HashSet<PlotBlock> value = flag == null ? null : (HashSet<PlotBlock>) flag.getValue();
-                if (value == null || (!value.contains(PlotBlock.EVERYTHING) && !value.contains(block.getPlotBlock()))) {
-                    return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), notifyPerms);
-                }
+            case PLACE_MISC:
+            {
+                if (plot == null) { return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), notifyPerms); }
+                if (!plot.hasOwner()) { return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_UNOWNED.s(), notifyPerms); }
+
+                if (FlagManager.isPlotFlagTrue(plot, "misc-place")) { return true; }
+                final Flag flag = FlagManager.getPlotFlag(plot, "place");
+                final HashSet<PlotBlock> value = flag == null ? null : (HashSet<PlotBlock>) flag.getValue();
+                if ((value == null) || (!value.contains(PlotBlock.EVERYTHING) && !value.contains(block.getPlotBlock()))) { return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_OTHER.s(),
+                notifyPerms); }
                 return true;
             }
-            case PLACE_VEHICLE: {
-                if (plot == null) {
-                    return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), notifyPerms);
-                }
-                if (!plot.hasOwner()) {
-                    return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_UNOWNED.s(), notifyPerms);
-                }
-                
-                if (FlagManager.isPlotFlagTrue(plot, "vehicle-place")) {
-                    return true;
-                }
-                Flag flag = FlagManager.getPlotFlag(plot, "place");
-                HashSet<PlotBlock> value = flag == null ? null : (HashSet<PlotBlock>) flag.getValue();
-                if (value == null || (!value.contains(PlotBlock.EVERYTHING) && !value.contains(block.getPlotBlock()))) {
-                    return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), notifyPerms);
-                }
+            case PLACE_VEHICLE:
+            {
+                if (plot == null) { return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), notifyPerms); }
+                if (!plot.hasOwner()) { return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_UNOWNED.s(), notifyPerms); }
+
+                if (FlagManager.isPlotFlagTrue(plot, "vehicle-place")) { return true; }
+                final Flag flag = FlagManager.getPlotFlag(plot, "place");
+                final HashSet<PlotBlock> value = flag == null ? null : (HashSet<PlotBlock>) flag.getValue();
+                if ((value == null) || (!value.contains(PlotBlock.EVERYTHING) && !value.contains(block.getPlotBlock()))) { return Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_OTHER.s(),
+                notifyPerms); }
                 return true;
             }
             default:
diff --git a/src/main/java/com/intellectualcrafters/plot/util/ExpireManager.java b/src/main/java/com/intellectualcrafters/plot/util/ExpireManager.java
index dae1d118f..def86b1f9 100644
--- a/src/main/java/com/intellectualcrafters/plot/util/ExpireManager.java
+++ b/src/main/java/com/intellectualcrafters/plot/util/ExpireManager.java
@@ -23,226 +23,277 @@ import com.intellectualcrafters.plot.object.PlotPlayer;
 import com.intellectualcrafters.plot.object.PlotWorld;
 import com.intellectualcrafters.plot.object.RunnableVal;
 
-public class ExpireManager {
+public class ExpireManager
+{
     public static ConcurrentHashMap<String, List<Plot>> expiredPlots = new ConcurrentHashMap<>();
     public static ConcurrentHashMap<String, Boolean> updatingPlots = new ConcurrentHashMap<>();
     public static ConcurrentHashMap<String, Long> timestamp = new ConcurrentHashMap<>();
     public static ConcurrentHashMap<UUID, Long> dates = new ConcurrentHashMap<>();
     public static int task;
 
-    public static long getTimeStamp(final String world) {
-        if (timestamp.containsKey(world)) {
+    public static long getTimeStamp(final String world)
+    {
+        if (timestamp.containsKey(world))
+        {
             return timestamp.get(world);
-        } else {
+        }
+        else
+        {
             timestamp.put(world, 0l);
             return 0;
         }
     }
 
-    public static boolean updateExpired(final String world) {
+    public static boolean updateExpired(final String world)
+    {
         updatingPlots.put(world, true);
         final long now = System.currentTimeMillis();
-        if (now > getTimeStamp(world)) {
+        if (now > getTimeStamp(world))
+        {
             timestamp.put(world, now + 86400000l);
-            TaskManager.runTaskAsync(new Runnable() {
+            TaskManager.runTaskAsync(new Runnable()
+            {
                 @Override
-                public void run() {
-                    try {
+                public void run()
+                {
+                    try
+                    {
                         final List<Plot> plots = getOldPlots(world);
                         PS.debug("$2[&5Expire&dManager$2] $4Found " + plots.size() + " expired plots for " + world + "!");
                         expiredPlots.put(world, plots);
                         updatingPlots.put(world, false);
                     }
-                    catch (Exception e) {
+                    catch (final Exception e)
+                    {
                         e.printStackTrace();
                     }
                 }
             });
             return true;
-        } else {
+        }
+        else
+        {
             updatingPlots.put(world, false);
             return false;
         }
     }
 
-    public static void runTask() {
-        ExpireManager.task = TaskManager.runTaskRepeatAsync(new Runnable() {
+    public static void runTask()
+    {
+        ExpireManager.task = TaskManager.runTaskRepeatAsync(new Runnable()
+        {
             @Override
-            public void run() {
-                try {
-                    for (final String world : PS.get().getPlotWorldsString()) {
-                        if (!ExpireManager.updatingPlots.containsKey(world)) {
+            public void run()
+            {
+                try
+                {
+                    for (final String world : PS.get().getPlotWorldsString())
+                    {
+                        if (!ExpireManager.updatingPlots.containsKey(world))
+                        {
                             ExpireManager.updatingPlots.put(world, false);
                         }
                         final Boolean updating = ExpireManager.updatingPlots.get(world);
-                        if (updating) {
+                        if (updating)
+                        {
                             PS.debug("$2[&5Expire&dManager$2] $4Waiting on fetch...");
                             return;
                         }
-                        if (!expiredPlots.containsKey(world)) {
+                        if (!expiredPlots.containsKey(world))
+                        {
                             PS.debug("$2[&5Expire&dManager$2] $4Updating expired plots for: " + world);
                             updateExpired(world);
                             return;
                         }
                         final List<Plot> plots = expiredPlots.get(world);
-                        if ((plots == null) || (plots.size() == 0)) {
-                            if (updateExpired(world)) {
+                        if ((plots == null) || (plots.size() == 0))
+                        {
+                            if (updateExpired(world))
+                            {
                                 PS.debug("$2[&5Expire&dManager$2] $4Re-evaluating expired plots for: " + world);
                                 return;
                             }
                             continue;
                         }
                         final Plot plot = plots.iterator().next();
-                        if (!isExpired(plot)) {
+                        if (!isExpired(plot))
+                        {
                             expiredPlots.get(world).remove(plot);
                             PS.debug("$2[&5Expire&dManager$2] &bSkipping no longer expired: " + plot);
                             return;
                         }
-                        for (final UUID helper : plot.getTrusted()) {
+                        for (final UUID helper : plot.getTrusted())
+                        {
                             final PlotPlayer player = UUIDHandler.getPlayer(helper);
-                            if (player != null) {
+                            if (player != null)
+                            {
                                 MainUtil.sendMessage(player, C.PLOT_REMOVED_USER, plot.id.toString());
                             }
                         }
-                        for (final UUID helper : plot.getMembers()) {
+                        for (final UUID helper : plot.getMembers())
+                        {
                             final PlotPlayer player = UUIDHandler.getPlayer(helper);
-                            if (player != null) {
+                            if (player != null)
+                            {
                                 MainUtil.sendMessage(player, C.PLOT_REMOVED_USER, plot.id.toString());
                             }
                         }
                         final PlotManager manager = PS.get().getPlotManager(world);
-                        if (manager == null) {
-                            PS.debug("$2[&5Expire&dManager$2] &cThis is a friendly reminder to create or delete " + world +" as it is currently setup incorrectly");
+                        if (manager == null)
+                        {
+                            PS.debug("$2[&5Expire&dManager$2] &cThis is a friendly reminder to create or delete " + world + " as it is currently setup incorrectly");
                             expiredPlots.get(world).remove(plot);
                             return;
                         }
                         final PlotWorld plotworld = PS.get().getPlotWorld(world);
-                        RunnableVal<PlotAnalysis> run = new RunnableVal<PlotAnalysis>() {
+                        final RunnableVal<PlotAnalysis> run = new RunnableVal<PlotAnalysis>()
+                        {
                             @Override
-                            public void run() {
-                                PlotAnalysis changed = this.value;
-                                if (Settings.CLEAR_THRESHOLD != -1 && plotworld.TYPE == 0 && changed != null) {
-                                    if (changed.changes != 0 && changed.getComplexity() > Settings.CLEAR_THRESHOLD) {
+                            public void run()
+                            {
+                                final PlotAnalysis changed = value;
+                                if ((Settings.CLEAR_THRESHOLD != -1) && (plotworld.TYPE == 0) && (changed != null))
+                                {
+                                    if ((changed.changes != 0) && (changed.getComplexity() > Settings.CLEAR_THRESHOLD))
+                                    {
                                         PS.debug("$2[&5Expire&dManager$2] &bIgnoring modified plot: " + plot + " : " + changed.getComplexity() + " - " + changed.changes);
                                         expiredPlots.get(world).remove(plot);
                                         FlagManager.addPlotFlag(plot, new Flag(FlagManager.getFlag("analysis"), changed.asList()));
                                         return;
                                     }
                                 }
-                                if (plot.isMerged()) {
+                                if (plot.isMerged())
+                                {
                                     MainUtil.unlinkPlot(plot, true);
                                 }
                                 plot.deletePlot(null);
                                 expiredPlots.get(world).remove(plot);
-                                int complexity = changed == null ? 0 : changed.getComplexity();
-                                int modified = changed == null ? 0 : changed.changes;
+                                final int complexity = changed == null ? 0 : changed.getComplexity();
+                                final int modified = changed == null ? 0 : changed.changes;
                                 PS.debug("$2[&5Expire&dManager$2] &cDeleted expired plot: " + plot + " : " + complexity + " - " + modified);
                                 PS.debug("$4 - World: " + plot.world);
-                                if (plot.hasOwner()) {
+                                if (plot.hasOwner())
+                                {
                                     PS.debug("$4 - Owner: " + UUIDHandler.getName(plot.owner));
-                                } else {
+                                }
+                                else
+                                {
                                     PS.debug("$4 - Owner: Unowned");
                                 }
                             }
                         };
-                        if (MainUtil.runners.containsKey(plot)) {
+                        if (MainUtil.runners.containsKey(plot))
+                        {
                             PS.debug("$2[&5Expire&dManager$2] &bSkipping plot in use: " + plot);
                             expiredPlots.get(world).remove(plot);
-                            this.run();
+                            run();
                             return;
                         }
-                        if (Settings.CLEAR_THRESHOLD != -1 && plotworld.TYPE == 0) {
-                            PlotAnalysis analysis = plot.getComplexity();
-                            if (analysis != null) {
-                                if (analysis.getComplexity() > Settings.CLEAR_THRESHOLD) {
+                        if ((Settings.CLEAR_THRESHOLD != -1) && (plotworld.TYPE == 0))
+                        {
+                            final PlotAnalysis analysis = plot.getComplexity();
+                            if (analysis != null)
+                            {
+                                if (analysis.getComplexity() > Settings.CLEAR_THRESHOLD)
+                                {
                                     PS.debug("$2[&5Expire&dManager$2] &bSkipping modified: " + plot);
                                     expiredPlots.get(world).remove(plot);
-                                    this.run();
+                                    run();
                                     return;
                                 }
                             }
                             HybridUtils.manager.analyzePlot(plot, run);
                         }
-                        else {
+                        else
+                        {
                             run.value = null;
                             run.run();
                         }
                         return;
                     }
                 }
-                catch (Exception e) {
+                catch (final Exception e)
+                {
                     e.printStackTrace();
                 }
             }
         }, Settings.CLEAR_INTERVAL * 20);
     }
 
-    public static boolean isExpired(final UUID uuid) {
-        if (UUIDHandler.getPlayer(uuid) != null) {
-            return false;
-        }
+    public static boolean isExpired(final UUID uuid)
+    {
+        if (UUIDHandler.getPlayer(uuid) != null) { return false; }
         final String name = UUIDHandler.getName(uuid);
-        if (name != null) {
+        if (name != null)
+        {
             long last;
-            if (dates.contains(uuid)) {
+            if (dates.contains(uuid))
+            {
                 last = dates.get(uuid);
             }
-            else {
+            else
+            {
                 OfflinePlayer op;
-                if (Settings.TWIN_MODE_UUID) {
+                if (Settings.TWIN_MODE_UUID)
+                {
                     op = Bukkit.getOfflinePlayer(uuid);
                 }
-                else {
+                else
+                {
                     op = Bukkit.getOfflinePlayer(name);
                 }
-                if (op.hasPlayedBefore()) {
+                if (op.hasPlayedBefore())
+                {
                     last = op.getLastPlayed();
                     dates.put(uuid, last);
                 }
-                else {
+                else
+                {
                     return false;
                 }
             }
-            if (last == 0) {
-                return false;
-            }
+            if (last == 0) { return false; }
             final long compared = System.currentTimeMillis() - last;
-            if (compared >= (86400000l * Settings.AUTO_CLEAR_DAYS)) {
-                return true;
-            }
+            if (compared >= (86400000l * Settings.AUTO_CLEAR_DAYS)) { return true; }
         }
         return false;
     }
-    
-    public static boolean isExpired(Plot plot) {
-        for (UUID owner : PlotHandler.getOwners(plot)) {
-            if (!isExpired(owner)) {
-                return false;
-            }
+
+    public static boolean isExpired(final Plot plot)
+    {
+        for (final UUID owner : PlotHandler.getOwners(plot))
+        {
+            if (!isExpired(owner)) { return false; }
         }
         return true;
     }
 
-    public static List<Plot> getOldPlots(final String world) {
+    public static List<Plot> getOldPlots(final String world)
+    {
         final ArrayList<Plot> plots = new ArrayList<>(PS.get().getPlotsInWorld(world));
         final List<Plot> toRemove = new ArrayList<>();
-        Iterator<Plot> iter = plots.iterator();
-        while (iter.hasNext()) {
-            Plot plot = iter.next();
+        final Iterator<Plot> iter = plots.iterator();
+        while (iter.hasNext())
+        {
+            final Plot plot = iter.next();
             final Flag keepFlag = FlagManager.getPlotFlag(plot, "keep");
-            if (keepFlag != null && (Boolean) keepFlag.getValue()) {
+            if ((keepFlag != null) && (Boolean) keepFlag.getValue())
+            {
                 continue;
             }
             final UUID uuid = plot.owner;
-            if (uuid == null) {
+            if (uuid == null)
+            {
                 toRemove.add(plot);
                 continue;
             }
             final PlotPlayer player = UUIDHandler.getPlayer(uuid);
-            if (player != null) {
+            if (player != null)
+            {
                 continue;
             }
-            if (isExpired(plot)) {
+            if (isExpired(plot))
+            {
                 toRemove.add(plot);
             }
         }
diff --git a/src/main/java/com/intellectualcrafters/plot/util/HastebinUtility.java b/src/main/java/com/intellectualcrafters/plot/util/HastebinUtility.java
index a525bc1f9..8ae22a9f6 100644
--- a/src/main/java/com/intellectualcrafters/plot/util/HastebinUtility.java
+++ b/src/main/java/com/intellectualcrafters/plot/util/HastebinUtility.java
@@ -11,47 +11,55 @@ import java.net.URL;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-public class HastebinUtility {
+public class HastebinUtility
+{
 
     public static final String BIN_URL = "http://hastebin.com/documents", USER_AGENT = "Mozilla/5.0";
     public static final Pattern PATTERN = Pattern.compile("\\{\"key\":\"([\\S\\s]*)\"\\}");
 
-    public static String upload(final String string) throws IOException {
-        URL url = new URL(BIN_URL);
-        HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+    public static String upload(final String string) throws IOException
+    {
+        final URL url = new URL(BIN_URL);
+        final HttpURLConnection connection = (HttpURLConnection) url.openConnection();
 
         connection.setRequestMethod("POST");
         connection.setRequestProperty("User-Agent", USER_AGENT);
         connection.setDoOutput(true);
 
-        DataOutputStream outputStream = new DataOutputStream(connection.getOutputStream());
+        final DataOutputStream outputStream = new DataOutputStream(connection.getOutputStream());
         outputStream.write(string.getBytes());
         outputStream.flush();
         outputStream.close();
 
-        BufferedReader in = new BufferedReader(
-                new InputStreamReader(connection.getInputStream()));
+        final BufferedReader in = new BufferedReader(
+        new InputStreamReader(connection.getInputStream()));
         String inputLine;
-        StringBuffer response = new StringBuffer();
+        final StringBuffer response = new StringBuffer();
 
-        while ((inputLine = in.readLine()) != null) {
+        while ((inputLine = in.readLine()) != null)
+        {
             response.append(inputLine);
         }
         in.close();
 
-        Matcher matcher = PATTERN.matcher(response.toString());
-        if (matcher.matches()) {
+        final Matcher matcher = PATTERN.matcher(response.toString());
+        if (matcher.matches())
+        {
             return "http://hastebin.com/" + matcher.group(1);
-        } else {
+        }
+        else
+        {
             throw new RuntimeException("Couldn't read response!");
         }
     }
 
-    public static String upload(final File file) throws IOException {
-        StringBuilder content = new StringBuilder();
-        BufferedReader reader = new BufferedReader(new FileReader(file));
+    public static String upload(final File file) throws IOException
+    {
+        final StringBuilder content = new StringBuilder();
+        final BufferedReader reader = new BufferedReader(new FileReader(file));
         String line;
-        while ((line = reader.readLine()) != null) {
+        while ((line = reader.readLine()) != null)
+        {
             content.append(line).append("\n");
         }
         reader.close();
@@ -59,4 +67,3 @@ public class HastebinUtility {
     }
 
 }
-
diff --git a/src/main/java/com/intellectualcrafters/plot/util/InventoryUtil.java b/src/main/java/com/intellectualcrafters/plot/util/InventoryUtil.java
index 093c5969e..6adfcc723 100644
--- a/src/main/java/com/intellectualcrafters/plot/util/InventoryUtil.java
+++ b/src/main/java/com/intellectualcrafters/plot/util/InventoryUtil.java
@@ -7,15 +7,21 @@ import com.intellectualcrafters.plot.object.PlotPlayer;
 /**
  * This class is only used by internal functions, for most cases use the PlotInventory class
  */
-public abstract class InventoryUtil {
-    
+public abstract class InventoryUtil
+{
+
     /**
      * This class is only used by internal functions, for most cases use the PlotInventory class
      */
     public static InventoryUtil manager = null;
-    public abstract void open(PlotInventory inv);
-    public abstract void close(PlotInventory inv);
-    public abstract void setItem(PlotInventory plotInventory, int index, PlotItemStack item);
-    public abstract PlotItemStack[] getItems(PlotPlayer player);
-    public abstract boolean isOpen(PlotInventory plotInventory);
+
+    public abstract void open(final PlotInventory inv);
+
+    public abstract void close(final PlotInventory inv);
+
+    public abstract void setItem(final PlotInventory plotInventory, final int index, final PlotItemStack item);
+
+    public abstract PlotItemStack[] getItems(final PlotPlayer player);
+
+    public abstract boolean isOpen(final PlotInventory plotInventory);
 }
diff --git a/src/main/java/com/intellectualcrafters/plot/util/Lag.java b/src/main/java/com/intellectualcrafters/plot/util/Lag.java
index 04c69ccd5..2a7b48e4d 100644
--- a/src/main/java/com/intellectualcrafters/plot/util/Lag.java
+++ b/src/main/java/com/intellectualcrafters/plot/util/Lag.java
@@ -1,103 +1,107 @@
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// PlotSquared - A plot manager and world generator for the Bukkit API                             /
-// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
-//                                                                                                 /
-// This program is free software; you can redistribute it and/or modify                            /
-// it under the terms of the GNU General Public License as published by                            /
-// the Free Software Foundation; either version 3 of the License, or                               /
-// (at your option) any later version.                                                             /
-//                                                                                                 /
-// This program is distributed in the hope that it will be useful,                                 /
-// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
-// GNU General Public License for more details.                                                    /
-//                                                                                                 /
-// You should have received a copy of the GNU General Public License                               /
-// along with this program; if not, write to the Free Software Foundation,                         /
-// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
-//                                                                                                 /
-// You can contact us via: support@intellectualsites.com                                           /
-////////////////////////////////////////////////////////////////////////////////////////////////////
-package com.intellectualcrafters.plot.util;
-
-/**
- * TPS and Lag Checker.
- *
- * @author Citymonstret
- */
-public class Lag implements Runnable {
-    /**
-     * Ticks
-     */
-    public final static long[] T = new long[600];
-    /**
-     * Tick count
-     */
-    public static int TC = 0;
-    /**
-     * something :_:
-     */
-    @SuppressWarnings("unused")
-    public static long LT = 0L;
-
-    /**
-     * Get the server TPS
-     *
-     * @return server tick per second
-     */
-    public static double getTPS() {
-        return Math.round(getTPS(100)) > 20.0D ? 20.0D : Math.round(getTPS(100));
-    }
-
-    /**
-     * Return the tick per second (measured in $ticks)
-     *
-     * @param ticks Ticks
-     *
-     * @return ticks per second
-     */
-    public static double getTPS(final int ticks) {
-        if (TC < ticks) {
-            return 20.0D;
-        }
-        final int t = (TC - 1 - ticks) % T.length;
-        final long e = System.currentTimeMillis() - T[t];
-        return ticks / (e / 1000.0D);
-    }
-
-    /**
-     * Get number of ticks since
-     *
-     * @param tI Ticks <
-     *
-     * @return number of ticks since $tI
-     */
-    public static long getElapsed(final int tI) {
-        final long t = T[tI % T.length];
-        return System.currentTimeMillis() - t;
-    }
-
-    /**
-     * Get lag percentage
-     *
-     * @return lag percentage
-     */
-    public static double getPercentage() {
-        return Math.round((1.0D - (Lag.getTPS() / 20.0D)) * 100.0D);
-    }
-
-    /**
-     * Get TPS percentage (of 20)
-     *
-     * @return TPS percentage
-     */
-    public static double getFullPercentage() {
-        return getTPS() * 5.0D;
-    }
-
-    @Override
-    public void run() {
-        T[TC % T.length] = System.currentTimeMillis();
-        TC++;
-    }
-}
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// PlotSquared - A plot manager and world generator for the Bukkit API                             /
+// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
+//                                                                                                 /
+// This program is free software; you can redistribute it and/or modify                            /
+// it under the terms of the GNU General Public License as published by                            /
+// the Free Software Foundation; either version 3 of the License, or                               /
+// (at your option) any later version.                                                             /
+//                                                                                                 /
+// This program is distributed in the hope that it will be useful,                                 /
+// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
+// GNU General Public License for more details.                                                    /
+//                                                                                                 /
+// You should have received a copy of the GNU General Public License                               /
+// along with this program; if not, write to the Free Software Foundation,                         /
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
+//                                                                                                 /
+// You can contact us via: support@intellectualsites.com                                           /
+////////////////////////////////////////////////////////////////////////////////////////////////////
+package com.intellectualcrafters.plot.util;
+
+/**
+ * TPS and Lag Checker.
+ *

+ */
+public class Lag implements Runnable
+{
+    /**
+     * Ticks
+     */
+    public final static long[] T = new long[600];
+    /**
+     * Tick count
+     */
+    public static int TC = 0;
+    /**
+     * something :_:
+     */
+    @SuppressWarnings("unused")
+    public static long LT = 0L;
+
+    /**
+     * Get the server TPS
+     *
+     * @return server tick per second
+     */
+    public static double getTPS()
+    {
+        return Math.round(getTPS(100)) > 20.0D ? 20.0D : Math.round(getTPS(100));
+    }
+
+    /**
+     * Return the tick per second (measured in $ticks)
+     *
+     * @param ticks Ticks
+     *
+     * @return ticks per second
+     */
+    public static double getTPS(final int ticks)
+    {
+        if (TC < ticks) { return 20.0D; }
+        final int t = (TC - 1 - ticks) % T.length;
+        final long e = System.currentTimeMillis() - T[t];
+        return ticks / (e / 1000.0D);
+    }
+
+    /**
+     * Get number of ticks since
+     *
+     * @param tI Ticks <
+     *
+     * @return number of ticks since $tI
+     */
+    public static long getElapsed(final int tI)
+    {
+        final long t = T[tI % T.length];
+        return System.currentTimeMillis() - t;
+    }
+
+    /**
+     * Get lag percentage
+     *
+     * @return lag percentage
+     */
+    public static double getPercentage()
+    {
+        return Math.round((1.0D - (Lag.getTPS() / 20.0D)) * 100.0D);
+    }
+
+    /**
+     * Get TPS percentage (of 20)
+     *
+     * @return TPS percentage
+     */
+    public static double getFullPercentage()
+    {
+        return getTPS() * 5.0D;
+    }
+
+    @Override
+    public void run()
+    {
+        T[TC % T.length] = System.currentTimeMillis();
+        TC++;
+    }
+}
diff --git a/src/main/java/com/intellectualcrafters/plot/util/MainUtil.java b/src/main/java/com/intellectualcrafters/plot/util/MainUtil.java
index 7bfa2cf5b..06233179a 100644
--- a/src/main/java/com/intellectualcrafters/plot/util/MainUtil.java
+++ b/src/main/java/com/intellectualcrafters/plot/util/MainUtil.java
@@ -1,1931 +1,2191 @@
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// PlotSquared - A plot manager and world generator for the Bukkit API                             /
-// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
-//                                                                                                 /
-// This program is free software; you can redistribute it and/or modify                            /
-// it under the terms of the GNU General Public License as published by                            /
-// the Free Software Foundation; either version 3 of the License, or                               /
-// (at your option) any later version.                                                             /
-//                                                                                                 /
-// This program is distributed in the hope that it will be useful,                                 /
-// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
-// GNU General Public License for more details.                                                    /
-//                                                                                                 /
-// You should have received a copy of the GNU General Public License                               /
-// along with this program; if not, write to the Free Software Foundation,                         /
-// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
-//                                                                                                 /
-// You can contact us via: support@intellectualsites.com                                           /
-////////////////////////////////////////////////////////////////////////////////////////////////////
-package com.intellectualcrafters.plot.util;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.ConcurrentHashMap;
-
-import com.intellectualcrafters.plot.PS;
-import com.intellectualcrafters.plot.config.C;
-import com.intellectualcrafters.plot.config.Settings;
-import com.intellectualcrafters.plot.database.DBFunc;
-import com.intellectualcrafters.plot.object.BlockLoc;
-import com.intellectualcrafters.plot.object.ChunkLoc;
-import com.intellectualcrafters.plot.object.Location;
-import com.intellectualcrafters.plot.object.Plot;
-import com.intellectualcrafters.plot.object.PlotBlock;
-import com.intellectualcrafters.plot.object.PlotCluster;
-import com.intellectualcrafters.plot.object.PlotId;
-import com.intellectualcrafters.plot.object.PlotManager;
-import com.intellectualcrafters.plot.object.PlotPlayer;
-import com.intellectualcrafters.plot.object.PlotWorld;
-import com.intellectualcrafters.plot.object.PseudoRandom;
-import com.intellectualcrafters.plot.object.RunnableVal;
-import com.plotsquared.listener.PlotListener;
-
-/**
- * plot functions
- *
- * @author Citymonstret
- */
-public class MainUtil {
-    public final static HashMap<Plot, Integer> runners = new HashMap<>();
-    public static boolean canSendChunk = false;
-    public static boolean canSetFast = true;
-    public static ArrayList<String> runners_p = new ArrayList<>();
-    public static HashMap<String, PlotId> lastPlot = new HashMap<>();
-    public static HashMap<String, Integer> worldBorder = new HashMap<>();
-    static long state = 1;
-    static PseudoRandom random = new PseudoRandom();
-    
-    public static short[][] x_loc;
-    public static short[][] y_loc;
-    public static short[][] z_loc;
-
-    public static void initCache() {
-        if (x_loc == null) {
-            x_loc = new short[16][4096];
-            y_loc = new short[16][4096];
-            z_loc = new short[16][4096];
-            for (int i = 0; i < 16; i++) {
-                int i4 = i << 4;
-                for (int j = 0; j < 4096; j++) {
-                    final int y = (i4) + (j >> 8);
-                    final int a = (j - ((y & 0xF) << 8));
-                    final int z1 = (a >> 4);
-                    final int x1 = a - (z1 << 4);
-                    x_loc[i][j] = (short) x1;
-                    y_loc[i][j] = (short) y;
-                    z_loc[i][j] = (short) z1;
-                }
-            }
-        }
-    }
-    
-    public static boolean isPlotArea(final Location location) {
-        final PlotWorld plotworld = PS.get().getPlotWorld(location.getWorld());
-        if (plotworld == null) {
-            return false;
-        }
-        if (plotworld.TYPE == 2) {
-            return ClusterManager.getCluster(location) != null;
-        }
-        return true;
-    }
-    
-    public static String getName(UUID owner) {
-        if (owner == null) {
-            return C.NONE.s();
-        }
-        String name = UUIDHandler.getName(owner);
-        if (name == null) {
-            return C.UNKNOWN.s();
-        }
-        return name;
-    }
-    
-    public static List<PlotPlayer> getPlayersInPlot(Plot plot) {
-        ArrayList<PlotPlayer> players = new ArrayList<>();
-        for (PlotPlayer pp : UUIDHandler.getPlayers().values()) {
-            if (plot.equals(pp.getCurrentPlot())) {
-                players.add(pp);
-            }
-        }
-        return players;
-    }
-    
-    public static void reEnterPlot(final Plot plot) {
-        TaskManager.runTaskLater(new Runnable() {
-            @Override
-            public void run() {
-                for (PlotPlayer pp : getPlayersInPlot(plot)) {
-                    PlotListener.plotExit(pp, plot);
-                    PlotListener.plotEntry(pp, plot);
-                }
-            }
-        }, 1);
-    }
-    
-    public static Location getPlotCenter(Plot plot) {
-        Location bot = getPlotBottomLoc(plot.world, plot.id);
-        Location top = getPlotTopLoc(plot.world, plot.id).add(1, 0, 1);
-        return new Location(plot.world, bot.getX() + (top.getX() - bot.getX()) / 2, 0, bot.getZ() + (top.getZ() - bot.getZ()) / 2);
-    }
-    
-    public static List<Plot> getPlotsBySearch(String search) {
-        String[] split = search.split(" ");
-        int size = split.length * 2;
-
-        List<UUID> uuids = new ArrayList<>();
-        PlotId id = null;
-        String world = null;
-        String alias = null;
-        
-        for (String term : split) {
-            try {
-                UUID uuid = UUIDHandler.getUUID(term, null);
-                if (uuid == null) {
-                    uuid = UUID.fromString(term);
-                }
-                if (uuid != null) {
-                    uuids.add(uuid);
-                    continue;
-                }
-            }
-            catch (Exception e) {
-                id = PlotId.fromString(term);
-                if (id != null) {
-                    continue;
-                }
-                for (String pw : PS.get().getPlotWorlds()) {
-                    if (pw.equalsIgnoreCase(term)) {
-                        world = pw;
-                        break;
-                    }
-                }
-                if (world == null) {
-                    alias = term;
-                }
-            }
-        }
-        
-        ArrayList<ArrayList<Plot>> plotList = new ArrayList<>(size);
-        for (int i = 0; i < size; i++) {
-            plotList.add(new ArrayList<Plot>());
-        }
-        
-        for (Plot plot : PS.get().getPlots()) {
-            int count = 0;
-            if (uuids.size() > 0) {
-                for (UUID uuid : uuids) {
-                    if (plot.isOwner(uuid)) {
-                        count += 2;
-                    }
-                    else if (plot.isAdded(uuid)) {
-                        count++;
-                    }
-                }
-            }
-            if (id != null) {
-                if (plot.id.equals(id)) {
-                    count++;
-                }
-            }
-            if (world != null && plot.world.equals(world)) {
-                count++;
-            }
-            if (alias != null && alias.equals(plot.getSettings().getAlias())) {
-                count+=2;
-            }
-            if (count != 0) {
-                plotList.get(count - 1).add(plot);
-            }
-        }
-        
-        List<Plot> plots = new ArrayList<Plot>();
-        for (int i = plotList.size() - 1; i >= 0; i--) {
-            if (plotList.get(i).size() > 0) {
-                plots.addAll(plotList.get(i));
-            }
-        }
-        return plots;
-    }
-    
-    public static Plot getPlotFromString(PlotPlayer player, String arg, boolean message) {
-        if (arg == null) {
-            if (player == null) {
-                if (message) MainUtil.sendMessage(player, C.NOT_VALID_PLOT_WORLD);
-                return null;
-            }
-            return getPlot(player.getLocation());
-        }
-        String worldname = null;
-        PlotId id = null;
-        if (player != null) {
-            worldname = player.getLocation().getWorld();
-        }
-        String[] split = arg.split(";|,");
-        if (split.length == 3) {
-            worldname = split[0];
-            id = PlotId.fromString(split[1] + ";" + split[2]);
-        }
-        else if (split.length == 2) {
-            id = PlotId.fromString(arg);
-        }
-        else {
-            if (worldname == null) {
-                if (PS.get().getPlotWorlds().size() == 0) {
-                    if (message) MainUtil.sendMessage(player, C.NOT_VALID_PLOT_WORLD);
-                    return null;
-                }
-                worldname = PS.get().getPlotWorlds().iterator().next();
-            }
-            for (Plot p : PS.get().getPlotsInWorld(worldname)) {
-                String name = p.getSettings().getAlias();
-                if (name.length() != 0 && name.equalsIgnoreCase(arg)) {
-                    return p;
-                }
-            }
-            for (String world : PS.get().getPlotWorlds()) {
-                if (!world.endsWith(worldname)) {
-                    for (Plot p : PS.get().getPlotsInWorld(world)) {
-                        String name = p.getSettings().getAlias();
-                        if (name.length() != 0 && name.equalsIgnoreCase(arg)) {
-                            return p;
-                        }  
-                    }
-                }
-            }
-        }
-        if (worldname == null || !PS.get().isPlotWorld(worldname)) {
-            if (message) MainUtil.sendMessage(player, C.NOT_VALID_PLOT_WORLD);
-            return null;
-        }
-        if (id == null) {
-            if (message) MainUtil.sendMessage(player, C.NOT_VALID_PLOT_ID); 
-            return null;
-        }
-        return getPlot(worldname, id);
-    }
-    
-    /**
-     * Merges all plots in the arraylist (with cost)
-     *
-     * @param world
-     * @param plotIds
-     *
-     * @return boolean
-     */
-    public static boolean mergePlots(final PlotPlayer player, final String world, final ArrayList<PlotId> plotIds) {
-        final PlotWorld plotworld = PS.get().getPlotWorld(world);
-        if ((EconHandler.manager != null) && plotworld.USE_ECONOMY) {
-            final double cost = plotIds.size() * plotworld.MERGE_PRICE;
-            if (cost > 0d) {
-                if (EconHandler.manager.getMoney(player) < cost) {
-                    MainUtil.sendMessage(player, C.CANNOT_AFFORD_MERGE, "" + cost);
-                    return false;
-                }
-                EconHandler.manager.withdrawMoney(player, cost);
-                MainUtil.sendMessage(player, C.REMOVED_BALANCE, cost + "");
-            }
-        }
-        return MainUtil.mergePlots(world, plotIds, true, true);
-    }
-    
-    public static boolean unlinkPlot(final Plot plot, boolean createRoad) {
-        final String world = plot.world;
-        final PlotId pos1 = MainUtil.getBottomPlot(plot).id;
-        final PlotId pos2 = MainUtil.getTopPlot(plot).id;
-        final ArrayList<PlotId> ids = MainUtil.getPlotSelectionIds(pos1, pos2);
-        final boolean result = EventUtil.manager.callUnlink(world, ids);
-        if (!result) {
-            return false;
-        }
-        final PlotManager manager = PS.get().getPlotManager(world);
-        final PlotWorld plotworld = PS.get().getPlotWorld(world);
-        manager.startPlotUnlink(plotworld, ids);
-        for (final PlotId id : ids) {
-            final Plot myplot = PS.get().getPlot(world, id);
-            if (plot == null) {
-                continue;
-            }
-            if (plot.trusted != null) {
-                myplot.trusted = plot.trusted;
-            }
-            if (plot.denied != null) {
-                myplot.denied = plot.denied;
-            }
-            myplot.getSettings().setMerged(new boolean[] { false, false, false, false });
-            DBFunc.setMerged(myplot, myplot.getSettings().getMerged());
-        }
-        if (plotworld.TERRAIN != 3 && createRoad) {
-            for (int x = pos1.x; x <= pos2.x; x++) {
-                for (int y = pos1.y; y <= pos2.y; y++) {
-                    final boolean lx = x < pos2.x;
-                    final boolean ly = y < pos2.y;
-                    final Plot p = MainUtil.getPlot(world, new PlotId(x, y));
-                    if (lx) {
-                        manager.createRoadEast(plotworld, p);
-                        if (ly) {
-                            manager.createRoadSouthEast(plotworld, p);
-                        }
-                    }
-                    if (ly) {
-                        manager.createRoadSouth(plotworld, p);
-                    }
-                    MainUtil.setSign(UUIDHandler.getName(plot.owner), plot);
-                }
-            }
-        }
-        manager.finishPlotUnlink(plotworld, ids);
-        for (final PlotId id : ids) {
-            final Plot myPlot = MainUtil.getPlot(world, id);
-            if (plot.hasOwner()) {
-                final String name = UUIDHandler.getName(myPlot.owner);
-                if (name != null) {
-                    MainUtil.setSign(name, myPlot);
-                }
-            }
-        }
-        return true;
-    }
-    
-    public static boolean isPlotAreaAbs(final Location location) {
-        final PlotWorld plotworld = PS.get().getPlotWorld(location.getWorld());
-        if (plotworld == null) {
-            return false;
-        }
-        if (plotworld.TYPE == 2) {
-            return ClusterManager.getClusterAbs(location) != null;
-        }
-        return true;
-    }
-    
-    public static boolean isPlotRoad(final Location location) {
-        final PlotWorld plotworld = PS.get().getPlotWorld(location.getWorld());
-        if (plotworld.TYPE == 2) {
-            PlotCluster cluster = ClusterManager.getCluster(location);
-            if (cluster == null) {
-                return false;
-            }
-        }
-        PlotManager manager = PS.get().getPlotManager(location.getWorld());
-        return manager.getPlotId(plotworld, location.getX(), location.getY(), location.getZ()) == null;
-    }
-    
-    public static boolean isPlotArea(final Plot plot) {
-        final PlotWorld plotworld = PS.get().getPlotWorld(plot.world);
-        if (plotworld.TYPE == 2) {
-            return plot.getCluster() != null;
-        }
-        return true;
-    }
-    
-    public static boolean enteredPlot(final Location l1, final Location l2) {
-        final PlotId p1 = MainUtil.getPlotId(l1);
-        final PlotId p2 = MainUtil.getPlotId(l2);
-        return (p2 != null) && ((p1 == null) || !p1.equals(p2));
-    }
-
-    public static boolean leftPlot(final Location l1, final Location l2) {
-        final PlotId p1 = MainUtil.getPlotId(l1);
-        final PlotId p2 = MainUtil.getPlotId(l2);
-        return (p1 != null) && ((p2 == null) || !p1.equals(p2));
-    }
-    
-    public static ArrayList<PlotId> getMaxPlotSelectionIds(final String world, PlotId pos1, PlotId pos2) {
-
-        final Plot plot1 = PS.get().getPlot(world, pos1);
-        final Plot plot2 = PS.get().getPlot(world, pos2);
-        
-        if (plot1 != null) {
-            pos1 = getBottomPlot(plot1).id;
-        }
-        
-        if (plot2 != null) {
-            pos2 = getTopPlot(plot2).id;
-        }
-        
-        final ArrayList<PlotId> myplots = new ArrayList<>();
-        for (int x = pos1.x; x <= pos2.x; x++) {
-            for (int y = pos1.y; y <= pos2.y; y++) {
-                myplots.add(new PlotId(x, y));
-            }
-        }
-        return myplots;
-    }
-    
-    public static boolean equals(Object a, Object b) {
-        if (a == b) {
-            return true;
-        }
-        if (a == null ^ b == null) {
-            return false;
-        }
-        return a.equals(b);
-    }
-
-    /**
-     * Get the number of plots for a player
-     *
-     * @param plr
-     *
-     * @return int plot count
-     */
-    public static int getPlayerPlotCount(final String world, final PlotPlayer plr) {
-        final UUID uuid = plr.getUUID();
-        int count = 0;
-        for (final Plot plot : PS.get().getPlotsInWorld(world)) {
-            if (plot.hasOwner() && plot.owner.equals(uuid) && (!Settings.DONE_COUNTS_TOWARDS_LIMIT || !plot.getSettings().flags.containsKey("done"))) {
-                count++;
-            }
-        }
-        return count;
-    }
-
-    /**
-     * Get a player's total number of plots that count towards their limit
-     * @param plr
-     * @return
-     */
-    public static int getPlayerPlotCount(final PlotPlayer plr) {
-        int count = 0;
-        for (final String world : PS.get().getPlotWorldsString()) {
-            count += getPlayerPlotCount(world, plr);
-        }
-        return count;
-    }
-    
-    public static Location getDefaultHome(Plot plot) {
-        PlotWorld plotworld = PS.get().getPlotWorld(plot.world);
-        if (plotworld.DEFAULT_HOME != null) {
-            final Location bot = getPlotBottomLoc(plot.world, plot.id).add(1, 0, 1);
-            final PlotManager manager = PS.get().getPlotManager(plot.world);
-            final int x;
-            final int z;
-            if (plotworld.DEFAULT_HOME.x == Integer.MAX_VALUE && plotworld.DEFAULT_HOME.z == Integer.MAX_VALUE) {
-                final Location top = getPlotTopLoc(plot.world, plot.id);
-                x = ((top.getX() - bot.getX()) / 2) + bot.getX();
-                z = ((top.getZ() - bot.getZ()) / 2) + bot.getZ();
-            }
-            else {
-                x = bot.getX() + plotworld.DEFAULT_HOME.x;
-                z = bot.getZ() + plotworld.DEFAULT_HOME.z;
-            }
-            final int y = Math.max(getHeighestBlock(plot.world, x, z), manager.getSignLoc(PS.get().getPlotWorld(plot.world), plot).getY());
-            return new Location(plot.world, x, y + 1, z);
-        }
-        final Location top = getPlotTopLoc(plot.world, plot.id);
-        final Location bot = getPlotBottomLoc(plot.world, plot.id).add(1, 0, 1);
-        final int x = ((top.getX() - bot.getX()) / 2) + bot.getX();
-        final int z = bot.getZ();
-        PlotManager manager = PS.get().getPlotManager(plot.world);
-        final int y = Math.max(getHeighestBlock(plot.world, x, z), manager.getSignLoc(PS.get().getPlotWorld(plot.world), plot).getY());
-        return new Location(plot.world, x, y + 1, z - 1);
-    }
-
-    public static boolean teleportPlayer(final PlotPlayer player, final Location from, final Plot plot) {
-        final Plot bot = MainUtil.getBottomPlot(plot);
-        boolean result = EventUtil.manager.callTeleport(player, from, plot);
-
-        if (result) {
-            final Location location;
-            if (PS.get().getPlotWorld(plot.world).HOME_ALLOW_NONMEMBER || plot.isAdded(player.getUUID())) {
-                location = MainUtil.getPlotHome(bot);
-            }
-            else {
-                location = getDefaultHome(plot);
-            }
-            if ((Settings.TELEPORT_DELAY == 0) || Permissions.hasPermission(player, "plots.teleport.delay.bypass")) {
-                sendMessage(player, C.TELEPORTED_TO_PLOT);
-                player.teleport(location);
-                return true;
-            }
-            sendMessage(player, C.TELEPORT_IN_SECONDS, Settings.TELEPORT_DELAY + "");
-            final String name = player.getName();
-            TaskManager.TELEPORT_QUEUE.add(name);
-            TaskManager.runTaskLater(new Runnable() {
-                @Override
-                public void run() {
-                    if (!TaskManager.TELEPORT_QUEUE.contains(name)) {
-                        sendMessage(player, C.TELEPORT_FAILED);
-                        return;
-                    }
-                    TaskManager.TELEPORT_QUEUE.remove(name);
-                    if (!player.isOnline()) {
-                        return;
-                    }
-                    sendMessage(player, C.TELEPORTED_TO_PLOT);
-                    player.teleport(location);
-                }
-            }, Settings.TELEPORT_DELAY * 20);
-            return true;
-        }
-        return result;
-    }
-
-    public static int getBorder(final String worldname) {
-        if (worldBorder.containsKey(worldname)) {
-            int border = worldBorder.get(worldname) + 16;
-            if (border == 0) {
-                return Integer.MAX_VALUE;
-            }
-            else {
-                return border;
-            }
-        }
-        return Integer.MAX_VALUE;
-    }
-
-    public static void setupBorder(final String world) {
-        final PlotWorld plotworld = PS.get().getPlotWorld(world);
-        if (!plotworld.WORLD_BORDER) {
-            return;
-        }
-        if (!worldBorder.containsKey(world)) {
-            worldBorder.put(world, 0);
-        }
-        for (final Plot plot : PS.get().getPlotsInWorld(world)) {
-            updateWorldBorder(plot);
-        }
-    }
-
-    public static void update(String world, ChunkLoc loc) {
-        BlockUpdateUtil.setBlockManager.update(world, Arrays.asList(loc));
-    }
-    
-    public static void update(final Plot plot) {
-        Location bot = getPlotBottomLoc(plot.world, plot.id).add(1, 0, 1);
-        Location top = getPlotTopLoc(plot.world, plot.id);
-        
-        int bx = bot.getX() >> 4;
-        int bz = bot.getZ() >> 4;
-        
-        int tx = (top.getX() >> 4);
-        int tz = (top.getZ() >> 4);
-        
-        ArrayList<ChunkLoc> chunks = new ArrayList<>();
-        
-        for (int x = bx; x <= tx; x++) {
-            for (int z = bz; z <= tz; z++) {
-                chunks.add(new ChunkLoc(x, z));
-            }
-        }
-        BlockUpdateUtil.setBlockManager.update(plot.world, chunks);
-    }
-
-    public static void createWorld(final String world, final String generator) {
-    }
-
-    public static PlotId parseId(final String arg) {
-        try {
-            final String[] split = arg.split(";");
-            return new PlotId(Integer.parseInt(split[0]), Integer.parseInt(split[1]));
-        } catch (final Exception e) {
-            return null;
-        }
-    }
-
-    /**
-     * direction 0 = north, 1 = south, etc:
-     *
-     * @param id
-     * @param direction
-     *
-     * @return PlotId relative
-     */
-    public static PlotId getPlotIdRelative(final PlotId id, final int direction) {
-        switch (direction) {
-            case 0:
-                return new PlotId(id.x, id.y - 1);
-            case 1:
-                return new PlotId(id.x + 1, id.y);
-            case 2:
-                return new PlotId(id.x, id.y + 1);
-            case 3:
-                return new PlotId(id.x - 1, id.y);
-        }
-        return id;
-    }
-
-    /**
-     * Get a list of plot ids within a selection
-     * @param pos1
-     * @param pos2
-     * @return
-     */
-    public static ArrayList<PlotId> getPlotSelectionIds(final PlotId pos1, final PlotId pos2) {
-        final ArrayList<PlotId> myplots = new ArrayList<>();
-        for (int x = pos1.x; x <= pos2.x; x++) {
-            for (int y = pos1.y; y <= pos2.y; y++) {
-                myplots.add(new PlotId(x, y));
-            }
-        }
-        return myplots;
-    }
-    
-    /**
-     * Get a set of owned plots within a selection (chooses the best algorithm based on selection size.<br>
-     * i.e. A selection of billions of plots will work fine
-     * @param pos1
-     * @param pos2
-     * @return
-     */
-    public static HashSet<Plot> getPlotSelectionOwned(String world, final PlotId pos1, final PlotId pos2) {
-        int size = (1 + pos2.x - pos1.x) * (1 + pos2.y - pos1.y);
-        HashSet<Plot> result = new HashSet<>();
-        if (PS.get().isPlotWorld(world)) {
-            if (size < PS.get().getAllPlotsRaw().get(world).size()) {
-                for (PlotId pid : MainUtil.getPlotSelectionIds(pos1, pos2)) {
-                    Plot plot = MainUtil.getPlot(world, pid);
-                    if (plot.hasOwner()) {
-                        if (plot.id.x > pos1.x || plot.id.y > pos1.y || plot.id.x < pos2.x || plot.id.y < pos2.y) {
-                            result.add(plot);
-                        }
-                    }
-                }
-            }
-            else {
-                for (Plot plot : PS.get().getPlotsInWorld(world)) {
-                    if (plot.id.x > pos1.x || plot.id.y > pos1.y || plot.id.x < pos2.x || plot.id.y < pos2.y) {
-                        result.add(plot);
-                    }
-                }
-            }
-        }
-        return result;
-    }
-
-    /**
-     * Completely merges a set of plots<br> <b>(There are no checks to make sure you supply the correct
-     * arguments)</b><br> - Misuse of this method can result in unusable plots<br> - the set of plots must belong to one
-     * owner and be rectangular<br> - the plot array must be sorted in ascending order<br> - Road will be removed where
-     * required<br> - changes will be saved to DB<br>
-     *
-     * @param world
-     * @param plotIds
-     *
-     * @return boolean (success)
-     */
-    public static boolean mergePlots(final String world, final ArrayList<PlotId> plotIds, final boolean removeRoads, final boolean updateDatabase) {
-        if (plotIds.size() < 2) {
-            return false;
-        }
-        
-//        merged plots set db before finished merging
-        
-        final PlotId pos1 = plotIds.get(0);
-        final PlotId pos2 = plotIds.get(plotIds.size() - 1);
-        final PlotManager manager = PS.get().getPlotManager(world);
-        final PlotWorld plotworld = PS.get().getPlotWorld(world);
-
-        boolean result = EventUtil.manager.callMerge(world, getPlot(world, pos1), plotIds);
-        if (!result) {
-            return false;
-        }
-        
-        HashSet<UUID> trusted = new HashSet<UUID>();
-        HashSet<UUID> members = new HashSet<UUID>();
-        HashSet<UUID> denied = new HashSet<UUID>();
-
-        manager.startPlotMerge(plotworld, plotIds);
-        for (int x = pos1.x; x <= pos2.x; x++) {
-            for (int y = pos1.y; y <= pos2.y; y++) {
-                final PlotId id = new PlotId(x, y);
-                final Plot plot = PS.get().getPlot(world, id);
-                trusted.addAll(plot.getTrusted());
-                members.addAll(plot.getMembers());
-                denied.addAll(plot.getDenied());
-                if (removeRoads) {
-                    removeSign(plot);
-                }
-            }
-        }
-        members.removeAll(trusted);
-        denied.removeAll(trusted);
-        denied.removeAll(members);
-        for (int x = pos1.x; x <= pos2.x; x++) {
-            for (int y = pos1.y; y <= pos2.y; y++) {
-                final boolean lx = x < pos2.x;
-                final boolean ly = y < pos2.y;
-                final PlotId id = new PlotId(x, y);
-                final Plot plot = PS.get().getPlot(world, id);
-                plot.setTrusted(trusted);
-                plot.setMembers(members);
-                plot.setDenied(denied);
-                Plot plot2 = null;
-                if (lx) {
-                    if (ly) {
-                        if (!plot.getSettings().getMerged(1) || !plot.getSettings().getMerged(2)) {
-                            if (removeRoads) { 
-                                MainUtil.removeRoadSouthEast(plotworld, plot);
-                            }
-                        }
-                    }
-                    if (!plot.getSettings().getMerged(1)) {
-                        plot2 = PS.get().getPlot(world, new PlotId(x + 1, y));
-                        mergePlot(world, plot, plot2, removeRoads);
-                        plot.getSettings().setMerged(1, true);
-                        plot2.getSettings().setMerged(3, true);
-                    }
-                }
-                if (ly) {
-                    if (!plot.getSettings().getMerged(2)) {
-                        plot2 = PS.get().getPlot(world, new PlotId(x, y + 1));
-                        mergePlot(world, plot, plot2, removeRoads);
-                        plot.getSettings().setMerged(2, true);
-                        plot2.getSettings().setMerged(0, true);
-                    }
-                }
-            }
-        }
-        manager.finishPlotMerge(plotworld, plotIds);
-        if (updateDatabase) {
-            for (int x = pos1.x; x <= pos2.x; x++) {
-                for (int y = pos1.y; y <= pos2.y; y++) {
-                    final PlotId id = new PlotId(x, y);
-                    final Plot plot = PS.get().getPlot(world, id);
-                    DBFunc.setMerged(plot, plot.getSettings().getMerged());
-                }
-            }
-        }
-        return true;
-    }
-    
-    public static void removeRoadSouthEast(PlotWorld plotworld, Plot plot) {
-        if (plotworld.TYPE != 0 && plotworld.TERRAIN > 1) {
-            if (plotworld.TERRAIN == 3) {
-                return;
-            }
-            PlotId id = plot.id;
-            PlotId id2 = new PlotId(id.x + 1, id.y + 1);
-            Location pos1 = getPlotTopLocAbs(plot.world, id).add(1, 0, 1);
-            Location pos2 = getPlotBottomLocAbs(plot.world, id2);
-            pos1.setY(0);
-            pos2.setY(256);
-            ChunkManager.manager.regenerateRegion(pos1, pos2, null);
-        }
-        else {
-            PS.get().getPlotManager(plot.world).removeRoadSouthEast(plotworld, plot);
-        }
-    }
-    
-    public static void removeRoadEast(PlotWorld plotworld, Plot plot) {
-        if (plotworld.TYPE != 0 && plotworld.TERRAIN > 1) {
-            if (plotworld.TERRAIN == 3) {
-                return;
-            }
-            PlotId id = plot.id;
-            PlotId id2 = new PlotId(id.x + 1, id.y);
-            Location bot = getPlotBottomLocAbs(plot.world, id2);
-            Location top = getPlotTopLocAbs(plot.world, id);
-            Location pos1 = new Location(plot.world, top.getX() + 1, 0, bot.getZ() + 1);
-            Location pos2 = new Location(plot.world, bot.getX(), 256, top.getZ());
-            ChunkManager.manager.regenerateRegion(pos1, pos2, null);
-        }
-        else {
-            PS.get().getPlotManager(plot.world).removeRoadEast(plotworld, plot);
-        }
-    }
-    
-    public static void removeRoadSouth(PlotWorld plotworld, Plot plot) {
-        if (plotworld.TYPE != 0 && plotworld.TERRAIN > 1) {
-            if (plotworld.TERRAIN == 3) {
-                return;
-            }
-            PlotId id = plot.id;
-            PlotId id2 = new PlotId(id.x, id.y + 1);
-            Location bot = getPlotBottomLocAbs(plot.world, id2);
-            Location top = getPlotTopLocAbs(plot.world, id);
-            Location pos1 = new Location(plot.world, bot.getX() + 1, 0, top.getZ() + 1);
-            Location pos2 = new Location(plot.world, top.getX(), 256, bot.getZ());
-            ChunkManager.manager.regenerateRegion(pos1, pos2, null);
-        }
-        else {
-            PS.get().getPlotManager(plot.world).removeRoadSouth(plotworld, plot);
-        }
-    }
-
-    
-    /**
-     * Merges 2 plots Removes the road inbetween <br> - Assumes the first plot parameter is lower <br> - Assumes neither
-     * are a Mega-plot <br> - Assumes plots are directly next to each other <br> - Does not save to DB
-     *
-     * @param world
-     * @param lesserPlot
-     * @param greaterPlot
-     */
-    public static void mergePlot(final String world, final Plot lesserPlot, final Plot greaterPlot, final boolean removeRoads) {
-        final PlotWorld plotworld = PS.get().getPlotWorld(world);
-        if (lesserPlot.id.x.equals(greaterPlot.id.x)) {
-            if (!lesserPlot.getSettings().getMerged(2)) {
-                lesserPlot.getSettings().setMerged(2, true);
-                greaterPlot.getSettings().setMerged(0, true);
-                if (removeRoads) {
-                    MainUtil.removeRoadSouth(plotworld, lesserPlot);
-                }
-            }
-        } else {
-            if (!lesserPlot.getSettings().getMerged(1)) {
-                lesserPlot.getSettings().setMerged(1, true);
-                greaterPlot.getSettings().setMerged(3, true);
-                if (removeRoads) {
-                    MainUtil.removeRoadEast(plotworld, lesserPlot);
-                }
-            }
-        }
-    }
-
-    public static void removeSign(final Plot p) {
-        if (!PS.get().isMainThread(Thread.currentThread())) {
-            TaskManager.runTask(new Runnable() {
-                @Override
-                public void run() {
-                    removeSign(p);
-                }
-            });
-            return;
-        }
-        final String world = p.world;
-        final PlotManager manager = PS.get().getPlotManager(world);
-        final PlotWorld plotworld = PS.get().getPlotWorld(world);
-        if (!plotworld.ALLOW_SIGNS) {
-            return;
-        }
-        final Location loc = manager.getSignLoc(plotworld, p);
-        BlockManager.setBlocks(world, new int[]{loc.getX()}, new int[]{loc.getY()}, new int[]{loc.getZ()}, new int[]{0}, new byte[]{0});
-    }
-    
-    public static void setSign(final Plot p) {
-        if (p.owner == null) {
-            setSign(null, p);
-            return;
-        }
-        setSign(UUIDHandler.getName(p.owner), p);
-    }
-
-    public static void setSign(final String name, final Plot p) {
-        if (!PS.get().isMainThread(Thread.currentThread())) {
-            TaskManager.runTask(new Runnable() {
-                @Override
-                public void run() {
-                    setSign(name, p);
-                }
-            });
-            return;
-        }
-        String rename = name == null ? "unknown" : name; 
-        final PlotManager manager = PS.get().getPlotManager(p.world);
-        final PlotWorld plotworld = PS.get().getPlotWorld(p.world);
-        if (plotworld.ALLOW_SIGNS) {
-        final Location loc = manager.getSignLoc(plotworld, p);
-            final String id = p.id.x + ";" + p.id.y;
-            final String[] lines = new String[] { C.OWNER_SIGN_LINE_1.formatted().replaceAll("%id%", id), C.OWNER_SIGN_LINE_2.formatted().replaceAll("%id%", id).replaceAll("%plr%", rename), C.OWNER_SIGN_LINE_3.formatted().replaceAll("%id%", id).replaceAll("%plr%", rename), C.OWNER_SIGN_LINE_4.formatted().replaceAll("%id%", id).replaceAll("%plr%", rename) };
-            BlockManager.setSign(p.world, loc.getX(), loc.getY(), loc.getZ(), lines);
-        }
-    }
-
-    public static String getStringSized(final int max, final String string) {
-        if (string.length() > max) {
-            return string.substring(0, max);
-        }
-        return string;
-    }
-
-    public static void autoMerge(final Plot plot, final UUID uuid, boolean removeRoads) {
-        if (plot == null) {
-            return;
-        }
-        if (plot.owner == null) {
-            return;
-        }
-        if (!plot.owner.equals(uuid)) {
-            return;
-        }
-        ArrayList<PlotId> plots;
-        boolean merge = true;
-        int count = 0;
-        ArrayList<PlotId> toUpdate = new ArrayList<>();
-        while (merge) {
-            if (count > 16) {
-                break;
-            }
-            merge = false;
-            count++;
-            final PlotId bot = getBottomPlot(plot).id;
-            final PlotId top = getTopPlot(plot).id;
-            plots = getPlotSelectionIds(new PlotId(bot.x, bot.y - 1), new PlotId(top.x, top.y));
-            if (ownsPlots(plot.world, plots, uuid, 0)) {
-                final boolean result = mergePlots(plot.world, plots, removeRoads, false);
-                if (result) {
-                    toUpdate.addAll(plots);
-                    merge = true;
-                    continue;
-                }
-            }
-            plots = getPlotSelectionIds(new PlotId(bot.x, bot.y), new PlotId(top.x + 1, top.y));
-            if (ownsPlots(plot.world, plots, uuid, 1)) {
-                final boolean result = mergePlots(plot.world, plots, removeRoads, false);
-                if (result) {
-                    toUpdate.addAll(plots);
-                    merge = true;
-                    continue;
-                }
-            }
-            plots = getPlotSelectionIds(new PlotId(bot.x, bot.y), new PlotId(top.x, top.y + 1));
-            if (ownsPlots(plot.world, plots, uuid, 2)) {
-                final boolean result = mergePlots(plot.world, plots, removeRoads, false);
-                if (result) {
-                    toUpdate.addAll(plots);
-                    merge = true;
-                    continue;
-                }
-            }
-            plots = getPlotSelectionIds(new PlotId(bot.x - 1, bot.y), new PlotId(top.x, top.y));
-            if (ownsPlots(plot.world, plots, uuid, 3)) {
-                final boolean result = mergePlots(plot.world, plots, removeRoads, false);
-                if (result) {
-                    toUpdate.addAll(plots);
-                    merge = true;
-                    continue;
-                }
-            }
-        }
-        for (PlotId id : toUpdate) {
-            DBFunc.setMerged(plot, plot.getSettings().getMerged());
-        }
-    }
-
-    private static boolean ownsPlots(final String world, final ArrayList<PlotId> plots, final UUID uuid, final int dir) {
-        final PlotId id_min = plots.get(0);
-        final PlotId id_max = plots.get(plots.size() - 1);
-        for (final PlotId myid : plots) {
-            final Plot myplot = PS.get().getPlot(world, myid);
-            if ((myplot == null) || myplot.owner == null || !(myplot.owner.equals(uuid))) {
-                return false;
-            }
-            final PlotId top = getTopPlot(myplot).id;
-            if (((top.x > id_max.x) && (dir != 1)) || ((top.y > id_max.y) && (dir != 2))) {
-                return false;
-            }
-            final PlotId bot = getBottomPlot(myplot).id;
-            if (((bot.x < id_min.x) && (dir != 3)) || ((bot.y < id_min.y) && (dir != 0))) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    public static void updateWorldBorder(final Plot plot) {
-        if (!worldBorder.containsKey(plot.world)) {
-            return;
-        }
-        final String world = plot.world;
-        final PlotManager manager = PS.get().getPlotManager(world);
-        final PlotWorld plotworld = PS.get().getPlotWorld(world);
-        PlotId id = new PlotId(Math.abs(plot.id.x) + 1, Math.abs(plot.id.x) + 1);
-        final Location bot = manager.getPlotBottomLocAbs(plotworld, id);
-        final Location top = manager.getPlotTopLocAbs(plotworld, id);
-        final int border = worldBorder.get(plot.world);
-        final int botmax = Math.max(Math.abs(bot.getX()), Math.abs(bot.getZ()));
-        final int topmax = Math.max(Math.abs(top.getX()), Math.abs(top.getZ()));
-        final int max = Math.max(botmax, topmax);
-        if (max > border) {
-            worldBorder.put(plot.world, max);
-        }
-    }
-
-    /**
-     * Create a plot and notify the world border and plot merger
-     */
-    public static boolean createPlot(final UUID uuid, final Plot plot) {
-        if (MainUtil.worldBorder.containsKey(plot.world)) {
-            updateWorldBorder(plot);
-        }
-        final String w = plot.world;
-        if (PS.get().getPlot(plot.world, plot.id) != null) {
-            return true;
-        }
-        final Plot p = new Plot(w, plot.id, uuid);
-        if (p.owner == null) {
-            return false;
-        }
-        PS.get().updatePlot(p);
-        DBFunc.createPlotAndSettings(p, new Runnable() {
-            @Override
-            public void run() {
-                final PlotWorld plotworld = PS.get().getPlotWorld(plot.world);
-                if (plotworld.AUTO_MERGE) {
-                    autoMerge(p, uuid, true);
-                }
-            }
-        });
-        return true;
-    }
-
-    /**
-     * Create a plot without notifying the merge function or world border manager
-     */
-    public static Plot createPlotAbs(final UUID uuid, final Plot plot) {
-        final String w = plot.world;
-        Plot p = PS.get().getPlot(plot.world, plot.id);
-        if (p != null) {
-            return p;
-        }
-        p = new Plot(w, plot.id, uuid);
-        if (p.owner == null) {
-            return null;
-        }
-        PS.get().updatePlot(p);
-        DBFunc.createPlotAndSettings(p, null);
-        return p;
-    }
-
-    public static String createId(final int x, final int z) {
-        return x + ";" + z;
-    }
-
-    public static int square(final int x) {
-        return x * x;
-    }
-
-    public static short[] getBlock(final String block) {
-        if (block.contains(":")) {
-            final String[] split = block.split(":");
-            return new short[] { Short.parseShort(split[0]), Short.parseShort(split[1]) };
-        }
-        return new short[] { Short.parseShort(block), 0 };
-    }
-
-    /**
-     * Clear a plot and associated sections: [sign, entities, border]
-     *
-     * @param plot
-     * @param isDelete
-     * @param whenDone
-     */
-    public static boolean clearAsPlayer(final Plot plot, final boolean isDelete, final Runnable whenDone) {
-        if (runners.containsKey(plot)) {
-            return false;
-        }
-        long start = System.currentTimeMillis();
-        ChunkManager.manager.clearAllEntities(plot.getBottom(), plot.getTop());
-        if (isDelete) {
-            removeSign(plot);
-        }
-        clear(plot, isDelete, whenDone);
-        return true;
-    }
-
-    public static void clear(final Plot plot, final boolean isDelete, final Runnable whenDone) {
-        final PlotManager manager = PS.get().getPlotManager(plot.world);
-        final Location pos1 = MainUtil.getPlotBottomLoc(plot.world, plot.id).add(1, 0, 1);
-        final int prime = 31;
-        int h = 1;
-        h = (prime * h) + pos1.getX();
-        h = (prime * h) + pos1.getZ();
-        state = h;
-        System.currentTimeMillis();
-        final PlotWorld plotworld = PS.get().getPlotWorld(plot.world);
-        runners.put(plot, 1);
-        final Runnable run = new Runnable() {
-            @Override
-            public void run() {
-                if (isDelete) {
-                    manager.unclaimPlot(plotworld, plot, new Runnable() {
-                        @Override
-                        public void run() {
-                            runners.remove(plot);
-                            TaskManager.runTask(whenDone);
-                        }
-                    });
-                }
-                else {
-                    runners.remove(plot);
-                    TaskManager.runTask(whenDone);
-                }
-            }
-        };
-        if (plotworld.TERRAIN != 0 || Settings.FAST_CLEAR) {
-            final Location pos2 = MainUtil.getPlotTopLoc(plot.world, plot.id);
-            ChunkManager.manager.regenerateRegion(pos1, pos2, run);
-            return;
-        }
-        manager.clearPlot(plotworld, plot, run);
-    }
-
-    public static void setCuboid(final String world, final Location pos1, final Location pos2, final PlotBlock[] blocks) {
-        if (blocks.length == 1) {
-            setSimpleCuboid(world, pos1, pos2, blocks[0]);
-            return;
-        }
-        final int length = (pos2.getX() - pos1.getX()) * (pos2.getY() - pos1.getY()) * (pos2.getZ() - pos1.getZ());
-        final int[] xl = new int[length];
-        final int[] yl = new int[length];
-        final int[] zl = new int[length];
-        final int[] ids = new int[length];
-        final byte[] data = new byte[length];
-        int index = 0;
-        for (int y = pos1.getY(); y < pos2.getY(); y++) {
-            for (int x = pos1.getX(); x < pos2.getX(); x++) {
-                for (int z = pos1.getZ(); z < pos2.getZ(); z++) {
-                    final int i = random.random(blocks.length);
-                    xl[index] = x;
-                    yl[index] = y;
-                    zl[index] = z;
-                    final PlotBlock block = blocks[i];
-                    ids[index] = block.id;
-                    data[index] = block.data;
-                    index++;
-                }
-            }
-        }
-        BlockManager.setBlocks(world, xl, yl, zl, ids, data);
-    }
-    
-    public static void setCuboidAsync(final String world, final Location pos1, final Location pos2, final PlotBlock[] blocks) {
-        if (blocks.length == 1) {
-            setSimpleCuboidAsync(world, pos1, pos2, blocks[0]);
-            return;
-        }
-        for (int y = pos1.getY(); y < Math.min(256, pos2.getY()); y++) {
-            for (int x = pos1.getX(); x < pos2.getX(); x++) {
-                for (int z = pos1.getZ(); z < pos2.getZ(); z++) {
-                    final int i = random.random(blocks.length);
-                    final PlotBlock block = blocks[i];
-                    SetBlockQueue.setBlock(world, x, y, z, block);
-                }
-            }
-        }
-    }
-
-    public static void setSimpleCuboid(final String world, final Location pos1, final Location pos2, final PlotBlock newblock) {
-        final int length = (pos2.getX() - pos1.getX()) * (pos2.getY() - pos1.getY()) * (pos2.getZ() - pos1.getZ());
-        final int[] xl = new int[length];
-        final int[] yl = new int[length];
-        final int[] zl = new int[length];
-        final int[] ids = new int[length];
-        final byte[] data = new byte[length];
-        int index = 0;
-        for (int y = pos1.getY(); y < pos2.getY(); y++) {
-            for (int x = pos1.getX(); x < pos2.getX(); x++) {
-                for (int z = pos1.getZ(); z < pos2.getZ(); z++) {
-                    xl[index] = x;
-                    yl[index] = y;
-                    zl[index] = z;
-                    ids[index] = newblock.id;
-                    data[index] = newblock.data;
-                    index++;
-                }
-            }
-        }
-        BlockManager.setBlocks(world, xl, yl, zl, ids, data);
-    }
-    
-    public static void setSimpleCuboidAsync(final String world, final Location pos1, final Location pos2, final PlotBlock newblock) {
-        for (int y = pos1.getY(); y < Math.min(256, pos2.getY()); y++) {
-            for (int x = pos1.getX(); x < pos2.getX(); x++) {
-                for (int z = pos1.getZ(); z < pos2.getZ(); z++) {
-                    SetBlockQueue.setBlock(world, x, y, z, newblock);
-                }
-            }
-        }
-    }
-
-    public static void setBiome(final Plot plot, final String biome, final Runnable whenDone) {
-        Location pos1 = plot.getBottom();
-        Location pos2 = plot.getTop();
-        ChunkManager.chunkTask(pos1, pos2, new RunnableVal<int[]>() {
-            @Override
-            public void run() {
-                ChunkLoc loc = new ChunkLoc(value[0], value[1]);
-                ChunkManager.manager.loadChunk(plot.world, loc, false);
-                setBiome(plot.world, value[2], value[3], value[4], value[5], biome);
-                ChunkManager.manager.unloadChunk(plot.world, loc, true, true);
-            }
-        }, new Runnable() {
-            @Override
-            public void run() {
-                update(plot);
-                TaskManager.runTask(whenDone);
-            }
-        }, 5);
-    }
-    
-    public static void setBiome(final String world, int p1x, int p1z, int p2x, int p2z, final String biome) {
-        final int length = (p2x - p1x + 1) * (p2z - p1z + 1);
-        final int[] xl = new int[length];
-        final int[] zl = new int[length];
-        int index = 0;
-        for (int x = p1x; x <= p2x; x++) {
-            for (int z = p1z; z <= p2z; z++) {
-                xl[index] = x;
-                zl[index] = z;
-                index++;
-            }
-        }
-        BlockManager.setBiomes(world, xl, zl, biome);
-    }
-    
-    public static int getHeighestBlock(final String world, final int x, final int z) {
-        final int result = BlockManager.manager.getHeighestBlock(world, x, z);
-        if (result == 0) {
-            return 64;
-        }
-        return result;
-    }
-
-    /**
-     * Get plot home
-     *
-     * @param w      World in which the plot is located
-     * @param plotid Plot ID
-     *
-     * @return Home Location
-     */
-    public static Location getPlotHome(final String w, final PlotId plotid) {
-        final Plot plot = getPlot(w, plotid);
-        final BlockLoc home = plot.getSettings().getPosition();
-        final Location bot = getPlotBottomLoc(w, plotid);
-        final PlotManager manager = PS.get().getPlotManager(w);
-        if ((home == null) || ((home.x == 0) && (home.z == 0))) {
-            return getDefaultHome(plot);
-        } else {
-            Location loc = new Location(bot.getWorld(), bot.getX() + home.x, bot.getY() + home.y, bot.getZ() + home.z);
-            if (BlockManager.manager.getBlock(loc).id != 0) {
-                // sendConsoleMessage("ID was " + BukkitUtil.getBlock(loc).id);
-                loc.setY(Math.max(getHeighestBlock(w, loc.getX(), loc.getZ()), bot.getY()));
-            }
-            return loc;
-        }
-    }
-
-    /**
-     * Get the plot home
-     *
-     * @param plot Plot Object
-     *
-     * @return Plot Home Location
-     *
-     */
-    public static Location getPlotHome(final Plot plot) {
-        return getPlotHome(plot.world, plot.id);
-    }
-
-    /**
-     * Gets the top plot location of a plot (all plots are treated as small plots) - To get the top loc of a mega plot
-     * use getPlotTopLoc(...)
-     *
-     * @param world
-     * @param id
-     *
-     * @return Location top
-     */
-    public static Location getPlotTopLocAbs(final String world, final PlotId id) {
-        final PlotWorld plotworld = PS.get().getPlotWorld(world);
-        final PlotManager manager = PS.get().getPlotManager(world);
-        return manager.getPlotTopLocAbs(plotworld, id);
-    }
-
-    /**
-     * Gets the bottom plot location of a plot (all plots are treated as small plots) - To get the top loc of a mega
-     * plot use getPlotBottomLoc(...)
-     *
-     * @param world
-     * @param id
-     *
-     * @return Location bottom
-     */
-    public static Location getPlotBottomLocAbs(final String world, final PlotId id) {
-        final PlotWorld plotworld = PS.get().getPlotWorld(world);
-        final PlotManager manager = PS.get().getPlotManager(world);
-        return manager.getPlotBottomLocAbs(plotworld, id);
-    }
-
-    /**
-     * Obtains the width of a plot (x width)
-     *
-     * @param world
-     * @param id
-     *
-     * @return int width of plot
-     */
-    public static int getPlotWidth(final String world, final PlotId id) {
-        return getPlotTopLoc(world, id).getX() - getPlotBottomLoc(world, id).getX();
-    }
-
-    /**
-     * Gets the top loc of a plot (if mega, returns top loc of that mega plot) - If you would like each plot treated as
-     * a small plot use getPlotTopLocAbs(...)
-     *
-     * @param world
-     * @param id
-     *
-     * @return Location top of mega plot
-     */
-    public static Location getPlotTopLoc(final String world, PlotId id) {
-        final Plot plot = PS.get().getPlot(world, id);
-        if (plot != null) {
-            id = getTopPlot(plot).id;
-        }
-        final PlotWorld plotworld = PS.get().getPlotWorld(world);
-        final PlotManager manager = PS.get().getPlotManager(world);
-        return manager.getPlotTopLocAbs(plotworld, id);
-    }
-
-    /**
-     * Gets the bottom loc of a plot (if mega, returns bottom loc of that mega plot) - If you would like each plot
-     * treated as a small plot use getPlotBottomLocAbs(...)
-     *
-     * @param world
-     * @param id
-     *
-     * @return Location bottom of mega plot
-     * 
-     * @deprecated Incorrect offset / legacy / use plot.getBottom()
-     * 
-     */
-    @Deprecated
-    public static Location getPlotBottomLoc(final String world, PlotId id) {
-        final Plot plot = PS.get().getPlot(world, id);
-        if (plot != null) {
-            id = getBottomPlot(plot).id;
-        }
-        final PlotWorld plotworld = PS.get().getPlotWorld(world);
-        final PlotManager manager = PS.get().getPlotManager(world);
-        return manager.getPlotBottomLocAbs(plotworld, id);
-    }
-
-    public static boolean canClaim(PlotPlayer player, String world, final PlotId pos1, final PlotId pos2) {
-        for (int x = pos1.x; x <= pos2.x; x++) {
-            for (int y = pos1.y; y <= pos2.y; y++) {
-                final PlotId id = new PlotId(x, y);
-                Plot plot = getPlot(world, id);
-                if (!canClaim(player, plot)) {
-                    return false;
-                }
-            }
-        }
-        return true;
-    }
-    
-    public static boolean canClaim(PlotPlayer player, Plot plot) {
-        if (plot == null) {
-            return false;
-        }
-        if (Settings.ENABLE_CLUSTERS) {
-            PlotCluster cluster = plot.getCluster();
-            if (cluster != null) {
-                if (!cluster.isAdded(player.getUUID()) && !Permissions.hasPermission(player, "plots.admin.command.claim")) {
-                    return false;
-                }
-            }
-        }
-        return plot.owner == null;
-    }
-    
-    public static boolean isUnowned(final String world, final PlotId pos1, final PlotId pos2) {
-        for (int x = pos1.x; x <= pos2.x; x++) {
-            for (int y = pos1.y; y <= pos2.y; y++) {
-                final PlotId id = new PlotId(x, y);
-                if (PS.get().getPlot(world, id) != null) {
-                    if (PS.get().getPlot(world, id).owner != null) {
-                        return false;
-                    }
-                }
-            }
-        }
-        return true;
-    }
-    
-    public static boolean swap(final String world, final PlotId current, final PlotId newPlot, final Runnable whenDone) {
-        Plot p1 = PS.get().getPlot(world, current);
-        Plot p2 = PS.get().getPlot(world, newPlot);
-        if (p1==null || p2 == null || p1.owner == null || !p1.owner.equals(p2.owner)) {
-            return false;
-        }
-        // Swap blocks
-        ChunkManager.manager.swap(world, current, newPlot);
-        // Swap cached
-        PlotId temp = new PlotId(p1.id.x.intValue(), p1.id.y.intValue());
-        p1.id.x = p2.id.x.intValue();
-        p1.id.y = p2.id.y.intValue();
-        p2.id.x = temp.x;
-        p2.id.y = temp.y;
-        Map<String, ConcurrentHashMap<PlotId, Plot>> raw = PS.get().getAllPlotsRaw();
-        raw.get(world).remove(p1.id);
-        raw.get(world).remove(p2.id);
-        p1.id.recalculateHash();
-        p2.id.recalculateHash();
-        raw.get(world).put(p1.id, p1);
-        raw.get(world).put(p2.id, p2);
-        // Swap database
-        DBFunc.dbManager.swapPlots(p2, p1);
-        return true;
-    }
-    
-    public static boolean swapData(final String world, final PlotId current, final PlotId newPlot, final Runnable whenDone) {
-        Plot p1 = PS.get().getPlot(world, current);
-        Plot p2 = PS.get().getPlot(world, newPlot);
-        if (p1 == null || p1.owner == null) {
-            if (p2 != null && p2.owner != null) {
-                moveData(p2, getPlot(world, current), whenDone);
-                return true;
-            }
-            return false;
-        }
-        if (p2 == null || p2.owner == null) {
-            if (p1 != null && p1.owner != null) {
-                moveData(p1, getPlot(world, newPlot), whenDone);
-                return true;
-            }
-            return false;
-        }
-        // Swap cached
-        PlotId temp = new PlotId(p1.id.x.intValue(), p1.id.y.intValue());
-        p1.id.x = p2.id.x.intValue();
-        p1.id.y = p2.id.y.intValue();
-        p2.id.x = temp.x;
-        p2.id.y = temp.y;
-        Map<String, ConcurrentHashMap<PlotId, Plot>> raw = PS.get().getAllPlotsRaw();
-        raw.get(world).remove(p1.id);
-        raw.get(world).remove(p2.id);
-        p1.id.recalculateHash();
-        p2.id.recalculateHash();
-        raw.get(world).put(p1.id, p1);
-        raw.get(world).put(p2.id, p2);
-        // Swap database
-        DBFunc.dbManager.swapPlots(p2, p1);
-        TaskManager.runTask(whenDone);
-        return true;
-    }
-
-    public static boolean moveData(final Plot plot1, final Plot plot2, final Runnable whenDone) {
-        if (plot1.owner == null) {
-            PS.debug(plot2 +" is unowned (single)");
-            TaskManager.runTask(whenDone);
-            return false;
-        }
-        final Plot pos1 = getBottomPlot(plot1);
-        final Plot pos2 = getTopPlot(plot1);
-        final PlotId size = MainUtil.getSize(plot1);
-        if (!MainUtil.isUnowned(plot2.world, plot2.id, new PlotId((plot2.id.x + size.x) - 1, (plot2.id.y + size.y) - 1))) {
-            PS.debug(plot2 +" is unowned (multi)");
-            TaskManager.runTask(whenDone);
-            return false;
-        }
-        final int offset_x = plot2.id.x - pos1.id.x;
-        final int offset_y = plot2.id.y - pos1.id.y;
-        final ArrayList<PlotId> selection = getPlotSelectionIds(pos1.id, pos2.id);
-        for (final PlotId id : selection) {
-            String worldOriginal = plot1.world;
-            PlotId idOriginal = new PlotId(id.x, id.y);
-            final Plot plot = PS.get().getPlot(plot1.world, id);
-            Map<String, ConcurrentHashMap<PlotId, Plot>> raw = PS.get().getAllPlotsRaw();
-            raw.get(plot1.world).remove(id);
-            plot.id.x += offset_x;
-            plot.id.y += offset_y;
-            plot.id.recalculateHash();
-            raw.get(plot2.world).put(plot.id, plot);
-            DBFunc.movePlot(getPlot(worldOriginal, idOriginal), getPlot(plot2.world, new PlotId(id.x + offset_x, id.y + offset_y)));
-        }
-        TaskManager.runTaskLater(whenDone, 1);
-        return true;
-    }
-    
-    public static boolean move(final Plot plot1, final Plot plot2, final Runnable whenDone) {
-        final com.intellectualcrafters.plot.object.Location bot1 = MainUtil.getPlotBottomLoc(plot1.world, plot1.id);
-        final com.intellectualcrafters.plot.object.Location bot2 = MainUtil.getPlotBottomLoc(plot2.world, plot2.id);
-        final Location top = MainUtil.getPlotTopLoc(plot1.world, plot1.id);
-        if (plot1.owner == null) {
-            PS.debug(plot2 +" is unowned (single)");
-            TaskManager.runTask(whenDone);
-            return false;
-        }
-        final Plot pos1 = getBottomPlot(plot1);
-        final Plot pos2 = getTopPlot(plot1);
-        final PlotId size = MainUtil.getSize(plot1);
-        if (!MainUtil.isUnowned(plot2.world, plot2.id, new PlotId((plot2.id.x + size.x) - 1, (plot2.id.y + size.y) - 1))) {
-            PS.debug(plot2 +" is unowned (multi)");
-            TaskManager.runTask(whenDone);
-            return false;
-        }
-        final int offset_x = plot2.id.x - pos1.id.x;
-        final int offset_y = plot2.id.y - pos1.id.y;
-        final ArrayList<PlotId> selection = getPlotSelectionIds(pos1.id, pos2.id);
-        for (final PlotId id : selection) {
-            String worldOriginal = plot1.world;
-            PlotId idOriginal = new PlotId(id.x, id.y);
-            final Plot plot = PS.get().getPlot(plot1.world, id);
-            Map<String, ConcurrentHashMap<PlotId, Plot>> raw = PS.get().getAllPlotsRaw();
-            raw.get(plot1.world).remove(id);
-            plot.id.x += offset_x;
-            plot.id.y += offset_y;
-            plot.id.recalculateHash();
-            raw.get(plot2.world).put(plot.id, plot);
-            DBFunc.movePlot(getPlot(worldOriginal, idOriginal), getPlot(plot2.world, new PlotId(id.x + offset_x, id.y + offset_y)));
-        }
-        ChunkManager.manager.copyRegion(bot1, top, bot2, new Runnable() {
-            @Override
-            public void run() {
-                final Location bot = bot1.clone().add(1, 0, 1);
-                ChunkManager.manager.regenerateRegion(bot, top, null);
-                TaskManager.runTaskLater(whenDone, 1);
-            }
-        });
-        return true;
-    }
-    
-    public static boolean copy(final String world, final PlotId current, final PlotId newPlot, final Runnable whenDone) {
-        final com.intellectualcrafters.plot.object.Location bot1 = MainUtil.getPlotBottomLoc(world, current);
-        final com.intellectualcrafters.plot.object.Location bot2 = MainUtil.getPlotBottomLoc(world, newPlot);
-        final Location top = MainUtil.getPlotTopLoc(world, current);
-        final Plot currentPlot = MainUtil.getPlot(world, current);
-        if (currentPlot.owner == null) {
-            TaskManager.runTaskLater(whenDone, 1);
-            return false;
-        }
-        final Plot pos1 = getBottomPlot(currentPlot);
-        final Plot pos2 = getTopPlot(currentPlot);
-        final PlotId size = MainUtil.getSize(currentPlot);
-        if (!MainUtil.isUnowned(world, newPlot, new PlotId((newPlot.x + size.x) - 1, (newPlot.y + size.y) - 1))) {
-            TaskManager.runTaskLater(whenDone, 1);
-            return false;
-        }
-        final ArrayList<PlotId> selection = getPlotSelectionIds(pos1.id, pos2.id);
-        final int offset_x = newPlot.x - pos1.id.x;
-        final int offset_y = newPlot.y - pos1.id.y;
-        for (final PlotId id : selection) {
-            int x = id.x + offset_x;
-            int y = id.y + offset_y;
-            Plot plot = createPlotAbs(currentPlot.owner, getPlot(world, new PlotId(x, y)));
-            if (currentPlot.getSettings().flags != null && currentPlot.getSettings().flags.size() > 0) {
-                plot.getSettings().flags = currentPlot.getSettings().flags;
-                DBFunc.setFlags(plot, currentPlot.getSettings().flags.values());
-            }
-            if (currentPlot.isMerged()) {
-                plot.getSettings().setMerged(currentPlot.getSettings().getMerged());
-                DBFunc.setMerged(plot, currentPlot.getSettings().getMerged());
-            }
-            if (currentPlot.members != null && currentPlot.members.size() > 0) {
-                plot.members = currentPlot.members;
-                for (UUID member : plot.members) {
-                    DBFunc.setMember(plot, member);
-                }
-            }
-            if (currentPlot.trusted != null && currentPlot.trusted.size() > 0) {
-                plot.trusted = currentPlot.trusted;
-                for (UUID trusted : plot.trusted) {
-                    DBFunc.setTrusted(plot, trusted);
-                }
-            }
-            if (currentPlot.denied != null && currentPlot.denied.size() > 0) {
-                plot.denied = currentPlot.denied;
-                for (UUID denied : plot.denied) {
-                    DBFunc.setDenied(plot, denied);
-                }
-            }
-            PS.get().updatePlot(plot);
-        }
-        ChunkManager.manager.copyRegion(bot1, top, bot2, whenDone);
-        return true;
-    }
-
-    /**
-     * Send a message to the player
-     *
-     * @param plr Player to recieve message
-     * @param msg Message to send
-     *
-     * @return true Can be used in things such as commands (return PlayerFunctions.sendMessage(...))
-     */
-    public static boolean sendMessage(final PlotPlayer plr, final String msg) {
-        return sendMessage(plr, msg, true);
-    }
-
-    public static void sendConsoleMessage(String msg) {
-        sendMessage(null, msg);
-    }
-    
-    public static void sendConsoleMessage(C caption, String... args) {
-        sendMessage(null, caption, args);
-    }
-
-    public static boolean sendMessage(final PlotPlayer plr, String msg, final boolean prefix) {
-        if ((msg.length() > 0) && !msg.equals("")) {
-            if (plr == null) {
-                PS.log((prefix ? C.PREFIX.s() : "") + msg);
-            } else {
-                plr.sendMessage((prefix ? C.PREFIX.s() : "") + C.color(msg));
-            }
-        }
-        return true;
-    }
-
-    public static String[] wordWrap(final String rawString, final int lineLength) {
-        if (rawString == null) {
-            return new String[] { "" };
-        }
-        if ((rawString.length() <= lineLength) && (!rawString.contains("\n"))) {
-            return new String[] { rawString };
-        }
-        final char[] rawChars = (rawString + ' ').toCharArray();
-        StringBuilder word = new StringBuilder();
-        StringBuilder line = new StringBuilder();
-        final ArrayList<String> lines = new ArrayList();
-        int lineColorChars = 0;
-        for (int i = 0; i < rawChars.length; i++) {
-            final char c = rawChars[i];
-            if (c == '\u00A7') {
-                word.append('\u00A7' + (rawChars[(i + 1)]));
-                lineColorChars += 2;
-                i++;
-            } else if ((c == ' ') || (c == '\n')) {
-                if ((line.length() == 0) && (word.length() > lineLength)) {
-                    for (final String partialWord : word.toString().split("(?<=\\G.{" + lineLength + "})")) {
-                        lines.add(partialWord);
-                    }
-                } else if (((line.length() + word.length()) - lineColorChars) == lineLength) {
-                    line.append(word);
-                    lines.add(line.toString());
-                    line = new StringBuilder();
-                    lineColorChars = 0;
-                } else if (((line.length() + 1 + word.length()) - lineColorChars) > lineLength) {
-                    for (final String partialWord : word.toString().split("(?<=\\G.{" + lineLength + "})")) {
-                        lines.add(line.toString());
-                        line = new StringBuilder(partialWord);
-                    }
-                    lineColorChars = 0;
-                } else {
-                    if (line.length() > 0) {
-                        line.append(' ');
-                    }
-                    line.append(word);
-                }
-                word = new StringBuilder();
-                if (c == '\n') {
-                    lines.add(line.toString());
-                    line = new StringBuilder();
-                }
-            } else {
-                word.append(c);
-            }
-        }
-        if (line.length() > 0) {
-            lines.add(line.toString());
-        }
-        if ((lines.get(0).length() == 0) || (lines.get(0).charAt(0) != '\u00A7')) {
-            lines.set(0, "\u00A7f" + lines.get(0));
-        }
-        for (int i = 1; i < lines.size(); i++) {
-            final String pLine = lines.get(i - 1);
-            final String subLine = lines.get(i);
-
-            final char color = pLine.charAt(pLine.lastIndexOf('\u00A7') + 1);
-            if ((subLine.length() == 0) || (subLine.charAt(0) != '\u00A7')) {
-                lines.set(i, '\u00A7' + (color) + subLine);
-            }
-        }
-        return lines.toArray(new String[lines.size()]);
-    }
-
-    /**
-     * Send a message to the player
-     *
-     * @param plr Player to recieve message
-     * @param c   Caption to send
-     *
-     * @return boolean success
-     */
-    public static boolean sendMessage(final PlotPlayer plr, final C c, final String... args) {
-        if (c.s().length() > 1) {
-            String msg = c.s();
-            if ((args != null) && (args.length > 0)) {
-                msg = C.format(c, args);
-            }
-            if (plr == null) {
-                PS.log(msg);
-            } else {
-                sendMessage(plr, msg, c.usePrefix());
-            }
-        }
-        return true;
-    }
-    
-    /**
-     * Send a message to the player
-     *
-     * @param plr Player to recieve message
-     * @param c   Caption to send
-     *
-     * @return boolean success
-     */
-    public static boolean sendMessage(final PlotPlayer plr, final C c, final Object... args) {
-        if (c.s().length() > 1) {
-            String msg = c.s();
-            if ((args != null) && (args.length > 0)) {
-                msg = C.format(c, args);
-            }
-            if (plr == null) {
-                PS.log(msg);
-            } else {
-                sendMessage(plr, msg, c.usePrefix());
-            }
-        }
-        return true;
-    }
-
-    public static Plot getBottomPlot(final Plot plot) {
-        if (plot.getSettings().getMerged(0)) {
-            final Plot p = PS.get().getPlot(plot.world, new PlotId(plot.id.x, plot.id.y - 1));
-            if (p == null) {
-                return plot;
-            }
-            return getBottomPlot(p);
-        }
-        if (plot.getSettings().getMerged(3)) {
-            final Plot p = PS.get().getPlot(plot.world, new PlotId(plot.id.x - 1, plot.id.y));
-            if (p == null) {
-                return plot;
-            }
-            return getBottomPlot(p);
-        }
-        return plot;
-    }
-
-    public static Plot getTopPlot(final Plot plot) {
-        if (plot.getSettings().getMerged(2)) {
-            final Plot p = PS.get().getPlot(plot.world, new PlotId(plot.id.x, plot.id.y + 1));
-            if (p == null) {
-                return plot;
-            }
-            return getTopPlot(p);
-        }
-        if (plot.getSettings().getMerged(1)) {
-            final Plot p = PS.get().getPlot(plot.world, new PlotId(plot.id.x + 1, plot.id.y));
-            if (p == null) {
-                return plot;
-            }
-            return getTopPlot(p);
-        }
-        return plot;
-        
-    }
-
-    public static PlotId getSize(final Plot plot) {
-        if (!plot.isMerged()) {
-            return new PlotId(1, 1);
-        }
-        final Plot top = getTopPlot(plot);
-        final Plot bot = getBottomPlot(plot);
-        return new PlotId((top.id.x - bot.id.x) + 1, (top.id.y - bot.id.y) + 1);
-    }
-
-    /**
-     * Fetches the plot from the main class
-     */
-    public static Plot getPlot(final String world, final PlotId id) {
-        if (id == null) {
-            return null;
-        }
-        Plot plot = PS.get().getPlot(world, id);
-        if (plot != null) {
-            return plot;
-        }
-        return new Plot(world, id, null);
-    }
-
-    /**
-     * Returns the plot at a location (mega plots are not considered, all plots are treated as small plots)
-     * @param loc
-     * @return PlotId underlying plot id of loc
-     */
-    public static PlotId getPlotAbs(final Location loc) {
-        final String world = loc.getWorld();
-        final PlotManager manager = PS.get().getPlotManager(world);
-        if (manager == null) {
-            return null;
-        }
-        final PlotWorld plotworld = PS.get().getPlotWorld(world);
-        return manager.getPlotIdAbs(plotworld, loc.getX(), loc.getY(), loc.getZ());
-    }
-
-    /**
-     * Returns the plot id at a location (mega plots are considered)
-     * @param loc
-     * @return PlotId PlotId observed id
-     */
-    public static PlotId getPlotId(final Location loc) {
-        final String world = loc.getWorld();
-        final PlotManager manager = PS.get().getPlotManager(world);
-        if (manager == null) {
-            return null;
-        }
-        final PlotWorld plotworld = PS.get().getPlotWorld(world);
-        final PlotId id = manager.getPlotId(plotworld, loc.getX(), loc.getY(), loc.getZ());
-        if ((id != null) && (plotworld.TYPE == 2)) {
-            if (ClusterManager.getCluster(world, id) == null) {
-                return null;
-            }
-        }
-        return id;
-    }
-
-    /**
-     * Get the maximum number of plots a player is allowed
-     *
-     * @param p
-     * @return int
-     */
-    public static int getAllowedPlots(final PlotPlayer p) {
-        return Permissions.hasPermissionRange(p, "plots.plot", Settings.MAX_PLOTS);
-    }
-
-    public static Plot getPlot(final Location loc) {
-        final PlotId id = getPlotId(loc);
-        if (id == null) {
-            return null;
-        }
-        return getPlot(loc.getWorld(), id);
-    }
-
-    public static double getAverageRating(Plot plot) {
-        HashMap<UUID, Integer> rating;
-        if (plot.getSettings().ratings != null) {
-            rating = plot.getSettings().ratings;
-        }
-        else if (Settings.CACHE_RATINGS) {
-            rating = new HashMap<>();
-        }
-        else {
-            rating = DBFunc.getRatings(plot);
-        }
-        if (rating == null || rating.size() == 0) {
-            return 0;
-        }
-        double val = 0;
-        int size = 0;
-        for (Entry<UUID, Integer> entry : rating.entrySet()) {
-            int current = entry.getValue();
-            if (Settings.RATING_CATEGORIES == null || Settings.RATING_CATEGORIES.size() == 0) {
-                val += current;
-                size++;
-            }
-            else {
-                for (int i = 0 ; i < Settings.RATING_CATEGORIES.size(); i++) {
-                    val += (current % 10) - 1;
-                    current /= 10;
-                    size++;
-                }
-            }
-        }
-        return val / (double) size;
-    }
-    
-    public static double[] getAverageRatings(Plot plot) {
-        HashMap<UUID, Integer> rating;
-        if (plot.getSettings().ratings != null) {
-            rating = plot.getSettings().ratings;
-        }
-        else if (Settings.CACHE_RATINGS) {
-            rating = new HashMap<>();
-        }
-        else {
-            rating = DBFunc.getRatings(plot);
-        }
-        int size = 1;
-        if (Settings.RATING_CATEGORIES != null) {
-            size = Math.max(1, Settings.RATING_CATEGORIES.size());
-        }
-        double[] ratings = new double[size];
-        if (rating == null || rating.size() == 0) {
-            return ratings;
-        }
-        for (Entry<UUID, Integer> entry : rating.entrySet()) {
-            int current = entry.getValue();
-            if (Settings.RATING_CATEGORIES == null || Settings.RATING_CATEGORIES.size() == 0) {
-                ratings[0] += current;
-            }
-            else {
-                for (int i = 0 ; i < Settings.RATING_CATEGORIES.size(); i++) {
-                    ratings[i] += (current % 10) - 1;
-                    current /= 10;
-                }
-            }
-        }
-        for (int i = 0; i < size; i++) {
-            ratings[i] /= (double) rating.size();
-        }
-        return ratings;
-    }
-
-    public static void setComponent(Plot plot, String component, PlotBlock[] blocks) {
-        PS.get().getPlotManager(plot.world).setComponent(PS.get().getPlotWorld(plot.world), plot.id, component, blocks);
-    }
-}
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// PlotSquared - A plot manager and world generator for the Bukkit API                             /
+// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
+//                                                                                                 /
+// This program is free software; you can redistribute it and/or modify                            /
+// it under the terms of the GNU General Public License as published by                            /
+// the Free Software Foundation; either version 3 of the License, or                               /
+// (at your option) any later version.                                                             /
+//                                                                                                 /
+// This program is distributed in the hope that it will be useful,                                 /
+// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
+// GNU General Public License for more details.                                                    /
+//                                                                                                 /
+// You should have received a copy of the GNU General Public License                               /
+// along with this program; if not, write to the Free Software Foundation,                         /
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
+//                                                                                                 /
+// You can contact us via: support@intellectualsites.com                                           /
+////////////////////////////////////////////////////////////////////////////////////////////////////
+package com.intellectualcrafters.plot.util;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+
+import com.intellectualcrafters.plot.PS;
+import com.intellectualcrafters.plot.config.C;
+import com.intellectualcrafters.plot.config.Settings;
+import com.intellectualcrafters.plot.database.DBFunc;
+import com.intellectualcrafters.plot.object.BlockLoc;
+import com.intellectualcrafters.plot.object.ChunkLoc;
+import com.intellectualcrafters.plot.object.Location;
+import com.intellectualcrafters.plot.object.Plot;
+import com.intellectualcrafters.plot.object.PlotBlock;
+import com.intellectualcrafters.plot.object.PlotCluster;
+import com.intellectualcrafters.plot.object.PlotId;
+import com.intellectualcrafters.plot.object.PlotManager;
+import com.intellectualcrafters.plot.object.PlotPlayer;
+import com.intellectualcrafters.plot.object.PlotWorld;
+import com.intellectualcrafters.plot.object.PseudoRandom;
+import com.intellectualcrafters.plot.object.RunnableVal;
+import com.plotsquared.listener.PlotListener;
+
+/**
+ * plot functions
+ *

+ */
+public class MainUtil
+{
+    public final static HashMap<Plot, Integer> runners = new HashMap<>();
+    public static boolean canSendChunk = false;
+    public static boolean canSetFast = true;
+    public static ArrayList<String> runners_p = new ArrayList<>();
+    public static HashMap<String, PlotId> lastPlot = new HashMap<>();
+    public static HashMap<String, Integer> worldBorder = new HashMap<>();
+    public static PseudoRandom random = new PseudoRandom();
+
+    public static short[][] x_loc;
+    public static short[][] y_loc;
+    public static short[][] z_loc;
+
+    public static void initCache()
+    {
+        if (x_loc == null)
+        {
+            x_loc = new short[16][4096];
+            y_loc = new short[16][4096];
+            z_loc = new short[16][4096];
+            for (int i = 0; i < 16; i++)
+            {
+                final int i4 = i << 4;
+                for (int j = 0; j < 4096; j++)
+                {
+                    final int y = (i4) + (j >> 8);
+                    final int a = (j - ((y & 0xF) << 8));
+                    final int z1 = (a >> 4);
+                    final int x1 = a - (z1 << 4);
+                    x_loc[i][j] = (short) x1;
+                    y_loc[i][j] = (short) y;
+                    z_loc[i][j] = (short) z1;
+                }
+            }
+        }
+    }
+
+    public static boolean isPlotArea(final Location location)
+    {
+        final PlotWorld plotworld = PS.get().getPlotWorld(location.getWorld());
+        if (plotworld == null) { return false; }
+        if (plotworld.TYPE == 2) { return ClusterManager.getCluster(location) != null; }
+        return true;
+    }
+
+    public static String getName(final UUID owner)
+    {
+        if (owner == null) { return C.NONE.s(); }
+        final String name = UUIDHandler.getName(owner);
+        if (name == null) { return C.UNKNOWN.s(); }
+        return name;
+    }
+
+    public static List<PlotPlayer> getPlayersInPlot(final Plot plot)
+    {
+        final ArrayList<PlotPlayer> players = new ArrayList<>();
+        for (final PlotPlayer pp : UUIDHandler.getPlayers().values())
+        {
+            if (plot.equals(pp.getCurrentPlot()))
+            {
+                players.add(pp);
+            }
+        }
+        return players;
+    }
+
+    public static void reEnterPlot(final Plot plot)
+    {
+        TaskManager.runTaskLater(new Runnable()
+        {
+            @Override
+            public void run()
+            {
+                for (final PlotPlayer pp : getPlayersInPlot(plot))
+                {
+                    PlotListener.plotExit(pp, plot);
+                    PlotListener.plotEntry(pp, plot);
+                }
+            }
+        }, 1);
+    }
+
+    public static Location getPlotCenter(final Plot plot)
+    {
+        final Location bot = getPlotBottomLoc(plot.world, plot.id);
+        final Location top = getPlotTopLoc(plot.world, plot.id).add(1, 0, 1);
+        return new Location(plot.world, bot.getX() + ((top.getX() - bot.getX()) / 2), 0, bot.getZ() + ((top.getZ() - bot.getZ()) / 2));
+    }
+
+    public static List<Plot> getPlotsBySearch(final String search)
+    {
+        final String[] split = search.split(" ");
+        final int size = split.length * 2;
+
+        final List<UUID> uuids = new ArrayList<>();
+        PlotId id = null;
+        String world = null;
+        String alias = null;
+
+        for (final String term : split)
+        {
+            try
+            {
+                UUID uuid = UUIDHandler.getUUID(term, null);
+                if (uuid == null)
+                {
+                    uuid = UUID.fromString(term);
+                }
+                if (uuid != null)
+                {
+                    uuids.add(uuid);
+                    continue;
+                }
+            }
+            catch (final Exception e)
+            {
+                id = PlotId.fromString(term);
+                if (id != null)
+                {
+                    continue;
+                }
+                for (final String pw : PS.get().getPlotWorlds())
+                {
+                    if (pw.equalsIgnoreCase(term))
+                    {
+                        world = pw;
+                        break;
+                    }
+                }
+                if (world == null)
+                {
+                    alias = term;
+                }
+            }
+        }
+
+        final ArrayList<ArrayList<Plot>> plotList = new ArrayList<>(size);
+        for (int i = 0; i < size; i++)
+        {
+            plotList.add(new ArrayList<Plot>());
+        }
+
+        for (final Plot plot : PS.get().getPlots())
+        {
+            int count = 0;
+            if (uuids.size() > 0)
+            {
+                for (final UUID uuid : uuids)
+                {
+                    if (plot.isOwner(uuid))
+                    {
+                        count += 2;
+                    }
+                    else if (plot.isAdded(uuid))
+                    {
+                        count++;
+                    }
+                }
+            }
+            if (id != null)
+            {
+                if (plot.id.equals(id))
+                {
+                    count++;
+                }
+            }
+            if ((world != null) && plot.world.equals(world))
+            {
+                count++;
+            }
+            if ((alias != null) && alias.equals(plot.getSettings().getAlias()))
+            {
+                count += 2;
+            }
+            if (count != 0)
+            {
+                plotList.get(count - 1).add(plot);
+            }
+        }
+
+        final List<Plot> plots = new ArrayList<Plot>();
+        for (int i = plotList.size() - 1; i >= 0; i--)
+        {
+            if (plotList.get(i).size() > 0)
+            {
+                plots.addAll(plotList.get(i));
+            }
+        }
+        return plots;
+    }
+
+    public static Plot getPlotFromString(final PlotPlayer player, final String arg, final boolean message)
+    {
+        if (arg == null)
+        {
+            if (player == null)
+            {
+                if (message)
+                {
+                    MainUtil.sendMessage(player, C.NOT_VALID_PLOT_WORLD);
+                }
+                return null;
+            }
+            return getPlot(player.getLocation());
+        }
+        String worldname = null;
+        PlotId id = null;
+        if (player != null)
+        {
+            worldname = player.getLocation().getWorld();
+        }
+        final String[] split = arg.split(";|,");
+        if (split.length == 3)
+        {
+            worldname = split[0];
+            id = PlotId.fromString(split[1] + ";" + split[2]);
+        }
+        else if (split.length == 2)
+        {
+            id = PlotId.fromString(arg);
+        }
+        else
+        {
+            if (worldname == null)
+            {
+                if (PS.get().getPlotWorlds().size() == 0)
+                {
+                    if (message)
+                    {
+                        MainUtil.sendMessage(player, C.NOT_VALID_PLOT_WORLD);
+                    }
+                    return null;
+                }
+                worldname = PS.get().getPlotWorlds().iterator().next();
+            }
+            for (final Plot p : PS.get().getPlotsInWorld(worldname))
+            {
+                final String name = p.getSettings().getAlias();
+                if ((name.length() != 0) && name.equalsIgnoreCase(arg)) { return p; }
+            }
+            for (final String world : PS.get().getPlotWorlds())
+            {
+                if (!world.endsWith(worldname))
+                {
+                    for (final Plot p : PS.get().getPlotsInWorld(world))
+                    {
+                        final String name = p.getSettings().getAlias();
+                        if ((name.length() != 0) && name.equalsIgnoreCase(arg)) { return p; }
+                    }
+                }
+            }
+        }
+        if ((worldname == null) || !PS.get().isPlotWorld(worldname))
+        {
+            if (message)
+            {
+                MainUtil.sendMessage(player, C.NOT_VALID_PLOT_WORLD);
+            }
+            return null;
+        }
+        if (id == null)
+        {
+            if (message)
+            {
+                MainUtil.sendMessage(player, C.NOT_VALID_PLOT_ID);
+            }
+            return null;
+        }
+        return getPlot(worldname, id);
+    }
+
+    /**
+     * Merges all plots in the arraylist (with cost)
+     *
+     * @param world
+     * @param plotIds
+     *
+     * @return boolean
+     */
+    public static boolean mergePlots(final PlotPlayer player, final String world, final ArrayList<PlotId> plotIds)
+    {
+        final PlotWorld plotworld = PS.get().getPlotWorld(world);
+        if ((EconHandler.manager != null) && plotworld.USE_ECONOMY)
+        {
+            final double cost = plotIds.size() * plotworld.MERGE_PRICE;
+            if (cost > 0d)
+            {
+                if (EconHandler.manager.getMoney(player) < cost)
+                {
+                    MainUtil.sendMessage(player, C.CANNOT_AFFORD_MERGE, "" + cost);
+                    return false;
+                }
+                EconHandler.manager.withdrawMoney(player, cost);
+                MainUtil.sendMessage(player, C.REMOVED_BALANCE, cost + "");
+            }
+        }
+        return MainUtil.mergePlots(world, plotIds, true, true);
+    }
+
+    public static boolean unlinkPlot(final Plot plot, final boolean createRoad)
+    {
+        final String world = plot.world;
+        final PlotId pos1 = MainUtil.getBottomPlot(plot).id;
+        final PlotId pos2 = MainUtil.getTopPlot(plot).id;
+        final ArrayList<PlotId> ids = MainUtil.getPlotSelectionIds(pos1, pos2);
+        final boolean result = EventUtil.manager.callUnlink(world, ids);
+        if (!result) { return false; }
+        final PlotManager manager = PS.get().getPlotManager(world);
+        final PlotWorld plotworld = PS.get().getPlotWorld(world);
+        manager.startPlotUnlink(plotworld, ids);
+        for (final PlotId id : ids)
+        {
+            final Plot myplot = PS.get().getPlot(world, id);
+            if (plot == null)
+            {
+                continue;
+            }
+            if (plot.trusted != null)
+            {
+                myplot.trusted = plot.trusted;
+            }
+            if (plot.denied != null)
+            {
+                myplot.denied = plot.denied;
+            }
+            myplot.getSettings().setMerged(new boolean[] { false, false, false, false });
+            DBFunc.setMerged(myplot, myplot.getSettings().getMerged());
+        }
+        if ((plotworld.TERRAIN != 3) && createRoad)
+        {
+            for (int x = pos1.x; x <= pos2.x; x++)
+            {
+                for (int y = pos1.y; y <= pos2.y; y++)
+                {
+                    final boolean lx = x < pos2.x;
+                    final boolean ly = y < pos2.y;
+                    final Plot p = MainUtil.getPlot(world, new PlotId(x, y));
+                    if (lx)
+                    {
+                        manager.createRoadEast(plotworld, p);
+                        if (ly)
+                        {
+                            manager.createRoadSouthEast(plotworld, p);
+                        }
+                    }
+                    if (ly)
+                    {
+                        manager.createRoadSouth(plotworld, p);
+                    }
+                    MainUtil.setSign(UUIDHandler.getName(plot.owner), plot);
+                }
+            }
+        }
+        manager.finishPlotUnlink(plotworld, ids);
+        for (final PlotId id : ids)
+        {
+            final Plot myPlot = MainUtil.getPlot(world, id);
+            if (plot.hasOwner())
+            {
+                final String name = UUIDHandler.getName(myPlot.owner);
+                if (name != null)
+                {
+                    MainUtil.setSign(name, myPlot);
+                }
+            }
+        }
+        return true;
+    }
+
+    public static boolean isPlotAreaAbs(final Location location)
+    {
+        final PlotWorld plotworld = PS.get().getPlotWorld(location.getWorld());
+        if (plotworld == null) { return false; }
+        if (plotworld.TYPE == 2) { return ClusterManager.getClusterAbs(location) != null; }
+        return true;
+    }
+
+    public static boolean isPlotRoad(final Location location)
+    {
+        final PlotWorld plotworld = PS.get().getPlotWorld(location.getWorld());
+        if (plotworld.TYPE == 2)
+        {
+            final PlotCluster cluster = ClusterManager.getCluster(location);
+            if (cluster == null) { return false; }
+        }
+        final PlotManager manager = PS.get().getPlotManager(location.getWorld());
+        return manager.getPlotId(plotworld, location.getX(), location.getY(), location.getZ()) == null;
+    }
+
+    public static boolean isPlotArea(final Plot plot)
+    {
+        final PlotWorld plotworld = PS.get().getPlotWorld(plot.world);
+        if (plotworld.TYPE == 2) { return plot.getCluster() != null; }
+        return true;
+    }
+
+    public static boolean enteredPlot(final Location l1, final Location l2)
+    {
+        final PlotId p1 = MainUtil.getPlotId(l1);
+        final PlotId p2 = MainUtil.getPlotId(l2);
+        return (p2 != null) && ((p1 == null) || !p1.equals(p2));
+    }
+
+    public static boolean leftPlot(final Location l1, final Location l2)
+    {
+        final PlotId p1 = MainUtil.getPlotId(l1);
+        final PlotId p2 = MainUtil.getPlotId(l2);
+        return (p1 != null) && ((p2 == null) || !p1.equals(p2));
+    }
+
+    public static ArrayList<PlotId> getMaxPlotSelectionIds(final String world, PlotId pos1, PlotId pos2)
+    {
+
+        final Plot plot1 = PS.get().getPlot(world, pos1);
+        final Plot plot2 = PS.get().getPlot(world, pos2);
+
+        if (plot1 != null)
+        {
+            pos1 = getBottomPlot(plot1).id;
+        }
+
+        if (plot2 != null)
+        {
+            pos2 = getTopPlot(plot2).id;
+        }
+
+        final ArrayList<PlotId> myplots = new ArrayList<>();
+        for (int x = pos1.x; x <= pos2.x; x++)
+        {
+            for (int y = pos1.y; y <= pos2.y; y++)
+            {
+                myplots.add(new PlotId(x, y));
+            }
+        }
+        return myplots;
+    }
+
+    public static boolean equals(final Object a, final Object b)
+    {
+        if (a == b) { return true; }
+        if ((a == null) ^ (b == null)) { return false; }
+        return a.equals(b);
+    }
+
+    /**
+     * Get the number of plots for a player
+     *
+     * @param plr
+     *
+     * @return int plot count
+     */
+    public static int getPlayerPlotCount(final String world, final PlotPlayer plr)
+    {
+        final UUID uuid = plr.getUUID();
+        int count = 0;
+        for (final Plot plot : PS.get().getPlotsInWorld(world))
+        {
+            if (plot.hasOwner() && plot.owner.equals(uuid) && (!Settings.DONE_COUNTS_TOWARDS_LIMIT || !plot.getSettings().flags.containsKey("done")))
+            {
+                count++;
+            }
+        }
+        return count;
+    }
+
+    /**
+     * Get a player's total number of plots that count towards their limit
+     * @param plr
+     * @return
+     */
+    public static int getPlayerPlotCount(final PlotPlayer plr)
+    {
+        int count = 0;
+        for (final String world : PS.get().getPlotWorldsString())
+        {
+            count += getPlayerPlotCount(world, plr);
+        }
+        return count;
+    }
+
+    public static Location getDefaultHome(final Plot plot)
+    {
+        final PlotWorld plotworld = PS.get().getPlotWorld(plot.world);
+        if (plotworld.DEFAULT_HOME != null)
+        {
+            final Location bot = getPlotBottomLoc(plot.world, plot.id).add(1, 0, 1);
+            final PlotManager manager = PS.get().getPlotManager(plot.world);
+            final int x;
+            final int z;
+            if ((plotworld.DEFAULT_HOME.x == Integer.MAX_VALUE) && (plotworld.DEFAULT_HOME.z == Integer.MAX_VALUE))
+            {
+                final Location top = getPlotTopLoc(plot.world, plot.id);
+                x = ((top.getX() - bot.getX()) / 2) + bot.getX();
+                z = ((top.getZ() - bot.getZ()) / 2) + bot.getZ();
+            }
+            else
+            {
+                x = bot.getX() + plotworld.DEFAULT_HOME.x;
+                z = bot.getZ() + plotworld.DEFAULT_HOME.z;
+            }
+            final int y = Math.max(getHeighestBlock(plot.world, x, z), manager.getSignLoc(PS.get().getPlotWorld(plot.world), plot).getY());
+            return new Location(plot.world, x, y + 1, z);
+        }
+        final Location top = getPlotTopLoc(plot.world, plot.id);
+        final Location bot = getPlotBottomLoc(plot.world, plot.id).add(1, 0, 1);
+        final int x = ((top.getX() - bot.getX()) / 2) + bot.getX();
+        final int z = bot.getZ();
+        final PlotManager manager = PS.get().getPlotManager(plot.world);
+        final int y = Math.max(getHeighestBlock(plot.world, x, z), manager.getSignLoc(PS.get().getPlotWorld(plot.world), plot).getY());
+        return new Location(plot.world, x, y + 1, z - 1);
+    }
+
+    public static boolean teleportPlayer(final PlotPlayer player, final Location from, final Plot plot)
+    {
+        final Plot bot = MainUtil.getBottomPlot(plot);
+        final boolean result = EventUtil.manager.callTeleport(player, from, plot);
+
+        if (result)
+        {
+            final Location location;
+            if (PS.get().getPlotWorld(plot.world).HOME_ALLOW_NONMEMBER || plot.isAdded(player.getUUID()))
+            {
+                location = MainUtil.getPlotHome(bot);
+            }
+            else
+            {
+                location = getDefaultHome(plot);
+            }
+            if ((Settings.TELEPORT_DELAY == 0) || Permissions.hasPermission(player, "plots.teleport.delay.bypass"))
+            {
+                sendMessage(player, C.TELEPORTED_TO_PLOT);
+                player.teleport(location);
+                return true;
+            }
+            sendMessage(player, C.TELEPORT_IN_SECONDS, Settings.TELEPORT_DELAY + "");
+            final String name = player.getName();
+            TaskManager.TELEPORT_QUEUE.add(name);
+            TaskManager.runTaskLater(new Runnable()
+            {
+                @Override
+                public void run()
+                {
+                    if (!TaskManager.TELEPORT_QUEUE.contains(name))
+                    {
+                        sendMessage(player, C.TELEPORT_FAILED);
+                        return;
+                    }
+                    TaskManager.TELEPORT_QUEUE.remove(name);
+                    if (!player.isOnline()) {
+                    return;
+                    }
+                    sendMessage(player, C.TELEPORTED_TO_PLOT);
+                    player.teleport(location);
+                }
+            }, Settings.TELEPORT_DELAY * 20);
+            return true;
+        }
+        return result;
+    }
+
+    public static int getBorder(final String worldname)
+    {
+        if (worldBorder.containsKey(worldname))
+        {
+            final int border = worldBorder.get(worldname) + 16;
+            if (border == 0)
+            {
+                return Integer.MAX_VALUE;
+            }
+            else
+            {
+                return border;
+            }
+        }
+        return Integer.MAX_VALUE;
+    }
+
+    public static void setupBorder(final String world)
+    {
+        final PlotWorld plotworld = PS.get().getPlotWorld(world);
+        if (!plotworld.WORLD_BORDER) { return; }
+        if (!worldBorder.containsKey(world))
+        {
+            worldBorder.put(world, 0);
+        }
+        for (final Plot plot : PS.get().getPlotsInWorld(world))
+        {
+            updateWorldBorder(plot);
+        }
+    }
+
+    public static void update(final String world, final ChunkLoc loc)
+    {
+        BlockUpdateUtil.setBlockManager.update(world, Arrays.asList(loc));
+    }
+
+    public static void update(final Plot plot)
+    {
+        final Location bot = getPlotBottomLoc(plot.world, plot.id).add(1, 0, 1);
+        final Location top = getPlotTopLoc(plot.world, plot.id);
+
+        final int bx = bot.getX() >> 4;
+        final int bz = bot.getZ() >> 4;
+
+        final int tx = (top.getX() >> 4);
+        final int tz = (top.getZ() >> 4);
+
+        final ArrayList<ChunkLoc> chunks = new ArrayList<>();
+
+        for (int x = bx; x <= tx; x++)
+        {
+            for (int z = bz; z <= tz; z++)
+            {
+                chunks.add(new ChunkLoc(x, z));
+            }
+        }
+        BlockUpdateUtil.setBlockManager.update(plot.world, chunks);
+    }
+
+    public static void createWorld(final String world, final String generator)
+    {}
+
+    public static PlotId parseId(final String arg)
+    {
+        try
+        {
+            final String[] split = arg.split(";");
+            return new PlotId(Integer.parseInt(split[0]), Integer.parseInt(split[1]));
+        }
+        catch (final Exception e)
+        {
+            return null;
+        }
+    }
+
+    /**
+     * direction 0 = north, 1 = south, etc:
+     *
+     * @param id
+     * @param direction
+     *
+     * @return PlotId relative
+     */
+    public static PlotId getPlotIdRelative(final PlotId id, final int direction)
+    {
+        switch (direction)
+        {
+            case 0:
+                return new PlotId(id.x, id.y - 1);
+            case 1:
+                return new PlotId(id.x + 1, id.y);
+            case 2:
+                return new PlotId(id.x, id.y + 1);
+            case 3:
+                return new PlotId(id.x - 1, id.y);
+        }
+        return id;
+    }
+
+    /**
+     * Get a list of plot ids within a selection
+     * @param pos1
+     * @param pos2
+     * @return
+     */
+    public static ArrayList<PlotId> getPlotSelectionIds(final PlotId pos1, final PlotId pos2)
+    {
+        final ArrayList<PlotId> myplots = new ArrayList<>();
+        for (int x = pos1.x; x <= pos2.x; x++)
+        {
+            for (int y = pos1.y; y <= pos2.y; y++)
+            {
+                myplots.add(new PlotId(x, y));
+            }
+        }
+        return myplots;
+    }
+
+    /**
+     * Get a set of owned plots within a selection (chooses the best algorithm based on selection size.<br>
+     * i.e. A selection of billions of plots will work fine
+     * @param pos1
+     * @param pos2
+     * @return
+     */
+    public static HashSet<Plot> getPlotSelectionOwned(final String world, final PlotId pos1, final PlotId pos2)
+    {
+        final int size = ((1 + pos2.x) - pos1.x) * ((1 + pos2.y) - pos1.y);
+        final HashSet<Plot> result = new HashSet<>();
+        if (PS.get().isPlotWorld(world))
+        {
+            if (size < PS.get().getAllPlotsRaw().get(world).size())
+            {
+                for (final PlotId pid : MainUtil.getPlotSelectionIds(pos1, pos2))
+                {
+                    final Plot plot = MainUtil.getPlot(world, pid);
+                    if (plot.hasOwner())
+                    {
+                        if ((plot.id.x > pos1.x) || (plot.id.y > pos1.y) || (plot.id.x < pos2.x) || (plot.id.y < pos2.y))
+                        {
+                            result.add(plot);
+                        }
+                    }
+                }
+            }
+            else
+            {
+                for (final Plot plot : PS.get().getPlotsInWorld(world))
+                {
+                    if ((plot.id.x > pos1.x) || (plot.id.y > pos1.y) || (plot.id.x < pos2.x) || (plot.id.y < pos2.y))
+                    {
+                        result.add(plot);
+                    }
+                }
+            }
+        }
+        return result;
+    }
+
+    /**
+     * Completely merges a set of plots<br> <b>(There are no checks to make sure you supply the correct
+     * arguments)</b><br> - Misuse of this method can result in unusable plots<br> - the set of plots must belong to one
+     * owner and be rectangular<br> - the plot array must be sorted in ascending order<br> - Road will be removed where
+     * required<br> - changes will be saved to DB<br>
+     *
+     * @param world
+     * @param plotIds
+     *
+     * @return boolean (success)
+     */
+    public static boolean mergePlots(final String world, final ArrayList<PlotId> plotIds, final boolean removeRoads, final boolean updateDatabase)
+    {
+        if (plotIds.size() < 2) { return false; }
+
+        //        merged plots set db before finished merging
+
+        final PlotId pos1 = plotIds.get(0);
+        final PlotId pos2 = plotIds.get(plotIds.size() - 1);
+        final PlotManager manager = PS.get().getPlotManager(world);
+        final PlotWorld plotworld = PS.get().getPlotWorld(world);
+
+        final boolean result = EventUtil.manager.callMerge(world, getPlot(world, pos1), plotIds);
+        if (!result) { return false; }
+
+        final HashSet<UUID> trusted = new HashSet<UUID>();
+        final HashSet<UUID> members = new HashSet<UUID>();
+        final HashSet<UUID> denied = new HashSet<UUID>();
+
+        manager.startPlotMerge(plotworld, plotIds);
+        for (int x = pos1.x; x <= pos2.x; x++)
+        {
+            for (int y = pos1.y; y <= pos2.y; y++)
+            {
+                final PlotId id = new PlotId(x, y);
+                final Plot plot = PS.get().getPlot(world, id);
+                trusted.addAll(plot.getTrusted());
+                members.addAll(plot.getMembers());
+                denied.addAll(plot.getDenied());
+                if (removeRoads)
+                {
+                    removeSign(plot);
+                }
+            }
+        }
+        members.removeAll(trusted);
+        denied.removeAll(trusted);
+        denied.removeAll(members);
+        for (int x = pos1.x; x <= pos2.x; x++)
+        {
+            for (int y = pos1.y; y <= pos2.y; y++)
+            {
+                final boolean lx = x < pos2.x;
+                final boolean ly = y < pos2.y;
+                final PlotId id = new PlotId(x, y);
+                final Plot plot = PS.get().getPlot(world, id);
+                plot.setTrusted(trusted);
+                plot.setMembers(members);
+                plot.setDenied(denied);
+                Plot plot2 = null;
+                if (lx)
+                {
+                    if (ly)
+                    {
+                        if (!plot.getSettings().getMerged(1) || !plot.getSettings().getMerged(2))
+                        {
+                            if (removeRoads)
+                            {
+                                MainUtil.removeRoadSouthEast(plotworld, plot);
+                            }
+                        }
+                    }
+                    if (!plot.getSettings().getMerged(1))
+                    {
+                        plot2 = PS.get().getPlot(world, new PlotId(x + 1, y));
+                        mergePlot(world, plot, plot2, removeRoads);
+                        plot.getSettings().setMerged(1, true);
+                        plot2.getSettings().setMerged(3, true);
+                    }
+                }
+                if (ly)
+                {
+                    if (!plot.getSettings().getMerged(2))
+                    {
+                        plot2 = PS.get().getPlot(world, new PlotId(x, y + 1));
+                        mergePlot(world, plot, plot2, removeRoads);
+                        plot.getSettings().setMerged(2, true);
+                        plot2.getSettings().setMerged(0, true);
+                    }
+                }
+            }
+        }
+        manager.finishPlotMerge(plotworld, plotIds);
+        if (updateDatabase)
+        {
+            for (int x = pos1.x; x <= pos2.x; x++)
+            {
+                for (int y = pos1.y; y <= pos2.y; y++)
+                {
+                    final PlotId id = new PlotId(x, y);
+                    final Plot plot = PS.get().getPlot(world, id);
+                    DBFunc.setMerged(plot, plot.getSettings().getMerged());
+                }
+            }
+        }
+        return true;
+    }
+
+    public static void removeRoadSouthEast(final PlotWorld plotworld, final Plot plot)
+    {
+        if ((plotworld.TYPE != 0) && (plotworld.TERRAIN > 1))
+        {
+            if (plotworld.TERRAIN == 3) { return; }
+            final PlotId id = plot.id;
+            final PlotId id2 = new PlotId(id.x + 1, id.y + 1);
+            final Location pos1 = getPlotTopLocAbs(plot.world, id).add(1, 0, 1);
+            final Location pos2 = getPlotBottomLocAbs(plot.world, id2);
+            pos1.setY(0);
+            pos2.setY(256);
+            ChunkManager.manager.regenerateRegion(pos1, pos2, null);
+        }
+        else
+        {
+            PS.get().getPlotManager(plot.world).removeRoadSouthEast(plotworld, plot);
+        }
+    }
+
+    public static void removeRoadEast(final PlotWorld plotworld, final Plot plot)
+    {
+        if ((plotworld.TYPE != 0) && (plotworld.TERRAIN > 1))
+        {
+            if (plotworld.TERRAIN == 3) { return; }
+            final PlotId id = plot.id;
+            final PlotId id2 = new PlotId(id.x + 1, id.y);
+            final Location bot = getPlotBottomLocAbs(plot.world, id2);
+            final Location top = getPlotTopLocAbs(plot.world, id);
+            final Location pos1 = new Location(plot.world, top.getX() + 1, 0, bot.getZ() + 1);
+            final Location pos2 = new Location(plot.world, bot.getX(), 256, top.getZ());
+            ChunkManager.manager.regenerateRegion(pos1, pos2, null);
+        }
+        else
+        {
+            PS.get().getPlotManager(plot.world).removeRoadEast(plotworld, plot);
+        }
+    }
+
+    public static void removeRoadSouth(final PlotWorld plotworld, final Plot plot)
+    {
+        if ((plotworld.TYPE != 0) && (plotworld.TERRAIN > 1))
+        {
+            if (plotworld.TERRAIN == 3) { return; }
+            final PlotId id = plot.id;
+            final PlotId id2 = new PlotId(id.x, id.y + 1);
+            final Location bot = getPlotBottomLocAbs(plot.world, id2);
+            final Location top = getPlotTopLocAbs(plot.world, id);
+            final Location pos1 = new Location(plot.world, bot.getX() + 1, 0, top.getZ() + 1);
+            final Location pos2 = new Location(plot.world, top.getX(), 256, bot.getZ());
+            ChunkManager.manager.regenerateRegion(pos1, pos2, null);
+        }
+        else
+        {
+            PS.get().getPlotManager(plot.world).removeRoadSouth(plotworld, plot);
+        }
+    }
+
+    /**
+     * Merges 2 plots Removes the road inbetween <br> - Assumes the first plot parameter is lower <br> - Assumes neither
+     * are a Mega-plot <br> - Assumes plots are directly next to each other <br> - Does not save to DB
+     *
+     * @param world
+     * @param lesserPlot
+     * @param greaterPlot
+     */
+    public static void mergePlot(final String world, final Plot lesserPlot, final Plot greaterPlot, final boolean removeRoads)
+    {
+        final PlotWorld plotworld = PS.get().getPlotWorld(world);
+        if (lesserPlot.id.x.equals(greaterPlot.id.x))
+        {
+            if (!lesserPlot.getSettings().getMerged(2))
+            {
+                lesserPlot.getSettings().setMerged(2, true);
+                greaterPlot.getSettings().setMerged(0, true);
+                if (removeRoads)
+                {
+                    MainUtil.removeRoadSouth(plotworld, lesserPlot);
+                }
+            }
+        }
+        else
+        {
+            if (!lesserPlot.getSettings().getMerged(1))
+            {
+                lesserPlot.getSettings().setMerged(1, true);
+                greaterPlot.getSettings().setMerged(3, true);
+                if (removeRoads)
+                {
+                    MainUtil.removeRoadEast(plotworld, lesserPlot);
+                }
+            }
+        }
+    }
+
+    public static void removeSign(final Plot p)
+    {
+        if (!PS.get().isMainThread(Thread.currentThread()))
+        {
+            TaskManager.runTask(new Runnable()
+            {
+                @Override
+                public void run()
+                {
+                    removeSign(p);
+                }
+            });
+            return;
+        }
+        final String world = p.world;
+        final PlotManager manager = PS.get().getPlotManager(world);
+        final PlotWorld plotworld = PS.get().getPlotWorld(world);
+        if (!plotworld.ALLOW_SIGNS) { return; }
+        final Location loc = manager.getSignLoc(plotworld, p);
+        BlockManager.setBlocks(world, new int[] { loc.getX() }, new int[] { loc.getY() }, new int[] { loc.getZ() }, new int[] { 0 }, new byte[] { 0 });
+    }
+
+    public static void setSign(final Plot p)
+    {
+        if (p.owner == null)
+        {
+            setSign(null, p);
+            return;
+        }
+        setSign(UUIDHandler.getName(p.owner), p);
+    }
+
+    public static void setSign(final String name, final Plot p)
+    {
+        if (!PS.get().isMainThread(Thread.currentThread()))
+        {
+            TaskManager.runTask(new Runnable()
+            {
+                @Override
+                public void run()
+                {
+                    setSign(name, p);
+                }
+            });
+            return;
+        }
+        final String rename = name == null ? "unknown" : name;
+        final PlotManager manager = PS.get().getPlotManager(p.world);
+        final PlotWorld plotworld = PS.get().getPlotWorld(p.world);
+        if (plotworld.ALLOW_SIGNS)
+        {
+            final Location loc = manager.getSignLoc(plotworld, p);
+            final String id = p.id.x + ";" + p.id.y;
+            final String[] lines = new String[] {
+            C.OWNER_SIGN_LINE_1.formatted().replaceAll("%id%", id),
+            C.OWNER_SIGN_LINE_2.formatted().replaceAll("%id%", id).replaceAll("%plr%", rename),
+            C.OWNER_SIGN_LINE_3.formatted().replaceAll("%id%", id).replaceAll("%plr%", rename),
+            C.OWNER_SIGN_LINE_4.formatted().replaceAll("%id%", id).replaceAll("%plr%", rename) };
+            BlockManager.setSign(p.world, loc.getX(), loc.getY(), loc.getZ(), lines);
+        }
+    }
+
+    public static String getStringSized(final int max, final String string)
+    {
+        if (string.length() > max) { return string.substring(0, max); }
+        return string;
+    }
+
+    public static void autoMerge(final Plot plot, final UUID uuid, final boolean removeRoads)
+    {
+        if (plot == null) { return; }
+        if (plot.owner == null) { return; }
+        if (!plot.owner.equals(uuid)) { return; }
+        ArrayList<PlotId> plots;
+        boolean merge = true;
+        int count = 0;
+        final ArrayList<PlotId> toUpdate = new ArrayList<>();
+        while (merge)
+        {
+            if (count > 16)
+            {
+                break;
+            }
+            merge = false;
+            count++;
+            final PlotId bot = getBottomPlot(plot).id;
+            final PlotId top = getTopPlot(plot).id;
+            plots = getPlotSelectionIds(new PlotId(bot.x, bot.y - 1), new PlotId(top.x, top.y));
+            if (ownsPlots(plot.world, plots, uuid, 0))
+            {
+                final boolean result = mergePlots(plot.world, plots, removeRoads, false);
+                if (result)
+                {
+                    toUpdate.addAll(plots);
+                    merge = true;
+                    continue;
+                }
+            }
+            plots = getPlotSelectionIds(new PlotId(bot.x, bot.y), new PlotId(top.x + 1, top.y));
+            if (ownsPlots(plot.world, plots, uuid, 1))
+            {
+                final boolean result = mergePlots(plot.world, plots, removeRoads, false);
+                if (result)
+                {
+                    toUpdate.addAll(plots);
+                    merge = true;
+                    continue;
+                }
+            }
+            plots = getPlotSelectionIds(new PlotId(bot.x, bot.y), new PlotId(top.x, top.y + 1));
+            if (ownsPlots(plot.world, plots, uuid, 2))
+            {
+                final boolean result = mergePlots(plot.world, plots, removeRoads, false);
+                if (result)
+                {
+                    toUpdate.addAll(plots);
+                    merge = true;
+                    continue;
+                }
+            }
+            plots = getPlotSelectionIds(new PlotId(bot.x - 1, bot.y), new PlotId(top.x, top.y));
+            if (ownsPlots(plot.world, plots, uuid, 3))
+            {
+                final boolean result = mergePlots(plot.world, plots, removeRoads, false);
+                if (result)
+                {
+                    toUpdate.addAll(plots);
+                    merge = true;
+                    continue;
+                }
+            }
+        }
+        for (final PlotId id : toUpdate)
+        {
+            DBFunc.setMerged(plot, plot.getSettings().getMerged());
+        }
+    }
+
+    private static boolean ownsPlots(final String world, final ArrayList<PlotId> plots, final UUID uuid, final int dir)
+    {
+        final PlotId id_min = plots.get(0);
+        final PlotId id_max = plots.get(plots.size() - 1);
+        for (final PlotId myid : plots)
+        {
+            final Plot myplot = PS.get().getPlot(world, myid);
+            if ((myplot == null) || (myplot.owner == null) || !(myplot.owner.equals(uuid))) { return false; }
+            final PlotId top = getTopPlot(myplot).id;
+            if (((top.x > id_max.x) && (dir != 1)) || ((top.y > id_max.y) && (dir != 2))) { return false; }
+            final PlotId bot = getBottomPlot(myplot).id;
+            if (((bot.x < id_min.x) && (dir != 3)) || ((bot.y < id_min.y) && (dir != 0))) { return false; }
+        }
+        return true;
+    }
+
+    public static void updateWorldBorder(final Plot plot)
+    {
+        if (!worldBorder.containsKey(plot.world)) { return; }
+        final String world = plot.world;
+        final PlotManager manager = PS.get().getPlotManager(world);
+        final PlotWorld plotworld = PS.get().getPlotWorld(world);
+        final PlotId id = new PlotId(Math.abs(plot.id.x) + 1, Math.abs(plot.id.x) + 1);
+        final Location bot = manager.getPlotBottomLocAbs(plotworld, id);
+        final Location top = manager.getPlotTopLocAbs(plotworld, id);
+        final int border = worldBorder.get(plot.world);
+        final int botmax = Math.max(Math.abs(bot.getX()), Math.abs(bot.getZ()));
+        final int topmax = Math.max(Math.abs(top.getX()), Math.abs(top.getZ()));
+        final int max = Math.max(botmax, topmax);
+        if (max > border)
+        {
+            worldBorder.put(plot.world, max);
+        }
+    }
+
+    /**
+     * Create a plot and notify the world border and plot merger
+     */
+    public static boolean createPlot(final UUID uuid, final Plot plot)
+    {
+        if (MainUtil.worldBorder.containsKey(plot.world))
+        {
+            updateWorldBorder(plot);
+        }
+        final String w = plot.world;
+        if (PS.get().getPlot(plot.world, plot.id) != null) { return true; }
+        final Plot p = new Plot(w, plot.id, uuid);
+        if (p.owner == null) { return false; }
+        PS.get().updatePlot(p);
+        DBFunc.createPlotAndSettings(p, new Runnable()
+        {
+            @Override
+            public void run()
+            {
+                final PlotWorld plotworld = PS.get().getPlotWorld(plot.world);
+                if (plotworld.AUTO_MERGE)
+                {
+                    autoMerge(p, uuid, true);
+                }
+            }
+        });
+        return true;
+    }
+
+    /**
+     * Create a plot without notifying the merge function or world border manager
+     */
+    public static Plot createPlotAbs(final UUID uuid, final Plot plot)
+    {
+        final String w = plot.world;
+        Plot p = PS.get().getPlot(plot.world, plot.id);
+        if (p != null) { return p; }
+        p = new Plot(w, plot.id, uuid);
+        if (p.owner == null) { return null; }
+        PS.get().updatePlot(p);
+        DBFunc.createPlotAndSettings(p, null);
+        return p;
+    }
+
+    public static String createId(final int x, final int z)
+    {
+        return x + ";" + z;
+    }
+
+    public static int square(final int x)
+    {
+        return x * x;
+    }
+
+    public static short[] getBlock(final String block)
+    {
+        if (block.contains(":"))
+        {
+            final String[] split = block.split(":");
+            return new short[] { Short.parseShort(split[0]), Short.parseShort(split[1]) };
+        }
+        return new short[] { Short.parseShort(block), 0 };
+    }
+
+    /**
+     * Clear a plot and associated sections: [sign, entities, border]
+     *
+     * @param plot
+     * @param isDelete
+     * @param whenDone
+     */
+    public static boolean clearAsPlayer(final Plot plot, final boolean isDelete, final Runnable whenDone)
+    {
+        if (runners.containsKey(plot)) { return false; }
+        System.currentTimeMillis();
+        ChunkManager.manager.clearAllEntities(plot.getBottom(), plot.getTop());
+        if (isDelete)
+        {
+            removeSign(plot);
+        }
+        clear(plot, isDelete, whenDone);
+        return true;
+    }
+
+    public static void clear(final Plot plot, final boolean isDelete, final Runnable whenDone)
+    {
+        final PlotManager manager = PS.get().getPlotManager(plot.world);
+        final Location pos1 = MainUtil.getPlotBottomLoc(plot.world, plot.id).add(1, 0, 1);
+        final PlotWorld plotworld = PS.get().getPlotWorld(plot.world);
+        runners.put(plot, 1);
+        final Runnable run = new Runnable()
+        {
+            @Override
+            public void run()
+            {
+                if (isDelete)
+                {
+                    manager.unclaimPlot(plotworld, plot, new Runnable()
+                    {
+                        @Override
+                        public void run()
+                        {
+                            runners.remove(plot);
+                            TaskManager.runTask(whenDone);
+                        }
+                    });
+                }
+                else
+                {
+                    runners.remove(plot);
+                    TaskManager.runTask(whenDone);
+                }
+            }
+        };
+        if ((plotworld.TERRAIN != 0) || Settings.FAST_CLEAR)
+        {
+            final Location pos2 = MainUtil.getPlotTopLoc(plot.world, plot.id);
+            ChunkManager.manager.regenerateRegion(pos1, pos2, run);
+            return;
+        }
+        manager.clearPlot(plotworld, plot, run);
+    }
+
+    public static void setCuboid(final String world, final Location pos1, final Location pos2, final PlotBlock[] blocks)
+    {
+        if (blocks.length == 1)
+        {
+            setSimpleCuboid(world, pos1, pos2, blocks[0]);
+            return;
+        }
+        final int length = (pos2.getX() - pos1.getX()) * (pos2.getY() - pos1.getY()) * (pos2.getZ() - pos1.getZ());
+        final int[] xl = new int[length];
+        final int[] yl = new int[length];
+        final int[] zl = new int[length];
+        final int[] ids = new int[length];
+        final byte[] data = new byte[length];
+        int index = 0;
+        for (int y = pos1.getY(); y < pos2.getY(); y++)
+        {
+            for (int x = pos1.getX(); x < pos2.getX(); x++)
+            {
+                for (int z = pos1.getZ(); z < pos2.getZ(); z++)
+                {
+                    final int i = random.random(blocks.length);
+                    xl[index] = x;
+                    yl[index] = y;
+                    zl[index] = z;
+                    final PlotBlock block = blocks[i];
+                    ids[index] = block.id;
+                    data[index] = block.data;
+                    index++;
+                }
+            }
+        }
+        BlockManager.setBlocks(world, xl, yl, zl, ids, data);
+    }
+
+    public static void setCuboidAsync(final String world, final Location pos1, final Location pos2, final PlotBlock[] blocks)
+    {
+        if (blocks.length == 1)
+        {
+            setSimpleCuboidAsync(world, pos1, pos2, blocks[0]);
+            return;
+        }
+        for (int y = pos1.getY(); y < Math.min(256, pos2.getY()); y++)
+        {
+            for (int x = pos1.getX(); x < pos2.getX(); x++)
+            {
+                for (int z = pos1.getZ(); z < pos2.getZ(); z++)
+                {
+                    final int i = random.random(blocks.length);
+                    final PlotBlock block = blocks[i];
+                    SetBlockQueue.setBlock(world, x, y, z, block);
+                }
+            }
+        }
+    }
+
+    public static void setSimpleCuboid(final String world, final Location pos1, final Location pos2, final PlotBlock newblock)
+    {
+        final int length = (pos2.getX() - pos1.getX()) * (pos2.getY() - pos1.getY()) * (pos2.getZ() - pos1.getZ());
+        final int[] xl = new int[length];
+        final int[] yl = new int[length];
+        final int[] zl = new int[length];
+        final int[] ids = new int[length];
+        final byte[] data = new byte[length];
+        int index = 0;
+        for (int y = pos1.getY(); y < pos2.getY(); y++)
+        {
+            for (int x = pos1.getX(); x < pos2.getX(); x++)
+            {
+                for (int z = pos1.getZ(); z < pos2.getZ(); z++)
+                {
+                    xl[index] = x;
+                    yl[index] = y;
+                    zl[index] = z;
+                    ids[index] = newblock.id;
+                    data[index] = newblock.data;
+                    index++;
+                }
+            }
+        }
+        BlockManager.setBlocks(world, xl, yl, zl, ids, data);
+    }
+
+    public static void setSimpleCuboidAsync(final String world, final Location pos1, final Location pos2, final PlotBlock newblock)
+    {
+        for (int y = pos1.getY(); y < Math.min(256, pos2.getY()); y++)
+        {
+            for (int x = pos1.getX(); x < pos2.getX(); x++)
+            {
+                for (int z = pos1.getZ(); z < pos2.getZ(); z++)
+                {
+                    SetBlockQueue.setBlock(world, x, y, z, newblock);
+                }
+            }
+        }
+    }
+
+    public static void setBiome(final Plot plot, final String biome, final Runnable whenDone)
+    {
+        final Location pos1 = plot.getBottom();
+        final Location pos2 = plot.getTop();
+        ChunkManager.chunkTask(pos1, pos2, new RunnableVal<int[]>()
+        {
+            @Override
+            public void run()
+            {
+                final ChunkLoc loc = new ChunkLoc(value[0], value[1]);
+                ChunkManager.manager.loadChunk(plot.world, loc, false);
+                setBiome(plot.world, value[2], value[3], value[4], value[5], biome);
+                ChunkManager.manager.unloadChunk(plot.world, loc, true, true);
+            }
+        }, new Runnable()
+        {
+            @Override
+            public void run()
+            {
+                update(plot);
+                TaskManager.runTask(whenDone);
+            }
+        }, 5);
+    }
+
+    public static void setBiome(final String world, final int p1x, final int p1z, final int p2x, final int p2z, final String biome)
+    {
+        final int length = ((p2x - p1x) + 1) * ((p2z - p1z) + 1);
+        final int[] xl = new int[length];
+        final int[] zl = new int[length];
+        int index = 0;
+        for (int x = p1x; x <= p2x; x++)
+        {
+            for (int z = p1z; z <= p2z; z++)
+            {
+                xl[index] = x;
+                zl[index] = z;
+                index++;
+            }
+        }
+        BlockManager.setBiomes(world, xl, zl, biome);
+    }
+
+    public static int getHeighestBlock(final String world, final int x, final int z)
+    {
+        final int result = BlockManager.manager.getHeighestBlock(world, x, z);
+        if (result == 0) { return 64; }
+        return result;
+    }
+
+    /**
+     * Get plot home
+     *
+     * @param w      World in which the plot is located
+     * @param plotid Plot ID
+     *
+     * @return Home Location
+     */
+    public static Location getPlotHome(final String w, final PlotId plotid)
+    {
+        final Plot plot = getPlot(w, plotid);
+        final BlockLoc home = plot.getSettings().getPosition();
+        final Location bot = getPlotBottomLoc(w, plotid);
+        PS.get().getPlotManager(w);
+        if ((home == null) || ((home.x == 0) && (home.z == 0)))
+        {
+            return getDefaultHome(plot);
+        }
+        else
+        {
+            final Location loc = new Location(bot.getWorld(), bot.getX() + home.x, bot.getY() + home.y, bot.getZ() + home.z);
+            if (BlockManager.manager.getBlock(loc).id != 0)
+            {
+                // sendConsoleMessage("ID was " + BukkitUtil.getBlock(loc).id);
+                loc.setY(Math.max(getHeighestBlock(w, loc.getX(), loc.getZ()), bot.getY()));
+            }
+            return loc;
+        }
+    }
+
+    /**
+     * Get the plot home
+     *
+     * @param plot Plot Object
+     *
+     * @return Plot Home Location
+     *
+     */
+    public static Location getPlotHome(final Plot plot)
+    {
+        return getPlotHome(plot.world, plot.id);
+    }
+
+    /**
+     * Gets the top plot location of a plot (all plots are treated as small plots) - To get the top loc of a mega plot
+     * use getPlotTopLoc(...)
+     *
+     * @param world
+     * @param id
+     *
+     * @return Location top
+     */
+    public static Location getPlotTopLocAbs(final String world, final PlotId id)
+    {
+        final PlotWorld plotworld = PS.get().getPlotWorld(world);
+        final PlotManager manager = PS.get().getPlotManager(world);
+        return manager.getPlotTopLocAbs(plotworld, id);
+    }
+
+    /**
+     * Gets the bottom plot location of a plot (all plots are treated as small plots) - To get the top loc of a mega
+     * plot use getPlotBottomLoc(...)
+     *
+     * @param world
+     * @param id
+     *
+     * @return Location bottom
+     */
+    public static Location getPlotBottomLocAbs(final String world, final PlotId id)
+    {
+        final PlotWorld plotworld = PS.get().getPlotWorld(world);
+        final PlotManager manager = PS.get().getPlotManager(world);
+        return manager.getPlotBottomLocAbs(plotworld, id);
+    }
+
+    /**
+     * Obtains the width of a plot (x width)
+     *
+     * @param world
+     * @param id
+     *
+     * @return int width of plot
+     */
+    public static int getPlotWidth(final String world, final PlotId id)
+    {
+        return getPlotTopLoc(world, id).getX() - getPlotBottomLoc(world, id).getX();
+    }
+
+    /**
+     * Gets the top loc of a plot (if mega, returns top loc of that mega plot) - If you would like each plot treated as
+     * a small plot use getPlotTopLocAbs(...)
+     *
+     * @param world
+     * @param id
+     *
+     * @return Location top of mega plot
+     */
+    public static Location getPlotTopLoc(final String world, PlotId id)
+    {
+        final Plot plot = PS.get().getPlot(world, id);
+        if (plot != null)
+        {
+            id = getTopPlot(plot).id;
+        }
+        final PlotWorld plotworld = PS.get().getPlotWorld(world);
+        final PlotManager manager = PS.get().getPlotManager(world);
+        return manager.getPlotTopLocAbs(plotworld, id);
+    }
+
+    /**
+     * Gets the bottom loc of a plot (if mega, returns bottom loc of that mega plot) - If you would like each plot
+     * treated as a small plot use getPlotBottomLocAbs(...)
+     *
+     * @param world
+     * @param id
+     *
+     * @return Location bottom of mega plot
+     *
+     * @deprecated Incorrect offset / legacy / use plot.getBottom()
+     *
+     */
+    @Deprecated
+    public static Location getPlotBottomLoc(final String world, PlotId id)
+    {
+        final Plot plot = PS.get().getPlot(world, id);
+        if (plot != null)
+        {
+            id = getBottomPlot(plot).id;
+        }
+        final PlotWorld plotworld = PS.get().getPlotWorld(world);
+        final PlotManager manager = PS.get().getPlotManager(world);
+        return manager.getPlotBottomLocAbs(plotworld, id);
+    }
+
+    public static boolean canClaim(final PlotPlayer player, final String world, final PlotId pos1, final PlotId pos2)
+    {
+        for (int x = pos1.x; x <= pos2.x; x++)
+        {
+            for (int y = pos1.y; y <= pos2.y; y++)
+            {
+                final PlotId id = new PlotId(x, y);
+                final Plot plot = getPlot(world, id);
+                if (!canClaim(player, plot)) { return false; }
+            }
+        }
+        return true;
+    }
+
+    public static boolean canClaim(final PlotPlayer player, final Plot plot)
+    {
+        if (plot == null) { return false; }
+        if (Settings.ENABLE_CLUSTERS)
+        {
+            final PlotCluster cluster = plot.getCluster();
+            if (cluster != null)
+            {
+                if (!cluster.isAdded(player.getUUID()) && !Permissions.hasPermission(player, "plots.admin.command.claim")) { return false; }
+            }
+        }
+        return plot.owner == null;
+    }
+
+    public static boolean isUnowned(final String world, final PlotId pos1, final PlotId pos2)
+    {
+        for (int x = pos1.x; x <= pos2.x; x++)
+        {
+            for (int y = pos1.y; y <= pos2.y; y++)
+            {
+                final PlotId id = new PlotId(x, y);
+                if (PS.get().getPlot(world, id) != null)
+                {
+                    if (PS.get().getPlot(world, id).owner != null) { return false; }
+                }
+            }
+        }
+        return true;
+    }
+
+    public static boolean swap(final String world, final PlotId current, final PlotId newPlot, final Runnable whenDone)
+    {
+        final Plot p1 = PS.get().getPlot(world, current);
+        final Plot p2 = PS.get().getPlot(world, newPlot);
+        if ((p1 == null) || (p2 == null) || (p1.owner == null) || !p1.owner.equals(p2.owner)) { return false; }
+        // Swap blocks
+        ChunkManager.manager.swap(world, current, newPlot);
+        // Swap cached
+        final PlotId temp = new PlotId(p1.id.x.intValue(), p1.id.y.intValue());
+        p1.id.x = p2.id.x.intValue();
+        p1.id.y = p2.id.y.intValue();
+        p2.id.x = temp.x;
+        p2.id.y = temp.y;
+        final Map<String, ConcurrentHashMap<PlotId, Plot>> raw = PS.get().getAllPlotsRaw();
+        raw.get(world).remove(p1.id);
+        raw.get(world).remove(p2.id);
+        p1.id.recalculateHash();
+        p2.id.recalculateHash();
+        raw.get(world).put(p1.id, p1);
+        raw.get(world).put(p2.id, p2);
+        // Swap database
+        DBFunc.dbManager.swapPlots(p2, p1);
+        return true;
+    }
+
+    public static boolean swapData(final String world, final PlotId current, final PlotId newPlot, final Runnable whenDone)
+    {
+        final Plot p1 = PS.get().getPlot(world, current);
+        final Plot p2 = PS.get().getPlot(world, newPlot);
+        if ((p1 == null) || (p1.owner == null))
+        {
+            if ((p2 != null) && (p2.owner != null))
+            {
+                moveData(p2, getPlot(world, current), whenDone);
+                return true;
+            }
+            return false;
+        }
+        if ((p2 == null) || (p2.owner == null))
+        {
+            if ((p1 != null) && (p1.owner != null))
+            {
+                moveData(p1, getPlot(world, newPlot), whenDone);
+                return true;
+            }
+            return false;
+        }
+        // Swap cached
+        final PlotId temp = new PlotId(p1.id.x.intValue(), p1.id.y.intValue());
+        p1.id.x = p2.id.x.intValue();
+        p1.id.y = p2.id.y.intValue();
+        p2.id.x = temp.x;
+        p2.id.y = temp.y;
+        final Map<String, ConcurrentHashMap<PlotId, Plot>> raw = PS.get().getAllPlotsRaw();
+        raw.get(world).remove(p1.id);
+        raw.get(world).remove(p2.id);
+        p1.id.recalculateHash();
+        p2.id.recalculateHash();
+        raw.get(world).put(p1.id, p1);
+        raw.get(world).put(p2.id, p2);
+        // Swap database
+        DBFunc.dbManager.swapPlots(p2, p1);
+        TaskManager.runTask(whenDone);
+        return true;
+    }
+
+    public static boolean moveData(final Plot plot1, final Plot plot2, final Runnable whenDone)
+    {
+        if (plot1.owner == null)
+        {
+            PS.debug(plot2 + " is unowned (single)");
+            TaskManager.runTask(whenDone);
+            return false;
+        }
+        final Plot pos1 = getBottomPlot(plot1);
+        final Plot pos2 = getTopPlot(plot1);
+        final PlotId size = MainUtil.getSize(plot1);
+        if (!MainUtil.isUnowned(plot2.world, plot2.id, new PlotId((plot2.id.x + size.x) - 1, (plot2.id.y + size.y) - 1)))
+        {
+            PS.debug(plot2 + " is unowned (multi)");
+            TaskManager.runTask(whenDone);
+            return false;
+        }
+        final int offset_x = plot2.id.x - pos1.id.x;
+        final int offset_y = plot2.id.y - pos1.id.y;
+        final ArrayList<PlotId> selection = getPlotSelectionIds(pos1.id, pos2.id);
+        for (final PlotId id : selection)
+        {
+            final String worldOriginal = plot1.world;
+            final PlotId idOriginal = new PlotId(id.x, id.y);
+            final Plot plot = PS.get().getPlot(plot1.world, id);
+            final Map<String, ConcurrentHashMap<PlotId, Plot>> raw = PS.get().getAllPlotsRaw();
+            raw.get(plot1.world).remove(id);
+            plot.id.x += offset_x;
+            plot.id.y += offset_y;
+            plot.id.recalculateHash();
+            raw.get(plot2.world).put(plot.id, plot);
+            DBFunc.movePlot(getPlot(worldOriginal, idOriginal), getPlot(plot2.world, new PlotId(id.x + offset_x, id.y + offset_y)));
+        }
+        TaskManager.runTaskLater(whenDone, 1);
+        return true;
+    }
+
+    public static boolean move(final Plot plot1, final Plot plot2, final Runnable whenDone)
+    {
+        final com.intellectualcrafters.plot.object.Location bot1 = MainUtil.getPlotBottomLoc(plot1.world, plot1.id);
+        final com.intellectualcrafters.plot.object.Location bot2 = MainUtil.getPlotBottomLoc(plot2.world, plot2.id);
+        final Location top = MainUtil.getPlotTopLoc(plot1.world, plot1.id);
+        if (plot1.owner == null)
+        {
+            PS.debug(plot2 + " is unowned (single)");
+            TaskManager.runTask(whenDone);
+            return false;
+        }
+        final Plot pos1 = getBottomPlot(plot1);
+        final Plot pos2 = getTopPlot(plot1);
+        final PlotId size = MainUtil.getSize(plot1);
+        if (!MainUtil.isUnowned(plot2.world, plot2.id, new PlotId((plot2.id.x + size.x) - 1, (plot2.id.y + size.y) - 1)))
+        {
+            PS.debug(plot2 + " is unowned (multi)");
+            TaskManager.runTask(whenDone);
+            return false;
+        }
+        final int offset_x = plot2.id.x - pos1.id.x;
+        final int offset_y = plot2.id.y - pos1.id.y;
+        final ArrayList<PlotId> selection = getPlotSelectionIds(pos1.id, pos2.id);
+        for (final PlotId id : selection)
+        {
+            final String worldOriginal = plot1.world;
+            final PlotId idOriginal = new PlotId(id.x, id.y);
+            final Plot plot = PS.get().getPlot(plot1.world, id);
+            final Map<String, ConcurrentHashMap<PlotId, Plot>> raw = PS.get().getAllPlotsRaw();
+            raw.get(plot1.world).remove(id);
+            plot.id.x += offset_x;
+            plot.id.y += offset_y;
+            plot.id.recalculateHash();
+            raw.get(plot2.world).put(plot.id, plot);
+            DBFunc.movePlot(getPlot(worldOriginal, idOriginal), getPlot(plot2.world, new PlotId(id.x + offset_x, id.y + offset_y)));
+        }
+        ChunkManager.manager.copyRegion(bot1, top, bot2, new Runnable()
+        {
+            @Override
+            public void run()
+            {
+                final Location bot = bot1.clone().add(1, 0, 1);
+                ChunkManager.manager.regenerateRegion(bot, top, null);
+                TaskManager.runTaskLater(whenDone, 1);
+            }
+        });
+        return true;
+    }
+
+    public static boolean copy(final String world, final PlotId current, final PlotId newPlot, final Runnable whenDone)
+    {
+        final com.intellectualcrafters.plot.object.Location bot1 = MainUtil.getPlotBottomLoc(world, current);
+        final com.intellectualcrafters.plot.object.Location bot2 = MainUtil.getPlotBottomLoc(world, newPlot);
+        final Location top = MainUtil.getPlotTopLoc(world, current);
+        final Plot currentPlot = MainUtil.getPlot(world, current);
+        if (currentPlot.owner == null)
+        {
+            TaskManager.runTaskLater(whenDone, 1);
+            return false;
+        }
+        final Plot pos1 = getBottomPlot(currentPlot);
+        final Plot pos2 = getTopPlot(currentPlot);
+        final PlotId size = MainUtil.getSize(currentPlot);
+        if (!MainUtil.isUnowned(world, newPlot, new PlotId((newPlot.x + size.x) - 1, (newPlot.y + size.y) - 1)))
+        {
+            TaskManager.runTaskLater(whenDone, 1);
+            return false;
+        }
+        final ArrayList<PlotId> selection = getPlotSelectionIds(pos1.id, pos2.id);
+        final int offset_x = newPlot.x - pos1.id.x;
+        final int offset_y = newPlot.y - pos1.id.y;
+        for (final PlotId id : selection)
+        {
+            final int x = id.x + offset_x;
+            final int y = id.y + offset_y;
+            final Plot plot = createPlotAbs(currentPlot.owner, getPlot(world, new PlotId(x, y)));
+            if ((currentPlot.getSettings().flags != null) && (currentPlot.getSettings().flags.size() > 0))
+            {
+                plot.getSettings().flags = currentPlot.getSettings().flags;
+                DBFunc.setFlags(plot, currentPlot.getSettings().flags.values());
+            }
+            if (currentPlot.isMerged())
+            {
+                plot.getSettings().setMerged(currentPlot.getSettings().getMerged());
+                DBFunc.setMerged(plot, currentPlot.getSettings().getMerged());
+            }
+            if ((currentPlot.members != null) && (currentPlot.members.size() > 0))
+            {
+                plot.members = currentPlot.members;
+                for (final UUID member : plot.members)
+                {
+                    DBFunc.setMember(plot, member);
+                }
+            }
+            if ((currentPlot.trusted != null) && (currentPlot.trusted.size() > 0))
+            {
+                plot.trusted = currentPlot.trusted;
+                for (final UUID trusted : plot.trusted)
+                {
+                    DBFunc.setTrusted(plot, trusted);
+                }
+            }
+            if ((currentPlot.denied != null) && (currentPlot.denied.size() > 0))
+            {
+                plot.denied = currentPlot.denied;
+                for (final UUID denied : plot.denied)
+                {
+                    DBFunc.setDenied(plot, denied);
+                }
+            }
+            PS.get().updatePlot(plot);
+        }
+        ChunkManager.manager.copyRegion(bot1, top, bot2, whenDone);
+        return true;
+    }
+
+    /**
+     * Send a message to the player
+     *
+     * @param plr Player to recieve message
+     * @param msg Message to send
+     *
+     * @return true Can be used in things such as commands (return PlayerFunctions.sendMessage(...))
+     */
+    public static boolean sendMessage(final PlotPlayer plr, final String msg)
+    {
+        return sendMessage(plr, msg, true);
+    }
+
+    public static void sendConsoleMessage(final String msg)
+    {
+        sendMessage(null, msg);
+    }
+
+    public static void sendConsoleMessage(final C caption, final String... args)
+    {
+        sendMessage(null, caption, args);
+    }
+
+    public static boolean sendMessage(final PlotPlayer plr, final String msg, final boolean prefix)
+    {
+        if ((msg.length() > 0) && !msg.equals(""))
+        {
+            if (plr == null)
+            {
+                PS.log((prefix ? C.PREFIX.s() : "") + msg);
+            }
+            else
+            {
+                plr.sendMessage((prefix ? C.PREFIX.s() : "") + C.color(msg));
+            }
+        }
+        return true;
+    }
+
+    public static String[] wordWrap(final String rawString, final int lineLength)
+    {
+        if (rawString == null) { return new String[] { "" }; }
+        if ((rawString.length() <= lineLength) && (!rawString.contains("\n"))) { return new String[] { rawString }; }
+        final char[] rawChars = (rawString + ' ').toCharArray();
+        StringBuilder word = new StringBuilder();
+        StringBuilder line = new StringBuilder();
+        final ArrayList<String> lines = new ArrayList();
+        int lineColorChars = 0;
+        for (int i = 0; i < rawChars.length; i++)
+        {
+            final char c = rawChars[i];
+            if (c == '\u00A7')
+            {
+                word.append('\u00A7' + (rawChars[(i + 1)]));
+                lineColorChars += 2;
+                i++;
+            }
+            else if ((c == ' ') || (c == '\n'))
+            {
+                if ((line.length() == 0) && (word.length() > lineLength))
+                {
+                    for (final String partialWord : word.toString().split("(?<=\\G.{" + lineLength + "})"))
+                    {
+                        lines.add(partialWord);
+                    }
+                }
+                else if (((line.length() + word.length()) - lineColorChars) == lineLength)
+                {
+                    line.append(word);
+                    lines.add(line.toString());
+                    line = new StringBuilder();
+                    lineColorChars = 0;
+                }
+                else if (((line.length() + 1 + word.length()) - lineColorChars) > lineLength)
+                {
+                    for (final String partialWord : word.toString().split("(?<=\\G.{" + lineLength + "})"))
+                    {
+                        lines.add(line.toString());
+                        line = new StringBuilder(partialWord);
+                    }
+                    lineColorChars = 0;
+                }
+                else
+                {
+                    if (line.length() > 0)
+                    {
+                        line.append(' ');
+                    }
+                    line.append(word);
+                }
+                word = new StringBuilder();
+                if (c == '\n')
+                {
+                    lines.add(line.toString());
+                    line = new StringBuilder();
+                }
+            }
+            else
+            {
+                word.append(c);
+            }
+        }
+        if (line.length() > 0)
+        {
+            lines.add(line.toString());
+        }
+        if ((lines.get(0).length() == 0) || (lines.get(0).charAt(0) != '\u00A7'))
+        {
+            lines.set(0, "\u00A7f" + lines.get(0));
+        }
+        for (int i = 1; i < lines.size(); i++)
+        {
+            final String pLine = lines.get(i - 1);
+            final String subLine = lines.get(i);
+
+            final char color = pLine.charAt(pLine.lastIndexOf('\u00A7') + 1);
+            if ((subLine.length() == 0) || (subLine.charAt(0) != '\u00A7'))
+            {
+                lines.set(i, '\u00A7' + (color) + subLine);
+            }
+        }
+        return lines.toArray(new String[lines.size()]);
+    }
+
+    /**
+     * Send a message to the player
+     *
+     * @param plr Player to recieve message
+     * @param c   Caption to send
+     *
+     * @return boolean success
+     */
+    public static boolean sendMessage(final PlotPlayer plr, final C c, final String... args)
+    {
+        if (c.s().length() > 1)
+        {
+            String msg = c.s();
+            if ((args != null) && (args.length > 0))
+            {
+                msg = C.format(c, args);
+            }
+            if (plr == null)
+            {
+                PS.log(msg);
+            }
+            else
+            {
+                sendMessage(plr, msg, c.usePrefix());
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Send a message to the player
+     *
+     * @param plr Player to recieve message
+     * @param c   Caption to send
+     *
+     * @return boolean success
+     */
+    public static boolean sendMessage(final PlotPlayer plr, final C c, final Object... args)
+    {
+        if (c.s().length() > 1)
+        {
+            String msg = c.s();
+            if ((args != null) && (args.length > 0))
+            {
+                msg = C.format(c, args);
+            }
+            if (plr == null)
+            {
+                PS.log(msg);
+            }
+            else
+            {
+                sendMessage(plr, msg, c.usePrefix());
+            }
+        }
+        return true;
+    }
+
+    public static Plot getBottomPlot(final Plot plot)
+    {
+        if (plot.getSettings().getMerged(0))
+        {
+            final Plot p = PS.get().getPlot(plot.world, new PlotId(plot.id.x, plot.id.y - 1));
+            if (p == null) { return plot; }
+            return getBottomPlot(p);
+        }
+        if (plot.getSettings().getMerged(3))
+        {
+            final Plot p = PS.get().getPlot(plot.world, new PlotId(plot.id.x - 1, plot.id.y));
+            if (p == null) { return plot; }
+            return getBottomPlot(p);
+        }
+        return plot;
+    }
+
+    public static Plot getTopPlot(final Plot plot)
+    {
+        if (plot.getSettings().getMerged(2))
+        {
+            final Plot p = PS.get().getPlot(plot.world, new PlotId(plot.id.x, plot.id.y + 1));
+            if (p == null) { return plot; }
+            return getTopPlot(p);
+        }
+        if (plot.getSettings().getMerged(1))
+        {
+            final Plot p = PS.get().getPlot(plot.world, new PlotId(plot.id.x + 1, plot.id.y));
+            if (p == null) { return plot; }
+            return getTopPlot(p);
+        }
+        return plot;
+
+    }
+
+    public static PlotId getSize(final Plot plot)
+    {
+        if (!plot.isMerged()) { return new PlotId(1, 1); }
+        final Plot top = getTopPlot(plot);
+        final Plot bot = getBottomPlot(plot);
+        return new PlotId((top.id.x - bot.id.x) + 1, (top.id.y - bot.id.y) + 1);
+    }
+
+    /**
+     * Fetches the plot from the main class
+     */
+    public static Plot getPlot(final String world, final PlotId id)
+    {
+        if (id == null) { return null; }
+        final Plot plot = PS.get().getPlot(world, id);
+        if (plot != null) { return plot; }
+        return new Plot(world, id, null);
+    }
+
+    /**
+     * Returns the plot at a location (mega plots are not considered, all plots are treated as small plots)
+     * @param loc
+     * @return PlotId underlying plot id of loc
+     */
+    public static PlotId getPlotAbs(final Location loc)
+    {
+        final String world = loc.getWorld();
+        final PlotManager manager = PS.get().getPlotManager(world);
+        if (manager == null) { return null; }
+        final PlotWorld plotworld = PS.get().getPlotWorld(world);
+        return manager.getPlotIdAbs(plotworld, loc.getX(), loc.getY(), loc.getZ());
+    }
+
+    /**
+     * Returns the plot id at a location (mega plots are considered)
+     * @param loc
+     * @return PlotId PlotId observed id
+     */
+    public static PlotId getPlotId(final Location loc)
+    {
+        final String world = loc.getWorld();
+        final PlotManager manager = PS.get().getPlotManager(world);
+        if (manager == null) { return null; }
+        final PlotWorld plotworld = PS.get().getPlotWorld(world);
+        final PlotId id = manager.getPlotId(plotworld, loc.getX(), loc.getY(), loc.getZ());
+        if ((id != null) && (plotworld.TYPE == 2))
+        {
+            if (ClusterManager.getCluster(world, id) == null) { return null; }
+        }
+        return id;
+    }
+
+    /**
+     * Get the maximum number of plots a player is allowed
+     *
+     * @param p
+     * @return int
+     */
+    public static int getAllowedPlots(final PlotPlayer p)
+    {
+        return Permissions.hasPermissionRange(p, "plots.plot", Settings.MAX_PLOTS);
+    }
+
+    public static Plot getPlot(final Location loc)
+    {
+        final PlotId id = getPlotId(loc);
+        if (id == null) { return null; }
+        return getPlot(loc.getWorld(), id);
+    }
+
+    public static double getAverageRating(final Plot plot)
+    {
+        HashMap<UUID, Integer> rating;
+        if (plot.getSettings().ratings != null)
+        {
+            rating = plot.getSettings().ratings;
+        }
+        else if (Settings.CACHE_RATINGS)
+        {
+            rating = new HashMap<>();
+        }
+        else
+        {
+            rating = DBFunc.getRatings(plot);
+        }
+        if ((rating == null) || (rating.size() == 0)) { return 0; }
+        double val = 0;
+        int size = 0;
+        for (final Entry<UUID, Integer> entry : rating.entrySet())
+        {
+            int current = entry.getValue();
+            if ((Settings.RATING_CATEGORIES == null) || (Settings.RATING_CATEGORIES.size() == 0))
+            {
+                val += current;
+                size++;
+            }
+            else
+            {
+                for (int i = 0; i < Settings.RATING_CATEGORIES.size(); i++)
+                {
+                    val += (current % 10) - 1;
+                    current /= 10;
+                    size++;
+                }
+            }
+        }
+        return val / size;
+    }
+
+    public static double[] getAverageRatings(final Plot plot)
+    {
+        HashMap<UUID, Integer> rating;
+        if (plot.getSettings().ratings != null)
+        {
+            rating = plot.getSettings().ratings;
+        }
+        else if (Settings.CACHE_RATINGS)
+        {
+            rating = new HashMap<>();
+        }
+        else
+        {
+            rating = DBFunc.getRatings(plot);
+        }
+        int size = 1;
+        if (Settings.RATING_CATEGORIES != null)
+        {
+            size = Math.max(1, Settings.RATING_CATEGORIES.size());
+        }
+        final double[] ratings = new double[size];
+        if ((rating == null) || (rating.size() == 0)) { return ratings; }
+        for (final Entry<UUID, Integer> entry : rating.entrySet())
+        {
+            int current = entry.getValue();
+            if ((Settings.RATING_CATEGORIES == null) || (Settings.RATING_CATEGORIES.size() == 0))
+            {
+                ratings[0] += current;
+            }
+            else
+            {
+                for (int i = 0; i < Settings.RATING_CATEGORIES.size(); i++)
+                {
+                    ratings[i] += (current % 10) - 1;
+                    current /= 10;
+                }
+            }
+        }
+        for (int i = 0; i < size; i++)
+        {
+            ratings[i] /= rating.size();
+        }
+        return ratings;
+    }
+
+    public static void setComponent(final Plot plot, final String component, final PlotBlock[] blocks)
+    {
+        PS.get().getPlotManager(plot.world).setComponent(PS.get().getPlotWorld(plot.world), plot.id, component, blocks);
+    }
+}
diff --git a/src/main/java/com/intellectualcrafters/plot/util/MathMan.java b/src/main/java/com/intellectualcrafters/plot/util/MathMan.java
index 21c52468f..eab236edb 100644
--- a/src/main/java/com/intellectualcrafters/plot/util/MathMan.java
+++ b/src/main/java/com/intellectualcrafters/plot/util/MathMan.java
@@ -1,17 +1,22 @@
 package com.intellectualcrafters.plot.util;
 
-public class MathMan {
-    public static double getMean(int[] array) {
+public class MathMan
+{
+    public static double getMean(final int[] array)
+    {
         double count = 0;
-        for (int i : array) {
+        for (final int i : array)
+        {
             count += i;
         }
         return count / array.length;
     }
-    
-    public static double getMean(double[] array) {
+
+    public static double getMean(final double[] array)
+    {
         double count = 0;
-        for (double i : array) {
+        for (final double i : array)
+        {
             count += i;
         }
         return count / array.length;
@@ -23,19 +28,21 @@ public class MathMan {
      * @param pitch
      * @return
      */
-    public static float[] getDirection(float yaw, float pitch) {
-        double pitch_sin = Math.sin(pitch);
+    public static float[] getDirection(final float yaw, final float pitch)
+    {
+        final double pitch_sin = Math.sin(pitch);
         return new float[] {
-                (float) (pitch_sin * Math.cos(yaw)),
-                (float) (pitch_sin * Math.sin(yaw)),
-                (float) Math.cos(pitch)
+        (float) (pitch_sin * Math.cos(yaw)),
+        (float) (pitch_sin * Math.sin(yaw)),
+        (float) Math.cos(pitch)
         };
     }
-    
-    public static int roundInt(double value) {
+
+    public static int roundInt(final double value)
+    {
         return (int) (value < 0 ? (value == (int) value) ? value : value - 1 : value);
     }
-    
+
     /**
      * Returns [ pitch, yaw ]
      * @param x
@@ -43,148 +50,160 @@ public class MathMan {
      * @param z
      * @return
      */
-    public static float[] getPitchAndYaw(float x, float y, float z) {
-        float distance = sqrtApprox(z * z + x * x);
+    public static float[] getPitchAndYaw(final float x, final float y, final float z)
+    {
+        final float distance = sqrtApprox((z * z) + (x * x));
         return new float[] { atan2(y, distance), atan2(x, z) };
     }
-    
+
     private static final int ATAN2_BITS = 7;
-    
+
     private static final int ATAN2_BITS2 = ATAN2_BITS << 1;
     private static final int ATAN2_MASK = ~(-1 << ATAN2_BITS2);
     private static final int ATAN2_COUNT = ATAN2_MASK + 1;
     private static final int ATAN2_DIM = (int) Math.sqrt(ATAN2_COUNT);
-    
+
     private static final float INV_ATAN2_DIM_MINUS_1 = 1.0f / (ATAN2_DIM - 1);
-    
+
     private static final float[] atan2 = new float[ATAN2_COUNT];
-    
-    static {
-        for (int i = 0; i < ATAN2_DIM; i++) {
-            for (int j = 0; j < ATAN2_DIM; j++) {
-                float x0 = (float) i / ATAN2_DIM;
-                float y0 = (float) j / ATAN2_DIM;
-                
-                atan2[j * ATAN2_DIM + i] = (float) Math.atan2(y0, x0);
+
+    static
+    {
+        for (int i = 0; i < ATAN2_DIM; i++)
+        {
+            for (int j = 0; j < ATAN2_DIM; j++)
+            {
+                final float x0 = (float) i / ATAN2_DIM;
+                final float y0 = (float) j / ATAN2_DIM;
+
+                atan2[(j * ATAN2_DIM) + i] = (float) Math.atan2(y0, x0);
             }
         }
     }
-    
-    public static final float atan2(float y, float x) {
+
+    public static final float atan2(float y, float x)
+    {
         float add, mul;
-        
-        if (x < 0.0f) {
-            if (y < 0.0f) {
+
+        if (x < 0.0f)
+        {
+            if (y < 0.0f)
+            {
                 x = -x;
                 y = -y;
-                
+
                 mul = 1.0f;
-            } else {
+            }
+            else
+            {
                 x = -x;
                 mul = -1.0f;
             }
-            
+
             add = -3.141592653f;
-        } else {
-            if (y < 0.0f) {
+        }
+        else
+        {
+            if (y < 0.0f)
+            {
                 y = -y;
                 mul = -1.0f;
-            } else {
+            }
+            else
+            {
                 mul = 1.0f;
             }
-            
+
             add = 0.0f;
         }
-        
-        float invDiv = 1.0f / (((x < y) ? y : x) * INV_ATAN2_DIM_MINUS_1);
-        
-        int xi = (int) (x * invDiv);
-        int yi = (int) (y * invDiv);
-        
-        return (atan2[yi * ATAN2_DIM + xi] + add) * mul;
+
+        final float invDiv = 1.0f / (((x < y) ? y : x) * INV_ATAN2_DIM_MINUS_1);
+
+        final int xi = (int) (x * invDiv);
+        final int yi = (int) (y * invDiv);
+
+        return (atan2[(yi * ATAN2_DIM) + xi] + add) * mul;
     }
-    
-    public static float sqrtApprox(float f) {
+
+    public static float sqrtApprox(final float f)
+    {
         return f * Float.intBitsToFloat(0x5f375a86 - (Float.floatToIntBits(f) >> 1));
     }
-    
-    public static double sqrtApprox(double d) {
-        return Double.longBitsToDouble( ( ( Double.doubleToLongBits( d )-(1l<<52) )>>1 ) + ( 1l<<61 ) );
+
+    public static double sqrtApprox(final double d)
+    {
+        return Double.longBitsToDouble(((Double.doubleToLongBits(d) - (1l << 52)) >> 1) + (1l << 61));
     }
-    
-    public static float invSqrt(float x) {
-        float xhalf = 0.5f*x;
+
+    public static float invSqrt(float x)
+    {
+        final float xhalf = 0.5f * x;
         int i = Float.floatToIntBits(x);
-        i = 0x5f3759df - (i>>1);
+        i = 0x5f3759df - (i >> 1);
         x = Float.intBitsToFloat(i);
-        x = x*(1.5f - xhalf*x*x);
+        x = x * (1.5f - (xhalf * x * x));
         return x;
     }
-    
-    public static int getPositiveId(int i) {
-        if (i < 0) {
-            return -i*2 - 1;
-        }
+
+    public static int getPositiveId(final int i)
+    {
+        if (i < 0) { return (-i * 2) - 1; }
         return i * 2;
     }
-    
-    public static boolean isInteger(String str) {
-        if (str == null) {
-            return false;
-        }
-        int length = str.length();
-        if (length == 0) {
-            return false;
-        }
+
+    public static boolean isInteger(final String str)
+    {
+        if (str == null) { return false; }
+        final int length = str.length();
+        if (length == 0) { return false; }
         int i = 0;
-        if (str.charAt(0) == '-') {
-            if (length == 1) {
-                return false;
-            }
+        if (str.charAt(0) == '-')
+        {
+            if (length == 1) { return false; }
             i = 1;
         }
-        for (; i < length; i++) {
-            char c = str.charAt(i);
-            if (c <= '/' || c >= ':') {
-                return false;
-            }
+        for (; i < length; i++)
+        {
+            final char c = str.charAt(i);
+            if ((c <= '/') || (c >= ':')) { return false; }
         }
         return true;
     }
-    
-    public static double getSD(double[] array, double av) {
+
+    public static double getSD(final double[] array, final double av)
+    {
         double sd = 0;
-        for (int i=0; i<array.length;i++)
+        for (final double element : array)
         {
-            sd += Math.pow(Math.abs(array[i] - av), 2);
+            sd += Math.pow(Math.abs(element - av), 2);
         }
-        return Math.sqrt(sd/array.length);
+        return Math.sqrt(sd / array.length);
     }
-    
-    public static double getSD(int[] array, double av) {
+
+    public static double getSD(final int[] array, final double av)
+    {
         double sd = 0;
-        for (int i=0; i<array.length;i++)
+        for (final int element : array)
         {
-            sd += Math.pow(Math.abs(array[i] - av), 2);
+            sd += Math.pow(Math.abs(element - av), 2);
         }
-        return Math.sqrt(sd/array.length);
+        return Math.sqrt(sd / array.length);
     }
-    
-    public static int mod(int x, int y) {
-        if (isPowerOfTwo(y)) {
-            return x & (y - 1);
-        }
+
+    public static int mod(final int x, final int y)
+    {
+        if (isPowerOfTwo(y)) { return x & (y - 1); }
         return x % y;
     }
-    
-    public static int unsignedmod(int x, int y) {
-        if (isPowerOfTwo(y)) {
-            return x & (y - 1);
-        }
+
+    public static int unsignedmod(final int x, final int y)
+    {
+        if (isPowerOfTwo(y)) { return x & (y - 1); }
         return x % y;
     }
-    
-    public static boolean isPowerOfTwo(int x) {
+
+    public static boolean isPowerOfTwo(final int x)
+    {
         return (x & (x - 1)) == 0;
     }
 }
diff --git a/src/main/java/com/intellectualcrafters/plot/util/NbtFactory.java b/src/main/java/com/intellectualcrafters/plot/util/NbtFactory.java
index 0f0bb0a00..2487dcb18 100644
--- a/src/main/java/com/intellectualcrafters/plot/util/NbtFactory.java
+++ b/src/main/java/com/intellectualcrafters/plot/util/NbtFactory.java
@@ -40,21 +40,24 @@ import com.google.common.io.InputSupplier;
 import com.google.common.io.OutputSupplier;
 import com.google.common.primitives.Primitives;
 
-public class NbtFactory {   
+public class NbtFactory
+{
     // Convert between NBT id and the equivalent class in java
     private static final BiMap<Integer, Class<?>> NBT_CLASS = HashBiMap.create();
     private static final BiMap<Integer, NbtType> NBT_ENUM = HashBiMap.create();
-    
+
     /**
      * Whether or not to enable stream compression.
      * @author Kristian
      */
-    public enum StreamOptions {
+    public enum StreamOptions
+    {
         NO_COMPRESSION,
         GZIP_COMPRESSION,
     }
-    
-    private enum NbtType {
+
+    private enum NbtType
+    {
         TAG_END(0, Void.class),
         TAG_BYTE(1, byte.class),
         TAG_SHORT(2, short.class),
@@ -70,23 +73,31 @@ public class NbtFactory {
 
         // Unique NBT id
         public final int id;
-        
-        NbtType(int id, Class<?> type) {
+
+        NbtType(final int id, final Class<?> type)
+        {
             this.id = id;
             NBT_CLASS.put(id, type);
             NBT_ENUM.put(id, this);
         }
-        
-        private String getFieldName() {
-            if (this == TAG_COMPOUND) 
+
+        private String getFieldName()
+        {
+            if (this == TAG_COMPOUND)
+            {
                 return "map";
+            }
             else if (this == TAG_LIST)
+            {
                 return "list";
+            }
             else
+            {
                 return "data";
+            }
         }
     }
-    
+
     // The NBT base class
     private Class<?> BASE_CLASS;
     private Class<?> COMPOUND_CLASS;
@@ -101,14 +112,14 @@ public class NbtFactory {
     private Class<?> CRAFT_STACK;
     private Field CRAFT_HANDLE;
     private Field STACK_TAG;
-    
+
     // Loading/saving compounds
     private LoadCompoundMethod LOAD_COMPOUND;
     private Method SAVE_COMPOUND;
-    
+
     // Shared instance
     private static NbtFactory INSTANCE;
-    
+
     /**
      * Represents a root NBT compound.
      * <p>
@@ -127,65 +138,89 @@ public class NbtFactory {
      * </ul>
      * @author Kristian
      */
-    public final class NbtCompound extends ConvertedMap {
-        private NbtCompound(Object handle) {
+    public final class NbtCompound extends ConvertedMap
+    {
+        private NbtCompound(final Object handle)
+        {
             super(handle, getDataMap(handle));
         }
 
         // Simplifiying access to each value
-        public Byte getByte(String key, Byte defaultValue) {
-            return containsKey(key) ? (Byte)get(key) : defaultValue;
+        public Byte getByte(final String key, final Byte defaultValue)
+        {
+            return containsKey(key) ? (Byte) get(key) : defaultValue;
         }
-        public Short getShort(String key, Short defaultValue) {
-            return containsKey(key) ? (Short)get(key) : defaultValue;
+
+        public Short getShort(final String key, final Short defaultValue)
+        {
+            return containsKey(key) ? (Short) get(key) : defaultValue;
         }
-        public Integer getInteger(String key, Integer defaultValue) {
-            return containsKey(key) ? (Integer)get(key) : defaultValue;
+
+        public Integer getInteger(final String key, final Integer defaultValue)
+        {
+            return containsKey(key) ? (Integer) get(key) : defaultValue;
         }
-        public Long getLong(String key, Long defaultValue) {
-            return containsKey(key) ? (Long)get(key) : defaultValue;
+
+        public Long getLong(final String key, final Long defaultValue)
+        {
+            return containsKey(key) ? (Long) get(key) : defaultValue;
         }
-        public Float getFloat(String key, Float defaultValue) {
-            return containsKey(key) ? (Float)get(key) : defaultValue;
+
+        public Float getFloat(final String key, final Float defaultValue)
+        {
+            return containsKey(key) ? (Float) get(key) : defaultValue;
         }
-        public Double getDouble(String key, Double defaultValue) {
-            return containsKey(key) ? (Double)get(key) : defaultValue;
+
+        public Double getDouble(final String key, final Double defaultValue)
+        {
+            return containsKey(key) ? (Double) get(key) : defaultValue;
         }
-        public String getString(String key, String defaultValue) {
-            return containsKey(key) ? (String)get(key) : defaultValue;
+
+        public String getString(final String key, final String defaultValue)
+        {
+            return containsKey(key) ? (String) get(key) : defaultValue;
         }
-        public byte[] getByteArray(String key, byte[] defaultValue) {
-            return containsKey(key) ? (byte[])get(key) : defaultValue;
+
+        public byte[] getByteArray(final String key, final byte[] defaultValue)
+        {
+            return containsKey(key) ? (byte[]) get(key) : defaultValue;
         }
-        public int[] getIntegerArray(String key, int[] defaultValue) {
-            return containsKey(key) ? (int[])get(key) : defaultValue;
+
+        public int[] getIntegerArray(final String key, final int[] defaultValue)
+        {
+            return containsKey(key) ? (int[]) get(key) : defaultValue;
         }
-        
+
         /**
          * Retrieve the list by the given name.
          * @param key - the name of the list.
          * @param createNew - whether or not to create a new list if its missing.
          * @return An existing list, a new list or NULL.
          */
-        public NbtList getList(String key, boolean createNew) {
+        public NbtList getList(final String key, final boolean createNew)
+        {
             NbtList list = (NbtList) get(key);
-            
-            if (list == null && createNew) 
+
+            if ((list == null) && createNew)
+            {
                 put(key, list = createList());
+            }
             return list;
         }
-        
+
         /**
          * Retrieve the map by the given name.
          * @param key - the name of the map.
          * @param createNew - whether or not to create a new map if its missing.
          * @return An existing map, a new map or NULL.
          */
-        public NbtCompound getMap(String key, boolean createNew) {
+        public NbtCompound getMap(final String key, final boolean createNew)
+        {
             return getMap(Arrays.asList(key), createNew);
         }
+
         // Done
-        
+
         /**
          * Set the value of an entry at a given location.
          * <p>
@@ -195,33 +230,33 @@ public class NbtFactory {
          * @param value - the new value of this entry.
          * @return This compound, for chaining.
          */
-        public NbtCompound putPath(String path, Object value) {
-            List<String> entries = getPathElements(path);
-            Map<String, Object> map = getMap(entries.subList(0, entries.size() - 1), true);
-            
+        public NbtCompound putPath(final String path, final Object value)
+        {
+            final List<String> entries = getPathElements(path);
+            final Map<String, Object> map = getMap(entries.subList(0, entries.size() - 1), true);
+
             map.put(entries.get(entries.size() - 1), value);
             return this;
         }
-        
+
         /**
          * Retrieve the value of a given entry in the tree.
          * <p>
-         * Every element of the path (except the end) are assumed to be compounds. The 
+         * Every element of the path (except the end) are assumed to be compounds. The
          * retrieval operation will be cancelled if any of them are missing.
          * @param path - path to the entry.
          * @return The value, or NULL if not found.
          */
         @SuppressWarnings("unchecked")
-        public <T> T getPath(String path) {
-            List<String> entries = getPathElements(path);
-            NbtCompound map = getMap(entries.subList(0, entries.size() - 1), false);
-            
-            if (map != null) {
-                return (T) map.get(entries.get(entries.size() - 1));
-            }
+        public <T> T getPath(final String path)
+        {
+            final List<String> entries = getPathElements(path);
+            final NbtCompound map = getMap(entries.subList(0, entries.size() - 1), false);
+
+            if (map != null) { return (T) map.get(entries.get(entries.size() - 1)); }
             return null;
         }
-        
+
         /**
          * Save the content of a NBT compound to a stream.
          * <p>
@@ -230,42 +265,46 @@ public class NbtFactory {
          * @param option - whether or not to compress the output.
          * @throws IOException If anything went wrong.
          */
-        public void saveTo(OutputSupplier<? extends OutputStream> stream, StreamOptions option) throws IOException {
+        public void saveTo(final OutputSupplier<? extends OutputStream> stream, final StreamOptions option) throws IOException
+        {
             saveStream(this, stream, option);
         }
-        
+
         /**
          * Retrieve a map from a given path.
          * @param path - path of compounds to look up.
          * @param createNew - whether or not to create new compounds on the way.
          * @return The map at this location.
          */
-        private NbtCompound getMap(Iterable<String> path, boolean createNew) {
+        private NbtCompound getMap(final Iterable<String> path, final boolean createNew)
+        {
             NbtCompound current = this;
-            
-            for (String entry : path) {
+
+            for (final String entry : path)
+            {
                 NbtCompound child = (NbtCompound) current.get(entry);
-                
-                if (child == null) {
-                    if (!createNew)
-                        return null;
+
+                if (child == null)
+                {
+                    if (!createNew) { return null; }
                     current.put(entry, child = createCompound());
                 }
                 current = child;
             }
             return current;
         }
-        
+
         /**
          * Split the path into separate elements.
          * @param path - the path to split.
          * @return The elements.
          */
-        private List<String> getPathElements(String path) {
+        private List<String> getPathElements(final String path)
+        {
             return Lists.newArrayList(Splitter.on(".").omitEmptyStrings().split(path));
         }
     }
-    
+
     /**
      * Represents a root NBT list.
      * See also:
@@ -275,150 +314,176 @@ public class NbtFactory {
      * </ul>
      * @author Kristian
      */
-    public final class NbtList extends ConvertedList {
-        private NbtList(Object handle) {
+    public final class NbtList extends ConvertedList
+    {
+        private NbtList(final Object handle)
+        {
             super(handle, getDataList(handle));
         }
     }
-    
+
     /**
      * Represents an object that provides a view of a native NMS class.
      * @author Kristian
      */
-    public interface Wrapper {
+    public interface Wrapper
+    {
         /**
          * Retrieve the underlying native NBT tag.
          * @return The underlying NBT.
          */
         Object getHandle();
     }
-    
+
     /**
      * Retrieve or construct a shared NBT factory.
      * @return The factory.
      */
-    private static NbtFactory get() {
+    private static NbtFactory get()
+    {
         if (INSTANCE == null)
+        {
             INSTANCE = new NbtFactory();
+        }
         return INSTANCE;
     }
-    
+
     /**
      * Construct an instance of the NBT factory by deducing the class of NBTBase.
      */
-    private NbtFactory() {
-        if (BASE_CLASS == null) {
-            try {
-                // Keep in mind that I do use hard-coded field names - but it's okay as long as we're dealing 
+    private NbtFactory()
+    {
+        if (BASE_CLASS == null)
+        {
+            try
+            {
+                // Keep in mind that I do use hard-coded field names - but it's okay as long as we're dealing
                 // with CraftBukkit or its derivatives. This does not work in MCPC+ however.
-                ClassLoader loader = NbtFactory.class.getClassLoader();
-                
-                String packageName = getPackageName();
-                Class<?> offlinePlayer = loader.loadClass(packageName + ".CraftOfflinePlayer");
-                
+                final ClassLoader loader = NbtFactory.class.getClassLoader();
+
+                final String packageName = getPackageName();
+                final Class<?> offlinePlayer = loader.loadClass(packageName + ".CraftOfflinePlayer");
+
                 // Prepare NBT
                 COMPOUND_CLASS = getMethod(0, Modifier.STATIC, offlinePlayer, "getData").getReturnType();
                 BASE_CLASS = COMPOUND_CLASS.getSuperclass();
                 NBT_GET_TYPE = getMethod(0, Modifier.STATIC, BASE_CLASS, "getTypeId");
                 NBT_CREATE_TAG = getMethod(Modifier.STATIC, 0, BASE_CLASS, "createTag", byte.class);
-                
+
                 // Prepare CraftItemStack
                 CRAFT_STACK = loader.loadClass(packageName + ".inventory.CraftItemStack");
                 CRAFT_HANDLE = getField(null, CRAFT_STACK, "handle");
                 STACK_TAG = getField(null, CRAFT_HANDLE.getType(), "tag");
-                
+
                 // Loading/saving
-                String nmsPackage = BASE_CLASS.getPackage().getName();
+                final String nmsPackage = BASE_CLASS.getPackage().getName();
                 initializeNMS(loader, nmsPackage);
-                
-                LOAD_COMPOUND = READ_LIMITER_CLASS != null ? 
-                        new LoadMethodSkinUpdate(STREAM_TOOLS, READ_LIMITER_CLASS) :
-                        new LoadMethodWorldUpdate(STREAM_TOOLS);
+
+                LOAD_COMPOUND = READ_LIMITER_CLASS != null ?
+                new LoadMethodSkinUpdate(STREAM_TOOLS, READ_LIMITER_CLASS) :
+                new LoadMethodWorldUpdate(STREAM_TOOLS);
                 SAVE_COMPOUND = getMethod(Modifier.STATIC, 0, STREAM_TOOLS, null, BASE_CLASS, DataOutput.class);
-                
-            } catch (ClassNotFoundException e) {
+
+            }
+            catch (final ClassNotFoundException e)
+            {
                 throw new IllegalStateException("Unable to find offline player.", e);
             }
         }
     }
 
-    private void initializeNMS(ClassLoader loader, String nmsPackage) {     
-        try {
+    private void initializeNMS(final ClassLoader loader, final String nmsPackage)
+    {
+        try
+        {
             STREAM_TOOLS = loader.loadClass(nmsPackage + ".NBTCompressedStreamTools");
             READ_LIMITER_CLASS = loader.loadClass(nmsPackage + ".NBTReadLimiter");
-        } catch (ClassNotFoundException e) { 
+        }
+        catch (final ClassNotFoundException e)
+        {
             // Ignore - we will detect this later
         }
     }
-     
-    private String getPackageName() {
-        Server server = Bukkit.getServer();
-        String name = server != null ? server.getClass().getPackage().getName() : null;
-        
-        if (name != null && name.contains("craftbukkit")) {
+
+    private String getPackageName()
+    {
+        final Server server = Bukkit.getServer();
+        final String name = server != null ? server.getClass().getPackage().getName() : null;
+
+        if ((name != null) && name.contains("craftbukkit"))
+        {
             return name;
-        } else {
-            // Fallback
-            return "org.bukkit.craftbukkit.v1_7_R3"; 
         }
-    } 
-    
+        else
+        {
+            // Fallback
+            return "org.bukkit.craftbukkit.v1_7_R3";
+        }
+    }
+
     @SuppressWarnings("unchecked")
-    private Map<String, Object> getDataMap(Object handle) {
+    private Map<String, Object> getDataMap(final Object handle)
+    {
         return (Map<String, Object>) getFieldValue(
-            getDataField(NbtType.TAG_COMPOUND, handle), handle);
+        getDataField(NbtType.TAG_COMPOUND, handle), handle);
     }
-    
+
     @SuppressWarnings("unchecked")
-    private List<Object> getDataList(Object handle) {
+    private List<Object> getDataList(final Object handle)
+    {
         return (List<Object>) getFieldValue(
-            getDataField(NbtType.TAG_LIST, handle), handle);
+        getDataField(NbtType.TAG_LIST, handle), handle);
     }
-    
+
     /**
      * Construct a new NBT list of an unspecified type.
      * @return The NBT list.
      */
-    public static NbtList createList(Object... content) {
+    public static NbtList createList(final Object... content)
+    {
         return createList(Arrays.asList(content));
     }
-    
+
     /**
      * Construct a new NBT list of an unspecified type.
      * @return The NBT list.
      */
-    public static NbtList createList(Iterable<? extends Object> iterable) {
-        NbtList list = get().new NbtList(
-            INSTANCE.createNbtTag(NbtType.TAG_LIST, null)
+    public static NbtList createList(final Iterable<? extends Object> iterable)
+    {
+        final NbtList list = get().new NbtList(
+        INSTANCE.createNbtTag(NbtType.TAG_LIST, null)
         );
-        
+
         // Add the content as well
-        for (Object obj : iterable) 
+        for (final Object obj : iterable)
+        {
             list.add(obj);
+        }
         return list;
     }
-    
+
     /**
      * Construct a new NBT compound.
      * <p>
      * Use {@link NbtCompound#asMap()} to modify it.
      * @return The NBT compound.
      */
-    public static NbtCompound createCompound() {
+    public static NbtCompound createCompound()
+    {
         return get().new NbtCompound(
-            INSTANCE.createNbtTag(NbtType.TAG_COMPOUND, null)
-        );
+        INSTANCE.createNbtTag(NbtType.TAG_COMPOUND, null));
     }
-    
+
     /**
      * Construct a new NBT wrapper from a list.
      * @param nmsList - the NBT list.
      * @return The wrapper.
      */
-    public static NbtList fromList(Object nmsList) {
+    public static NbtList fromList(final Object nmsList)
+    {
         return get().new NbtList(nmsList);
     }
-    
+
     /**
      * Load the content of a file from a stream.
      * <p>
@@ -428,29 +493,37 @@ public class NbtFactory {
      * @return The decoded NBT compound.
      * @throws IOException If anything went wrong.
      */
-    public static NbtCompound fromStream(InputSupplier<? extends InputStream> stream, StreamOptions option) throws IOException {
+    public static NbtCompound fromStream(final InputSupplier<? extends InputStream> stream, final StreamOptions option) throws IOException
+    {
         InputStream input = null;
         DataInputStream data = null;
         boolean suppress = true;
-        
-        try {
+
+        try
+        {
             input = stream.getInput();
             data = new DataInputStream(new BufferedInputStream(
-                option == StreamOptions.GZIP_COMPRESSION ? new GZIPInputStream(input) : input
+            option == StreamOptions.GZIP_COMPRESSION ? new GZIPInputStream(input) : input
             ));
-            
-            NbtCompound result = fromCompound(get().LOAD_COMPOUND.loadNbt(data));
+
+            final NbtCompound result = fromCompound(get().LOAD_COMPOUND.loadNbt(data));
             suppress = false;
             return result;
-            
-        } finally {
+
+        }
+        finally
+        {
             if (data != null)
+            {
                 Closeables.close(data, suppress);
+            }
             else if (input != null)
+            {
                 Closeables.close(input, suppress);
+            }
         }
     }
-    
+
     /**
      * Save the content of a NBT compound to a stream.
      * <p>
@@ -460,50 +533,60 @@ public class NbtFactory {
      * @param option - whether or not to compress the output.
      * @throws IOException If anything went wrong.
      */
-    public static void saveStream(NbtCompound source, OutputSupplier<? extends OutputStream> stream, StreamOptions option) throws IOException {
+    public static void saveStream(final NbtCompound source, final OutputSupplier<? extends OutputStream> stream, final StreamOptions option) throws IOException
+    {
         OutputStream output = null;
         DataOutputStream data = null;
         boolean suppress = true;
-        
-        try {
+
+        try
+        {
             output = stream.getOutput();
             data = new DataOutputStream(
-                option == StreamOptions.GZIP_COMPRESSION ? new GZIPOutputStream(output) : output
-            );
-            
+            option == StreamOptions.GZIP_COMPRESSION ? new GZIPOutputStream(output) : output
+                   );
+
             invokeMethod(get().SAVE_COMPOUND, null, source.getHandle(), data);
             suppress = false;
-            
-        } finally {
+
+        }
+        finally
+        {
             if (data != null)
+            {
                 Closeables.close(data, suppress);
+            }
             else if (output != null)
+            {
                 Closeables.close(output, suppress);
+            }
         }
     }
-    
+
     /**
      * Construct a new NBT wrapper from a compound.
      * @param nmsCompound - the NBT compund.
      * @return The wrapper.
      */
-    public static NbtCompound fromCompound(Object nmsCompound) {
+    public static NbtCompound fromCompound(final Object nmsCompound)
+    {
         return get().new NbtCompound(nmsCompound);
     }
 
     /**
      * Set the NBT compound tag of a given item stack.
      * <p>
-     * The item stack must be a wrapper for a CraftItemStack. Use 
+     * The item stack must be a wrapper for a CraftItemStack. Use
      * {@link MinecraftReflection#getBukkitItemStack(ItemStack)} if not.
      * @param stack - the item stack, cannot be air.
      * @param compound - the new NBT compound, or NULL to remove it.
      * @throws IllegalArgumentException If the stack is not a CraftItemStack, or it represents air.
      */
-    public static void setItemTag(ItemStack stack, NbtCompound compound) {
+    public static void setItemTag(final ItemStack stack, final NbtCompound compound)
+    {
         checkItemStack(stack);
-        Object nms = getFieldValue(get().CRAFT_HANDLE, stack);
-        
+        final Object nms = getFieldValue(get().CRAFT_HANDLE, stack);
+
         // Now update the tag compound
         setFieldValue(get().STACK_TAG, nms, compound.getHandle());
     }
@@ -517,75 +600,85 @@ public class NbtFactory {
      * @param stack - the item stack.
      * @return A wrapper for its NBT tag.
      */
-    public static NbtCompound fromItemTag(ItemStack stack) {
+    public static NbtCompound fromItemTag(final ItemStack stack)
+    {
         checkItemStack(stack);
-        Object nms = getFieldValue(get().CRAFT_HANDLE, stack);
-        Object tag = getFieldValue(get().STACK_TAG, nms);
-        
+        final Object nms = getFieldValue(get().CRAFT_HANDLE, stack);
+        final Object tag = getFieldValue(get().STACK_TAG, nms);
+
         // Create the tag if it doesn't exist
-        if (tag == null) {
-            NbtCompound compound = createCompound();
+        if (tag == null)
+        {
+            final NbtCompound compound = createCompound();
             setItemTag(stack, compound);
             return compound;
         }
         return fromCompound(tag);
     }
-    
+
     /**
      * Retrieve a CraftItemStack version of the stack.
      * @param stack - the stack to convert.
      * @return The CraftItemStack version.
      */
-    public static ItemStack getCraftItemStack(ItemStack stack) {
+    public static ItemStack getCraftItemStack(final ItemStack stack)
+    {
         // Any need to convert?
-        if (stack == null || get().CRAFT_STACK.isAssignableFrom(stack.getClass()))
-            return stack;
-        try {
+        if ((stack == null) || get().CRAFT_STACK.isAssignableFrom(stack.getClass())) { return stack; }
+        try
+        {
             // Call the private constructor
-            Constructor<?> caller = INSTANCE.CRAFT_STACK.getDeclaredConstructor(ItemStack.class);
+            final Constructor<?> caller = INSTANCE.CRAFT_STACK.getDeclaredConstructor(ItemStack.class);
             caller.setAccessible(true);
             return (ItemStack) caller.newInstance(stack);
-        } catch (Exception e) {
+        }
+        catch (final Exception e)
+        {
             throw new IllegalStateException("Unable to convert " + stack + " + to a CraftItemStack.");
         }
     }
-    
+
     /**
      * Ensure that the given stack can store arbitrary NBT information.
      * @param stack - the stack to check.
      */
-    private static void checkItemStack(ItemStack stack) {
-        if (stack == null)
-            throw new IllegalArgumentException("Stack cannot be NULL.");
-        if (!get().CRAFT_STACK.isAssignableFrom(stack.getClass()))
-            throw new IllegalArgumentException("Stack must be a CraftItemStack.");
-        if (stack.getType() == Material.AIR)
-            throw new IllegalArgumentException("ItemStacks representing air cannot store NMS information.");
+    private static void checkItemStack(final ItemStack stack)
+    {
+        if (stack == null) { throw new IllegalArgumentException("Stack cannot be NULL."); }
+        if (!get().CRAFT_STACK.isAssignableFrom(stack.getClass())) { throw new IllegalArgumentException("Stack must be a CraftItemStack."); }
+        if (stack.getType() == Material.AIR) { throw new IllegalArgumentException("ItemStacks representing air cannot store NMS information."); }
     }
-    
+
     /**
      * Convert wrapped List and Map objects into their respective NBT counterparts.
      * @param name - the name of the NBT element to create.
      * @param value - the value of the element to create. Can be a List or a Map.
      * @return The NBT element.
      */
-    private Object unwrapValue(Object value) {
-        if (value == null)
-            return null;
-        
-        if (value instanceof Wrapper) {
+    private Object unwrapValue(final Object value)
+    {
+        if (value == null) { return null; }
+
+        if (value instanceof Wrapper)
+        {
             return ((Wrapper) value).getHandle();
-            
-        } else if (value instanceof List) {
+
+        }
+        else if (value instanceof List)
+        {
             throw new IllegalArgumentException("Can only insert a WrappedList.");
-        } else if (value instanceof Map) {
+        }
+        else if (value instanceof Map)
+        {
             throw new IllegalArgumentException("Can only insert a WrappedCompound.");
-            
-        } else {
+
+        }
+        else
+        {
             return createNbtTag(getPrimitiveType(value), value);
         }
     }
-    
+
     /**
      * Convert a given NBT element to a primitive wrapper or List/Map equivalent.
      * <p>
@@ -593,15 +686,17 @@ public class NbtFactory {
      * @param nms - the NBT element.
      * @return The wrapper equivalent.
      */
-    private Object wrapNative(Object nms) {
-        if (nms == null)
-            return null;
+    private Object wrapNative(final Object nms)
+    {
+        if (nms == null) { return null; }
 
-        if (BASE_CLASS.isAssignableFrom(nms.getClass())) {
+        if (BASE_CLASS.isAssignableFrom(nms.getClass()))
+        {
             final NbtType type = getNbtType(nms);
-            
+
             // Handle the different types
-            switch (type) {
+            switch (type)
+            {
                 case TAG_COMPOUND:
                     return new NbtCompound(nms);
                 case TAG_LIST:
@@ -612,58 +707,64 @@ public class NbtFactory {
         }
         throw new IllegalArgumentException("Unexpected type: " + nms);
     }
-    
+
     /**
      * Construct a new NMS NBT tag initialized with the given value.
      * @param type - the NBT type.
      * @param value - the value, or NULL to keep the original value.
      * @return The created tag.
      */
-    private Object createNbtTag(NbtType type, Object value) {
-        Object tag = invokeMethod(NBT_CREATE_TAG, null, (byte)type.id);
+    private Object createNbtTag(final NbtType type, final Object value)
+    {
+        final Object tag = invokeMethod(NBT_CREATE_TAG, null, (byte) type.id);
 
-        if (value != null) {
+        if (value != null)
+        {
             setFieldValue(getDataField(type, tag), tag, value);
         }
         return tag;
     }
-    
+
     /**
      * Retrieve the field where the NBT class stores its value.
      * @param type - the NBT type.
      * @param nms - the NBT class instance.
      * @return The corresponding field.
      */
-    private Field getDataField(NbtType type, Object nms) {
-        if (DATA_FIELD[type.id] == null) 
+    private Field getDataField(final NbtType type, final Object nms)
+    {
+        if (DATA_FIELD[type.id] == null)
+        {
             DATA_FIELD[type.id] = getField(nms, null, type.getFieldName());
+        }
         return DATA_FIELD[type.id];
     }
-    
+
     /**
      * Retrieve the NBT type from a given NMS NBT tag.
      * @param nms - the native NBT tag.
      * @return The corresponding type.
      */
-    private NbtType getNbtType(Object nms) {
-        int type = (Byte) invokeMethod(NBT_GET_TYPE, nms);
+    private NbtType getNbtType(final Object nms)
+    {
+        final int type = (Byte) invokeMethod(NBT_GET_TYPE, nms);
         return NBT_ENUM.get(type);
     }
-    
+
     /**
      * Retrieve the nearest NBT type for a given primitive type.
      * @param primitive - the primitive type.
      * @return The corresponding type.
      */
-    private NbtType getPrimitiveType(Object primitive) {
-        NbtType type = NBT_ENUM.get(NBT_CLASS.inverse().get(
-            Primitives.unwrap(primitive.getClass())
+    private NbtType getPrimitiveType(final Object primitive)
+    {
+        final NbtType type = NBT_ENUM.get(NBT_CLASS.inverse().get(
+        Primitives.unwrap(primitive.getClass())
         ));
-        
+
         // Display the illegal value at least
-        if (type == null)
-            throw new IllegalArgumentException(String.format(
-                "Illegal type: %s (%s)", primitive.getClass(), primitive));
+        if (type == null) { throw new IllegalArgumentException(String.format(
+        "Illegal type: %s (%s)", primitive.getClass(), primitive)); }
         return type;
     }
 
@@ -674,30 +775,42 @@ public class NbtFactory {
      * @param params - the parameters to supply.
      * @return The result of the method.
      */
-    private static Object invokeMethod(Method method, Object target, Object... params) {
-        try {
+    private static Object invokeMethod(final Method method, final Object target, final Object... params)
+    {
+        try
+        {
             return method.invoke(target, params);
-        } catch (Exception e) {
+        }
+        catch (final Exception e)
+        {
             throw new RuntimeException("Unable to invoke method " + method + " for " + target, e);
         }
     }
-    
-    private static void setFieldValue(Field field, Object target, Object value) {
-        try {
+
+    private static void setFieldValue(final Field field, final Object target, final Object value)
+    {
+        try
+        {
             field.set(target, value);
-        } catch (Exception e) {
+        }
+        catch (final Exception e)
+        {
             throw new RuntimeException("Unable to set " + field + " for " + target, e);
         }
     }
-    
-    private static Object getFieldValue(Field field, Object target) {
-        try {
+
+    private static Object getFieldValue(final Field field, final Object target)
+    {
+        try
+        {
             return field.get(target);
-        } catch (Exception e) {
+        }
+        catch (final Exception e)
+        {
             throw new RuntimeException("Unable to retrieve " + field + " for " + target, e);
         }
     }
-    
+
     /**
      * Search for the first publically and privately defined method of the given name and parameter count.
      * @param requireMod - modifiers that are required.
@@ -708,268 +821,323 @@ public class NbtFactory {
      * @return The first method by this name.
      * @throws IllegalStateException If we cannot find this method.
      */
-    private static Method getMethod(int requireMod, int bannedMod, Class<?> clazz, String methodName, Class<?>... params) {
-        for (Method method : clazz.getDeclaredMethods()) {
+    private static Method getMethod(final int requireMod, final int bannedMod, final Class<?> clazz, final String methodName, final Class<?>... params)
+    {
+        for (final Method method : clazz.getDeclaredMethods())
+        {
             // Limitation: Doesn't handle overloads
-            if ((method.getModifiers() & requireMod) == requireMod &&
-                (method.getModifiers() & bannedMod) == 0 &&
-                (methodName == null || method.getName().equals(methodName)) && 
-                 Arrays.equals(method.getParameterTypes(), params)) {
-                
+            if (((method.getModifiers() & requireMod) == requireMod) &&
+            ((method.getModifiers() & bannedMod) == 0) &&
+            ((methodName == null) || method.getName().equals(methodName)) &&
+            Arrays.equals(method.getParameterTypes(), params))
+            {
+
                 method.setAccessible(true);
                 return method;
             }
         }
         // Search in every superclass
-        if (clazz.getSuperclass() != null)
-            return getMethod(requireMod, bannedMod, clazz.getSuperclass(), methodName, params);
+        if (clazz.getSuperclass() != null) { return getMethod(requireMod, bannedMod, clazz.getSuperclass(), methodName, params); }
         throw new IllegalStateException(String.format(
-            "Unable to find method %s (%s).", methodName, Arrays.asList(params)));
+        "Unable to find method %s (%s).", methodName, Arrays.asList(params)));
     }
-    
+
     /**
-     * Search for the first publically and privately defined field of the given name. 
+     * Search for the first publically and privately defined field of the given name.
      * @param instance - an instance of the class with the field.
      * @param clazz - an optional class to start with, or NULL to deduce it from instance.
      * @param fieldName - the field name.
      * @return The first field by this name.
      * @throws IllegalStateException If we cannot find this field.
      */
-    private static Field getField(Object instance, Class<?> clazz, String fieldName) {
-        if (clazz == null) 
+    private static Field getField(final Object instance, Class<?> clazz, final String fieldName)
+    {
+        if (clazz == null)
+        {
             clazz = instance.getClass();
+        }
         // Ignore access rules
-        for (Field field : clazz.getDeclaredFields()) {
-            if (field.getName().equals(fieldName)) {
+        for (final Field field : clazz.getDeclaredFields())
+        {
+            if (field.getName().equals(fieldName))
+            {
                 field.setAccessible(true);
                 return field;
             }
         }
         // Recursively fild the correct field
-        if (clazz.getSuperclass() != null)
-            return getField(instance, clazz.getSuperclass(), fieldName);
+        if (clazz.getSuperclass() != null) { return getField(instance, clazz.getSuperclass(), fieldName); }
         throw new IllegalStateException("Unable to find field " + fieldName + " in " + instance);
     }
-    
+
     /**
      * Represents a class for caching wrappers.
      * @author Kristian
      */
-    private final class CachedNativeWrapper {
+    private final class CachedNativeWrapper
+    {
         // Don't recreate wrapper objects
         private final ConcurrentMap<Object, Object> cache = new MapMaker().weakKeys().makeMap();
-        
-        public Object wrap(Object value) {
+
+        public Object wrap(final Object value)
+        {
             Object current = cache.get(value);
-            
-            if (current == null) {
+
+            if (current == null)
+            {
                 current = wrapNative(value);
-                
+
                 // Only cache composite objects
-                if (current instanceof ConvertedMap || 
-                    current instanceof ConvertedList) {
+                if ((current instanceof ConvertedMap) ||
+                (current instanceof ConvertedList))
+                {
                     cache.put(value, current);
                 }
             }
             return current;
         }
     }
-    
+
     /**
-     * Represents a map that wraps another map and automatically 
+     * Represents a map that wraps another map and automatically
      * converts entries of its type and another exposed type.
      * @author Kristian
      */
-    private class ConvertedMap extends AbstractMap<String, Object> implements Wrapper {
+    private class ConvertedMap extends AbstractMap<String, Object> implements Wrapper
+    {
         private final Object handle;
         private final Map<String, Object> original;
-        
+
         private final CachedNativeWrapper cache = new CachedNativeWrapper();
 
-        public ConvertedMap(Object handle, Map<String, Object> original) {
+        public ConvertedMap(final Object handle, final Map<String, Object> original)
+        {
             this.handle = handle;
             this.original = original;
         }
-        
+
         // For converting back and forth
-        protected Object wrapOutgoing(Object value) {
+        protected Object wrapOutgoing(final Object value)
+        {
             return cache.wrap(value);
         }
-        protected Object unwrapIncoming(Object wrapped) {
+
+        protected Object unwrapIncoming(final Object wrapped)
+        {
             return unwrapValue(wrapped);
         }
-        
+
         // Modification
         @Override
-        public Object put(String key, Object value) {
+        public Object put(final String key, final Object value)
+        {
             return wrapOutgoing(original.put(
-                (String) key, 
-                unwrapIncoming(value)
+            key,
+            unwrapIncoming(value)
             ));
         }
-        
+
         // Performance
         @Override
-        public Object get(Object key) {
+        public Object get(final Object key)
+        {
             return wrapOutgoing(original.get(key));
         }
+
         @Override
-        public Object remove(Object key) {
+        public Object remove(final Object key)
+        {
             return wrapOutgoing(original.remove(key));
         }
+
         @Override
-        public boolean containsKey(Object key) {
+        public boolean containsKey(final Object key)
+        {
             return original.containsKey(key);
         }
-        
+
         @Override
-        public Set<Entry<String, Object>> entrySet() {
-            return new AbstractSet<Entry<String,Object>>() {
+        public Set<Entry<String, Object>> entrySet()
+        {
+            return new AbstractSet<Entry<String, Object>>()
+            {
                 @Override
-                public boolean add(Entry<String, Object> e) {
-                    String key = e.getKey();
-                    Object value = e.getValue();
-                    
+                public boolean add(final Entry<String, Object> e)
+                {
+                    final String key = e.getKey();
+                    final Object value = e.getValue();
+
                     original.put(key, unwrapIncoming(value));
                     return true;
                 }
-                
+
                 @Override
-                public int size() {
+                public int size()
+                {
                     return original.size();
                 }
-                
+
                 @Override
-                public Iterator<Entry<String, Object>> iterator() {
+                public Iterator<Entry<String, Object>> iterator()
+                {
                     return ConvertedMap.this.iterator();
                 }
             };
         }
-        
-        private Iterator<Entry<String, Object>> iterator() {
+
+        private Iterator<Entry<String, Object>> iterator()
+        {
             final Iterator<Entry<String, Object>> proxy = original.entrySet().iterator();
-            
-            return new Iterator<Entry<String, Object>>() {
+
+            return new Iterator<Entry<String, Object>>()
+            {
                 @Override
-                public boolean hasNext() {
+                public boolean hasNext()
+                {
                     return proxy.hasNext();
                 }
-                
+
                 @Override
-                public Entry<String, Object> next() {
-                    Entry<String, Object> entry = proxy.next();
-                    
+                public Entry<String, Object> next()
+                {
+                    final Entry<String, Object> entry = proxy.next();
+
                     return new SimpleEntry<String, Object>(
-                        entry.getKey(), wrapOutgoing(entry.getValue())
-                    );
+                    entry.getKey(), wrapOutgoing(entry.getValue()));
                 }
-                
+
                 @Override
-                public void remove() {
+                public void remove()
+                {
                     proxy.remove();
                 }
             };
         }
-        
+
         @Override
-        public Object getHandle() {
+        public Object getHandle()
+        {
             return handle;
         }
     }
-    
+
     /**
-     * Represents a list that wraps another list and converts elements 
+     * Represents a list that wraps another list and converts elements
      * of its type and another exposed type.
      * @author Kristian
      */
-    private class ConvertedList extends AbstractList<Object> implements Wrapper {
+    private class ConvertedList extends AbstractList<Object> implements Wrapper
+    {
         private final Object handle;
-        
+
         private final List<Object> original;
         private final CachedNativeWrapper cache = new CachedNativeWrapper();
-        
-        public ConvertedList(Object handle, List<Object> original) {
+
+        public ConvertedList(final Object handle, final List<Object> original)
+        {
             if (NBT_LIST_TYPE == null)
+            {
                 NBT_LIST_TYPE = getField(handle, null, "type");
+            }
             this.handle = handle;
             this.original = original;
         }
 
-        protected Object wrapOutgoing(Object value) {
+        protected Object wrapOutgoing(final Object value)
+        {
             return cache.wrap(value);
         }
-        protected Object unwrapIncoming(Object wrapped) {
+
+        protected Object unwrapIncoming(final Object wrapped)
+        {
             return unwrapValue(wrapped);
         }
-        
+
         @Override
-        public Object get(int index) {
+        public Object get(final int index)
+        {
             return wrapOutgoing(original.get(index));
         }
+
         @Override
-        public int size() {
+        public int size()
+        {
             return original.size();
         }
+
         @Override
-        public Object set(int index, Object element) {
-            return wrapOutgoing(
-                original.set(index, unwrapIncoming(element))
-            );
+        public Object set(final int index, final Object element)
+        {
+            return wrapOutgoing(original.set(index, unwrapIncoming(element)));
         }
+
         @Override
-        public void add(int index, Object element) {
-            Object nbt = unwrapIncoming(element);
-            
+        public void add(final int index, final Object element)
+        {
+            final Object nbt = unwrapIncoming(element);
+
             // Set the list type if its the first element
-            if (size() == 0) 
-                setFieldValue(NBT_LIST_TYPE, handle, (byte)getNbtType(nbt).id);
+            if (size() == 0)
+            {
+                setFieldValue(NBT_LIST_TYPE, handle, (byte) getNbtType(nbt).id);
+            }
             original.add(index, nbt);
         }
+
         @Override
-        public Object remove(int index) {
+        public Object remove(final int index)
+        {
             return wrapOutgoing(original.remove(index));
         }
+
         @Override
-        public boolean remove(Object o) {
+        public boolean remove(final Object o)
+        {
             return original.remove(unwrapIncoming(o));
         }
-        
+
         @Override
-        public Object getHandle() {
+        public Object getHandle()
+        {
             return handle;
         }
     }
-    
+
     /**
      * Represents a method for loading an NBT compound.
      * @author Kristian
      */
-    private static abstract class LoadCompoundMethod {
+    private static abstract class LoadCompoundMethod
+    {
         protected Method staticMethod;
-        
-        protected void setMethod(Method method) {
-            this.staticMethod = method;
-            this.staticMethod.setAccessible(true);
+
+        protected void setMethod(final Method method)
+        {
+            staticMethod = method;
+            staticMethod.setAccessible(true);
         }
-        
+
         /**
          * Load an NBT compound from a given stream.
          * @param input - the input stream.
          * @return The loaded NBT compound.
          */
-        public abstract Object loadNbt(DataInput input);
+        public abstract Object loadNbt(final DataInput input);
     }
-    
+
     /**
      * Load an NBT compound from the NBTCompressedStreamTools static method in 1.7.2 - 1.7.5
      */
-    private static class LoadMethodWorldUpdate extends LoadCompoundMethod {
-        public LoadMethodWorldUpdate(Class<?> streamClass) {
+    private static class LoadMethodWorldUpdate extends LoadCompoundMethod
+    {
+        public LoadMethodWorldUpdate(final Class<?> streamClass)
+        {
             setMethod(getMethod(Modifier.STATIC, 0, streamClass, null, DataInput.class));
         }
-        
+
         @Override
-        public Object loadNbt(DataInput input) {
+        public Object loadNbt(final DataInput input)
+        {
             return invokeMethod(staticMethod, null, input);
         }
     }
@@ -977,27 +1145,35 @@ public class NbtFactory {
     /**
      * Load an NBT compound from the NBTCompressedStreamTools static method in 1.7.8
      */
-    private static class LoadMethodSkinUpdate extends LoadCompoundMethod {
+    private static class LoadMethodSkinUpdate extends LoadCompoundMethod
+    {
         private Object readLimiter;
-        
-        public LoadMethodSkinUpdate(Class<?> streamClass, Class<?> readLimiterClass) {
+
+        public LoadMethodSkinUpdate(final Class<?> streamClass, final Class<?> readLimiterClass)
+        {
             setMethod(getMethod(Modifier.STATIC, 0, streamClass, null, DataInput.class, readLimiterClass));
-            
+
             // Find the unlimited read limiter
-            for (Field field : readLimiterClass.getDeclaredFields()) {
-                if (readLimiterClass.isAssignableFrom(field.getType())) {
-                    try {
+            for (final Field field : readLimiterClass.getDeclaredFields())
+            {
+                if (readLimiterClass.isAssignableFrom(field.getType()))
+                {
+                    try
+                    {
                         readLimiter = field.get(null);
-                    } catch (Exception e) {
+                    }
+                    catch (final Exception e)
+                    {
                         throw new RuntimeException("Cannot retrieve read limiter.", e);
                     }
                 }
             }
         }
-        
+
         @Override
-        public Object loadNbt(DataInput input) {
+        public Object loadNbt(final DataInput input)
+        {
             return invokeMethod(staticMethod, null, input, readLimiter);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/intellectualcrafters/plot/util/Permissions.java b/src/main/java/com/intellectualcrafters/plot/util/Permissions.java
index 28b1d912c..e94585dca 100644
--- a/src/main/java/com/intellectualcrafters/plot/util/Permissions.java
+++ b/src/main/java/com/intellectualcrafters/plot/util/Permissions.java
@@ -1,44 +1,45 @@
 package com.intellectualcrafters.plot.util;
 
-import org.bukkit.permissions.Permission;
-
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.object.PlotPlayer;
 import com.plotsquared.general.commands.CommandCaller;
 
-public class Permissions {
-    public static boolean hasPermission(final PlotPlayer player, final C c) {
+public class Permissions
+{
+    public static boolean hasPermission(final PlotPlayer player, final C c)
+    {
         return hasPermission(player, c.s());
     }
 
-    public static boolean hasPermission(final PlotPlayer player, final String perm) {
+    public static boolean hasPermission(final PlotPlayer player, final String perm)
+    {
         return hasPermission((CommandCaller) player, perm);
     }
 
-    public static boolean hasPermission(final CommandCaller player, String perm) {
-        if ((player == null) || player.hasPermission(C.PERMISSION_ADMIN.s()) || player.hasPermission(C.PERMISSION_STAR.s())) {
-            return true;
-        }
-        if (player.hasPermission(perm)) {
-            return true;
-        }
+    public static boolean hasPermission(final CommandCaller player, String perm)
+    {
+        if ((player == null) || player.hasPermission(C.PERMISSION_ADMIN.s()) || player.hasPermission(C.PERMISSION_STAR.s())) { return true; }
+        if (player.hasPermission(perm)) { return true; }
         perm = perm.toLowerCase().replaceAll("^[^a-z|0-9|\\.|_|-]", "");
-        String[] nodes = perm.split("\\.");
+        final String[] nodes = perm.split("\\.");
         final StringBuilder n = new StringBuilder();
-        for (int i = 0; i < (nodes.length - 1); i++) {
+        for (int i = 0; i < (nodes.length - 1); i++)
+        {
             n.append(nodes[i] + ("."));
-            if (!perm.equals(n + C.PERMISSION_STAR.s())) {
-                if (player.hasPermission(n + C.PERMISSION_STAR.s())) {
-                    return true;
-                }
+            if (!perm.equals(n + C.PERMISSION_STAR.s()))
+            {
+                if (player.hasPermission(n + C.PERMISSION_STAR.s())) { return true; }
             }
         }
         return false;
     }
-    
-    public static boolean hasPermission(final PlotPlayer player, final String perm, boolean notify) {
-        if (!hasPermission(player, perm)) {
-            if (notify) {
+
+    public static boolean hasPermission(final PlotPlayer player, final String perm, final boolean notify)
+    {
+        if (!hasPermission(player, perm))
+        {
+            if (notify)
+            {
                 MainUtil.sendMessage(player, C.NO_PERMISSION_EVENT, perm);
             }
             return false;
@@ -46,17 +47,13 @@ public class Permissions {
         return true;
     }
 
-    public static int hasPermissionRange(final PlotPlayer player, final String stub, final int range) {
-        if ((player == null) || player.hasPermission(C.PERMISSION_ADMIN.s()) || player.hasPermission(C.PERMISSION_STAR.s())) {
-            return Integer.MAX_VALUE;
-        }
-        if (player.hasPermission(stub + ".*")) {
-            return Integer.MAX_VALUE;
-        }
-        for (int i = range; i > 0; i--) {
-            if (player.hasPermission(stub + "." + i)) {
-                return i;
-            }
+    public static int hasPermissionRange(final PlotPlayer player, final String stub, final int range)
+    {
+        if ((player == null) || player.hasPermission(C.PERMISSION_ADMIN.s()) || player.hasPermission(C.PERMISSION_STAR.s())) { return Integer.MAX_VALUE; }
+        if (player.hasPermission(stub + ".*")) { return Integer.MAX_VALUE; }
+        for (int i = range; i > 0; i--)
+        {
+            if (player.hasPermission(stub + "." + i)) { return i; }
         }
         return 0;
     }
diff --git a/src/main/java/com/intellectualcrafters/plot/util/PlotGamemode.java b/src/main/java/com/intellectualcrafters/plot/util/PlotGamemode.java
index a3f30ff21..90d657a1b 100644
--- a/src/main/java/com/intellectualcrafters/plot/util/PlotGamemode.java
+++ b/src/main/java/com/intellectualcrafters/plot/util/PlotGamemode.java
@@ -1,6 +1,7 @@
 package com.intellectualcrafters.plot.util;
 
-public enum PlotGamemode {
+public enum PlotGamemode
+{
     ADVENTURE,
     SURVIVAL,
     CREATIVE,
diff --git a/src/main/java/com/intellectualcrafters/plot/util/PlotWeather.java b/src/main/java/com/intellectualcrafters/plot/util/PlotWeather.java
index 9b008072c..146d76753 100644
--- a/src/main/java/com/intellectualcrafters/plot/util/PlotWeather.java
+++ b/src/main/java/com/intellectualcrafters/plot/util/PlotWeather.java
@@ -1,6 +1,7 @@
 package com.intellectualcrafters.plot.util;
 
-public enum PlotWeather {
+public enum PlotWeather
+{
     RAIN,
     CLEAR,
     RESET;
diff --git a/src/main/java/com/intellectualcrafters/plot/util/ReflectionUtils.java b/src/main/java/com/intellectualcrafters/plot/util/ReflectionUtils.java
index 9016558e7..851229e1c 100644
--- a/src/main/java/com/intellectualcrafters/plot/util/ReflectionUtils.java
+++ b/src/main/java/com/intellectualcrafters/plot/util/ReflectionUtils.java
@@ -35,13 +35,15 @@ import org.bukkit.Bukkit;
  * @author DPOH-VAR
  * @version 1.0
  */
-public class ReflectionUtils {
-    
-    public ReflectionUtils(String version) {
+public class ReflectionUtils
+{
+
+    public ReflectionUtils(final String version)
+    {
         preClassB += "." + version;
         preClassM += "." + version;
     }
-    
+
     /**
      * prefix of bukkit classes
      */
@@ -50,137 +52,186 @@ public class ReflectionUtils {
      * prefix of minecraft classes
      */
     private static String preClassM = "net.minecraft.server";
-    
-    public static Class<?> getNmsClass(final String name) {
+
+    public static Class<?> getNmsClass(final String name)
+    {
         final String className = "net.minecraft.server." + getVersion() + "." + name;
         return getClass(className);
     }
 
-    public static Class<?> getCbClass(final String name) {
+    public static Class<?> getCbClass(final String name)
+    {
         final String className = "org.bukkit.craftbukkit." + getVersion() + "." + name;
         return getClass(className);
     }
 
-    public static Class<?> getUtilClass(final String name) {
-        try {
+    public static Class<?> getUtilClass(final String name)
+    {
+        try
+        {
             return Class.forName(name); //Try before 1.8 first
-        } catch (final ClassNotFoundException ex) {
-            try {
+        }
+        catch (final ClassNotFoundException ex)
+        {
+            try
+            {
                 return Class.forName("net.minecraft.util." + name); //Not 1.8
-            } catch (final ClassNotFoundException ex2) {
+            }
+            catch (final ClassNotFoundException ex2)
+            {
                 return null;
             }
         }
     }
 
-    public static String getVersion() {
+    public static String getVersion()
+    {
         final String packageName = Bukkit.getServer().getClass().getPackage().getName();
         return packageName.substring(packageName.lastIndexOf('.') + 1);
     }
 
-    public static Object getHandle(final Object wrapper) {
+    public static Object getHandle(final Object wrapper)
+    {
         final Method getHandle = makeMethod(wrapper.getClass(), "getHandle");
         return callMethod(getHandle, wrapper);
     }
 
     //Utils
-    public static Method makeMethod(final Class<?> clazz, final String methodName, final Class<?>... paramaters) {
-        try {
+    public static Method makeMethod(final Class<?> clazz, final String methodName, final Class<?>... paramaters)
+    {
+        try
+        {
             return clazz.getDeclaredMethod(methodName, paramaters);
-        } catch (final NoSuchMethodException ex) {
+        }
+        catch (final NoSuchMethodException ex)
+        {
             return null;
-        } catch (final Exception ex) {
+        }
+        catch (final Exception ex)
+        {
             throw new RuntimeException(ex);
         }
     }
 
     @SuppressWarnings("unchecked")
-    public static <T> T callMethod(final Method method, final Object instance, final Object... paramaters) {
-        if (method == null) {
-            throw new RuntimeException("No such method");
-        }
+    public static <T> T callMethod(final Method method, final Object instance, final Object... paramaters)
+    {
+        if (method == null) { throw new RuntimeException("No such method"); }
         method.setAccessible(true);
-        try {
+        try
+        {
             return (T) method.invoke(instance, paramaters);
-        } catch (final InvocationTargetException ex) {
+        }
+        catch (final InvocationTargetException ex)
+        {
             throw new RuntimeException(ex.getCause());
-        } catch (final Exception ex) {
+        }
+        catch (final Exception ex)
+        {
             throw new RuntimeException(ex);
         }
     }
 
     @SuppressWarnings("unchecked")
-    public static <T> Constructor<T> makeConstructor(final Class<?> clazz, final Class<?>... paramaterTypes) {
-        try {
+    public static <T> Constructor<T> makeConstructor(final Class<?> clazz, final Class<?>... paramaterTypes)
+    {
+        try
+        {
             return (Constructor<T>) clazz.getConstructor(paramaterTypes);
-        } catch (final NoSuchMethodException ex) {
+        }
+        catch (final NoSuchMethodException ex)
+        {
             return null;
-        } catch (final Exception ex) {
+        }
+        catch (final Exception ex)
+        {
             throw new RuntimeException(ex);
         }
     }
 
-    public static <T> T callConstructor(final Constructor<T> constructor, final Object... paramaters) {
-        if (constructor == null) {
-            throw new RuntimeException("No such constructor");
-        }
+    public static <T> T callConstructor(final Constructor<T> constructor, final Object... paramaters)
+    {
+        if (constructor == null) { throw new RuntimeException("No such constructor"); }
         constructor.setAccessible(true);
-        try {
+        try
+        {
             return constructor.newInstance(paramaters);
-        } catch (final InvocationTargetException ex) {
+        }
+        catch (final InvocationTargetException ex)
+        {
             throw new RuntimeException(ex.getCause());
-        } catch (final Exception ex) {
+        }
+        catch (final Exception ex)
+        {
             throw new RuntimeException(ex);
         }
     }
 
-    public static Field makeField(final Class<?> clazz, final String name) {
-        try {
+    public static Field makeField(final Class<?> clazz, final String name)
+    {
+        try
+        {
             return clazz.getDeclaredField(name);
-        } catch (final NoSuchFieldException ex) {
+        }
+        catch (final NoSuchFieldException ex)
+        {
             return null;
-        } catch (final Exception ex) {
+        }
+        catch (final Exception ex)
+        {
             throw new RuntimeException(ex);
         }
     }
 
     @SuppressWarnings("unchecked")
-    public static <T> T getField(final Field field, final Object instance) {
-        if (field == null) {
-            throw new RuntimeException("No such field");
-        }
+    public static <T> T getField(final Field field, final Object instance)
+    {
+        if (field == null) { throw new RuntimeException("No such field"); }
         field.setAccessible(true);
-        try {
+        try
+        {
             return (T) field.get(instance);
-        } catch (final Exception ex) {
+        }
+        catch (final Exception ex)
+        {
             throw new RuntimeException(ex);
         }
     }
 
-    public static void setField(final Field field, final Object instance, final Object value) {
-        if (field == null) {
-            throw new RuntimeException("No such field");
-        }
+    public static void setField(final Field field, final Object instance, final Object value)
+    {
+        if (field == null) { throw new RuntimeException("No such field"); }
         field.setAccessible(true);
-        try {
+        try
+        {
             field.set(instance, value);
-        } catch (final Exception ex) {
+        }
+        catch (final Exception ex)
+        {
             throw new RuntimeException(ex);
         }
     }
 
-    public static Class<?> getClass(final String name) {
-        try {
+    public static Class<?> getClass(final String name)
+    {
+        try
+        {
             return Class.forName(name);
-        } catch (final ClassNotFoundException ex) {
+        }
+        catch (final ClassNotFoundException ex)
+        {
             return null;
         }
     }
 
-    public static <T> Class<? extends T> getClass(final String name, final Class<T> superClass) {
-        try {
+    public static <T> Class<? extends T> getClass(final String name, final Class<T> superClass)
+    {
+        try
+        {
             return Class.forName(name).asSubclass(superClass);
-        } catch (ClassCastException | ClassNotFoundException ex) {
+        }
+        catch (ClassCastException | ClassNotFoundException ex)
+        {
             return null;
         }
     }
@@ -195,13 +246,17 @@ public class ReflectionUtils {
      *
      * @throws RuntimeException if no class found
      */
-    public static RefClass getRefClass(final String... classes) throws RuntimeException {
-        for (String className : classes) {
-            try {
+    public static RefClass getRefClass(final String... classes) throws RuntimeException
+    {
+        for (String className : classes)
+        {
+            try
+            {
                 className = className.replace("{cb}", preClassB).replace("{nms}", preClassM).replace("{nm}", "net.minecraft");
                 return getRefClass(Class.forName(className));
-            } catch (final ClassNotFoundException ignored) {
             }
+            catch (final ClassNotFoundException ignored)
+            {}
         }
         throw new RuntimeException("no class found");
     }
@@ -213,17 +268,20 @@ public class ReflectionUtils {
      *
      * @return RefClass based on passed class
      */
-    public static RefClass getRefClass(final Class clazz) {
+    public static RefClass getRefClass(final Class clazz)
+    {
         return new RefClass(clazz);
     }
 
     /**
      * RefClass - utility to simplify work with reflections.
      */
-    public static class RefClass {
+    public static class RefClass
+    {
         private final Class<?> clazz;
 
-        private RefClass(final Class<?> clazz) {
+        private RefClass(final Class<?> clazz)
+        {
             this.clazz = clazz;
         }
 
@@ -232,8 +290,9 @@ public class ReflectionUtils {
          *
          * @return class
          */
-        public Class<?> getRealClass() {
-            return this.clazz;
+        public Class<?> getRealClass()
+        {
+            return clazz;
         }
 
         /**
@@ -243,8 +302,9 @@ public class ReflectionUtils {
          *
          * @return true if object is an instance of this class
          */
-        public boolean isInstance(final Object object) {
-            return this.clazz.isInstance(object);
+        public boolean isInstance(final Object object)
+        {
+            return clazz.isInstance(object);
         }
 
         /**
@@ -257,25 +317,38 @@ public class ReflectionUtils {
          *
          * @throws RuntimeException if method not found
          */
-        public RefMethod getMethod(final String name, final Object... types) throws NoSuchMethodException {
-            try {
+        public RefMethod getMethod(final String name, final Object... types) throws NoSuchMethodException
+        {
+            try
+            {
                 final Class[] classes = new Class[types.length];
                 int i = 0;
-                for (final Object e : types) {
-                    if (e instanceof Class) {
+                for (final Object e : types)
+                {
+                    if (e instanceof Class)
+                    {
                         classes[i++] = (Class) e;
-                    } else if (e instanceof RefClass) {
+                    }
+                    else if (e instanceof RefClass)
+                    {
                         classes[i++] = ((RefClass) e).getRealClass();
-                    } else {
+                    }
+                    else
+                    {
                         classes[i++] = e.getClass();
                     }
                 }
-                try {
-                    return new RefMethod(this.clazz.getMethod(name, classes));
-                } catch (final NoSuchMethodException ignored) {
-                    return new RefMethod(this.clazz.getDeclaredMethod(name, classes));
+                try
+                {
+                    return new RefMethod(clazz.getMethod(name, classes));
                 }
-            } catch (final Exception e) {
+                catch (final NoSuchMethodException ignored)
+                {
+                    return new RefMethod(clazz.getDeclaredMethod(name, classes));
+                }
+            }
+            catch (final Exception e)
+            {
                 throw new RuntimeException(e);
             }
         }
@@ -289,25 +362,38 @@ public class ReflectionUtils {
          *
          * @throws RuntimeException if constructor not found
          */
-        public RefConstructor getConstructor(final Object... types) {
-            try {
+        public RefConstructor getConstructor(final Object... types)
+        {
+            try
+            {
                 final Class[] classes = new Class[types.length];
                 int i = 0;
-                for (final Object e : types) {
-                    if (e instanceof Class) {
+                for (final Object e : types)
+                {
+                    if (e instanceof Class)
+                    {
                         classes[i++] = (Class) e;
-                    } else if (e instanceof RefClass) {
+                    }
+                    else if (e instanceof RefClass)
+                    {
                         classes[i++] = ((RefClass) e).getRealClass();
-                    } else {
+                    }
+                    else
+                    {
                         classes[i++] = e.getClass();
                     }
                 }
-                try {
-                    return new RefConstructor(this.clazz.getConstructor(classes));
-                } catch (final NoSuchMethodException ignored) {
-                    return new RefConstructor(this.clazz.getDeclaredConstructor(classes));
+                try
+                {
+                    return new RefConstructor(clazz.getConstructor(classes));
                 }
-            } catch (final Exception e) {
+                catch (final NoSuchMethodException ignored)
+                {
+                    return new RefConstructor(clazz.getDeclaredConstructor(classes));
+                }
+            }
+            catch (final Exception e)
+            {
                 throw new RuntimeException(e);
             }
         }
@@ -321,28 +407,39 @@ public class ReflectionUtils {
          *
          * @throws RuntimeException if method not found
          */
-        public RefMethod findMethod(final Object... types) {
+        public RefMethod findMethod(final Object... types)
+        {
             final Class[] classes = new Class[types.length];
             int t = 0;
-            for (final Object e : types) {
-                if (e instanceof Class) {
+            for (final Object e : types)
+            {
+                if (e instanceof Class)
+                {
                     classes[t++] = (Class) e;
-                } else if (e instanceof RefClass) {
+                }
+                else if (e instanceof RefClass)
+                {
                     classes[t++] = ((RefClass) e).getRealClass();
-                } else {
+                }
+                else
+                {
                     classes[t++] = e.getClass();
                 }
             }
             final List<Method> methods = new ArrayList<>();
-            Collections.addAll(methods, this.clazz.getMethods());
-            Collections.addAll(methods, this.clazz.getDeclaredMethods());
-            findMethod: for (final Method m : methods) {
+            Collections.addAll(methods, clazz.getMethods());
+            Collections.addAll(methods, clazz.getDeclaredMethods());
+            findMethod: for (final Method m : methods)
+            {
                 final Class<?>[] methodTypes = m.getParameterTypes();
-                if (methodTypes.length != classes.length) {
+                if (methodTypes.length != classes.length)
+                {
                     continue;
                 }
-                for (final Class aClass : classes) {
-                    if (!Arrays.equals(classes, methodTypes)) {
+                for (final Class aClass : classes)
+                {
+                    if (!Arrays.equals(classes, methodTypes))
+                    {
                         continue findMethod;
                     }
                     return new RefMethod(m);
@@ -360,15 +457,16 @@ public class ReflectionUtils {
          *
          * @throws RuntimeException if method not found
          */
-        public RefMethod findMethodByName(final String... names) {
+        public RefMethod findMethodByName(final String... names)
+        {
             final List<Method> methods = new ArrayList<>();
-            Collections.addAll(methods, this.clazz.getMethods());
-            Collections.addAll(methods, this.clazz.getDeclaredMethods());
-            for (final Method m : methods) {
-                for (final String name : names) {
-                    if (m.getName().equals(name)) {
-                        return new RefMethod(m);
-                    }
+            Collections.addAll(methods, clazz.getMethods());
+            Collections.addAll(methods, clazz.getDeclaredMethods());
+            for (final Method m : methods)
+            {
+                for (final String name : names)
+                {
+                    if (m.getName().equals(name)) { return new RefMethod(m); }
                 }
             }
             throw new RuntimeException("no such method");
@@ -383,7 +481,8 @@ public class ReflectionUtils {
          *
          * @throws RuntimeException if method not found
          */
-        public RefMethod findMethodByReturnType(final RefClass type) {
+        public RefMethod findMethodByReturnType(final RefClass type)
+        {
             return findMethodByReturnType(type.clazz);
         }
 
@@ -396,17 +495,18 @@ public class ReflectionUtils {
          *
          * @throws RuntimeException if method not found
          */
-        public RefMethod findMethodByReturnType(Class type) {
-            if (type == null) {
+        public RefMethod findMethodByReturnType(Class type)
+        {
+            if (type == null)
+            {
                 type = void.class;
             }
             final List<Method> methods = new ArrayList<>();
-            Collections.addAll(methods, this.clazz.getMethods());
-            Collections.addAll(methods, this.clazz.getDeclaredMethods());
-            for (final Method m : methods) {
-                if (type.equals(m.getReturnType())) {
-                    return new RefMethod(m);
-                }
+            Collections.addAll(methods, clazz.getMethods());
+            Collections.addAll(methods, clazz.getDeclaredMethods());
+            for (final Method m : methods)
+            {
+                if (type.equals(m.getReturnType())) { return new RefMethod(m); }
             }
             throw new RuntimeException("no such method");
         }
@@ -420,14 +520,14 @@ public class ReflectionUtils {
          *
          * @throws RuntimeException if constructor not found
          */
-        public RefConstructor findConstructor(final int number) {
+        public RefConstructor findConstructor(final int number)
+        {
             final List<Constructor> constructors = new ArrayList<>();
-            Collections.addAll(constructors, this.clazz.getConstructors());
-            Collections.addAll(constructors, this.clazz.getDeclaredConstructors());
-            for (final Constructor m : constructors) {
-                if (m.getParameterTypes().length == number) {
-                    return new RefConstructor(m);
-                }
+            Collections.addAll(constructors, clazz.getConstructors());
+            Collections.addAll(constructors, clazz.getDeclaredConstructors());
+            for (final Constructor m : constructors)
+            {
+                if (m.getParameterTypes().length == number) { return new RefConstructor(m); }
             }
             throw new RuntimeException("no such constructor");
         }
@@ -441,14 +541,21 @@ public class ReflectionUtils {
          *
          * @throws RuntimeException if field not found
          */
-        public RefField getField(final String name) {
-            try {
-                try {
-                    return new RefField(this.clazz.getField(name));
-                } catch (final NoSuchFieldException ignored) {
-                    return new RefField(this.clazz.getDeclaredField(name));
+        public RefField getField(final String name)
+        {
+            try
+            {
+                try
+                {
+                    return new RefField(clazz.getField(name));
                 }
-            } catch (final Exception e) {
+                catch (final NoSuchFieldException ignored)
+                {
+                    return new RefField(clazz.getDeclaredField(name));
+                }
+            }
+            catch (final Exception e)
+            {
                 throw new RuntimeException(e);
             }
         }
@@ -462,7 +569,8 @@ public class ReflectionUtils {
          *
          * @throws RuntimeException if field not found
          */
-        public RefField findField(final RefClass type) {
+        public RefField findField(final RefClass type)
+        {
             return findField(type.clazz);
         }
 
@@ -475,17 +583,18 @@ public class ReflectionUtils {
          *
          * @throws RuntimeException if field not found
          */
-        public RefField findField(Class type) {
-            if (type == null) {
+        public RefField findField(Class type)
+        {
+            if (type == null)
+            {
                 type = void.class;
             }
             final List<Field> fields = new ArrayList<>();
-            Collections.addAll(fields, this.clazz.getFields());
-            Collections.addAll(fields, this.clazz.getDeclaredFields());
-            for (final Field f : fields) {
-                if (type.equals(f.getType())) {
-                    return new RefField(f);
-                }
+            Collections.addAll(fields, clazz.getFields());
+            Collections.addAll(fields, clazz.getDeclaredFields());
+            for (final Field f : fields)
+            {
+                if (type.equals(f.getType())) { return new RefField(f); }
             }
             throw new RuntimeException("no such field");
         }
@@ -494,10 +603,12 @@ public class ReflectionUtils {
     /**
      * Method wrapper
      */
-    public static class RefMethod {
+    public static class RefMethod
+    {
         private final Method method;
 
-        private RefMethod(final Method method) {
+        private RefMethod(final Method method)
+        {
             this.method = method;
             method.setAccessible(true);
         }
@@ -505,22 +616,25 @@ public class ReflectionUtils {
         /**
          * @return passed method
          */
-        public Method getRealMethod() {
-            return this.method;
+        public Method getRealMethod()
+        {
+            return method;
         }
 
         /**
          * @return owner class of method
          */
-        public RefClass getRefClass() {
-            return new RefClass(this.method.getDeclaringClass());
+        public RefClass getRefClass()
+        {
+            return new RefClass(method.getDeclaringClass());
         }
 
         /**
          * @return class of method return type
          */
-        public RefClass getReturnRefClass() {
-            return new RefClass(this.method.getReturnType());
+        public RefClass getReturnRefClass()
+        {
+            return new RefClass(method.getReturnType());
         }
 
         /**
@@ -530,7 +644,8 @@ public class ReflectionUtils {
          *
          * @return RefExecutor with method call(...)
          */
-        public RefExecutor of(final Object e) {
+        public RefExecutor of(final Object e)
+        {
             return new RefExecutor(e);
         }
 
@@ -541,18 +656,24 @@ public class ReflectionUtils {
          *
          * @return return value
          */
-        public Object call(final Object... params) {
-            try {
-                return this.method.invoke(null, params);
-            } catch (final Exception e) {
+        public Object call(final Object... params)
+        {
+            try
+            {
+                return method.invoke(null, params);
+            }
+            catch (final Exception e)
+            {
                 throw new RuntimeException(e);
             }
         }
 
-        public class RefExecutor {
+        public class RefExecutor
+        {
             final Object e;
 
-            public RefExecutor(final Object e) {
+            public RefExecutor(final Object e)
+            {
                 this.e = e;
             }
 
@@ -565,10 +686,14 @@ public class ReflectionUtils {
              *
              * @throws RuntimeException if something went wrong
              */
-            public Object call(final Object... params) {
-                try {
-                    return RefMethod.this.method.invoke(this.e, params);
-                } catch (final Exception e) {
+            public Object call(final Object... params)
+            {
+                try
+                {
+                    return method.invoke(e, params);
+                }
+                catch (final Exception e)
+                {
                     throw new RuntimeException(e);
                 }
             }
@@ -578,10 +703,12 @@ public class ReflectionUtils {
     /**
      * Constructor wrapper
      */
-    public static class RefConstructor {
+    public static class RefConstructor
+    {
         private final Constructor constructor;
 
-        private RefConstructor(final Constructor constructor) {
+        private RefConstructor(final Constructor constructor)
+        {
             this.constructor = constructor;
             constructor.setAccessible(true);
         }
@@ -589,15 +716,17 @@ public class ReflectionUtils {
         /**
          * @return passed constructor
          */
-        public Constructor getRealConstructor() {
-            return this.constructor;
+        public Constructor getRealConstructor()
+        {
+            return constructor;
         }
 
         /**
          * @return owner class of method
          */
-        public RefClass getRefClass() {
-            return new RefClass(this.constructor.getDeclaringClass());
+        public RefClass getRefClass()
+        {
+            return new RefClass(constructor.getDeclaringClass());
         }
 
         /**
@@ -609,19 +738,25 @@ public class ReflectionUtils {
          *
          * @throws RuntimeException if something went wrong
          */
-        public Object create(final Object... params) {
-            try {
-                return this.constructor.newInstance(params);
-            } catch (final Exception e) {
+        public Object create(final Object... params)
+        {
+            try
+            {
+                return constructor.newInstance(params);
+            }
+            catch (final Exception e)
+            {
                 throw new RuntimeException(e);
             }
         }
     }
 
-    public static class RefField {
+    public static class RefField
+    {
         private final Field field;
 
-        private RefField(final Field field) {
+        private RefField(final Field field)
+        {
             this.field = field;
             field.setAccessible(true);
         }
@@ -629,22 +764,25 @@ public class ReflectionUtils {
         /**
          * @return passed field
          */
-        public Field getRealField() {
-            return this.field;
+        public Field getRealField()
+        {
+            return field;
         }
 
         /**
          * @return owner class of field
          */
-        public RefClass getRefClass() {
-            return new RefClass(this.field.getDeclaringClass());
+        public RefClass getRefClass()
+        {
+            return new RefClass(field.getDeclaringClass());
         }
 
         /**
          * @return type of field
          */
-        public RefClass getFieldRefClass() {
-            return new RefClass(this.field.getType());
+        public RefClass getFieldRefClass()
+        {
+            return new RefClass(field.getType());
         }
 
         /**
@@ -654,14 +792,17 @@ public class ReflectionUtils {
          *
          * @return RefExecutor with getter and setter
          */
-        public RefExecutor of(final Object e) {
+        public RefExecutor of(final Object e)
+        {
             return new RefExecutor(e);
         }
 
-        public class RefExecutor {
+        public class RefExecutor
+        {
             final Object e;
 
-            public RefExecutor(final Object e) {
+            public RefExecutor(final Object e)
+            {
                 this.e = e;
             }
 
@@ -670,10 +811,14 @@ public class ReflectionUtils {
              *
              * @param param value
              */
-            public void set(final Object param) {
-                try {
-                    RefField.this.field.set(this.e, param);
-                } catch (final Exception e) {
+            public void set(final Object param)
+            {
+                try
+                {
+                    field.set(e, param);
+                }
+                catch (final Exception e)
+                {
                     throw new RuntimeException(e);
                 }
             }
@@ -683,10 +828,14 @@ public class ReflectionUtils {
              *
              * @return value of field
              */
-            public Object get() {
-                try {
-                    return RefField.this.field.get(this.e);
-                } catch (final Exception e) {
+            public Object get()
+            {
+                try
+                {
+                    return field.get(e);
+                }
+                catch (final Exception e)
+                {
                     throw new RuntimeException(e);
                 }
             }
diff --git a/src/main/java/com/intellectualcrafters/plot/util/RegExUtil.java b/src/main/java/com/intellectualcrafters/plot/util/RegExUtil.java
index 230099a92..52c887380 100644
--- a/src/main/java/com/intellectualcrafters/plot/util/RegExUtil.java
+++ b/src/main/java/com/intellectualcrafters/plot/util/RegExUtil.java
@@ -4,11 +4,13 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.regex.Pattern;
 
-public class RegExUtil {
+public class RegExUtil
+{
 
     public static Map<String, Pattern> compiledPatterns;
 
-    static {
+    static
+    {
         compiledPatterns = new HashMap<>();
     }
 
diff --git a/src/main/java/com/intellectualcrafters/plot/util/SchematicHandler.java b/src/main/java/com/intellectualcrafters/plot/util/SchematicHandler.java
index 1ef4db388..bd4cd18c4 100644
--- a/src/main/java/com/intellectualcrafters/plot/util/SchematicHandler.java
+++ b/src/main/java/com/intellectualcrafters/plot/util/SchematicHandler.java
@@ -1,909 +1,1032 @@
-package com.intellectualcrafters.plot.util;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.io.Reader;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.net.URLConnection;
-import java.nio.channels.Channels;
-import java.nio.channels.ReadableByteChannel;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import java.util.zip.GZIPInputStream;
-import java.util.zip.GZIPOutputStream;
-
-import com.google.common.collect.Lists;
-import com.intellectualcrafters.jnbt.ByteArrayTag;
-import com.intellectualcrafters.jnbt.CompoundTag;
-import com.intellectualcrafters.jnbt.IntTag;
-import com.intellectualcrafters.jnbt.ListTag;
-import com.intellectualcrafters.jnbt.NBTInputStream;
-import com.intellectualcrafters.jnbt.NBTOutputStream;
-import com.intellectualcrafters.jnbt.ShortTag;
-import com.intellectualcrafters.jnbt.StringTag;
-import com.intellectualcrafters.jnbt.Tag;
-import com.intellectualcrafters.json.JSONArray;
-import com.intellectualcrafters.plot.PS;
-import com.intellectualcrafters.plot.config.Settings;
-import com.intellectualcrafters.plot.object.ChunkLoc;
-import com.intellectualcrafters.plot.object.Location;
-import com.intellectualcrafters.plot.object.Plot;
-import com.intellectualcrafters.plot.object.PlotBlock;
-import com.intellectualcrafters.plot.object.PlotId;
-import com.intellectualcrafters.plot.object.RunnableVal;
-import com.intellectualcrafters.plot.object.schematic.PlotItem;
-import com.plotsquared.object.schematic.StateWrapper;
-
-public abstract class SchematicHandler {
-    public static SchematicHandler manager;
-    
-    private boolean exportAll = false;
-    
-    public boolean exportAll(final Collection<Plot> collection, final File outputDir, final String namingScheme, final Runnable ifSuccess) {
-    	if (exportAll) {
-    		return false;
-    	}
-    	if (collection.size() == 0) {
-    		return false;
-    	}
-    	exportAll = true;
-    	final ArrayList<Plot> plots = new ArrayList<Plot>(collection);
-        TaskManager.runTask(new Runnable() {
-            @Override
-            public void run() {
-            	if (plots.size() == 0) {
-            	    exportAll = false;
-                    TaskManager.runTask(ifSuccess);
-                    return;
-            	}
-            	Iterator<Plot> i = plots.iterator();
-            	final Plot plot = i.next();
-            	i.remove();
-                String o = UUIDHandler.getName(plot.owner);
-                if (o == null) {
-                	o = "unknown";
-                }
-                final String name;
-                if (namingScheme == null) {
-                	name = plot.id.x + ";" + plot.id.y + "," + plot.world + "," + o;
-                }
-                else {
-                	name = namingScheme.replaceAll("%owner%", o).replaceAll("%id%", plot.id.toString()).replaceAll("%idx%", plot.id.x + "").replaceAll("%idy%", plot.id.y + "").replaceAll("%world%", plot.world);
-                }
-                final String directory;
-                if (outputDir == null) {
-                	directory = Settings.SCHEMATIC_SAVE_PATH;
-                }
-                else {
-                	directory = outputDir.getPath();
-                }
-                Location top = plot.getTop();
-                Location bot = plot.getBottom();
-                int area = (1 + top.getX() - bot.getX()) * (1 + top.getZ() - bot.getZ());
-                if (area > 4096) {
-                    PS.debug("The plot is > 64 x 64 - Fast lossy schematic saving will be used");
-                }
-//                if (area <= 4096 && PS.get().worldEdit != null) {
-//                    new WorldEditSchematic().saveSchematic(directory + File.separator + name + ".schematic", plot.world, plot.id);
-//                }
-                final Runnable THIS = this;
-                SchematicHandler.manager.getCompoundTag(plot.world, plot.id, new RunnableVal<CompoundTag>() {
-                    @Override
-                    public void run() {
-                        if (value == null) {
-                            MainUtil.sendMessage(null, "&7 - Skipped plot &c" + plot.id);
-                        }
-                        else {
-                            TaskManager.runTaskAsync(new Runnable() {
-                                @Override
-                                public void run() {
-                                    MainUtil.sendMessage(null, "&6ID: " + plot.id);
-                                    final boolean result = SchematicHandler.manager.save(value, directory + File.separator + name + ".schematic");
-                                    if (!result) {
-                                        MainUtil.sendMessage(null, "&7 - Failed to save &c" + plot.id);
-                                    } else {
-                                        MainUtil.sendMessage(null, "&7 - &a  success: " + plot.id);
-                                    }
-                                    TaskManager.runTask(new Runnable() {
-                                        @Override
-                                        public void run() {
-                                            THIS.run();
-                                        }
-                                    });
-                                }
-                            });
-                        }
-                    }
-                });
-            }
-        });
-    	return true;
-    }
-    
-    /**
-     * Paste a schematic
-     *
-     * @param schematic the schematic object to paste
-     * @param plot      plot to paste in
-     * @param x_offset  offset x to paste it from plot origin
-     * @param z_offset  offset z to paste it from plot origin
-     *
-     * @return boolean true if succeeded
-     */
-    public void paste(final Schematic schematic, final Plot plot, final int x_offset, final int z_offset, final RunnableVal<Boolean> whenDone) {
-        TaskManager.runTaskAsync(new Runnable() {
-            @Override
-            public void run() {
-                if (whenDone != null) whenDone.value = false;
-                if (schematic == null) {
-                    PS.debug("Schematic == null :|");
-                    TaskManager.runTask(whenDone);
-                    return;
-                }
-                try {
-                    final Dimension demensions = schematic.getSchematicDimension();
-                    final int WIDTH = demensions.getX();
-                    final int LENGTH = demensions.getZ();
-                    final int HEIGHT = demensions.getY();
-                    // Validate dimensions
-                    Location bottom = plot.getBottom();
-                    Location top = plot.getTop();
-                    if (top.getX() - bottom.getX() + 1 < WIDTH || top.getZ() - bottom.getZ() + 1 < LENGTH || HEIGHT > 256) {
-                        PS.debug("Schematic is too large");
-                        TaskManager.runTask(whenDone);
-                        return;
-                    }
-                    // block id and data arrays
-                    final short[] ids = schematic.ids;
-                    final byte[] datas = schematic.datas;
-                    // Calculate the optimal height to paste the schematic at
-                    final int y_offset;
-                    if (HEIGHT >= 256) {
-                        y_offset = 0;
-                    }
-                    else {
-                        y_offset = MainUtil.getHeighestBlock(plot.world, bottom.getX() + 1, bottom.getZ() + 1);
-                    }
-                    Location pos1 = MainUtil.getPlotBottomLoc(plot.world, plot.id).add(1 + x_offset, y_offset - 1, 1 + z_offset);
-                    Location pos2 = pos1.clone().add(WIDTH - 1, HEIGHT - 1, LENGTH - 1);
-                    // TODO switch to ChunkManager.chunkTask(pos1, pos2, task, whenDone, allocate);        
-                    final int p1x = pos1.getX();
-                    final int p1z = pos1.getZ();
-                    final int p2x = pos2.getX();
-                    final int p2z = pos2.getZ();
-                    final int bcx = p1x >> 4;
-                    final int bcz = p1z >> 4;
-                    final int tcx = p2x >> 4;
-                    final int tcz = p2z >> 4;
-                    final ArrayList<ChunkLoc> chunks = new ArrayList<ChunkLoc>();
-                    for (int x = bcx; x <= tcx; x++) {
-                        for (int z = bcz; z <= tcz; z++) {
-                            chunks.add(new ChunkLoc(x, z));
-                        }
-                    }
-                    TaskManager.runTaskAsync(new Runnable() {
-                        @Override
-                        public void run() {
-                            int count = 0;
-                            while (chunks.size() > 0 && count < 256) {
-                                count++;
-                                ChunkLoc chunk = chunks.remove(0);
-                                int x = chunk.x;
-                                int z = chunk.z;
-                                int xxb = x << 4;
-                                int zzb = z << 4;
-                                int xxt = xxb + 15;
-                                int zzt = zzb + 15;
-                                if (x == bcx) {
-                                    xxb = p1x; 
-                                }
-                                if (x == tcx) {
-                                    xxt = p2x;
-                                }
-                                if (z == bcz) {
-                                    zzb = p1z;
-                                }
-                                if (z == tcz) {
-                                    zzt = p2z;
-                                }
-                                // Paste schematic here
-                                int id;
-                                
-                                for (int ry = 0; ry < Math.min(256, HEIGHT); ry++) {
-                                    int yy = y_offset + ry;
-                                    if (yy > 255) {
-                                        continue;
-                                    }
-                                    int i1 = ry * WIDTH * LENGTH;
-                                    for (int rz = zzb - p1z; rz <= zzt - p1z; rz++) {
-                                        int i2 = rz * WIDTH + i1;
-                                        for (int rx = xxb - p1x; rx <= xxt - p1x; rx++) {
-                                            int i = i2 + rx;
-                                            
-                                            int xx = p1x + rx;
-                                            int zz = p1z + rz;
-                                            
-                                            id = ids[i];
-                                            
-                                            switch(id) {
-                                                case 0:
-                                                case 2:
-                                                case 4:
-                                                case 13:
-                                                case 14:
-                                                case 15:
-                                                case 20:
-                                                case 21:
-                                                case 22:
-                                                case 24:
-                                                case 30:
-                                                case 32:
-                                                case 37:
-                                                case 39:
-                                                case 40:
-                                                case 41:
-                                                case 42:
-                                                case 45:
-                                                case 46:
-                                                case 47:
-                                                case 48:
-                                                case 49:
-                                                case 50:
-                                                case 51:
-                                                case 55:
-                                                case 56:
-                                                case 57:
-                                                case 58:
-                                                case 60:
-                                                case 7:
-                                                case 8:
-                                                case 9:
-                                                case 10:
-                                                case 11:
-                                                case 73:
-                                                case 74:
-                                                case 75:
-                                                case 76:
-                                                case 78:
-                                                case 79:
-                                                case 80:
-                                                case 81:
-                                                case 82:
-                                                case 83:
-                                                case 85:
-                                                case 87:
-                                                case 88:
-                                                case 101:
-                                                case 102:
-                                                case 103:
-                                                case 110:
-                                                case 112:
-                                                case 113:
-                                                case 121:
-                                                case 122:
-                                                case 129:
-                                                case 133:
-                                                case 165:
-                                                case 166:
-                                                case 169:
-                                                case 170:
-                                                case 172:
-                                                case 173:
-                                                case 174:
-                                                case 181:
-                                                case 182:
-                                                case 188:
-                                                case 189:
-                                                case 190:
-                                                case 191:
-                                                case 192: {
-                                                    SetBlockQueue.setBlock(plot.world, xx, yy, zz, id);
-                                                    break;
-                                                }
-                                                default: {
-                                                    SetBlockQueue.setBlock(plot.world, xx, yy, zz, new PlotBlock((short) id, (byte) datas[i]));
-                                                    break;
-                                                }
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                            if (chunks.size() != 0) {
-                                final Runnable task = this;
-                                // Run when the queue is free
-                                SetBlockQueue.addNotify(new Runnable() {
-                                    @Override
-                                    public void run() {
-                                        System.gc();
-                                        TaskManager.runTaskLaterAsync(task, 80);
-                                    }
-                                });
-                            }
-                            else {
-                                System.gc();
-                                // Finished
-                                SetBlockQueue.addNotify(new Runnable() {
-                                    @Override
-                                    public void run() {
-                                        pasteStates(schematic, plot, x_offset, z_offset);
-                                        if (whenDone != null) {
-                                            whenDone.value = true;
-                                            whenDone.run();
-                                        }
-                                    }
-                                });
-                                return;
-                            }
-                        }
-                    });
-                } catch (final Exception e) {
-                    e.printStackTrace();
-                    TaskManager.runTask(whenDone);
-                    return;
-                }
-            }
-        });
-    }
-    
-    public boolean pasteStates(final Schematic schematic, final Plot plot, final int x_offset, final int z_offset) {
-        if (schematic == null) {
-            PS.debug("Schematic == null :|");
-            return false;
-        }
-        HashSet<PlotItem> items = schematic.getItems();
-        if (items == null) {
-            return false;
-        }
-        Location l1 = MainUtil.getPlotBottomLoc(plot.world, plot.getId());
-        final int sy = MainUtil.getHeighestBlock(plot.world, l1.getX() + 1, l1.getZ() + 1);
-        final Dimension demensions = schematic.getSchematicDimension();
-        final int HEIGHT = demensions.getY();
-        if ((HEIGHT < 255)) {
-            l1 = l1.add(1, sy - 1, 1);
-        } else {
-            l1 = l1.add(1, 0, 1);
-        }
-        int X = l1.getX() + x_offset;
-        int Y = l1.getY();
-        int Z = l1.getZ() + z_offset;
-        for (PlotItem item : items) {
-            item.x += X;
-            item.y += Y;
-            item.z += Z;
-            BlockManager.manager.addItems(plot.world, item);
-        }
-        return true;
-    }
-
-    public Schematic getSchematic(final CompoundTag tag) {
-        final Map<String, Tag> tagMap = tag.getValue();
-        // Slow
-//        byte[] addId = new byte[0];
-//        if (tagMap.containsKey("AddBlocks")) {
-//            addId = ByteArrayTag.class.cast(tagMap.get("AddBlocks")).getValue();
-//        }
-        // end slow
-        
-        final short width = ShortTag.class.cast(tagMap.get("Width")).getValue();
-        final short length = ShortTag.class.cast(tagMap.get("Length")).getValue();
-        final short height = ShortTag.class.cast(tagMap.get("Height")).getValue();
-        final byte[] block_sml = ByteArrayTag.class.cast(tagMap.get("Blocks")).getValue();
-        final byte[] data = ByteArrayTag.class.cast(tagMap.get("Data")).getValue();
-        
-        final short[] block = new short[block_sml.length];
-        for (int i = 0; i < block.length; i++) {
-            short id = block_sml[i];
-            if (id < 0) {
-                id = (short) (id & 0xFF);
-            }
-            block[i] = id;
-        }
-        
-        
-        
-        // Slow + has code for exceptions (addId) inside the loop rather than outside
-//        for (int index = 0; index < b.length; index++) {
-//            if ((index >> 1) >= addId.length) {
-//                blocks[index] = (short) (b[index] & 0xFF);
-//            } else {
-//                if ((index & 1) == 0) {
-//                    blocks[index] = (short) (((addId[index >> 1] & 0x0F) << 8) + (b[index] & 0xFF));
-//                } else {
-//                    blocks[index] = (short) (((addId[index >> 1] & 0xF0) << 4) + (b[index] & 0xFF));
-//                }
-//            }
-//        }
-        // Slow as wrapper for each block
-//        final DataCollection[] collection = new DataCollection[b.length];
-//        for (int x = 0; x < b.length; x++) {
-//            collection[x] = new DataCollection(blocks[x], d[x]);
-//        }
-//        Schematic schem = new Schematic(collection, dimension, file);
-        
-        Dimension dimensions = new Dimension(width, height, length);
-        Schematic schem = new Schematic(block, data, dimensions);
-        
-        // Slow
-        try {
-            List<Tag> blockStates = ListTag.class.cast(tagMap.get("TileEntities")).getValue();
-            for (Tag stateTag : blockStates) {
-                try {
-                    CompoundTag ct = ((CompoundTag) stateTag);
-                    Map<String, Tag> state = ct.getValue();
-                    short x = IntTag.class.cast(state.get("x")).getValue().shortValue();
-                    short y = IntTag.class.cast(state.get("y")).getValue().shortValue();
-                    short z = IntTag.class.cast(state.get("z")).getValue().shortValue();
-                    new StateWrapper(ct).restoreTag(x, y, z, schem);
-                }
-                catch (Exception e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-        catch (Exception e) {
-            e.printStackTrace();
-        }
-        return schem;
-    }
-    
-    /**
-     * Get a schematic
-     *
-     * @param name to check
-     *
-     * @return schematic if found, else null
-     */
-    public Schematic getSchematic(final String name) {
-        {
-            final File parent = new File(PS.get().IMP.getDirectory() + File.separator + "schematics");
-            if (!parent.exists()) {
-                if (!parent.mkdir()) {
-                    throw new RuntimeException("Could not create schematic parent directory");
-                }
-            }
-        }
-        final File file = new File(PS.get().IMP.getDirectory() + File.separator + "schematics" + File.separator + name + ".schematic");
-        return getSchematic(file);
-    }
-    
-    /**
-     * Get a schematic
-     *
-     * @param name to check
-     *
-     * @return schematic if found, else null
-     */
-    public Schematic getSchematic(File file) {
-        if (!file.exists()) {
-            PS.debug(file.toString() + " doesn't exist");
-            return null;
-        }
-        try {
-            return getSchematic(new FileInputStream(file));
-        } catch (final Exception e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-    
-    public Schematic getSchematic(URL url) {
-        try {
-            ReadableByteChannel rbc = Channels.newChannel(url.openStream());
-            InputStream is = Channels.newInputStream(rbc);
-            return getSchematic(is);
-        } catch (final Exception e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-    
-    public Schematic getSchematic(InputStream is) {
-        if (is == null) {
-            return null;
-        }
-        try {
-            final NBTInputStream stream = new NBTInputStream(new GZIPInputStream(is));
-            final CompoundTag tag = (CompoundTag) stream.readTag(1073741824);
-            is.close();
-            stream.close();
-            return getSchematic(tag);
-        }
-        catch (Exception e) {
-            e.printStackTrace();
-            PS.debug(is.toString() + " | " + is.getClass().getCanonicalName() + " is not in GZIP format : " + e.getMessage());
-        }
-        return null;
-    }
-    
-    public List<String> getSaves(UUID uuid) {
-        try {
-            String website = Settings.WEB_URL + "list.php?" + uuid.toString();
-            URL url = new URL(website);
-            URLConnection connection = new URL(url.toString()).openConnection();
-            connection.setRequestProperty("User-Agent", "Mozilla/5.0");
-            BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream()));
-            String line;
-            StringBuilder rawJSON = new StringBuilder();
-            while ((line = reader.readLine()) != null) {
-                rawJSON.append(line);
-            }
-            reader.close();
-            JSONArray array = new JSONArray(rawJSON.toString());
-            List<String> schematics = new ArrayList<>();
-            for (int i = 0; i < array.length(); i++) {
-                String schematic = array.getString(i);
-                schematics.add(schematic);
-            }
-            return Lists.reverse(schematics);
-        }
-        catch (Exception e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-    
-    public URL upload(final CompoundTag tag, UUID uuid, String file) {
-        if (tag == null) {
-            PS.debug("&cCannot save empty tag");
-            return null;
-        }
-        try {
-            String website;
-            if (uuid == null) {
-                uuid = UUID.randomUUID();
-                website = Settings.WEB_URL + "upload.php?" + uuid;
-                file = "plot";
-            }
-            else {
-                website = Settings.WEB_URL + "save.php?" + uuid;
-            }
-            String charset = "UTF-8";
-            String param = "value";
-            String boundary = Long.toHexString(System.currentTimeMillis());
-            String CRLF = "\r\n";
-            URLConnection con = new URL(website).openConnection();
-            con.setDoOutput(true);
-            con.setRequestProperty("Content-Type", "multipart/form-data; boundary=" + boundary);
-            try (
-                OutputStream output = con.getOutputStream();
-                PrintWriter writer = new PrintWriter(new OutputStreamWriter(output, charset), true)
-            ) {
-                writer.append("--" + boundary).append(CRLF);
-                writer.append("Content-Disposition: form-data; name=\"param\"").append(CRLF);
-                writer.append("Content-Type: text/plain; charset=" + charset).append(CRLF);
-                writer.append(CRLF).append(param).append(CRLF).flush();
-                writer.append("--" + boundary).append(CRLF);
-                writer.append("Content-Disposition: form-data; name=\"schematicFile\"; filename=\"" + file + ".schematic" + "\"").append(CRLF);
-                writer.append("Content-Type: " + URLConnection.guessContentTypeFromName(file + ".schematic")).append(CRLF);
-                writer.append("Content-Transfer-Encoding: binary").append(CRLF);
-                writer.append(CRLF).flush();
-                GZIPOutputStream gzip = new GZIPOutputStream(output);
-                NBTOutputStream nos = new NBTOutputStream(gzip);
-                nos.writeTag(tag);
-                gzip.finish();
-                nos.flush();
-                output.flush();
-                writer.append(CRLF).flush();
-                writer.append("--" + boundary + "--").append(CRLF).flush();
-                nos.close();
-                output.close();
-            }
-            try (Reader response = new InputStreamReader(con.getInputStream(), StandardCharsets.UTF_8)) {
-                final char[] buffer = new char[256];
-                StringBuilder result = new StringBuilder();
-                while (true) {
-                    int r = response.read(buffer);
-                    if (r < 0) {
-                        break;
-                    }
-                    result.append(buffer, 0, r);
-                }
-                if (!result.toString().equals("The file plot.schematic has been uploaded.")) {
-                    PS.debug(result);
-                }
-            }
-            catch (Exception e) {
-                e.printStackTrace();
-            }
-            int responseCode = ((HttpURLConnection) con).getResponseCode();
-            if (responseCode != 200) {
-                return null;
-            }
-            return new URL(Settings.WEB_URL + "?key=" + uuid + "&ip=" + Settings.WEB_IP);
-        } catch (final Exception e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-    
-    /**
-     * Saves a schematic to a file path
-     *
-     * @param tag  to save
-     * @param path to save in
-     *
-     * @return true if succeeded
-     */
-    public boolean save(final CompoundTag tag, final String path) {
-        if (tag == null) {
-            PS.debug("&cCannot save empty tag");
-            return false;
-        }
-        try {
-            final File tmp = new File(path);
-            tmp.getParentFile().mkdirs();
-            final OutputStream stream = new FileOutputStream(path);
-            final NBTOutputStream output = new NBTOutputStream(new GZIPOutputStream(stream));
-            output.writeTag(tag);
-            output.close();
-            stream.close();
-        } catch (final IOException e) {
-            e.printStackTrace();
-            return false;
-        }
-        return true;
-    }
-    
-    /**
-     * Create a compound tag from blocks
-     *  - Untested
-     * @param blocks
-     * @param blockdata
-     * @param d
-     * @return
-     */
-    public CompoundTag createTag(byte[] blocks, byte[] blockdata, Dimension d) {
-        final HashMap<String, Tag> schematic = new HashMap<>();
-        schematic.put("Width", new ShortTag("Width", (short) d.getX()));
-        schematic.put("Length", new ShortTag("Length", (short) d.getZ()));
-        schematic.put("Height", new ShortTag("Height", (short) d.getY()));
-        schematic.put("Materials", new StringTag("Materials", "Alpha"));
-        schematic.put("WEOriginX", new IntTag("WEOriginX", 0));
-        schematic.put("WEOriginY", new IntTag("WEOriginY", 0));
-        schematic.put("WEOriginZ", new IntTag("WEOriginZ", 0));
-        schematic.put("WEOffsetX", new IntTag("WEOffsetX", 0));
-        schematic.put("WEOffsetY", new IntTag("WEOffsetY", 0));
-        schematic.put("WEOffsetZ", new IntTag("WEOffsetZ", 0));
-        schematic.put("Blocks", new ByteArrayTag("Blocks", blocks));
-        schematic.put("Data", new ByteArrayTag("Data", blockdata));
-        schematic.put("Entities", new ListTag("Entities", CompoundTag.class, new ArrayList<Tag>()));
-        schematic.put("TileEntities", new ListTag("TileEntities", CompoundTag.class, new ArrayList<Tag>()));
-        return new CompoundTag("Schematic", schematic);
-    }
-    
-    /**
-     * Gets the schematic of a plot
-     *
-     * @param world to check
-     * @param id    plot
-     *
-     * @return tag
-     */
-    public void getCompoundTag(final String world, final PlotId id, RunnableVal<CompoundTag> whenDone) {
-        if (PS.get().getPlot(world, id) == null) {
-            whenDone.run();
-            return;
-        }
-        final Location pos1 = MainUtil.getPlotBottomLoc(world, id).add(1, -1, 1);
-        final Location pos2 = MainUtil.getPlotTopLoc(world, id);
-        getCompoundTag(world, pos1, pos2, whenDone);
-    }
-    
-    public abstract void getCompoundTag(final String world, final Location pos1, final Location pos2, RunnableVal<CompoundTag> whenDone);
-    
-    public boolean pastePart(final String world, final DataCollection[] blocks, final Location l1, final int x_offset, final int z_offset, final int i1, final int i2, final int WIDTH, final int LENGTH) {
-        int length = 0;
-        for (int i = i1; i <= i2; i++) {
-            if (blocks[i].block == 0) {
-                length++;
-            }
-        }
-        length = i2 - i1 - length + 1;
-
-        int X = l1.getX();
-        int Y = l1.getY();
-        int Z = l1.getZ();
-        
-        final int[] xl = new int[length];
-        final int[] yl = new int[length];
-        final int[] zl = new int[length];
-        final int[] ids = new int[length];
-        final byte[] data = new byte[length];
-        int count = 0;
-        for (int i = i1; i <= i2; i++) {
-            final short id = blocks[i].block;
-            if (id == 0) {
-                continue; //
-            }
-            final int area = WIDTH * LENGTH;
-            final int r = i % (area);
-            final int x = r % WIDTH;
-            final int y = i / area;
-            final int z = r / WIDTH;
-            xl[count] = x + X;
-            yl[count] = y + Y;
-            zl[count] = z + Z;
-            ids[count] = id;
-            data[count] = blocks[i].data;
-            count++;
-            if (y > 256) {
-                break;
-            }
-        }
-        BlockManager.setBlocks(world, xl, yl, zl, ids, data);
-        return true;
-    }
-
-    /**
-     * Schematic Class
-     *
-     * @author Citymonstret
-     */
-    public class Schematic {
-        // Lossy but fast
-        private final short[] ids;
-        private final byte[] datas;
-        
-        @Deprecated
-        private DataCollection[] collection;
-        
-        private final Dimension schematicDimension;
-        private HashSet<PlotItem> items;
-
-        /**
-         * This is deprecated as having a wrapper for each block is slow.<br>
-         *  - There's also a performance hit by having to cast the DataCollection short / byte
-         *  - 
-         * @param blockCollection
-         * @param schematicDimension
-         * @param file
-         */
-        @Deprecated
-        public Schematic(final DataCollection[] blockCollection, final Dimension schematicDimension) {
-            ids = new short[blockCollection.length];
-            datas = new byte[blockCollection.length];
-            for (int i = 0; i < blockCollection.length; i++) {
-                DataCollection block = blockCollection[i];
-                ids[i] = (byte) block.block;
-                datas[i] = block.data;
-            }
-            this.collection = blockCollection;
-            this.schematicDimension = schematicDimension;
-        }
-        
-        public Schematic(final short[] i, final byte[] b, final Dimension d) {
-            ids = i;
-            datas = b;
-            schematicDimension = d;
-        }
-        
-        /**
-         * Add an item to the schematic
-         * @param item
-         */
-        public  void addItem(PlotItem item) {
-            if (this.items == null) {
-                this.items = new HashSet<>();
-            }
-            items.add(item);
-        }
-        
-        /**
-         * Get any items associated with this schematic
-         * @return
-         */
-        public HashSet<PlotItem> getItems() {
-            return this.items;
-        }
-
-        /**
-         * Get the schematic dimensions
-         * @return
-         */
-        public Dimension getSchematicDimension() {
-            return this.schematicDimension;
-        }
-        
-        /**
-         * Get the block id array
-         * @return
-         */
-        public short[] getIds() {
-            return ids;
-        }
-        
-        /**
-         * Get the block data array
-         * @return
-         */
-        public byte[] getDatas() {
-            return datas;
-        }
-
-        /**
-         * @deprecated as it is slow to wrap each block
-         * @return DataCollection of schematic blocks
-         */
-        @Deprecated
-        public DataCollection[] getBlockCollection() {
-            if (this.collection == null) {
-                collection = new DataCollection[ids.length];
-                for (int i = 0; i < ids.length; i++) {
-                    collection[i] = new DataCollection(ids[i], datas[i]);
-                }
-            }
-            return this.collection;
-        }
-    }
-
-    /**
-     * Schematic Dimensions
-     *
-     * @author Citymonstret
-     */
-    public static class Dimension {
-        private final int x;
-        private final int y;
-        private final int z;
-
-        public Dimension(final int x, final int y, final int z) {
-            this.x = x;
-            this.y = y;
-            this.z = z;
-        }
-
-        public int getX() {
-            return this.x;
-        }
-
-        public int getY() {
-            return this.y;
-        }
-
-        public int getZ() {
-            return this.z;
-        }
-    }
-
-    /**
-     * Schematic Data Collection
-     * @deprecated as it is slow to wrap each block
-     * @author Citymonstret
-     */
-    @Deprecated
-    public class DataCollection {
-        private final short block;
-        private final byte data;
-
-        // public CompoundTag tag;
-        public DataCollection(final short block, final byte data) {
-            this.block = block;
-            this.data = data;
-        }
-
-        public short getBlock() {
-            return this.block;
-        }
-
-        public byte getData() {
-            return this.data;
-        }
-    }
-}
+package com.intellectualcrafters.plot.util;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.io.Reader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.net.URLConnection;
+import java.nio.channels.Channels;
+import java.nio.channels.ReadableByteChannel;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.zip.GZIPInputStream;
+import java.util.zip.GZIPOutputStream;
+
+import com.google.common.collect.Lists;
+import com.intellectualcrafters.jnbt.ByteArrayTag;
+import com.intellectualcrafters.jnbt.CompoundTag;
+import com.intellectualcrafters.jnbt.IntTag;
+import com.intellectualcrafters.jnbt.ListTag;
+import com.intellectualcrafters.jnbt.NBTInputStream;
+import com.intellectualcrafters.jnbt.NBTOutputStream;
+import com.intellectualcrafters.jnbt.ShortTag;
+import com.intellectualcrafters.jnbt.StringTag;
+import com.intellectualcrafters.jnbt.Tag;
+import com.intellectualcrafters.json.JSONArray;
+import com.intellectualcrafters.plot.PS;
+import com.intellectualcrafters.plot.config.Settings;
+import com.intellectualcrafters.plot.object.ChunkLoc;
+import com.intellectualcrafters.plot.object.Location;
+import com.intellectualcrafters.plot.object.Plot;
+import com.intellectualcrafters.plot.object.PlotBlock;
+import com.intellectualcrafters.plot.object.PlotId;
+import com.intellectualcrafters.plot.object.RunnableVal;
+import com.intellectualcrafters.plot.object.schematic.PlotItem;
+import com.plotsquared.object.schematic.StateWrapper;
+
+public abstract class SchematicHandler
+{
+    public static SchematicHandler manager;
+
+    private boolean exportAll = false;
+
+    public boolean exportAll(final Collection<Plot> collection, final File outputDir, final String namingScheme, final Runnable ifSuccess)
+    {
+        if (exportAll) { return false; }
+        if (collection.size() == 0) { return false; }
+        exportAll = true;
+        final ArrayList<Plot> plots = new ArrayList<Plot>(collection);
+        TaskManager.runTask(new Runnable()
+        {
+            @Override
+            public void run()
+            {
+                if (plots.size() == 0)
+                {
+                    exportAll = false;
+                    TaskManager.runTask(ifSuccess);
+                    return;
+                }
+                final Iterator<Plot> i = plots.iterator();
+                final Plot plot = i.next();
+                i.remove();
+                String o = UUIDHandler.getName(plot.owner);
+                if (o == null)
+                {
+                    o = "unknown";
+                }
+                final String name;
+                if (namingScheme == null)
+                {
+                    name = plot.id.x + ";" + plot.id.y + "," + plot.world + "," + o;
+                }
+                else
+                {
+                    name = namingScheme.replaceAll("%owner%", o).replaceAll("%id%", plot.id.toString()).replaceAll("%idx%", plot.id.x + "").replaceAll("%idy%", plot.id.y + "")
+                    .replaceAll("%world%", plot.world);
+                }
+                final String directory;
+                if (outputDir == null)
+                {
+                    directory = Settings.SCHEMATIC_SAVE_PATH;
+                }
+                else
+                {
+                    directory = outputDir.getPath();
+                }
+                final Location top = plot.getTop();
+                final Location bot = plot.getBottom();
+                final int area = ((1 + top.getX()) - bot.getX()) * ((1 + top.getZ()) - bot.getZ());
+                if (area > 4096)
+                {
+                    PS.debug("The plot is > 64 x 64 - Fast lossy schematic saving will be used");
+                }
+                //                if (area <= 4096 && PS.get().worldEdit != null) {
+                //                    new WorldEditSchematic().saveSchematic(directory + File.separator + name + ".schematic", plot.world, plot.id);
+                //                }
+                final Runnable THIS = this;
+                SchematicHandler.manager.getCompoundTag(plot.world, plot.id, new RunnableVal<CompoundTag>()
+                {
+                    @Override
+                    public void run()
+                    {
+                        if (value == null)
+                        {
+                            MainUtil.sendMessage(null, "&7 - Skipped plot &c" + plot.id);
+                        }
+                        else
+                        {
+                            TaskManager.runTaskAsync(new Runnable()
+                            {
+                                @Override
+                                public void run()
+                                {
+                                    MainUtil.sendMessage(null, "&6ID: " + plot.id);
+                                    final boolean result = SchematicHandler.manager.save(value, directory + File.separator + name + ".schematic");
+                                    if (!result)
+                                    {
+                                        MainUtil.sendMessage(null, "&7 - Failed to save &c" + plot.id);
+                                    }
+                                    else
+                                    {
+                                        MainUtil.sendMessage(null, "&7 - &a  success: " + plot.id);
+                                    }
+                                    TaskManager.runTask(new Runnable()
+                                    {
+                                        @Override
+                                        public void run()
+                                        {
+                                            THIS.run();
+                                        }
+                                    });
+                                }
+                            });
+                        }
+                    }
+                });
+            }
+        });
+        return true;
+    }
+
+    /**
+     * Paste a schematic
+     *
+     * @param schematic the schematic object to paste
+     * @param plot      plot to paste in
+     * @param x_offset  offset x to paste it from plot origin
+     * @param z_offset  offset z to paste it from plot origin
+     *
+     * @return boolean true if succeeded
+     */
+    public void paste(final Schematic schematic, final Plot plot, final int x_offset, final int z_offset, final RunnableVal<Boolean> whenDone)
+    {
+        TaskManager.runTaskAsync(new Runnable()
+        {
+            @Override
+            public void run()
+            {
+                if (whenDone != null)
+                {
+                    whenDone.value = false;
+                }
+                if (schematic == null)
+                {
+                    PS.debug("Schematic == null :|");
+                    TaskManager.runTask(whenDone);
+                    return;
+                }
+                try
+                {
+                    final Dimension demensions = schematic.getSchematicDimension();
+                    final int WIDTH = demensions.getX();
+                    final int LENGTH = demensions.getZ();
+                    final int HEIGHT = demensions.getY();
+                    // Validate dimensions
+                    final Location bottom = plot.getBottom();
+                    final Location top = plot.getTop();
+                    if ((((top.getX() - bottom.getX()) + 1) < WIDTH) || (((top.getZ() - bottom.getZ()) + 1) < LENGTH) || (HEIGHT > 256))
+                    {
+                        PS.debug("Schematic is too large");
+                        TaskManager.runTask(whenDone);
+                        return;
+                    }
+                    // block id and data arrays
+                    final short[] ids = schematic.ids;
+                    final byte[] datas = schematic.datas;
+                    // Calculate the optimal height to paste the schematic at
+                    final int y_offset;
+                    if (HEIGHT >= 256)
+                    {
+                        y_offset = 0;
+                    }
+                    else
+                    {
+                        y_offset = MainUtil.getHeighestBlock(plot.world, bottom.getX() + 1, bottom.getZ() + 1);
+                    }
+                    final Location pos1 = MainUtil.getPlotBottomLoc(plot.world, plot.id).add(1 + x_offset, y_offset - 1, 1 + z_offset);
+                    final Location pos2 = pos1.clone().add(WIDTH - 1, HEIGHT - 1, LENGTH - 1);
+                    // TODO switch to ChunkManager.chunkTask(pos1, pos2, task, whenDone, allocate);
+                    final int p1x = pos1.getX();
+                    final int p1z = pos1.getZ();
+                    final int p2x = pos2.getX();
+                    final int p2z = pos2.getZ();
+                    final int bcx = p1x >> 4;
+                    final int bcz = p1z >> 4;
+                    final int tcx = p2x >> 4;
+                    final int tcz = p2z >> 4;
+                    final ArrayList<ChunkLoc> chunks = new ArrayList<ChunkLoc>();
+                    for (int x = bcx; x <= tcx; x++)
+                    {
+                        for (int z = bcz; z <= tcz; z++)
+                        {
+                            chunks.add(new ChunkLoc(x, z));
+                        }
+                    }
+                    TaskManager.runTaskAsync(new Runnable()
+                    {
+                        @Override
+                        public void run()
+                        {
+                            int count = 0;
+                            while ((chunks.size() > 0) && (count < 256))
+                            {
+                                count++;
+                                final ChunkLoc chunk = chunks.remove(0);
+                                final int x = chunk.x;
+                                final int z = chunk.z;
+                                int xxb = x << 4;
+                                int zzb = z << 4;
+                                int xxt = xxb + 15;
+                                int zzt = zzb + 15;
+                                if (x == bcx)
+                                {
+                                    xxb = p1x;
+                                }
+                                if (x == tcx)
+                                {
+                                    xxt = p2x;
+                                }
+                                if (z == bcz)
+                                {
+                                    zzb = p1z;
+                                }
+                                if (z == tcz)
+                                {
+                                    zzt = p2z;
+                                }
+                                // Paste schematic here
+                                int id;
+
+                                for (int ry = 0; ry < Math.min(256, HEIGHT); ry++)
+                                {
+                                    final int yy = y_offset + ry;
+                                    if (yy > 255)
+                                    {
+                                        continue;
+                                    }
+                                    final int i1 = ry * WIDTH * LENGTH;
+                                    for (int rz = zzb - p1z; rz <= (zzt - p1z); rz++)
+                                    {
+                                        final int i2 = (rz * WIDTH) + i1;
+                                        for (int rx = xxb - p1x; rx <= (xxt - p1x); rx++)
+                                        {
+                                            final int i = i2 + rx;
+
+                                            final int xx = p1x + rx;
+                                            final int zz = p1z + rz;
+
+                                            id = ids[i];
+
+                                            switch (id)
+                                            {
+                                                case 0:
+                                                case 2:
+                                                case 4:
+                                                case 13:
+                                                case 14:
+                                                case 15:
+                                                case 20:
+                                                case 21:
+                                                case 22:
+                                                case 24:
+                                                case 30:
+                                                case 32:
+                                                case 37:
+                                                case 39:
+                                                case 40:
+                                                case 41:
+                                                case 42:
+                                                case 45:
+                                                case 46:
+                                                case 47:
+                                                case 48:
+                                                case 49:
+                                                case 50:
+                                                case 51:
+                                                case 55:
+                                                case 56:
+                                                case 57:
+                                                case 58:
+                                                case 60:
+                                                case 7:
+                                                case 8:
+                                                case 9:
+                                                case 10:
+                                                case 11:
+                                                case 73:
+                                                case 74:
+                                                case 75:
+                                                case 76:
+                                                case 78:
+                                                case 79:
+                                                case 80:
+                                                case 81:
+                                                case 82:
+                                                case 83:
+                                                case 85:
+                                                case 87:
+                                                case 88:
+                                                case 101:
+                                                case 102:
+                                                case 103:
+                                                case 110:
+                                                case 112:
+                                                case 113:
+                                                case 121:
+                                                case 122:
+                                                case 129:
+                                                case 133:
+                                                case 165:
+                                                case 166:
+                                                case 169:
+                                                case 170:
+                                                case 172:
+                                                case 173:
+                                                case 174:
+                                                case 181:
+                                                case 182:
+                                                case 188:
+                                                case 189:
+                                                case 190:
+                                                case 191:
+                                                case 192:
+                                                {
+                                                    SetBlockQueue.setBlock(plot.world, xx, yy, zz, id);
+                                                    break;
+                                                }
+                                                default:
+                                                {
+                                                    SetBlockQueue.setBlock(plot.world, xx, yy, zz, new PlotBlock((short) id, datas[i]));
+                                                    break;
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                            if (chunks.size() != 0)
+                            {
+                                final Runnable task = this;
+                                // Run when the queue is free
+                                SetBlockQueue.addNotify(new Runnable()
+                                {
+                                    @Override
+                                    public void run()
+                                    {
+                                        System.gc();
+                                        TaskManager.runTaskLaterAsync(task, 80);
+                                    }
+                                });
+                            }
+                            else
+                            {
+                                System.gc();
+                                // Finished
+                                SetBlockQueue.addNotify(new Runnable()
+                                {
+                                    @Override
+                                    public void run()
+                                    {
+                                        pasteStates(schematic, plot, x_offset, z_offset);
+                                        if (whenDone != null)
+                                        {
+                                            whenDone.value = true;
+                                            whenDone.run();
+                                        }
+                                    }
+                                });
+                                return;
+                            }
+                        }
+                    });
+                }
+                catch (final Exception e)
+                {
+                    e.printStackTrace();
+                    TaskManager.runTask(whenDone);
+                    return;
+                }
+            }
+        });
+    }
+
+    public boolean pasteStates(final Schematic schematic, final Plot plot, final int x_offset, final int z_offset)
+    {
+        if (schematic == null)
+        {
+            PS.debug("Schematic == null :|");
+            return false;
+        }
+        final HashSet<PlotItem> items = schematic.getItems();
+        if (items == null) { return false; }
+        Location l1 = MainUtil.getPlotBottomLoc(plot.world, plot.getId());
+        final int sy = MainUtil.getHeighestBlock(plot.world, l1.getX() + 1, l1.getZ() + 1);
+        final Dimension demensions = schematic.getSchematicDimension();
+        final int HEIGHT = demensions.getY();
+        if ((HEIGHT < 255))
+        {
+            l1 = l1.add(1, sy - 1, 1);
+        }
+        else
+        {
+            l1 = l1.add(1, 0, 1);
+        }
+        final int X = l1.getX() + x_offset;
+        final int Y = l1.getY();
+        final int Z = l1.getZ() + z_offset;
+        for (final PlotItem item : items)
+        {
+            item.x += X;
+            item.y += Y;
+            item.z += Z;
+            BlockManager.manager.addItems(plot.world, item);
+        }
+        return true;
+    }
+
+    public Schematic getSchematic(final CompoundTag tag)
+    {
+        final Map<String, Tag> tagMap = tag.getValue();
+        // Slow
+        //        byte[] addId = new byte[0];
+        //        if (tagMap.containsKey("AddBlocks")) {
+        //            addId = ByteArrayTag.class.cast(tagMap.get("AddBlocks")).getValue();
+        //        }
+        // end slow
+
+        final short width = ShortTag.class.cast(tagMap.get("Width")).getValue();
+        final short length = ShortTag.class.cast(tagMap.get("Length")).getValue();
+        final short height = ShortTag.class.cast(tagMap.get("Height")).getValue();
+        final byte[] block_sml = ByteArrayTag.class.cast(tagMap.get("Blocks")).getValue();
+        final byte[] data = ByteArrayTag.class.cast(tagMap.get("Data")).getValue();
+
+        final short[] block = new short[block_sml.length];
+        for (int i = 0; i < block.length; i++)
+        {
+            short id = block_sml[i];
+            if (id < 0)
+            {
+                id = (short) (id & 0xFF);
+            }
+            block[i] = id;
+        }
+
+        // Slow + has code for exceptions (addId) inside the loop rather than outside
+        //        for (int index = 0; index < b.length; index++) {
+        //            if ((index >> 1) >= addId.length) {
+        //                blocks[index] = (short) (b[index] & 0xFF);
+        //            } else {
+        //                if ((index & 1) == 0) {
+        //                    blocks[index] = (short) (((addId[index >> 1] & 0x0F) << 8) + (b[index] & 0xFF));
+        //                } else {
+        //                    blocks[index] = (short) (((addId[index >> 1] & 0xF0) << 4) + (b[index] & 0xFF));
+        //                }
+        //            }
+        //        }
+        // Slow as wrapper for each block
+        //        final DataCollection[] collection = new DataCollection[b.length];
+        //        for (int x = 0; x < b.length; x++) {
+        //            collection[x] = new DataCollection(blocks[x], d[x]);
+        //        }
+        //        Schematic schem = new Schematic(collection, dimension, file);
+
+        final Dimension dimensions = new Dimension(width, height, length);
+        final Schematic schem = new Schematic(block, data, dimensions);
+
+        // Slow
+        try
+        {
+            final List<Tag> blockStates = ListTag.class.cast(tagMap.get("TileEntities")).getValue();
+            for (final Tag stateTag : blockStates)
+            {
+                try
+                {
+                    final CompoundTag ct = ((CompoundTag) stateTag);
+                    final Map<String, Tag> state = ct.getValue();
+                    final short x = IntTag.class.cast(state.get("x")).getValue().shortValue();
+                    final short y = IntTag.class.cast(state.get("y")).getValue().shortValue();
+                    final short z = IntTag.class.cast(state.get("z")).getValue().shortValue();
+                    new StateWrapper(ct).restoreTag(x, y, z, schem);
+                }
+                catch (final Exception e)
+                {
+                    e.printStackTrace();
+                }
+            }
+        }
+        catch (final Exception e)
+        {
+            e.printStackTrace();
+        }
+        return schem;
+    }
+
+    /**
+     * Get a schematic
+     *
+     * @param name to check
+     *
+     * @return schematic if found, else null
+     */
+    public Schematic getSchematic(final String name)
+    {
+        {
+            final File parent = new File(PS.get().IMP.getDirectory() + File.separator + "schematics");
+            if (!parent.exists())
+            {
+                if (!parent.mkdir()) { throw new RuntimeException("Could not create schematic parent directory"); }
+            }
+        }
+        final File file = new File(PS.get().IMP.getDirectory() + File.separator + "schematics" + File.separator + name + ".schematic");
+        return getSchematic(file);
+    }
+
+    /**
+     * Get a schematic
+     *
+     * @param name to check
+     *
+     * @return schematic if found, else null
+     */
+    public Schematic getSchematic(final File file)
+    {
+        if (!file.exists())
+        {
+            PS.debug(file.toString() + " doesn't exist");
+            return null;
+        }
+        try
+        {
+            return getSchematic(new FileInputStream(file));
+        }
+        catch (final Exception e)
+        {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    public Schematic getSchematic(final URL url)
+    {
+        try
+        {
+            final ReadableByteChannel rbc = Channels.newChannel(url.openStream());
+            final InputStream is = Channels.newInputStream(rbc);
+            return getSchematic(is);
+        }
+        catch (final Exception e)
+        {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    public Schematic getSchematic(final InputStream is)
+    {
+        if (is == null) { return null; }
+        try
+        {
+            final NBTInputStream stream = new NBTInputStream(new GZIPInputStream(is));
+            final CompoundTag tag = (CompoundTag) stream.readTag(1073741824);
+            is.close();
+            stream.close();
+            return getSchematic(tag);
+        }
+        catch (final Exception e)
+        {
+            e.printStackTrace();
+            PS.debug(is.toString() + " | " + is.getClass().getCanonicalName() + " is not in GZIP format : " + e.getMessage());
+        }
+        return null;
+    }
+
+    public List<String> getSaves(final UUID uuid)
+    {
+        try
+        {
+            final String website = Settings.WEB_URL + "list.php?" + uuid.toString();
+            final URL url = new URL(website);
+            final URLConnection connection = new URL(url.toString()).openConnection();
+            connection.setRequestProperty("User-Agent", "Mozilla/5.0");
+            final BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream()));
+            String line;
+            final StringBuilder rawJSON = new StringBuilder();
+            while ((line = reader.readLine()) != null)
+            {
+                rawJSON.append(line);
+            }
+            reader.close();
+            final JSONArray array = new JSONArray(rawJSON.toString());
+            final List<String> schematics = new ArrayList<>();
+            for (int i = 0; i < array.length(); i++)
+            {
+                final String schematic = array.getString(i);
+                schematics.add(schematic);
+            }
+            return Lists.reverse(schematics);
+        }
+        catch (final Exception e)
+        {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    public URL upload(final CompoundTag tag, UUID uuid, String file)
+    {
+        if (tag == null)
+        {
+            PS.debug("&cCannot save empty tag");
+            return null;
+        }
+        try
+        {
+            String website;
+            if (uuid == null)
+            {
+                uuid = UUID.randomUUID();
+                website = Settings.WEB_URL + "upload.php?" + uuid;
+                file = "plot";
+            }
+            else
+            {
+                website = Settings.WEB_URL + "save.php?" + uuid;
+            }
+            final String charset = "UTF-8";
+            final String param = "value";
+            final String boundary = Long.toHexString(System.currentTimeMillis());
+            final String CRLF = "\r\n";
+            final URLConnection con = new URL(website).openConnection();
+            con.setDoOutput(true);
+            con.setRequestProperty("Content-Type", "multipart/form-data; boundary=" + boundary);
+            try (
+            OutputStream output = con.getOutputStream();
+            PrintWriter writer = new PrintWriter(new OutputStreamWriter(output, charset), true))
+            {
+                writer.append("--" + boundary).append(CRLF);
+                writer.append("Content-Disposition: form-data; name=\"param\"").append(CRLF);
+                writer.append("Content-Type: text/plain; charset=" + charset).append(CRLF);
+                writer.append(CRLF).append(param).append(CRLF).flush();
+                writer.append("--" + boundary).append(CRLF);
+                writer.append("Content-Disposition: form-data; name=\"schematicFile\"; filename=\"" + file + ".schematic" + "\"").append(CRLF);
+                writer.append("Content-Type: " + URLConnection.guessContentTypeFromName(file + ".schematic")).append(CRLF);
+                writer.append("Content-Transfer-Encoding: binary").append(CRLF);
+                writer.append(CRLF).flush();
+                final GZIPOutputStream gzip = new GZIPOutputStream(output);
+                final NBTOutputStream nos = new NBTOutputStream(gzip);
+                nos.writeTag(tag);
+                gzip.finish();
+                nos.flush();
+                output.flush();
+                writer.append(CRLF).flush();
+                writer.append("--" + boundary + "--").append(CRLF).flush();
+                nos.close();
+                output.close();
+            }
+            try (Reader response = new InputStreamReader(con.getInputStream(), StandardCharsets.UTF_8))
+            {
+                final char[] buffer = new char[256];
+                final StringBuilder result = new StringBuilder();
+                while (true)
+                {
+                    final int r = response.read(buffer);
+                    if (r < 0)
+                    {
+                        break;
+                    }
+                    result.append(buffer, 0, r);
+                }
+                if (!result.toString().equals("The file plot.schematic has been uploaded."))
+                {
+                    PS.debug(result);
+                }
+            }
+            catch (final Exception e)
+            {
+                e.printStackTrace();
+            }
+            final int responseCode = ((HttpURLConnection) con).getResponseCode();
+            if (responseCode != 200) { return null; }
+            return new URL(Settings.WEB_URL + "?key=" + uuid + "&ip=" + Settings.WEB_IP);
+        }
+        catch (final Exception e)
+        {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * Saves a schematic to a file path
+     *
+     * @param tag  to save
+     * @param path to save in
+     *
+     * @return true if succeeded
+     */
+    public boolean save(final CompoundTag tag, final String path)
+    {
+        if (tag == null)
+        {
+            PS.debug("&cCannot save empty tag");
+            return false;
+        }
+        try
+        {
+            final File tmp = new File(path);
+            tmp.getParentFile().mkdirs();
+            final OutputStream stream = new FileOutputStream(path);
+            final NBTOutputStream output = new NBTOutputStream(new GZIPOutputStream(stream));
+            output.writeTag(tag);
+            output.close();
+            stream.close();
+        }
+        catch (final IOException e)
+        {
+            e.printStackTrace();
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Create a compound tag from blocks
+     *  - Untested
+     * @param blocks
+     * @param blockdata
+     * @param d
+     * @return
+     */
+    public CompoundTag createTag(final byte[] blocks, final byte[] blockdata, final Dimension d)
+    {
+        final HashMap<String, Tag> schematic = new HashMap<>();
+        schematic.put("Width", new ShortTag("Width", (short) d.getX()));
+        schematic.put("Length", new ShortTag("Length", (short) d.getZ()));
+        schematic.put("Height", new ShortTag("Height", (short) d.getY()));
+        schematic.put("Materials", new StringTag("Materials", "Alpha"));
+        schematic.put("WEOriginX", new IntTag("WEOriginX", 0));
+        schematic.put("WEOriginY", new IntTag("WEOriginY", 0));
+        schematic.put("WEOriginZ", new IntTag("WEOriginZ", 0));
+        schematic.put("WEOffsetX", new IntTag("WEOffsetX", 0));
+        schematic.put("WEOffsetY", new IntTag("WEOffsetY", 0));
+        schematic.put("WEOffsetZ", new IntTag("WEOffsetZ", 0));
+        schematic.put("Blocks", new ByteArrayTag("Blocks", blocks));
+        schematic.put("Data", new ByteArrayTag("Data", blockdata));
+        schematic.put("Entities", new ListTag("Entities", CompoundTag.class, new ArrayList<Tag>()));
+        schematic.put("TileEntities", new ListTag("TileEntities", CompoundTag.class, new ArrayList<Tag>()));
+        return new CompoundTag("Schematic", schematic);
+    }
+
+    /**
+     * Gets the schematic of a plot
+     *
+     * @param world to check
+     * @param id    plot
+     *
+     * @return tag
+     */
+    public void getCompoundTag(final String world, final PlotId id, final RunnableVal<CompoundTag> whenDone)
+    {
+        if (PS.get().getPlot(world, id) == null)
+        {
+            whenDone.run();
+            return;
+        }
+        final Location pos1 = MainUtil.getPlotBottomLoc(world, id).add(1, -1, 1);
+        final Location pos2 = MainUtil.getPlotTopLoc(world, id);
+        getCompoundTag(world, pos1, pos2, whenDone);
+    }
+
+    public abstract void getCompoundTag(final String world, final Location pos1, final Location pos2, final RunnableVal<CompoundTag> whenDone);
+
+    public boolean pastePart(final String world, final DataCollection[] blocks, final Location l1, final int x_offset, final int z_offset, final int i1, final int i2, final int WIDTH, final int LENGTH)
+    {
+        int length = 0;
+        for (int i = i1; i <= i2; i++)
+        {
+            if (blocks[i].block == 0)
+            {
+                length++;
+            }
+        }
+        length = (i2 - i1 - length) + 1;
+
+        final int X = l1.getX();
+        final int Y = l1.getY();
+        final int Z = l1.getZ();
+
+        final int[] xl = new int[length];
+        final int[] yl = new int[length];
+        final int[] zl = new int[length];
+        final int[] ids = new int[length];
+        final byte[] data = new byte[length];
+        int count = 0;
+        for (int i = i1; i <= i2; i++)
+        {
+            final short id = blocks[i].block;
+            if (id == 0)
+            {
+                continue; //
+            }
+            final int area = WIDTH * LENGTH;
+            final int r = i % (area);
+            final int x = r % WIDTH;
+            final int y = i / area;
+            final int z = r / WIDTH;
+            xl[count] = x + X;
+            yl[count] = y + Y;
+            zl[count] = z + Z;
+            ids[count] = id;
+            data[count] = blocks[i].data;
+            count++;
+            if (y > 256)
+            {
+                break;
+            }
+        }
+        BlockManager.setBlocks(world, xl, yl, zl, ids, data);
+        return true;
+    }
+
+    /**
+     * Schematic Class
+     *

+     */
+    public class Schematic
+    {
+        // Lossy but fast
+        private final short[] ids;
+        private final byte[] datas;
+
+        @Deprecated
+        private DataCollection[] collection;
+
+        private final Dimension schematicDimension;
+        private HashSet<PlotItem> items;
+
+        /**
+         * This is deprecated as having a wrapper for each block is slow.<br>
+         *  - There's also a performance hit by having to cast the DataCollection short / byte
+         *  -
+         * @param blockCollection
+         * @param schematicDimension
+         * @param file
+         */
+        @Deprecated
+        public Schematic(final DataCollection[] blockCollection, final Dimension schematicDimension)
+        {
+            ids = new short[blockCollection.length];
+            datas = new byte[blockCollection.length];
+            for (int i = 0; i < blockCollection.length; i++)
+            {
+                final DataCollection block = blockCollection[i];
+                ids[i] = (byte) block.block;
+                datas[i] = block.data;
+            }
+            collection = blockCollection;
+            this.schematicDimension = schematicDimension;
+        }
+
+        public Schematic(final short[] i, final byte[] b, final Dimension d)
+        {
+            ids = i;
+            datas = b;
+            schematicDimension = d;
+        }
+
+        /**
+         * Add an item to the schematic
+         * @param item
+         */
+        public void addItem(final PlotItem item)
+        {
+            if (items == null)
+            {
+                items = new HashSet<>();
+            }
+            items.add(item);
+        }
+
+        /**
+         * Get any items associated with this schematic
+         * @return
+         */
+        public HashSet<PlotItem> getItems()
+        {
+            return items;
+        }
+
+        /**
+         * Get the schematic dimensions
+         * @return
+         */
+        public Dimension getSchematicDimension()
+        {
+            return schematicDimension;
+        }
+
+        /**
+         * Get the block id array
+         * @return
+         */
+        public short[] getIds()
+        {
+            return ids;
+        }
+
+        /**
+         * Get the block data array
+         * @return
+         */
+        public byte[] getDatas()
+        {
+            return datas;
+        }
+
+        /**
+         * @deprecated as it is slow to wrap each block
+         * @return DataCollection of schematic blocks
+         */
+        @Deprecated
+        public DataCollection[] getBlockCollection()
+        {
+            if (collection == null)
+            {
+                collection = new DataCollection[ids.length];
+                for (int i = 0; i < ids.length; i++)
+                {
+                    collection[i] = new DataCollection(ids[i], datas[i]);
+                }
+            }
+            return collection;
+        }
+    }
+
+    /**
+     * Schematic Dimensions
+     *

+     */
+    public static class Dimension
+    {
+        private final int x;
+        private final int y;
+        private final int z;
+
+        public Dimension(final int x, final int y, final int z)
+        {
+            this.x = x;
+            this.y = y;
+            this.z = z;
+        }
+
+        public int getX()
+        {
+            return x;
+        }
+
+        public int getY()
+        {
+            return y;
+        }
+
+        public int getZ()
+        {
+            return z;
+        }
+    }
+
+    /**
+     * Schematic Data Collection
+     * @deprecated as it is slow to wrap each block

+     */
+    @Deprecated
+    public class DataCollection
+    {
+        private final short block;
+        private final byte data;
+
+        // public CompoundTag tag;
+        public DataCollection(final short block, final byte data)
+        {
+            this.block = block;
+            this.data = data;
+        }
+
+        public short getBlock()
+        {
+            return block;
+        }
+
+        public byte getData()
+        {
+            return data;
+        }
+    }
+}
diff --git a/src/main/java/com/intellectualcrafters/plot/util/SetBlockQueue.java b/src/main/java/com/intellectualcrafters/plot/util/SetBlockQueue.java
index 23a2fa988..22cc17e85 100644
--- a/src/main/java/com/intellectualcrafters/plot/util/SetBlockQueue.java
+++ b/src/main/java/com/intellectualcrafters/plot/util/SetBlockQueue.java
@@ -9,8 +9,9 @@ import com.intellectualcrafters.plot.PS;
 import com.intellectualcrafters.plot.object.ChunkLoc;
 import com.intellectualcrafters.plot.object.PlotBlock;
 
-public class SetBlockQueue {
-    
+public class SetBlockQueue
+{
+
     private volatile static HashMap<ChunkWrapper, PlotBlock[][]> blocks;
     private volatile static int allocate = 25;
     private volatile static boolean running = false;
@@ -20,23 +21,30 @@ public class SetBlockQueue {
     private static long last;
     private static int lastInt = 0;
     private static PlotBlock lastBlock = new PlotBlock((short) 0, (byte) 0);
-    
-    public synchronized static void allocate(int t) {
+
+    public synchronized static void allocate(final int t)
+    {
         allocate = t;
     }
-    
-    public static int getAllocate() {
+
+    public static int getAllocate()
+    {
         return allocate;
     }
-    
-    public static void setSlow(boolean value) {
+
+    public static void setSlow(final boolean value)
+    {
         slow = value;
     }
-    
-    public synchronized static boolean addNotify(Runnable whenDone) {
-        if (runnables == null) {
-            if (blocks == null || blocks.size() == 0) {
-                if (whenDone != null) {
+
+    public synchronized static boolean addNotify(final Runnable whenDone)
+    {
+        if (runnables == null)
+        {
+            if ((blocks == null) || (blocks.size() == 0))
+            {
+                if (whenDone != null)
+                {
                     whenDone.run();
                 }
                 slow = false;
@@ -45,20 +53,24 @@ public class SetBlockQueue {
             }
             runnables = new ArrayDeque<>();
         }
-        if (whenDone != null) {
+        if (whenDone != null)
+        {
             init();
             runnables.add(whenDone);
         }
-        if (blocks == null || blocks.size() == 0 || !blocks.entrySet().iterator().hasNext()) {
-            ArrayDeque<Runnable> tasks = runnables;
+        if ((blocks == null) || (blocks.size() == 0) || !blocks.entrySet().iterator().hasNext())
+        {
+            final ArrayDeque<Runnable> tasks = runnables;
             lastInt = -1;
             lastBlock = null;
             runnables = null;
             running = false;
             blocks = null;
             slow = false;
-            if (tasks != null) {
-                for (Runnable runnable : tasks) {
+            if (tasks != null)
+            {
+                for (final Runnable runnable : tasks)
+                {
                     runnable.run();
                 }
             }
@@ -66,84 +78,103 @@ public class SetBlockQueue {
         return false;
     }
 
-    public synchronized static void init() {
-        if (blocks == null) {
-            if (MainUtil.x_loc == null) {
+    public synchronized static void init()
+    {
+        if (blocks == null)
+        {
+            if (MainUtil.x_loc == null)
+            {
                 MainUtil.initCache();
             }
             blocks = new HashMap<>();
             runnables = new ArrayDeque<>();
         }
-        if (!running) {
+        if (!running)
+        {
             TaskManager.index.incrementAndGet();
             final int current = TaskManager.index.intValue();
-            int task = TaskManager.runTaskRepeat(new Runnable() {
+            final int task = TaskManager.runTaskRepeat(new Runnable()
+            {
                 @Override
-                public void run() {
+                public void run()
+                {
                     if (locked) {
-                        return;
+                    return;
                     }
-                    if (blocks == null || blocks.size() == 0) {
+                    if ((blocks == null) || (blocks.size() == 0))
+                    {
                         PS.get().TASK.cancelTask(TaskManager.tasks.get(current));
-                        ArrayDeque<Runnable> tasks = runnables;
+                        final ArrayDeque<Runnable> tasks = runnables;
                         lastInt = -1;
                         lastBlock = null;
                         runnables = null;
                         running = false;
                         blocks = null;
                         slow = false;
-                        if (tasks != null) {
-                            for (Runnable runnable : tasks) {
+                        if (tasks != null)
+                        {
+                            for (final Runnable runnable : tasks)
+                            {
                                 runnable.run();
                             }
                         }
                         return;
                     }
-                    long newLast = System.currentTimeMillis();
+                    final long newLast = System.currentTimeMillis();
                     last = Math.max(newLast - 50, last);
-                    while (blocks.size() > 0 && (System.currentTimeMillis() - last < 50 + allocate)) {
+                    while ((blocks.size() > 0) && ((System.currentTimeMillis() - last) < (50 + allocate)))
+                    {
                         if (locked) {
-                            return;
+                        return;
                         }
-                        Iterator<Entry<ChunkWrapper, PlotBlock[][]>> iter = blocks.entrySet().iterator();
-                        if (!iter.hasNext()) {
+                        final Iterator<Entry<ChunkWrapper, PlotBlock[][]>> iter = blocks.entrySet().iterator();
+                        if (!iter.hasNext())
+                        {
                             PS.get().TASK.cancelTask(TaskManager.tasks.get(current));
-                            ArrayDeque<Runnable> tasks = runnables;
+                            final ArrayDeque<Runnable> tasks = runnables;
                             lastInt = -1;
                             lastBlock = null;
                             runnables = null;
                             running = false;
                             blocks = null;
                             slow = false;
-                            if (tasks != null) {
-                                for (Runnable runnable : tasks) {
+                            if (tasks != null)
+                            {
+                                for (final Runnable runnable : tasks)
+                                {
                                     runnable.run();
                                 }
                             }
                             return;
                         }
-                        Entry<ChunkWrapper, PlotBlock[][]> n = iter.next();
-                        ChunkWrapper chunk = n.getKey();
-                        PlotBlock[][] blocks = n.getValue();
-                        int X = chunk.x << 4;
-                        int Z = chunk.z << 4;
-                        String world = chunk.world;
-                        if (slow) {
+                        final Entry<ChunkWrapper, PlotBlock[][]> n = iter.next();
+                        final ChunkWrapper chunk = n.getKey();
+                        final PlotBlock[][] blocks = n.getValue();
+                        final int X = chunk.x << 4;
+                        final int Z = chunk.z << 4;
+                        final String world = chunk.world;
+                        if (slow)
+                        {
                             boolean once = false;
-                            for (int j = 0; j < blocks.length; j++) {
-                                PlotBlock[] blocksj = blocks[j];
-                                if (blocksj != null) {
-                                    long start = System.currentTimeMillis();
-                                    for (int k = 0; k < blocksj.length; k++) {
-                                        if (once && (System.currentTimeMillis() - start > allocate)) {
+                            for (int j = 0; j < blocks.length; j++)
+                            {
+                                final PlotBlock[] blocksj = blocks[j];
+                                if (blocksj != null)
+                                {
+                                    final long start = System.currentTimeMillis();
+                                    for (int k = 0; k < blocksj.length; k++)
+                                    {
+                                        if (once && ((System.currentTimeMillis() - start) > allocate))
+                                        {
                                             SetBlockQueue.blocks.put(n.getKey(), blocks);
                                             return;
                                         }
-                                        PlotBlock block = blocksj[k];
-                                        if (block != null) {
-                                            int x = MainUtil.x_loc[j][k];
-                                            int y = MainUtil.y_loc[j][k];
-                                            int z = MainUtil.z_loc[j][k];
+                                        final PlotBlock block = blocksj[k];
+                                        if (block != null)
+                                        {
+                                            final int x = MainUtil.x_loc[j][k];
+                                            final int y = MainUtil.y_loc[j][k];
+                                            final int z = MainUtil.z_loc[j][k];
                                             BlockManager.manager.functionSetBlock(world, X + x, y, Z + z, block.id, block.data);
                                             blocks[j][k] = null;
                                             once = true;
@@ -155,15 +186,19 @@ public class SetBlockQueue {
                             return;
                         }
                         SetBlockQueue.blocks.remove(n.getKey());
-                        for (int j = 0; j < blocks.length; j++) {
-                            PlotBlock[] blocksj = blocks[j];
-                            if (blocksj != null) {
-                                for (int k = 0; k < blocksj.length; k++) {
-                                    PlotBlock block = blocksj[k];
-                                    if (block != null) {
-                                        int x = MainUtil.x_loc[j][k];
-                                        int y = MainUtil.y_loc[j][k];
-                                        int z = MainUtil.z_loc[j][k];
+                        for (int j = 0; j < blocks.length; j++)
+                        {
+                            final PlotBlock[] blocksj = blocks[j];
+                            if (blocksj != null)
+                            {
+                                for (int k = 0; k < blocksj.length; k++)
+                                {
+                                    final PlotBlock block = blocksj[k];
+                                    if (block != null)
+                                    {
+                                        final int x = MainUtil.x_loc[j][k];
+                                        final int y = MainUtil.y_loc[j][k];
+                                        final int z = MainUtil.z_loc[j][k];
                                         BlockManager.manager.functionSetBlock(world, X + x, y, Z + z, block.id, block.data);
                                     }
                                 }
@@ -176,159 +211,187 @@ public class SetBlockQueue {
             running = true;
         }
     }
-    
-    public static void setChunk(final String world, ChunkLoc loc, PlotBlock[][] result) {
+
+    public static void setChunk(final String world, final ChunkLoc loc, final PlotBlock[][] result)
+    {
         locked = true;
-        if (!running) {
+        if (!running)
+        {
             init();
         }
-        ChunkWrapper wrap = new ChunkWrapper(world, loc.x, loc.z);
+        final ChunkWrapper wrap = new ChunkWrapper(world, loc.x, loc.z);
         blocks.put(wrap, result);
         locked = false;
     }
 
-    public static void setBlock(final String world, int x, final int y, int z, final PlotBlock block) {
+    public static void setBlock(final String world, int x, final int y, int z, final PlotBlock block)
+    {
         locked = true;
-        if (!running) {
+        if (!running)
+        {
             init();
         }
-        int X = x >> 4;
-        int Z = z >> 4;
+        final int X = x >> 4;
+        final int Z = z >> 4;
         x -= X << 4;
         z -= Z << 4;
 
-        ChunkWrapper wrap = new ChunkWrapper(world, X, Z);
+        final ChunkWrapper wrap = new ChunkWrapper(world, X, Z);
         PlotBlock[][] result;
         result = blocks.get(wrap);
-        if (!blocks.containsKey(wrap)) {
+        if (!blocks.containsKey(wrap))
+        {
             result = new PlotBlock[16][];
             blocks.put(wrap, result);
         }
-        if ((y > 255) || (y < 0)) {
+        if ((y > 255) || (y < 0))
+        {
             locked = false;
             return;
         }
-        if (result[y >> 4] == null) {
+        if (result[y >> 4] == null)
+        {
             result[y >> 4] = new PlotBlock[4096];
         }
         result[y >> 4][((y & 0xF) << 8) | (z << 4) | x] = block;
         locked = false;
     }
-    
-    public static void setData(final String world, int x, final int y, int z, final byte data) {
+
+    public static void setData(final String world, int x, final int y, int z, final byte data)
+    {
         locked = true;
-        if (!running) {
+        if (!running)
+        {
             init();
         }
-        int X = x >> 4;
-        int Z = z >> 4;
+        final int X = x >> 4;
+        final int Z = z >> 4;
         x -= X << 4;
         z -= Z << 4;
-        ChunkWrapper wrap = new ChunkWrapper(world, X, Z);
+        final ChunkWrapper wrap = new ChunkWrapper(world, X, Z);
         PlotBlock[][] result;
         result = blocks.get(wrap);
-        if (result == null) {
-            if (blocks == null) {
+        if (result == null)
+        {
+            if (blocks == null)
+            {
                 init();
             }
             result = new PlotBlock[16][];
             blocks.put(wrap, result);
         }
-        if ((y > 255) || (y < 0)) {
+        if ((y > 255) || (y < 0))
+        {
             locked = false;
             return;
         }
-        if (result[y >> 4] == null) {
+        if (result[y >> 4] == null)
+        {
             result[y >> 4] = new PlotBlock[4096];
         }
         result[y >> 4][((y & 0xF) << 8) | (z << 4) | x] = new PlotBlock((short) -1, data);
         locked = false;
     }
-    
-    public static void setBlock(final String world, int x, final int y, int z, final int id) {
+
+    public static void setBlock(final String world, int x, final int y, int z, final int id)
+    {
         locked = true;
-        if (!running) {
+        if (!running)
+        {
             init();
         }
-        int X = x >> 4;
-        int Z = z >> 4;
+        final int X = x >> 4;
+        final int Z = z >> 4;
         x -= X << 4;
         z -= Z << 4;
-        ChunkWrapper wrap = new ChunkWrapper(world, X, Z);
+        final ChunkWrapper wrap = new ChunkWrapper(world, X, Z);
         PlotBlock[][] result;
         result = blocks.get(wrap);
-        if (result == null) {
-            if (blocks == null) {
+        if (result == null)
+        {
+            if (blocks == null)
+            {
                 init();
             }
             result = new PlotBlock[16][];
             blocks.put(wrap, result);
         }
-        if ((y > 255) || (y < 0)) {
+        if ((y > 255) || (y < 0))
+        {
             locked = false;
             return;
         }
-        if (result[y >> 4] == null) {
+        if (result[y >> 4] == null)
+        {
             result[y >> 4] = new PlotBlock[4096];
         }
-        if (id == lastInt) {
+        if (id == lastInt)
+        {
             result[y >> 4][((y & 0xF) << 8) | (z << 4) | x] = lastBlock;
         }
-        else {
+        else
+        {
             lastInt = id;
             lastBlock = new PlotBlock((short) id, (byte) 0);
         }
         result[y >> 4][((y & 0xF) << 8) | (z << 4) | x] = lastBlock;
         locked = false;
     }
-    
-    public static class ChunkWrapper {
-        public final int x; 
+
+    public static class ChunkWrapper
+    {
+        public final int x;
         public final int z;
         public final String world;
-        
-        public ChunkWrapper(String world, int x, int z) {
+
+        public ChunkWrapper(final String world, final int x, final int z)
+        {
             this.world = world;
             this.x = x;
             this.z = z;
         }
-        
+
         @Override
-        public int hashCode() {
+        public int hashCode()
+        {
             int result;
-            if (this.x >= 0) {
-                if (this.z >= 0) {
-                    result = (this.x * this.x) + (3 * this.x) + (2 * this.x * this.z) + this.z + (this.z * this.z);
-                } else {
-                    final int y1 = -this.z;
-                    result = (this.x * this.x) + (3 * this.x) + (2 * this.x * y1) + y1 + (y1 * y1) + 1;
+            if (x >= 0)
+            {
+                if (z >= 0)
+                {
+                    result = (x * x) + (3 * x) + (2 * x * z) + z + (z * z);
                 }
-            } else {
-                final int x1 = -this.x;
-                if (this.z >= 0) {
-                    result = -((x1 * x1) + (3 * x1) + (2 * x1 * this.z) + this.z + (this.z * this.z));
-                } else {
-                    final int y1 = -this.z;
+                else
+                {
+                    final int y1 = -z;
+                    result = (x * x) + (3 * x) + (2 * x * y1) + y1 + (y1 * y1) + 1;
+                }
+            }
+            else
+            {
+                final int x1 = -x;
+                if (z >= 0)
+                {
+                    result = -((x1 * x1) + (3 * x1) + (2 * x1 * z) + z + (z * z));
+                }
+                else
+                {
+                    final int y1 = -z;
                     result = -((x1 * x1) + (3 * x1) + (2 * x1 * y1) + y1 + (y1 * y1) + 1);
                 }
             }
-            result = result * 31 + world.hashCode();
+            result = (result * 31) + world.hashCode();
             return result;
         }
-        
+
         @Override
-        public boolean equals(Object obj) {
-            if (this == obj) {
-                return true;
-            }
-            if (obj == null) {
-                return false;
-            }
-            if (getClass() != obj.getClass()) {
-                return false;
-            }
+        public boolean equals(final Object obj)
+        {
+            if (this == obj) { return true; }
+            if (obj == null) { return false; }
+            if (getClass() != obj.getClass()) { return false; }
             final ChunkWrapper other = (ChunkWrapper) obj;
-            return ((this.x == other.x) && (this.z == other.z) && (this.world.equals(other.world)));
+            return ((x == other.x) && (z == other.z) && (world.equals(other.world)));
         }
     }
 }
diff --git a/src/main/java/com/intellectualcrafters/plot/util/SetupUtils.java b/src/main/java/com/intellectualcrafters/plot/util/SetupUtils.java
index 9ba08a12a..cbe8e1591 100644
--- a/src/main/java/com/intellectualcrafters/plot/util/SetupUtils.java
+++ b/src/main/java/com/intellectualcrafters/plot/util/SetupUtils.java
@@ -8,18 +8,19 @@ import com.intellectualcrafters.plot.object.PlotCluster;
 import com.intellectualcrafters.plot.object.PlotWorld;
 import com.intellectualcrafters.plot.object.SetupObject;
 
-public abstract class SetupUtils {
+public abstract class SetupUtils
+{
 
     public static SetupUtils manager;
-    
+
     public final static Map<String, SetupObject> setupMap = new HashMap<>();
     public static HashMap<String, PlotGenerator<?>> generators = new HashMap<>();
 
     public abstract void updateGenerators();
 
-    public abstract String getGenerator(PlotWorld plotworld);
-    
+    public abstract String getGenerator(final PlotWorld plotworld);
+
     public abstract String setupWorld(final SetupObject object);
 
-    public abstract void removePopulator(String world, PlotCluster cluster);
+    public abstract void removePopulator(final String world, final PlotCluster cluster);
 }
diff --git a/src/main/java/com/intellectualcrafters/plot/util/StringComparison.java b/src/main/java/com/intellectualcrafters/plot/util/StringComparison.java
index 9bf3ab67f..588333075 100644
--- a/src/main/java/com/intellectualcrafters/plot/util/StringComparison.java
+++ b/src/main/java/com/intellectualcrafters/plot/util/StringComparison.java
@@ -1,174 +1,192 @@
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// PlotSquared - A plot manager and world generator for the Bukkit API                             /
-// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
-//                                                                                                 /
-// This program is free software; you can redistribute it and/or modify                            /
-// it under the terms of the GNU General Public License as published by                            /
-// the Free Software Foundation; either version 3 of the License, or                               /
-// (at your option) any later version.                                                             /
-//                                                                                                 /
-// This program is distributed in the hope that it will be useful,                                 /
-// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
-// GNU General Public License for more details.                                                    /
-//                                                                                                 /
-// You should have received a copy of the GNU General Public License                               /
-// along with this program; if not, write to the Free Software Foundation,                         /
-// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
-//                                                                                                 /
-// You can contact us via: support@intellectualsites.com                                           /
-////////////////////////////////////////////////////////////////////////////////////////////////////
-package com.intellectualcrafters.plot.util;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-
-/**
- * String comparison library
- *
- * @author Citymonstret
- * @author Empire92
- */
-@SuppressWarnings("unused")
-public class StringComparison<T> {
-
-    private T bestMatch;
-    private double match = Integer.MAX_VALUE;
-    private T bestMatchObject;
-
-    /**
-     * Constructor
-     *
-     * @param input   Input Base Value
-     * @param objects Objects to compare
-     */
-    public StringComparison(String input, final T[] objects) {
-        init(input, objects);
-    }
-    
-    public StringComparison(String input, final Collection<T> objects) {
-        init(input, (T[]) objects.toArray());
-    }
-    
-    /**
-     * You should call init(...) when you are ready to get a String comparison value
-     */
-    public StringComparison() {}
-    
-    public void init(String input, final T[] objects) {
-        int c;
-        this.bestMatch = objects[0];
-        this.bestMatchObject = objects[0];
-        input = input.toLowerCase();
-        for (final T o : objects) {
-            if ((c = compare(input, getString(o).toLowerCase())) < this.match) {
-                this.match = c;
-                this.bestMatch = o;
-                this.bestMatchObject = o;
-            }
-        }
-    }
-    
-    public String getString(T o) {
-        return o.toString();
-    }
-
-    /**
-     * Compare two strings
-     *
-     * @param s1 String Base
-     * @param s2 Object
-     *
-     * @return match
-     */
-    public static int compare(final String s1, final String s2) {
-        int distance = StringMan.getLevenshteinDistance(s1, s2);
-        if (s2.contains(s1)) {
-            distance -= (Math.min(s1.length(), s2.length()));
-        }
-        if (s2.startsWith(s1)) {
-            distance -= 4;
-        }
-        return distance;
-    }
-
-    /**
-     * Create an ArrayList containing pairs of letters
-     *
-     * @param s string to split
-     *
-     * @return ArrayList
-     */
-    public static ArrayList<String> wLetterPair(final String s) {
-        final ArrayList<String> aPairs = new ArrayList<>();
-        final String[] wo = s.split("\\s");
-        for (final String aWo : wo) {
-            final String[] po = sLetterPair(aWo);
-            Collections.addAll(aPairs, po);
-        }
-        return aPairs;
-    }
-
-    /**
-     * Get an array containing letter pairs
-     *
-     * @param s string to split
-     *
-     * @return Array
-     */
-    public static String[] sLetterPair(final String s) {
-        final int numPair = s.length() - 1;
-        final String[] p = new String[numPair];
-        for (int i = 0; i < numPair; i++) {
-            p[i] = s.substring(i, i + 2);
-        }
-        return p;
-    }
-
-    /**
-     * Get the object
-     *
-     * @return match object
-     */
-    public T getMatchObject() {
-        return this.bestMatchObject;
-    }
-
-    /**
-     * Get the best match value
-     *
-     * @return match value
-     */
-    public String getBestMatch() {
-        return getString(this.bestMatch);
-    }
-
-    /**
-     * Will return both the match number, and the actual match string
-     *
-     * @return object[] containing: double, String
-     */
-    public ComparisonResult getBestMatchAdvanced() {
-        return new ComparisonResult(this.match, this.bestMatch);
-    }
-
-    /**
-     * The comparison result
-     */
-    public class ComparisonResult {
-
-        public final T best;
-        public final double match;
-
-        /**
-         * The constructor
-         * @param match Match value
-         * @param best Best Match
-         */
-        public ComparisonResult(final double match, final T best) {
-            this.match = match;
-            this.best = best;
-        }
-    }
-}
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// PlotSquared - A plot manager and world generator for the Bukkit API                             /
+// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
+//                                                                                                 /
+// This program is free software; you can redistribute it and/or modify                            /
+// it under the terms of the GNU General Public License as published by                            /
+// the Free Software Foundation; either version 3 of the License, or                               /
+// (at your option) any later version.                                                             /
+//                                                                                                 /
+// This program is distributed in the hope that it will be useful,                                 /
+// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
+// GNU General Public License for more details.                                                    /
+//                                                                                                 /
+// You should have received a copy of the GNU General Public License                               /
+// along with this program; if not, write to the Free Software Foundation,                         /
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
+//                                                                                                 /
+// You can contact us via: support@intellectualsites.com                                           /
+////////////////////////////////////////////////////////////////////////////////////////////////////
+package com.intellectualcrafters.plot.util;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+
+/**
+ * String comparison library
+ *


+ */
+@SuppressWarnings("unused")
+public class StringComparison<T>
+{
+
+    private T bestMatch;
+    private double match = Integer.MAX_VALUE;
+    private T bestMatchObject;
+
+    /**
+     * Constructor
+     *
+     * @param input   Input Base Value
+     * @param objects Objects to compare
+     */
+    public StringComparison(final String input, final T[] objects)
+    {
+        init(input, objects);
+    }
+
+    public StringComparison(final String input, final Collection<T> objects)
+    {
+        init(input, (T[]) objects.toArray());
+    }
+
+    /**
+     * You should call init(...) when you are ready to get a String comparison value
+     */
+    public StringComparison()
+    {}
+
+    public void init(String input, final T[] objects)
+    {
+        int c;
+        this.bestMatch = objects[0];
+        this.bestMatchObject = objects[0];
+        input = input.toLowerCase();
+        for (final T o : objects)
+        {
+            if ((c = compare(input, getString(o).toLowerCase())) < this.match)
+            {
+                this.match = c;
+                this.bestMatch = o;
+                this.bestMatchObject = o;
+            }
+        }
+    }
+
+    public String getString(final T o)
+    {
+        return o.toString();
+    }
+
+    /**
+     * Compare two strings
+     *
+     * @param s1 String Base
+     * @param s2 Object
+     *
+     * @return match
+     */
+    public static int compare(final String s1, final String s2)
+    {
+        int distance = StringMan.getLevenshteinDistance(s1, s2);
+        if (s2.contains(s1))
+        {
+            distance -= (Math.min(s1.length(), s2.length()));
+        }
+        if (s2.startsWith(s1))
+        {
+            distance -= 4;
+        }
+        return distance;
+    }
+
+    /**
+     * Create an ArrayList containing pairs of letters
+     *
+     * @param s string to split
+     *
+     * @return ArrayList
+     */
+    public static ArrayList<String> wLetterPair(final String s)
+    {
+        final ArrayList<String> aPairs = new ArrayList<>();
+        final String[] wo = s.split("\\s");
+        for (final String aWo : wo)
+        {
+            final String[] po = sLetterPair(aWo);
+            Collections.addAll(aPairs, po);
+        }
+        return aPairs;
+    }
+
+    /**
+     * Get an array containing letter pairs
+     *
+     * @param s string to split
+     *
+     * @return Array
+     */
+    public static String[] sLetterPair(final String s)
+    {
+        final int numPair = s.length() - 1;
+        final String[] p = new String[numPair];
+        for (int i = 0; i < numPair; i++)
+        {
+            p[i] = s.substring(i, i + 2);
+        }
+        return p;
+    }
+
+    /**
+     * Get the object
+     *
+     * @return match object
+     */
+    public T getMatchObject()
+    {
+        return this.bestMatchObject;
+    }
+
+    /**
+     * Get the best match value
+     *
+     * @return match value
+     */
+    public String getBestMatch()
+    {
+        return getString(this.bestMatch);
+    }
+
+    /**
+     * Will return both the match number, and the actual match string
+     *
+     * @return object[] containing: double, String
+     */
+    public ComparisonResult getBestMatchAdvanced()
+    {
+        return new ComparisonResult(this.match, this.bestMatch);
+    }
+
+    /**
+     * The comparison result
+     */
+    public class ComparisonResult
+    {
+
+        public final T best;
+        public final double match;
+
+        /**
+         * The constructor
+         * @param match Match value
+         * @param best Best Match
+         */
+        public ComparisonResult(final double match, final T best)
+        {
+            this.match = match;
+            this.best = best;
+        }
+    }
+}
diff --git a/src/main/java/com/intellectualcrafters/plot/util/StringMan.java b/src/main/java/com/intellectualcrafters/plot/util/StringMan.java
index d84434b0f..71c927066 100644
--- a/src/main/java/com/intellectualcrafters/plot/util/StringMan.java
+++ b/src/main/java/com/intellectualcrafters/plot/util/StringMan.java
@@ -4,24 +4,28 @@ import java.lang.reflect.Array;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Comparator;
-import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
-public class StringMan {
-    public static String replaceFromMap(String string, Map<String, String> replacements) {
-        StringBuilder sb = new StringBuilder(string);
+public class StringMan
+{
+    public static String replaceFromMap(final String string, final Map<String, String> replacements)
+    {
+        final StringBuilder sb = new StringBuilder(string);
         int size = string.length();
-        for (Entry<String, String> entry : replacements.entrySet()) {
-            if (size == 0) {
+        for (final Entry<String, String> entry : replacements.entrySet())
+        {
+            if (size == 0)
+            {
                 break;
             }
-            String key = entry.getKey();
-            String value = entry.getValue();
+            final String key = entry.getKey();
+            final String value = entry.getValue();
             int start = sb.indexOf(key, 0);
-            while (start > -1) {
-                int end = start + key.length();
-                int nextSearchStart = start + value.length();
+            while (start > -1)
+            {
+                final int end = start + key.length();
+                final int nextSearchStart = start + value.length();
                 sb.replace(start, end, value);
                 size -= end - start;
                 start = sb.indexOf(key, nextSearchStart);
@@ -29,175 +33,193 @@ public class StringMan {
         }
         return sb.toString();
     }
-    
-    public static String getString(Object obj) {
-        if (obj == null) {
-            return "null";
-        }
-        if (obj.getClass() == String.class) {
-            return (String) obj;
-        }
-        if (obj.getClass().isArray()) {
+
+    public static String getString(final Object obj)
+    {
+        if (obj == null) { return "null"; }
+        if (obj.getClass() == String.class) { return (String) obj; }
+        if (obj.getClass().isArray())
+        {
             String result = "";
             String prefix = "";
-            
-            for(int i=0; i<Array.getLength(obj); i++){
+
+            for (int i = 0; i < Array.getLength(obj); i++)
+            {
                 result += prefix + getString(Array.get(obj, i));
                 prefix = ",";
             }
             return "( " + result + " )";
         }
-        else if (obj instanceof Collection<?>) {
+        else if (obj instanceof Collection<?>)
+        {
             String result = "";
             String prefix = "";
-            for (Object element : (Collection<?>) obj) {
+            for (final Object element : (Collection<?>) obj)
+            {
                 result += prefix + getString(element);
                 prefix = ",";
             }
             return "[ " + result + " ]";
         }
-        else {
+        else
+        {
             return obj.toString();
         }
     }
-    
-    public static String replaceFirst(char c, String s) {
-        if (s == null) {
-            return "";
-        }
-        if (s.isEmpty()) {
-            return s;
-        }
+
+    public static String replaceFirst(final char c, final String s)
+    {
+        if (s == null) { return ""; }
+        if (s.isEmpty()) { return s; }
         char[] chars = s.toCharArray();
-        char[] newChars = new char[chars.length];
+        final char[] newChars = new char[chars.length];
         int used = 0;
         boolean found = false;
-        for (char cc : chars) {
-            if (!found && c == cc) {
+        for (final char cc : chars)
+        {
+            if (!found && (c == cc))
+            {
                 found = true;
-            } else {
+            }
+            else
+            {
                 newChars[used++] = cc;
             }
         }
-        if (found) {
+        if (found)
+        {
             chars = new char[newChars.length - 1];
             System.arraycopy(newChars, 0, chars, 0, chars.length);
             return String.valueOf(chars);
         }
         return s;
     }
-    
-    public static String replaceAll(String string, Object... pairs) {
-        StringBuilder sb = new StringBuilder(string);
-        for (int i = 0; i < pairs.length; i+=2) {
-            String key = pairs[i] + "";
-            String value = pairs[i + 1] + "";
+
+    public static String replaceAll(final String string, final Object... pairs)
+    {
+        final StringBuilder sb = new StringBuilder(string);
+        for (int i = 0; i < pairs.length; i += 2)
+        {
+            final String key = pairs[i] + "";
+            final String value = pairs[i + 1] + "";
             int start = sb.indexOf(key, 0);
-            while (start > -1) {
-                int end = start + key.length();
-                int nextSearchStart = start + value.length();
+            while (start > -1)
+            {
+                final int end = start + key.length();
+                final int nextSearchStart = start + value.length();
                 sb.replace(start, end, value);
                 start = sb.indexOf(key, nextSearchStart);
             }
         }
         return sb.toString();
     }
-    
-    public static boolean isAlphanumeric(String str) {
-        for (int i=0; i<str.length(); i++) {
-            char c = str.charAt(i);
-            if (c < 0x30 || (c >= 0x3a && c <= 0x40) || (c > 0x5a && c <= 0x60) || c > 0x7a) {
-                return false;
-            }
+
+    public static boolean isAlphanumeric(final String str)
+    {
+        for (int i = 0; i < str.length(); i++)
+        {
+            final char c = str.charAt(i);
+            if ((c < 0x30) || ((c >= 0x3a) && (c <= 0x40)) || ((c > 0x5a) && (c <= 0x60)) || (c > 0x7a)) { return false; }
         }
         return true;
     }
-    
-    public static boolean isAlphanumericUnd(String str) {
-        for (int i=0; i<str.length(); i++) {
-            char c = str.charAt(i);
-            if (c < 0x30 || (c >= 0x3a && c <= 0x40) || (c > 0x5a && c <= 0x60) || c > 0x7a || c == '_') {
-                return false;
-            }
+
+    public static boolean isAlphanumericUnd(final String str)
+    {
+        for (int i = 0; i < str.length(); i++)
+        {
+            final char c = str.charAt(i);
+            if ((c < 0x30) || ((c >= 0x3a) && (c <= 0x40)) || ((c > 0x5a) && (c <= 0x60)) || (c > 0x7a) || (c == '_')) { return false; }
         }
         return true;
     }
-    
-    public static boolean isAlpha(String str) {
-        for (int i=0; i<str.length(); i++) {
-            char c = str.charAt(i);
-            if ((c <= 0x40) || (c > 0x5a && c <= 0x60) || c > 0x7a) {
-                return false;
-            }
+
+    public static boolean isAlpha(final String str)
+    {
+        for (int i = 0; i < str.length(); i++)
+        {
+            final char c = str.charAt(i);
+            if ((c <= 0x40) || ((c > 0x5a) && (c <= 0x60)) || (c > 0x7a)) { return false; }
         }
         return true;
     }
-    
-    public static String join(Collection<?> collection, String delimiter) {
+
+    public static String join(final Collection<?> collection, final String delimiter)
+    {
         return join(collection.toArray(), delimiter);
     }
-    
-    public static String joinOrdered(Collection<?> collection, String delimiter) {
-        Object[] array = collection.toArray();
-        Arrays.sort(array, new Comparator<Object>() {
+
+    public static String joinOrdered(final Collection<?> collection, final String delimiter)
+    {
+        final Object[] array = collection.toArray();
+        Arrays.sort(array, new Comparator<Object>()
+        {
             @Override
-            public int compare(Object a, Object b) {
+            public int compare(final Object a, final Object b)
+            {
                 return a.hashCode() - b.hashCode();
             }
-            
+
         });
         return join(array, delimiter);
     }
-    
-    public static String join(Collection<?> collection, char delimiter) {
+
+    public static String join(final Collection<?> collection, final char delimiter)
+    {
         return join(collection.toArray(), delimiter + "");
     }
-    
-    public static boolean isAsciiPrintable(char c) {
+
+    public static boolean isAsciiPrintable(final char c)
+    {
         return (c >= ' ') && (c < '');
     }
-    
-    public static boolean isAsciiPrintable(String s) {
-        for (char c: s.toCharArray()) {
-            if (!isAsciiPrintable(c)) {
-                return false;
-            }
+
+    public static boolean isAsciiPrintable(final String s)
+    {
+        for (final char c : s.toCharArray())
+        {
+            if (!isAsciiPrintable(c)) { return false; }
         }
         return true;
     }
-    
-    public static int getLevenshteinDistance(String s, String t) {
+
+    public static int getLevenshteinDistance(String s, String t)
+    {
         int n = s.length();
         int m = t.length();
-        if (n == 0) {
+        if (n == 0)
+        {
             return m;
-        } else if (m == 0) {
-            return n;
         }
-        if (n > m) {
-            String tmp = s;
+        else if (m == 0) { return n; }
+        if (n > m)
+        {
+            final String tmp = s;
             s = t;
             t = tmp;
             n = m;
             m = t.length();
         }
-        int p[] = new int[n+1];
-        int d[] = new int[n+1];
+        int p[] = new int[n + 1];
+        int d[] = new int[n + 1];
         int _d[];
         int i;
         int j;
         char t_j;
         int cost;
-        for (i = 0; i<=n; i++) {
+        for (i = 0; i <= n; i++)
+        {
             p[i] = i;
         }
-        for (j = 1; j<=m; j++) {
-            t_j = t.charAt(j-1);
+        for (j = 1; j <= m; j++)
+        {
+            t_j = t.charAt(j - 1);
             d[0] = j;
 
-            for (i=1; i<=n; i++) {
-                cost = s.charAt(i-1)==t_j ? 0 : 1;
-                d[i] = Math.min(Math.min(d[i-1]+1, p[i]+1),  p[i-1]+cost);
+            for (i = 1; i <= n; i++)
+            {
+                cost = s.charAt(i - 1) == t_j ? 0 : 1;
+                d[i] = Math.min(Math.min(d[i - 1] + 1, p[i] + 1), p[i - 1] + cost);
             }
             _d = p;
             p = d;
@@ -205,53 +227,64 @@ public class StringMan {
         }
         return p[n];
     }
-    
-    public static String join(Object[] array, String delimiter) {
-        StringBuilder result = new StringBuilder();
-        for (int i = 0, j = array.length; i < j; i++) {
-            if (i > 0) {
+
+    public static String join(final Object[] array, final String delimiter)
+    {
+        final StringBuilder result = new StringBuilder();
+        for (int i = 0, j = array.length; i < j; i++)
+        {
+            if (i > 0)
+            {
                 result.append(delimiter);
             }
             result.append(array[i]);
         }
         return result.toString();
     }
-    
-    public static String join(int[] array, String delimiter) {
-        Integer[] wrapped = new Integer[array.length];
-        for (int i = 0; i < array.length; i++) wrapped[i] = array[i];
+
+    public static String join(final int[] array, final String delimiter)
+    {
+        final Integer[] wrapped = new Integer[array.length];
+        for (int i = 0; i < array.length; i++)
+        {
+            wrapped[i] = array[i];
+        }
         return join(wrapped, delimiter);
     }
-    
-    public static boolean isEqualToAny(String a, String... args) {
-        for (String arg : args) {
-            if (StringMan.isEqual(a, arg)) {
-                return true;
-            }
+
+    public static boolean isEqualToAny(final String a, final String... args)
+    {
+        for (final String arg : args)
+        {
+            if (StringMan.isEqual(a, arg)) { return true; }
         }
         return false;
     }
-    
-    public static boolean isEqualIgnoreCaseToAny(String a, String... args) {
-        for (String arg : args) {
-            if (StringMan.isEqualIgnoreCase(a, arg)) {
-                return true;
-            }
-        }
-        return false;
-    }
-    
-    public static boolean isEqual(String a, String b) {
-        return (a == b || (a != null && b != null && a.length() == b.length() && a.hashCode() == b.hashCode() && a.equals(b)));
-    }
-    
-    public static boolean isEqualIgnoreCase(String a, String b) {
-        return (a == b || (a != null && b != null && a.length() == b.length() && a.equalsIgnoreCase(b)));
-    }
 
-    public static String repeat(String s, int n) {
+    public static boolean isEqualIgnoreCaseToAny(final String a, final String... args)
+    {
+        for (final String arg : args)
+        {
+            if (StringMan.isEqualIgnoreCase(a, arg)) { return true; }
+        }
+        return false;
+    }
+
+    public static boolean isEqual(final String a, final String b)
+    {
+        return ((a == b) || ((a != null) && (b != null) && (a.length() == b.length()) && (a.hashCode() == b.hashCode()) && a.equals(b)));
+    }
+
+    public static boolean isEqualIgnoreCase(final String a, final String b)
+    {
+        return ((a == b) || ((a != null) && (b != null) && (a.length() == b.length()) && a.equalsIgnoreCase(b)));
+    }
+
+    public static String repeat(final String s, final int n)
+    {
         final StringBuilder sb = new StringBuilder();
-        for(int i = 0; i < n; i++) {
+        for (int i = 0; i < n; i++)
+        {
             sb.append(s);
         }
         return sb.toString();
diff --git a/src/main/java/com/intellectualcrafters/plot/util/TaskManager.java b/src/main/java/com/intellectualcrafters/plot/util/TaskManager.java
index 4041ba454..6f027c247 100644
--- a/src/main/java/com/intellectualcrafters/plot/util/TaskManager.java
+++ b/src/main/java/com/intellectualcrafters/plot/util/TaskManager.java
@@ -6,35 +6,39 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 import com.intellectualcrafters.plot.PS;
 
-public abstract class TaskManager {
+public abstract class TaskManager
+{
     public static HashSet<String> TELEPORT_QUEUE = new HashSet<>();
-    
+
     public static AtomicInteger index = new AtomicInteger(0);
     public static HashMap<Integer, Integer> tasks = new HashMap<>();
 
-    public static int runTaskRepeat(final Runnable r, final int interval) {
-        if (r != null) {
-            if (PS.get().TASK == null) {
-                throw new IllegalArgumentException("disabled");
-            }
-            return PS.get().TASK.taskRepeat(r, interval);
-        }
-        return -1;
-    }
-    
-    public static int runTaskRepeatAsync(final Runnable r, final int interval) {
-        if (r != null) {
-            if (PS.get().TASK == null) {
-                throw new IllegalArgumentException("disabled");
-            }
+    public static int runTaskRepeat(final Runnable r, final int interval)
+    {
+        if (r != null)
+        {
+            if (PS.get().TASK == null) { throw new IllegalArgumentException("disabled"); }
             return PS.get().TASK.taskRepeat(r, interval);
         }
         return -1;
     }
 
-    public static void runTaskAsync(final Runnable r) {
-        if (r != null) {
-            if (PS.get().TASK == null) {
+    public static int runTaskRepeatAsync(final Runnable r, final int interval)
+    {
+        if (r != null)
+        {
+            if (PS.get().TASK == null) { throw new IllegalArgumentException("disabled"); }
+            return PS.get().TASK.taskRepeat(r, interval);
+        }
+        return -1;
+    }
+
+    public static void runTaskAsync(final Runnable r)
+    {
+        if (r != null)
+        {
+            if (PS.get().TASK == null)
+            {
                 r.run();
                 return;
             }
@@ -42,9 +46,12 @@ public abstract class TaskManager {
         }
     }
 
-    public static void runTask(final Runnable r) {
-        if (r != null) {
-            if (PS.get().TASK == null) {
+    public static void runTask(final Runnable r)
+    {
+        if (r != null)
+        {
+            if (PS.get().TASK == null)
+            {
                 r.run();
                 return;
             }
@@ -57,9 +64,12 @@ public abstract class TaskManager {
      * @param r
      * @param delay
      */
-    public static void runTaskLater(final Runnable r, final int delay) {
-        if (r != null) {
-            if (PS.get().TASK == null) {
+    public static void runTaskLater(final Runnable r, final int delay)
+    {
+        if (r != null)
+        {
+            if (PS.get().TASK == null)
+            {
                 r.run();
                 return;
             }
@@ -67,9 +77,12 @@ public abstract class TaskManager {
         }
     }
 
-    public static void runTaskLaterAsync(final Runnable r, final int delay) {
-        if (r != null) {
-            if (PS.get().TASK == null) {
+    public static void runTaskLaterAsync(final Runnable r, final int delay)
+    {
+        if (r != null)
+        {
+            if (PS.get().TASK == null)
+            {
                 r.run();
                 return;
             }
@@ -77,17 +90,17 @@ public abstract class TaskManager {
         }
     }
 
-    public abstract int taskRepeat(final Runnable r, int interval);
-    
-    public abstract int taskRepeatAsync(final Runnable r, int interval);
+    public abstract int taskRepeat(final Runnable r, final int interval);
+
+    public abstract int taskRepeatAsync(final Runnable r, final int interval);
 
     public abstract void taskAsync(final Runnable r);
 
     public abstract void task(final Runnable r);
 
-    public abstract void taskLater(final Runnable r, int delay);
+    public abstract void taskLater(final Runnable r, final int delay);
 
-    public abstract void taskLaterAsync(final Runnable r, int delay);
+    public abstract void taskLaterAsync(final Runnable r, final int delay);
 
-    public abstract void cancelTask(int task);
+    public abstract void cancelTask(final int task);
 }
diff --git a/src/main/java/com/intellectualcrafters/plot/util/UUIDHandler.java b/src/main/java/com/intellectualcrafters/plot/util/UUIDHandler.java
index 318b47077..048e446c5 100644
--- a/src/main/java/com/intellectualcrafters/plot/util/UUIDHandler.java
+++ b/src/main/java/com/intellectualcrafters/plot/util/UUIDHandler.java
@@ -13,11 +13,13 @@ import com.intellectualcrafters.plot.object.RunnableVal;
 import com.intellectualcrafters.plot.object.StringWrapper;
 import com.intellectualcrafters.plot.uuid.UUIDWrapper;
 
-public class UUIDHandler {
+public class UUIDHandler
+{
 
     public static UUIDHandlerImplementation implementation;
 
-    public static void add(final StringWrapper name, final UUID uuid) {
+    public static void add(final StringWrapper name, final UUID uuid)
+    {
         implementation.add(name, uuid);
     }
 
@@ -28,7 +30,8 @@ public class UUIDHandler {
      *
      * @see com.google.common.collect.BiMap
      */
-    public static BiMap<StringWrapper, UUID> getUuidMap() {
+    public static BiMap<StringWrapper, UUID> getUuidMap()
+    {
         return implementation.getUUIDMap();
     }
 
@@ -41,7 +44,8 @@ public class UUIDHandler {
      *
      * @see com.google.common.collect.BiMap#containsValue(Object)
      */
-    public static boolean uuidExists(final UUID uuid) {
+    public static boolean uuidExists(final UUID uuid)
+    {
         return implementation.uuidExists(uuid);
     }
 
@@ -54,14 +58,18 @@ public class UUIDHandler {
      *
      * @see com.google.common.collect.BiMap#containsKey(Object)
      */
-    public static boolean nameExists(final StringWrapper name) {
+    public static boolean nameExists(final StringWrapper name)
+    {
         return implementation.nameExists(name);
     }
-    
-    public static HashSet<UUID> getAllUUIDS() {
-        HashSet<UUID> uuids = new HashSet<>();
-        for (Plot plot : PS.get().getPlotsRaw()) {
-            if (plot.owner != null) {
+
+    public static HashSet<UUID> getAllUUIDS()
+    {
+        final HashSet<UUID> uuids = new HashSet<>();
+        for (final Plot plot : PS.get().getPlotsRaw())
+        {
+            if (plot.owner != null)
+            {
                 uuids.add(plot.owner);
                 uuids.addAll(plot.getTrusted());
                 uuids.addAll(plot.getMembers());
@@ -71,55 +79,68 @@ public class UUIDHandler {
         return uuids;
     }
 
-    public static UUIDWrapper getUUIDWrapper() {
+    public static UUIDWrapper getUUIDWrapper()
+    {
         return implementation.getUUIDWrapper();
     }
 
-    public static void setUUIDWrapper(final UUIDWrapper wrapper) {
+    public static void setUUIDWrapper(final UUIDWrapper wrapper)
+    {
         implementation.setUUIDWrapper(wrapper);
     }
 
-    public static void startCaching(Runnable whenDone) {
+    public static void startCaching(final Runnable whenDone)
+    {
         implementation.startCaching(whenDone);
     }
 
-    public static void cache(final BiMap<StringWrapper, UUID> toAdd) {
+    public static void cache(final BiMap<StringWrapper, UUID> toAdd)
+    {
         implementation.add(toAdd);
     }
 
-    public static UUID getUUID(final PlotPlayer player) {
+    public static UUID getUUID(final PlotPlayer player)
+    {
         return implementation.getUUID(player);
     }
 
-    public static UUID getUUID(final OfflinePlotPlayer player) {
+    public static UUID getUUID(final OfflinePlotPlayer player)
+    {
         return implementation.getUUID(player);
     }
 
-    public static String getName(final UUID uuid) {
+    public static String getName(final UUID uuid)
+    {
         return implementation.getName(uuid);
     }
 
-    public static PlotPlayer getPlayer(final UUID uuid) {
+    public static PlotPlayer getPlayer(final UUID uuid)
+    {
         return implementation.getPlayer(uuid);
     }
 
-    public static PlotPlayer getPlayer(final String name) {
+    public static PlotPlayer getPlayer(final String name)
+    {
         return implementation.getPlayer(name);
     }
-    
-    public static UUID getUUID(final String name, RunnableVal<UUID> ifFetch) {
+
+    public static UUID getUUID(final String name, final RunnableVal<UUID> ifFetch)
+    {
         return implementation.getUUID(name, ifFetch);
     }
-    
-    public static UUID getCachedUUID(final String name, RunnableVal<UUID> ifFetch) {
+
+    public static UUID getCachedUUID(final String name, final RunnableVal<UUID> ifFetch)
+    {
         return implementation.getUUIDMap().get(new StringWrapper(name));
     }
 
-    public static Map<String, PlotPlayer> getPlayers() {
+    public static Map<String, PlotPlayer> getPlayers()
+    {
         return implementation.getPlayers();
     }
 
-    public static void handleShutdown() {
+    public static void handleShutdown()
+    {
         implementation.handleShutdown();
     }
 }
diff --git a/src/main/java/com/intellectualcrafters/plot/util/UUIDHandlerImplementation.java b/src/main/java/com/intellectualcrafters/plot/util/UUIDHandlerImplementation.java
index 3deb4f649..fdaec6481 100644
--- a/src/main/java/com/intellectualcrafters/plot/util/UUIDHandlerImplementation.java
+++ b/src/main/java/com/intellectualcrafters/plot/util/UUIDHandlerImplementation.java
@@ -20,62 +20,72 @@ import com.intellectualcrafters.plot.object.RunnableVal;
 import com.intellectualcrafters.plot.object.StringWrapper;
 import com.intellectualcrafters.plot.uuid.UUIDWrapper;
 
-public abstract class UUIDHandlerImplementation {
-    
+public abstract class UUIDHandlerImplementation
+{
+
     private BiMap<StringWrapper, UUID> uuidMap = HashBiMap.create(new HashMap<StringWrapper, UUID>());
     public boolean CACHED = false;
     public UUIDWrapper uuidWrapper = null;
     public final HashMap<String, PlotPlayer> players;
-    
-    public UUIDHandlerImplementation(UUIDWrapper wrapper) {
-        this.uuidWrapper = wrapper;
-        this.players = new HashMap<>();
+
+    public UUIDHandlerImplementation(final UUIDWrapper wrapper)
+    {
+        uuidWrapper = wrapper;
+        players = new HashMap<>();
     }
-    
+
     /**
      * If the UUID is not found, some commands can request to fetch the UUID when possible
      * @param player
      * @param ifFetch
      */
-    public abstract void fetchUUID(String name, RunnableVal<UUID> ifFetch);
-    
+    public abstract void fetchUUID(final String name, final RunnableVal<UUID> ifFetch);
+
     /**
      * Start UUID caching (this should be an async task)
      * Recommended to override this is you want to cache offline players
      */
-    public boolean startCaching(Runnable whenDone) {
-        if (CACHED) {
-            return false;
-        }
-        return this.CACHED = true;
+    public boolean startCaching(final Runnable whenDone)
+    {
+        if (CACHED) { return false; }
+        return CACHED = true;
     }
-    
-    public UUIDWrapper getUUIDWrapper() {
-        return this.uuidWrapper;
+
+    public UUIDWrapper getUUIDWrapper()
+    {
+        return uuidWrapper;
     }
-    
-    public void setUUIDWrapper(UUIDWrapper wrapper) {
-        this.uuidWrapper = wrapper;
+
+    public void setUUIDWrapper(final UUIDWrapper wrapper)
+    {
+        uuidWrapper = wrapper;
     }
-    
-    public void rename(UUID uuid, StringWrapper name) {
+
+    public void rename(final UUID uuid, final StringWrapper name)
+    {
         uuidMap.inverse().remove(uuid);
         uuidMap.put(name, uuid);
     }
-    
-    public void add(final BiMap<StringWrapper, UUID> toAdd) {
-        if (uuidMap.size() == 0) {
+
+    public void add(final BiMap<StringWrapper, UUID> toAdd)
+    {
+        if (uuidMap.size() == 0)
+        {
             uuidMap = toAdd;
         }
-        for (Map.Entry<StringWrapper, UUID> entry : toAdd.entrySet()) {
-            UUID uuid = entry.getValue();
-            StringWrapper name = entry.getKey();
-            if ((uuid == null) || (name == null)) {
+        for (final Map.Entry<StringWrapper, UUID> entry : toAdd.entrySet())
+        {
+            final UUID uuid = entry.getValue();
+            final StringWrapper name = entry.getKey();
+            if ((uuid == null) || (name == null))
+            {
                 continue;
             }
-            BiMap<UUID, StringWrapper> inverse = uuidMap.inverse();
-            if (inverse.containsKey(uuid)) {
-                if (uuidMap.containsKey(name)) {
+            final BiMap<UUID, StringWrapper> inverse = uuidMap.inverse();
+            if (inverse.containsKey(uuid))
+            {
+                if (uuidMap.containsKey(name))
+                {
                     continue;
                 }
                 rename(uuid, name);
@@ -85,41 +95,49 @@ public abstract class UUIDHandlerImplementation {
         }
         PS.debug(C.PREFIX.s() + "&6Cached a total of: " + uuidMap.size() + " UUIDs");
     }
-    
+
     public HashSet<UUID> unknown = new HashSet<>();
-    
-    public boolean add(final StringWrapper name, final UUID uuid) {
-        if ((uuid == null)) {
-            return false;
-        }
-        if (name == null) {
-            try {
+
+    public boolean add(final StringWrapper name, final UUID uuid)
+    {
+        if ((uuid == null)) { return false; }
+        if (name == null)
+        {
+            try
+            {
                 unknown.add(uuid);
             }
-            catch (Exception e) {
+            catch (final Exception e)
+            {
                 PS.log("&c(minor) Invalid UUID mapping: " + uuid);
                 e.printStackTrace();
             }
             return false;
         }
-        
+
         /*
          * lazy UUID conversion:
          *  - Useful if the person misconfigured the database, or settings before PlotMe conversion
          */
-        if (!Settings.OFFLINE_MODE) {
+        if (!Settings.OFFLINE_MODE)
+        {
             UUID offline = UUID.nameUUIDFromBytes(("OfflinePlayer:" + name.value).getBytes(Charsets.UTF_8));
-            if (!unknown.contains(offline) && !name.value.equals(name.value.toLowerCase())){
+            if (!unknown.contains(offline) && !name.value.equals(name.value.toLowerCase()))
+            {
                 offline = UUID.nameUUIDFromBytes(("OfflinePlayer:" + name.value).getBytes(Charsets.UTF_8));
-                if (!unknown.contains(offline)) {
+                if (!unknown.contains(offline))
+                {
                     offline = null;
                 }
             }
-            if (offline != null) {
+            if (offline != null)
+            {
                 unknown.remove(offline);
-                Set<Plot> plots = PS.get().getPlots(offline);
-                if (plots.size() > 0) {
-                    for (Plot plot : PS.get().getPlots(offline)) {
+                final Set<Plot> plots = PS.get().getPlots(offline);
+                if (plots.size() > 0)
+                {
+                    for (final Plot plot : PS.get().getPlots(offline))
+                    {
                         plot.owner = uuid;
                     }
                     DBFunc.replaceUUID(offline, uuid);
@@ -129,12 +147,16 @@ public abstract class UUIDHandlerImplementation {
                 }
             }
         }
-        try {
-            UUID offline = uuidMap.put(name, uuid);
-            if (offline != null && !offline.equals(uuid)) {
-                Set<Plot> plots = PS.get().getPlots(offline);
-                if (plots.size() > 0) {
-                    for (Plot plot : PS.get().getPlots(offline)) {
+        try
+        {
+            final UUID offline = uuidMap.put(name, uuid);
+            if ((offline != null) && !offline.equals(uuid))
+            {
+                final Set<Plot> plots = PS.get().getPlots(offline);
+                if (plots.size() > 0)
+                {
+                    for (final Plot plot : PS.get().getPlots(offline))
+                    {
                         plot.owner = uuid;
                     }
                     DBFunc.replaceUUID(offline, uuid);
@@ -144,12 +166,12 @@ public abstract class UUIDHandlerImplementation {
                 }
             }
         }
-        catch (Exception e) {
-            BiMap<UUID, StringWrapper> inverse = uuidMap.inverse();
-            if (inverse.containsKey(uuid)) {
-                if (uuidMap.containsKey(name)) {
-                    return false;
-                }
+        catch (final Exception e)
+        {
+            final BiMap<UUID, StringWrapper> inverse = uuidMap.inverse();
+            if (inverse.containsKey(uuid))
+            {
+                if (uuidMap.containsKey(name)) { return false; }
                 rename(uuid, name);
                 return false;
             }
@@ -157,92 +179,92 @@ public abstract class UUIDHandlerImplementation {
         }
         return true;
     }
-    
-    public boolean uuidExists(final UUID uuid) {
+
+    public boolean uuidExists(final UUID uuid)
+    {
         return uuidMap.containsValue(uuid);
     }
-    
-    public BiMap<StringWrapper, UUID> getUUIDMap() {
+
+    public BiMap<StringWrapper, UUID> getUUIDMap()
+    {
         return uuidMap;
     }
-    
-    public boolean nameExists(final StringWrapper wrapper) {
+
+    public boolean nameExists(final StringWrapper wrapper)
+    {
         return uuidMap.containsKey(wrapper);
     }
-    
-    public void handleShutdown() {
+
+    public void handleShutdown()
+    {
         players.clear();
         uuidMap.clear();
         uuidWrapper = null;
     }
-    
-    public String getName(final UUID uuid) {
-        if (uuid == null) {
-            return null;
-        }
+
+    public String getName(final UUID uuid)
+    {
+        if (uuid == null) { return null; }
         // check online
         final PlotPlayer player = getPlayer(uuid);
-        if (player != null) {
-            return player.getName();
-        }
+        if (player != null) { return player.getName(); }
         // check cache
         final StringWrapper name = uuidMap.inverse().get(uuid);
-        if (name != null) {
-            return name.value;
-        }
+        if (name != null) { return name.value; }
         return null;
     }
-    
-    public UUID getUUID(final String name, RunnableVal<UUID> ifFetch) {
-        if ((name == null) || (name.length() == 0)) {
-            return null;
-        }
+
+    public UUID getUUID(final String name, final RunnableVal<UUID> ifFetch)
+    {
+        if ((name == null) || (name.length() == 0)) { return null; }
         // check online
         final PlotPlayer player = getPlayer(name);
-        if (player != null) {
-            return player.getUUID();
-        }
+        if (player != null) { return player.getUUID(); }
         // check cache
         final StringWrapper wrap = new StringWrapper(name);
         UUID uuid = uuidMap.get(wrap);
-        if (uuid != null) {
-            return uuid;
-        }
+        if (uuid != null) { return uuid; }
         // Read from disk OR convert directly to offline UUID
-        if (Settings.OFFLINE_MODE) {
+        if (Settings.OFFLINE_MODE)
+        {
             uuid = uuidWrapper.getUUID(name);
             add(new StringWrapper(name), uuid);
             return uuid;
         }
-        if (Settings.UUID_FROM_DISK && ifFetch != null) {
+        if (Settings.UUID_FROM_DISK && (ifFetch != null))
+        {
             fetchUUID(name, ifFetch);
             return null;
         }
         return null;
     }
-    
-    public UUID getUUID(final PlotPlayer player) {
+
+    public UUID getUUID(final PlotPlayer player)
+    {
         return uuidWrapper.getUUID(player);
     }
-    
-    public UUID getUUID(final OfflinePlotPlayer player) {
+
+    public UUID getUUID(final OfflinePlotPlayer player)
+    {
         return uuidWrapper.getUUID(player);
     }
-    
-    public PlotPlayer getPlayer(final UUID uuid) {
-        for (final PlotPlayer player : players.values()) {
-            if (player.getUUID().equals(uuid)) {
-                return player;
-            }
+
+    public PlotPlayer getPlayer(final UUID uuid)
+    {
+        for (final PlotPlayer player : players.values())
+        {
+            if (player.getUUID().equals(uuid)) { return player; }
         }
         return null;
     }
-    
-    public PlotPlayer getPlayer(String name) {
+
+    public PlotPlayer getPlayer(final String name)
+    {
         return players.get(name);
     }
-    
-    public Map<String, PlotPlayer> getPlayers() {
+
+    public Map<String, PlotPlayer> getPlayers()
+    {
         return players;
     }
 
diff --git a/src/main/java/com/intellectualcrafters/plot/util/helpmenu/HelpMenu.java b/src/main/java/com/intellectualcrafters/plot/util/helpmenu/HelpMenu.java
index 0d76ba144..e8bec8d20 100644
--- a/src/main/java/com/intellectualcrafters/plot/util/helpmenu/HelpMenu.java
+++ b/src/main/java/com/intellectualcrafters/plot/util/helpmenu/HelpMenu.java
@@ -7,7 +7,8 @@ import com.intellectualcrafters.plot.commands.MainCommand;
 import com.intellectualcrafters.plot.object.PlotPlayer;
 import com.plotsquared.general.commands.Command;
 
-public class HelpMenu {
+public class HelpMenu
+{
 
     public static final int PER_PAGE = 5;
 
@@ -17,41 +18,50 @@ public class HelpMenu {
     private CommandCategory _commandCategory;
     private List<Command<PlotPlayer>> _commands;
 
-    public HelpMenu(final PlotPlayer player) {
+    public HelpMenu(final PlotPlayer player)
+    {
         _player = player;
     }
 
-    public HelpMenu setCategory(final CommandCategory commandCategory) {
+    public HelpMenu setCategory(final CommandCategory commandCategory)
+    {
         _commandCategory = commandCategory;
         return this;
     }
 
-    public HelpMenu getCommands() {
+    public HelpMenu getCommands()
+    {
         _commands = MainCommand.getCommands(_commandCategory, _player);
         return this;
     }
 
-    public HelpMenu generateMaxPages() {
-        this._maxPage = Math.max((_commands.size() - 1) / PER_PAGE, 0);
+    public HelpMenu generateMaxPages()
+    {
+        _maxPage = Math.max((_commands.size() - 1) / PER_PAGE, 0);
         return this;
     }
 
-    public HelpMenu generatePage(int currentPage, String label) {
-        if (currentPage > _maxPage) {
+    public HelpMenu generatePage(int currentPage, final String label)
+    {
+        if (currentPage > _maxPage)
+        {
             currentPage = _maxPage;
         }
-        if (currentPage < 0) {
+        if (currentPage < 0)
+        {
             currentPage = 0;
         }
         _page = new HelpPage(_commandCategory, currentPage, _maxPage);
-        int max = Math.min((currentPage * PER_PAGE) + (PER_PAGE - 1), _commands.size());
-        for (int i = currentPage * PER_PAGE; i < max; i++) {
+        final int max = Math.min((currentPage * PER_PAGE) + (PER_PAGE - 1), _commands.size());
+        for (int i = currentPage * PER_PAGE; i < max; i++)
+        {
             _page.addHelpItem(new HelpObject(_commands.get(i), label));
         }
         return this;
     }
 
-    public void render() {
+    public void render()
+    {
         _page.render(_player);
     }
 
diff --git a/src/main/java/com/intellectualcrafters/plot/util/helpmenu/HelpObject.java b/src/main/java/com/intellectualcrafters/plot/util/helpmenu/HelpObject.java
index ebb8bacd4..6eb1b86ad 100644
--- a/src/main/java/com/intellectualcrafters/plot/util/helpmenu/HelpObject.java
+++ b/src/main/java/com/intellectualcrafters/plot/util/helpmenu/HelpObject.java
@@ -5,27 +5,32 @@ import com.intellectualcrafters.plot.util.StringMan;
 import com.plotsquared.general.commands.Argument;
 import com.plotsquared.general.commands.Command;
 
-public class HelpObject {
+public class HelpObject
+{
 
     private final Command _command;
     private final String _rendered;
 
-    public HelpObject(final Command command, String label) {
-        this._command = command;
-        this._rendered = StringMan.replaceAll(C.HELP_ITEM.s(), "%usage%", _command.getUsage().replaceAll("\\{label\\}", label), "[%alias%]", _command.getAliases().size() > 0 ? "(" + StringMan.join(_command.getAliases(), "|") + ")" : "","%desc%", _command.getDescription(),"%arguments%", buildArgumentList(_command.getRequiredArguments()), "{label}", label);
+    public HelpObject(final Command command, final String label)
+    {
+        _command = command;
+        _rendered = StringMan.replaceAll(C.HELP_ITEM.s(), "%usage%", _command.getUsage().replaceAll("\\{label\\}", label), "[%alias%]",
+        _command.getAliases().size() > 0 ? "(" + StringMan.join(_command.getAliases(), "|") + ")" : "", "%desc%", _command.getDescription(), "%arguments%",
+        buildArgumentList(_command.getRequiredArguments()), "{label}", label);
     }
 
     @Override
-    public String toString() {
+    public String toString()
+    {
         return _rendered;
     }
 
-    private String buildArgumentList(Argument[] arguments) {
-        if (arguments == null) {
-            return "";
-        }
-        StringBuilder builder = new StringBuilder();
-        for (final Argument<?> argument : arguments) {
+    private String buildArgumentList(final Argument[] arguments)
+    {
+        if (arguments == null) { return ""; }
+        final StringBuilder builder = new StringBuilder();
+        for (final Argument<?> argument : arguments)
+        {
             builder.append("[").append(argument.getName()).append(" (").append(argument.getExample()).append(")],");
         }
         return arguments.length > 0 ? builder.substring(0, builder.length() - 1) : "";
diff --git a/src/main/java/com/intellectualcrafters/plot/util/helpmenu/HelpPage.java b/src/main/java/com/intellectualcrafters/plot/util/helpmenu/HelpPage.java
index c539faf1d..47b9227ad 100644
--- a/src/main/java/com/intellectualcrafters/plot/util/helpmenu/HelpPage.java
+++ b/src/main/java/com/intellectualcrafters/plot/util/helpmenu/HelpPage.java
@@ -8,33 +8,41 @@ import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.object.PlotPlayer;
 import com.intellectualcrafters.plot.util.MainUtil;
 
-public class HelpPage {
+public class HelpPage
+{
 
     private final List<HelpObject> _helpObjecs;
     private final String _header;
 
-    public HelpPage(CommandCategory category, int currentPage, int maxPages) {
+    public HelpPage(final CommandCategory category, final int currentPage, final int maxPages)
+    {
         _helpObjecs = new ArrayList<>();
         _header = C.HELP_PAGE_HEADER.s()
-                .replace("%category%", category == null ? "ALL" : category.toString())
-                .replace("%current%", (currentPage + 1) + "")
-                .replace("%max%", (maxPages + 1) + "");
+        .replace("%category%", category == null ? "ALL" : category.toString())
+        .replace("%current%", (currentPage + 1) + "")
+        .replace("%max%", (maxPages + 1) + "");
     }
 
-    public void render(final PlotPlayer player) {
-        if (_helpObjecs.size() < 1) {
+    public void render(final PlotPlayer player)
+    {
+        if (_helpObjecs.size() < 1)
+        {
             MainUtil.sendMessage(player, C.NOT_VALID_NUMBER, "(0)");
-        } else {
+        }
+        else
+        {
             MainUtil.sendMessage(player, C.HELP_HEADER.s(), false);
             MainUtil.sendMessage(player, _header, false);
-            for (final HelpObject object : _helpObjecs) {
+            for (final HelpObject object : _helpObjecs)
+            {
                 MainUtil.sendMessage(player, object.toString(), false);
             }
             MainUtil.sendMessage(player, C.HELP_FOOTER.s(), false);
         }
     }
 
-    public void addHelpItem(final HelpObject object) {
+    public void addHelpItem(final HelpObject object)
+    {
         _helpObjecs.add(object);
     }
 }
diff --git a/src/main/java/com/intellectualcrafters/plot/uuid/UUIDWrapper.java b/src/main/java/com/intellectualcrafters/plot/uuid/UUIDWrapper.java
index 1c6381c1c..766c420c8 100644
--- a/src/main/java/com/intellectualcrafters/plot/uuid/UUIDWrapper.java
+++ b/src/main/java/com/intellectualcrafters/plot/uuid/UUIDWrapper.java
@@ -5,14 +5,15 @@ import java.util.UUID;
 import com.intellectualcrafters.plot.object.OfflinePlotPlayer;
 import com.intellectualcrafters.plot.object.PlotPlayer;
 
-public abstract class UUIDWrapper {
-    public abstract UUID getUUID(PlotPlayer player);
+public abstract class UUIDWrapper
+{
+    public abstract UUID getUUID(final PlotPlayer player);
 
-    public abstract UUID getUUID(OfflinePlotPlayer player);
+    public abstract UUID getUUID(final OfflinePlotPlayer player);
 
-    public abstract UUID getUUID(String name);
+    public abstract UUID getUUID(final String name);
+
+    public abstract OfflinePlotPlayer getOfflinePlayer(final UUID uuid);
 
-    public abstract OfflinePlotPlayer getOfflinePlayer(UUID uuid);
-    
     public abstract OfflinePlotPlayer[] getOfflinePlayers();
 }
diff --git a/src/main/java/com/plotsquared/bukkit/BukkitMain.java b/src/main/java/com/plotsquared/bukkit/BukkitMain.java
index cb8931e14..cff00f127 100644
--- a/src/main/java/com/plotsquared/bukkit/BukkitMain.java
+++ b/src/main/java/com/plotsquared/bukkit/BukkitMain.java
@@ -22,8 +22,6 @@ import org.bukkit.plugin.java.JavaPlugin;
 import com.intellectualcrafters.configuration.ConfigurationSection;
 import com.intellectualcrafters.plot.IPlotMain;
 import com.intellectualcrafters.plot.PS;
-import com.intellectualcrafters.plot.commands.MainCommand;
-import com.intellectualcrafters.plot.commands.WE_Anywhere;
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.config.ConfigurationNode;
 import com.intellectualcrafters.plot.config.Settings;
@@ -89,30 +87,34 @@ import com.plotsquared.bukkit.uuid.FileUUIDHandler;
 import com.plotsquared.bukkit.uuid.LowerOfflineUUIDWrapper;
 import com.plotsquared.bukkit.uuid.OfflineUUIDWrapper;
 import com.plotsquared.bukkit.uuid.SQLUUIDHandler;
-import com.plotsquared.listener.WESubscriber;
-import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.bukkit.WorldEditPlugin;
 
-public class BukkitMain extends JavaPlugin implements Listener, IPlotMain {
-    
+public class BukkitMain extends JavaPlugin implements Listener, IPlotMain
+{
+
     public static BukkitMain THIS;
     public static WorldEditPlugin worldEdit;
-    
+
     private int[] version;
 
-
     @Override
-    public int[] getServerVersion() {
-        if (version == null) {
-            try {
+    public int[] getServerVersion()
+    {
+        if (version == null)
+        {
+            try
+            {
                 version = new int[3];
                 final String[] split = Bukkit.getBukkitVersion().split("-")[0].split("\\.");
                 version[0] = Integer.parseInt(split[0]);
                 version[1] = Integer.parseInt(split[1]);
-                if (split.length == 3) {
+                if (split.length == 3)
+                {
                     version[2] = Integer.parseInt(split[2]);
                 }
-            } catch (Exception e) {
+            }
+            catch (final Exception e)
+            {
                 e.printStackTrace();
                 PS.debug(StringMan.getString(Bukkit.getBukkitVersion()));
                 PS.debug(StringMan.getString(Bukkit.getBukkitVersion().split("-")[0].split("\\.")));
@@ -121,93 +123,113 @@ public class BukkitMain extends JavaPlugin implements Listener, IPlotMain {
         }
         return version;
     }
-    
+
     @Override
-    public void onEnable() {
+    public void onEnable()
+    {
         THIS = this;
         PS.instance = new PS(this, "Bukkit");
     }
-    
+
     @Override
-    public void onDisable() {
+    public void onDisable()
+    {
         PS.get().disable();
         Bukkit.getScheduler().cancelTasks(this);
         THIS = null;
     }
-    
+
     @Override
-    public void log(String message) {
-        if (message == null) {
-            return;
-        }
-        if (THIS != null && Bukkit.getServer().getConsoleSender() != null) {
-            try {
+    public void log(String message)
+    {
+        if (message == null) { return; }
+        if ((THIS != null) && (Bukkit.getServer().getConsoleSender() != null))
+        {
+            try
+            {
                 message = C.color(message);
-                if (!Settings.CONSOLE_COLOR) {
+                if (!Settings.CONSOLE_COLOR)
+                {
                     message = ChatColor.stripColor(message);
                 }
                 Bukkit.getServer().getConsoleSender().sendMessage(message);
                 return;
             }
-            catch (Throwable e) {}
+            catch (final Throwable e)
+            {}
         }
         System.out.println(ConsoleColors.fromString(message));
     }
-    
+
     @Override
-    public void disable() {
-        if (THIS != null) {
+    public void disable()
+    {
+        if (THIS != null)
+        {
             onDisable();
         }
     }
-    
+
     @Override
-    public int[] getPluginVersion() {
-        String[] split = this.getDescription().getVersion().split("\\.");
+    public int[] getPluginVersion()
+    {
+        final String[] split = getDescription().getVersion().split("\\.");
         return new int[] { Integer.parseInt(split[0]), Integer.parseInt(split[1]), Integer.parseInt(split[2]) };
     }
-    
+
     @Override
-    public void registerCommands() {
+    public void registerCommands()
+    {
         final BukkitCommand bcmd = new BukkitCommand();
         final PluginCommand plotCommand = getCommand("plots");
         plotCommand.setExecutor(bcmd);
         plotCommand.setAliases(Arrays.asList("p", "ps", "plotme", "plot"));
         plotCommand.setTabCompleter(bcmd);
     }
-    
+
     @Override
-    public File getDirectory() {
+    public File getDirectory()
+    {
         return getDataFolder();
     }
-    
+
     @Override
-    public TaskManager getTaskManager() {
+    public TaskManager getTaskManager()
+    {
         return new BukkitTaskManager();
     }
-    
+
     @Override
-    public void runEntityTask() {
+    public void runEntityTask()
+    {
         log(C.PREFIX.s() + "KillAllEntities started.");
-        TaskManager.runTaskRepeat(new Runnable() {
+        TaskManager.runTaskRepeat(new Runnable()
+        {
             long ticked = 0l;
             long error = 0l;
-            
+
             @Override
-            public void run() {
-                if (this.ticked > 36_000L) {
-                    this.ticked = 0l;
-                    if (this.error > 0) {
-                        log(C.PREFIX.s() + "KillAllEntities has been running for 6 hours. Errors: " + this.error);
+            public void run()
+            {
+                if (ticked > 36_000L)
+                {
+                    ticked = 0l;
+                    if (error > 0)
+                    {
+                        log(C.PREFIX.s() + "KillAllEntities has been running for 6 hours. Errors: " + error);
                     }
-                    this.error = 0l;
+                    error = 0l;
                 }
                 World world;
-                for (final PlotWorld pw : PS.get().getPlotWorldObjects()) {
+                for (final PlotWorld pw : PS.get().getPlotWorldObjects())
+                {
                     world = Bukkit.getWorld(pw.worldname);
-                    try {
-                        for (Entity entity : world.getEntities()) {
-                            switch (entity.getType()) {
+                    try
+                    {
+                        for (final Entity entity : world.getEntities())
+                        {
+                            switch (entity.getType())
+                            {
                                 case EGG:
                                 case ENDER_CRYSTAL:
                                 case COMPLEX_PART:
@@ -223,7 +245,8 @@ public class BukkitMain extends JavaPlugin implements Listener, IPlotMain {
                                 case UNKNOWN:
                                 case ITEM_FRAME:
                                 case PAINTING:
-                                case PLAYER: {
+                                case PLAYER:
+                                {
                                     // non moving / unremovable
                                     continue;
                                 }
@@ -231,7 +254,8 @@ public class BukkitMain extends JavaPlugin implements Listener, IPlotMain {
                                 case SPLASH_POTION:
                                 case SNOWBALL:
                                 case ENDER_PEARL:
-                                case ARROW: {
+                                case ARROW:
+                                {
                                     // managed elsewhere | projectile
                                     continue;
                                 }
@@ -242,24 +266,29 @@ public class BukkitMain extends JavaPlugin implements Listener, IPlotMain {
                                 case MINECART_HOPPER:
                                 case MINECART_MOB_SPAWNER:
                                 case MINECART_TNT:
-                                case BOAT: {
-                                    if (!Settings.KILL_ROAD_VEHICLES) {
+                                case BOAT:
+                                {
+                                    if (!Settings.KILL_ROAD_VEHICLES)
+                                    {
                                         continue;
                                     }
-                                    Location loc = entity.getLocation();
-                                    if (MainUtil.isPlotRoad(BukkitUtil.getLocation(loc))) {
+                                    final Location loc = entity.getLocation();
+                                    if (MainUtil.isPlotRoad(BukkitUtil.getLocation(loc)))
+                                    {
                                         entity.remove();
                                     }
                                     break;
                                 }
                                 case SMALL_FIREBALL:
                                 case FIREBALL:
-                                case DROPPED_ITEM: {
+                                case DROPPED_ITEM:
+                                {
                                     // dropped item
                                     continue;
                                 }
                                 case PRIMED_TNT:
-                                case FALLING_BLOCK:  {
+                                case FALLING_BLOCK:
+                                {
                                     // managed elsewhere
                                     continue;
                                 }
@@ -295,14 +324,18 @@ public class BukkitMain extends JavaPlugin implements Listener, IPlotMain {
                                 case WITHER:
                                 case WOLF:
                                 case ZOMBIE:
-                                default: {
-                                    if (!Settings.KILL_ROAD_MOBS) {
+                                default:
+                                {
+                                    if (!Settings.KILL_ROAD_MOBS)
+                                    {
                                         continue;
                                     }
-                                    Location loc = entity.getLocation();
-                                    if (MainUtil.isPlotRoad(BukkitUtil.getLocation(loc))) {
-                                        Entity passenger = entity.getPassenger();
-                                        if (!(passenger instanceof Player)) {
+                                    final Location loc = entity.getLocation();
+                                    if (MainUtil.isPlotRoad(BukkitUtil.getLocation(loc)))
+                                    {
+                                        final Entity passenger = entity.getPassenger();
+                                        if (!(passenger instanceof Player))
+                                        {
                                             entity.remove();
                                         }
                                     }
@@ -310,112 +343,143 @@ public class BukkitMain extends JavaPlugin implements Listener, IPlotMain {
                                 }
                             }
                         }
-                    } catch (final Throwable e) {
-                        ++this.error;
-                    } finally {
-                        ++this.ticked;
+                    }
+                    catch (final Throwable e)
+                    {
+                        ++error;
+                    }
+                    finally
+                    {
+                        ++ticked;
                     }
                 }
             }
         }, 20);
     }
-    
+
     @Override
-    final public ChunkGenerator getDefaultWorldGenerator(final String world, final String id) {
+    final public ChunkGenerator getDefaultWorldGenerator(final String world, final String id)
+    {
         WorldEvents.lastWorld = world;
-        if (!PS.get().setupPlotWorld(world, id)) {
-            return null;
-        }
-        HybridGen result = new HybridGen(world);
-        TaskManager.runTaskLater(new Runnable() {
+        if (!PS.get().setupPlotWorld(world, id)) { return null; }
+        final HybridGen result = new HybridGen(world);
+        TaskManager.runTaskLater(new Runnable()
+        {
             @Override
-            public void run() {
-                if (WorldEvents.lastWorld != null && WorldEvents.lastWorld.equals(world)) {
+            public void run()
+            {
+                if ((WorldEvents.lastWorld != null) && WorldEvents.lastWorld.equals(world))
+                {
                     WorldEvents.lastWorld = null;
                 }
             }
         }, 20);
         return result;
     }
-    
+
     @Override
-    public void registerPlayerEvents() {
+    public void registerPlayerEvents()
+    {
         getServer().getPluginManager().registerEvents(new PlayerEvents(), this);
-        if (PS.get().checkVersion(this.getServerVersion(), 1, 8, 0)) {
+        if (PS.get().checkVersion(getServerVersion(), 1, 8, 0))
+        {
             getServer().getPluginManager().registerEvents(new PlayerEvents_1_8(), this);
         }
-        if (PS.get().checkVersion(this.getServerVersion(), 1, 8, 3)) {
+        if (PS.get().checkVersion(getServerVersion(), 1, 8, 3))
+        {
             getServer().getPluginManager().registerEvents(new PlayerEvents_1_8_3(), this);
         }
     }
-    
+
     @Override
-    public void registerInventoryEvents() {
-        
+    public void registerInventoryEvents()
+    {
+
         // Part of PlayerEvents - can be moved if necessary
-        
+
     }
-    
+
     @Override
-    public void registerPlotPlusEvents() {
+    public void registerPlotPlusEvents()
+    {
         PlotPlusListener.startRunnable(this);
         getServer().getPluginManager().registerEvents(new PlotPlusListener(), this);
     }
-    
+
     @Override
-    public void registerForceFieldEvents() {
+    public void registerForceFieldEvents()
+    {
         getServer().getPluginManager().registerEvents(new ForceFieldListener(), this);
     }
-    
+
     @Override
-    public boolean initWorldEdit() {
-        if (getServer().getPluginManager().getPlugin("WorldEdit") != null) {
+    public boolean initWorldEdit()
+    {
+        if (getServer().getPluginManager().getPlugin("WorldEdit") != null)
+        {
             BukkitMain.worldEdit = (WorldEditPlugin) getServer().getPluginManager().getPlugin("WorldEdit");
             final String version = BukkitMain.worldEdit.getDescription().getVersion();
-            if ((version != null) && version.startsWith("5.")) {
+            if ((version != null) && version.startsWith("5."))
+            {
                 log("&cThis version of WorldEdit does not support PlotSquared.");
                 log("&cPlease use WorldEdit 6+ for masking support");
                 log("&c - http://builds.enginehub.org/job/worldedit");
-            } else {
+            }
+            else
+            {
                 getServer().getPluginManager().registerEvents(new WEListener(), this);
                 return true;
             }
         }
         return false;
     }
-    
+
     @Override
-    public EconHandler getEconomyHandler() {
-        try {
-            BukkitEconHandler econ = new BukkitEconHandler();
-            if (econ.init()) {
-                return econ;
-            }
-        } catch (Throwable e) {
+    public EconHandler getEconomyHandler()
+    {
+        try
+        {
+            final BukkitEconHandler econ = new BukkitEconHandler();
+            if (econ.init()) { return econ; }
         }
+        catch (final Throwable e)
+        {}
         return null;
     }
-    
+
     @Override
-    public BlockManager initBlockManager() {
-        if (PS.get().checkVersion(this.getServerVersion(), 1, 8, 0)) {
-            try {
+    public BlockManager initBlockManager()
+    {
+        if (PS.get().checkVersion(getServerVersion(), 1, 8, 0))
+        {
+            try
+            {
                 BukkitSetBlockManager.setBlockManager = new SetBlockFast_1_8();
-            } catch (final Throwable e) {
+            }
+            catch (final Throwable e)
+            {
                 e.printStackTrace();
                 BukkitSetBlockManager.setBlockManager = new SetBlockSlow();
             }
-            try {
+            try
+            {
                 new SendChunk();
                 MainUtil.canSendChunk = true;
-            } catch (final Throwable e) {
+            }
+            catch (final Throwable e)
+            {
                 e.printStackTrace();
                 MainUtil.canSendChunk = false;
             }
-        } else {
-            try {
+        }
+        else
+        {
+            try
+            {
                 BukkitSetBlockManager.setBlockManager = new SetBlockFast();
-            } catch (final Throwable e) {
+            }
+            catch (final Throwable e)
+            {
                 MainUtil.canSetFast = false;
                 BukkitSetBlockManager.setBlockManager = new SetBlockSlow();
             }
@@ -423,156 +487,206 @@ public class BukkitMain extends JavaPlugin implements Listener, IPlotMain {
         BlockUpdateUtil.setBlockManager = BukkitSetBlockManager.setBlockManager;
         return BlockManager.manager = new BukkitUtil();
     }
-    
+
     @Override
-    public boolean initPlotMeConverter() {
-        TaskManager.runTaskLaterAsync(new Runnable() {
+    public boolean initPlotMeConverter()
+    {
+        TaskManager.runTaskLaterAsync(new Runnable()
+        {
             @Override
-            public void run() {
-                if (new LikePlotMeConverter("PlotMe").run(new ClassicPlotMeConnector())) return;
-                if (new LikePlotMeConverter("PlotMe").run(new PlotMeConnector_017())) return;
-                if (new LikePlotMeConverter("AthionPlots").run(new ClassicPlotMeConnector())) return;
+            public void run()
+            {
+                if (new LikePlotMeConverter("PlotMe").run(new ClassicPlotMeConnector())) {
+                    return;
+                }
+                if (new LikePlotMeConverter("PlotMe").run(new PlotMeConnector_017())) {
+                    return;
+                }
+                if (new LikePlotMeConverter("AthionPlots").run(new ClassicPlotMeConnector())) {
+                    return;
+                }
             }
         }, 20);
-        return Bukkit.getPluginManager().getPlugin("PlotMe") != null || Bukkit.getPluginManager().getPlugin("AthionPlots") != null;
+        return (Bukkit.getPluginManager().getPlugin("PlotMe") != null) || (Bukkit.getPluginManager().getPlugin("AthionPlots") != null);
     }
-    
+
     @Override
-    public BukkitGeneratorWrapper getGenerator(final String world, final String name) {
-        if (name == null) {
-            return new BukkitGeneratorWrapper(world, null);
-        }
+    public BukkitGeneratorWrapper getGenerator(final String world, final String name)
+    {
+        if (name == null) { return new BukkitGeneratorWrapper(world, null); }
         final Plugin gen_plugin = Bukkit.getPluginManager().getPlugin(name);
         ChunkGenerator gen;
-        if ((gen_plugin != null) && gen_plugin.isEnabled()) {
+        if ((gen_plugin != null) && gen_plugin.isEnabled())
+        {
             gen = gen_plugin.getDefaultWorldGenerator(world, "");
-        } else {
+        }
+        else
+        {
             gen = new HybridGen(world);
         }
         return new BukkitGeneratorWrapper(world, gen);
     }
-    
+
     @Override
-    public HybridUtils initHybridUtils() {
+    public HybridUtils initHybridUtils()
+    {
         return new BukkitHybridUtils();
     }
-    
+
     @Override
-    public SetupUtils initSetupUtils() {
+    public SetupUtils initSetupUtils()
+    {
         return new BukkitSetupUtils();
     }
-    
+
     @Override
-    public UUIDHandlerImplementation initUUIDHandler() {
-        final boolean checkVersion = PS.get().checkVersion(this.getServerVersion(), 1, 7, 6);
+    public UUIDHandlerImplementation initUUIDHandler()
+    {
+        final boolean checkVersion = PS.get().checkVersion(getServerVersion(), 1, 7, 6);
         UUIDWrapper wrapper;
-        if (Settings.OFFLINE_MODE) {
-            if (Settings.UUID_LOWERCASE) {
+        if (Settings.OFFLINE_MODE)
+        {
+            if (Settings.UUID_LOWERCASE)
+            {
                 wrapper = (new LowerOfflineUUIDWrapper());
-            } else {
-                wrapper = (new OfflineUUIDWrapper());
             }
-            Settings.OFFLINE_MODE = true;
-        } else if (checkVersion) {
-            wrapper = (new DefaultUUIDWrapper());
-            Settings.OFFLINE_MODE = false;
-        } else {
-            if (Settings.UUID_LOWERCASE) {
-                wrapper = (new LowerOfflineUUIDWrapper());
-            } else {
+            else
+            {
                 wrapper = (new OfflineUUIDWrapper());
             }
             Settings.OFFLINE_MODE = true;
         }
-        if (!checkVersion) {
+        else if (checkVersion)
+        {
+            wrapper = (new DefaultUUIDWrapper());
+            Settings.OFFLINE_MODE = false;
+        }
+        else
+        {
+            if (Settings.UUID_LOWERCASE)
+            {
+                wrapper = (new LowerOfflineUUIDWrapper());
+            }
+            else
+            {
+                wrapper = (new OfflineUUIDWrapper());
+            }
+            Settings.OFFLINE_MODE = true;
+        }
+        if (!checkVersion)
+        {
             log(C.PREFIX.s() + " &c[WARN] Titles are disabled - please update your version of Bukkit to support this feature.");
             Settings.TITLES = false;
             FlagManager.removeFlag(FlagManager.getFlag("titles"));
-        } else {
+        }
+        else
+        {
             AbstractTitle.TITLE_CLASS = new DefaultTitle();
-            if (wrapper instanceof DefaultUUIDWrapper) {
+            if (wrapper instanceof DefaultUUIDWrapper)
+            {
                 Settings.TWIN_MODE_UUID = true;
-            } else if (wrapper.getClass() == OfflineUUIDWrapper.class && !Bukkit.getOnlineMode()) {
+            }
+            else if ((wrapper.getClass() == OfflineUUIDWrapper.class) && !Bukkit.getOnlineMode())
+            {
                 Settings.TWIN_MODE_UUID = true;
             }
         }
-        if (Settings.OFFLINE_MODE) {
+        if (Settings.OFFLINE_MODE)
+        {
             log(C.PREFIX.s() + " &6PlotSquared is using Offline Mode UUIDs either because of user preference, or because you are using an old version of Bukkit");
-        } else {
+        }
+        else
+        {
             log(C.PREFIX.s() + " &6PlotSquared is using online UUIDs");
         }
         return Settings.USE_SQLUUIDHANDLER ? new SQLUUIDHandler(wrapper) : new FileUUIDHandler(wrapper);
     }
-    
+
     @Override
-    public ChunkManager initChunkManager() {
+    public ChunkManager initChunkManager()
+    {
         return new BukkitChunkManager();
     }
-    
+
     @Override
-    public EventUtil initEventUtil() {
+    public EventUtil initEventUtil()
+    {
         return new BukkitEventUtil();
     }
-    
+
     @Override
-    public void registerTNTListener() {
+    public void registerTNTListener()
+    {
         getServer().getPluginManager().registerEvents(new TNTListener(), this);
     }
-    
+
     @Override
-    public void unregister(PlotPlayer player) {
+    public void unregister(final PlotPlayer player)
+    {
         BukkitUtil.removePlayer(player.getName());
     }
-    
+
     @Override
-    public void registerChunkProcessor() {
+    public void registerChunkProcessor()
+    {
         getServer().getPluginManager().registerEvents(new ChunkListener(), this);
     }
-    
+
     @Override
-    public void registerWorldEvents() {
+    public void registerWorldEvents()
+    {
         getServer().getPluginManager().registerEvents(new WorldEvents(), this);
     }
-    
+
     @Override
-    public InventoryUtil initInventoryUtil() {
+    public InventoryUtil initInventoryUtil()
+    {
         return new BukkitInventoryUtil();
     }
 
     @Override
-    public String getServerName() {
+    public String getServerName()
+    {
         return Bukkit.getServerName();
     }
 
     @Override
-    public void startMetrics() {
-        try {
+    public void startMetrics()
+    {
+        try
+        {
             final Metrics metrics = new Metrics(this);
             metrics.start();
             log(C.PREFIX.s() + "&6Metrics enabled.");
-        } catch (final Exception e) {
+        }
+        catch (final Exception e)
+        {
             log(C.PREFIX.s() + "&cFailed to load up metrics.");
         }
     }
 
     @Override
-    public void setGenerator(String worldname) {
+    public void setGenerator(final String worldname)
+    {
         World world = BukkitUtil.getWorld(worldname);
-        if (world == null) {
+        if (world == null)
+        {
             // create world
-            ConfigurationSection worldConfig = PS.get().config.getConfigurationSection("worlds." + worldname);
+            final ConfigurationSection worldConfig = PS.get().config.getConfigurationSection("worlds." + worldname);
             String manager = worldConfig.getString("generator.plugin");
-            if (manager == null) {
+            if (manager == null)
+            {
                 manager = "PlotSquared";
             }
             String generator = worldConfig.getString("generator.init");
-            if (generator == null) {
+            if (generator == null)
+            {
                 generator = manager;
             }
 
-            int type = worldConfig.getInt("generator.type");
-            int terrain = worldConfig.getInt("generator.terrain");
-            SetupObject setup = new SetupObject();
+            final int type = worldConfig.getInt("generator.type");
+            final int terrain = worldConfig.getInt("generator.terrain");
+            final SetupObject setup = new SetupObject();
             setup.plotManager = manager;
             setup.setupGenerator = generator;
             setup.type = type;
@@ -581,75 +695,93 @@ public class BukkitMain extends JavaPlugin implements Listener, IPlotMain {
             setup.world = worldname;
             SetupUtils.manager.setupWorld(setup);
         }
-        else {
-            try {
-                if (!PS.get().isPlotWorld(worldname)) {
+        else
+        {
+            try
+            {
+                if (!PS.get().isPlotWorld(worldname))
+                {
                     SetGenCB.setGenerator(BukkitUtil.getWorld(worldname));
                 }
-            } catch (Exception e) {
+            }
+            catch (final Exception e)
+            {
                 log("Failed to reload world: " + world);
                 Bukkit.getServer().unloadWorld(world, false);
             }
         }
         world = Bukkit.getWorld(worldname);
         final ChunkGenerator gen = world.getGenerator();
-        if (gen instanceof BukkitPlotGenerator) {
-            PS.get().loadWorld(worldname, new BukkitGeneratorWrapper(worldname, (BukkitPlotGenerator) gen));
+        if (gen instanceof BukkitPlotGenerator)
+        {
+            PS.get().loadWorld(worldname, new BukkitGeneratorWrapper(worldname, gen));
         }
-        else {
-            if (PS.get().config.contains("worlds." + worldname)) {
+        else
+        {
+            if (PS.get().config.contains("worlds." + worldname))
+            {
                 PS.get().loadWorld(worldname, new BukkitGeneratorWrapper(worldname, null));
             }
         }
     }
 
     @Override
-    public SchematicHandler initSchematicHandler() {
+    public SchematicHandler initSchematicHandler()
+    {
         return new BukkitSchematicHandler();
     }
 
     @Override
-    public AbstractTitle initTitleManager() {
+    public AbstractTitle initTitleManager()
+    {
         // Already initialized in UUID handler
         return AbstractTitle.TITLE_CLASS;
     }
 
     @Override
-    public PlotPlayer wrapPlayer(Object obj) {
-        if (obj instanceof Player) {
+    public PlotPlayer wrapPlayer(final Object obj)
+    {
+        if (obj instanceof Player)
+        {
             return BukkitUtil.getPlayer((Player) obj);
         }
-        else if (obj instanceof OfflinePlayer) {
+        else if (obj instanceof OfflinePlayer)
+        {
             return BukkitUtil.getPlayer((OfflinePlayer) obj);
         }
-        else if (obj instanceof String) {
+        else if (obj instanceof String)
+        {
             return UUIDHandler.getPlayer((String) obj);
         }
-        else if (obj instanceof UUID) {
-            return UUIDHandler.getPlayer((UUID) obj);
-        }
+        else if (obj instanceof UUID) { return UUIDHandler.getPlayer((UUID) obj); }
         return null;
     }
 
     @Override
-    public String getNMSPackage() {
+    public String getNMSPackage()
+    {
         final Server server = Bukkit.getServer();
         final Class<?> bukkitServerClass = server.getClass();
         String[] pas = bukkitServerClass.getName().split("\\.");
-        if (pas.length == 5) {
+        if (pas.length == 5)
+        {
             final String verB = pas[3];
             return verB;
         }
-        try {
+        try
+        {
             final Method getHandle = bukkitServerClass.getDeclaredMethod("getHandle");
             final Object handle = getHandle.invoke(server);
             final Class handleServerClass = handle.getClass();
             pas = handleServerClass.getName().split("\\.");
-            if (pas.length == 5) {
+            if (pas.length == 5)
+            {
                 final String verM = pas[3];
-                    return verM;
+                return verM;
             }
-        } catch (Exception e) {
+        }
+        catch (final Exception e)
+        {
             e.printStackTrace();
         }
         PS.debug("Unknown NMS package: " + StringMan.getString(pas));
@@ -657,11 +789,14 @@ public class BukkitMain extends JavaPlugin implements Listener, IPlotMain {
     }
 
     @Override
-    public ChatManager<?> initChatManager() {
-        if (Settings.FANCY_CHAT) {
+    public ChatManager<?> initChatManager()
+    {
+        if (Settings.FANCY_CHAT)
+        {
             return new BukkitChatManager();
         }
-        else {
+        else
+        {
             return new BukkitPlainChatManager();
         }
     }
diff --git a/src/main/java/com/plotsquared/bukkit/chat/ArrayWrapper.java b/src/main/java/com/plotsquared/bukkit/chat/ArrayWrapper.java
index d027bb08a..feb236c32 100644
--- a/src/main/java/com/plotsquared/bukkit/chat/ArrayWrapper.java
+++ b/src/main/java/com/plotsquared/bukkit/chat/ArrayWrapper.java
@@ -16,61 +16,62 @@ import org.apache.commons.lang.Validate;
  * @param <E> The type of elements in the array.
  * @see Arrays
  */
-public final class ArrayWrapper<E> {
+public final class ArrayWrapper<E>
+{
 
-	/**
-	 * Creates an array wrapper with some elements.
-	 * @param elements The elements of the array.
-	 */
-	public ArrayWrapper(E... elements){
-		setArray(elements);
-	}
-	
-	private E[] _array;
-	
-	/**
-	 * Retrieves a reference to the wrapped array instance.
-	 * @return The array wrapped by this instance.
-	 */
-	public E[] getArray(){
-		return _array;	
-	}
-	
-	/**
-	 * Set this wrapper to wrap a new array instance.
-	 * @param array The new wrapped array.
-	 */
-	public void setArray(E[] array){
-		Validate.notNull(array, "The array must not be null.");
-		_array = array;
-	}
-	
-	/**
-	 * Determines if this object has a value equivalent to another object.
-	 * @see Arrays#equals(Object[], Object[])
-	 */
-	@SuppressWarnings("rawtypes")
-	@Override
-	public boolean equals(Object other)
+    /**
+     * Creates an array wrapper with some elements.
+     * @param elements The elements of the array.
+     */
+    public ArrayWrapper(final E... elements)
     {
-        if (!(other instanceof ArrayWrapper))
-        {
-            return false;
-        }
-        return Arrays.equals(_array, ((ArrayWrapper)other)._array);
+        setArray(elements);
     }
 
-	/**
-	 * Gets the hash code represented by this objects value.
-	 * @see Arrays#hashCode(Object[])
-	 * @return This object's hash code.
-	 */
+    private E[] _array;
+
+    /**
+     * Retrieves a reference to the wrapped array instance.
+     * @return The array wrapped by this instance.
+     */
+    public E[] getArray()
+    {
+        return _array;
+    }
+
+    /**
+     * Set this wrapper to wrap a new array instance.
+     * @param array The new wrapped array.
+     */
+    public void setArray(final E[] array)
+    {
+        Validate.notNull(array, "The array must not be null.");
+        _array = array;
+    }
+
+    /**
+     * Determines if this object has a value equivalent to another object.
+     * @see Arrays#equals(Object[], Object[])
+     */
+    @SuppressWarnings("rawtypes")
+    @Override
+    public boolean equals(final Object other)
+    {
+        if (!(other instanceof ArrayWrapper)) { return false; }
+        return Arrays.equals(_array, ((ArrayWrapper) other)._array);
+    }
+
+    /**
+     * Gets the hash code represented by this objects value.
+     * @see Arrays#hashCode(Object[])
+     * @return This object's hash code.
+     */
     @Override
     public int hashCode()
     {
         return Arrays.hashCode(_array);
     }
-    
+
     /**
      * Converts an iterable element collection to an array of elements.
      * The iteration order of the specified object will be used as the array element order.
@@ -78,29 +79,34 @@ public final class ArrayWrapper<E> {
      * @param c The type of the elements of the array.
      * @return An array of elements in the specified iterable.
      */
-     @SuppressWarnings("unchecked")
-    public static <T> T[] toArray(Iterable<? extends T> list, Class<T> c) {
+    @SuppressWarnings("unchecked")
+    public static <T> T[] toArray(final Iterable<? extends T> list, final Class<T> c)
+    {
         int size = -1;
-        if(list instanceof Collection<?>){
-        	@SuppressWarnings("rawtypes")
-			Collection coll = (Collection)list;
-        	size = coll.size();
+        if (list instanceof Collection<?>)
+        {
+            @SuppressWarnings("rawtypes")
+            final Collection coll = (Collection) list;
+            size = coll.size();
         }
-        
-        
-        if(size < 0){
-        	size = 0;
-        	// Ugly hack: Count it ourselves
-        	for(@SuppressWarnings("unused") T element : list){
-        		size++;
-        	}
+
+        if (size < 0)
+        {
+            size = 0;
+            // Ugly hack: Count it ourselves
+            for (@SuppressWarnings("unused")
+            final T element : list)
+            {
+                size++;
+            }
         }
-    	
-        T[] result = (T[]) Array.newInstance(c, size);
+
+        final T[] result = (T[]) Array.newInstance(c, size);
         int i = 0;
-        for(T element : list){ // Assumes iteration order is consistent
-    		result[i++] = element; // Assign array element at index THEN increment counter
-    	}
+        for (final T element : list)
+        { // Assumes iteration order is consistent
+            result[i++] = element; // Assign array element at index THEN increment counter
+        }
         return result;
     }
 }
diff --git a/src/main/java/com/plotsquared/bukkit/chat/FancyMessage.java b/src/main/java/com/plotsquared/bukkit/chat/FancyMessage.java
index 376cd323c..34fc5131e 100644
--- a/src/main/java/com/plotsquared/bukkit/chat/FancyMessage.java
+++ b/src/main/java/com/plotsquared/bukkit/chat/FancyMessage.java
@@ -35,7 +35,6 @@ import com.google.gson.JsonParser;
 import com.google.gson.stream.JsonWriter;
 import com.intellectualcrafters.configuration.serialization.ConfigurationSerializable;
 import com.intellectualcrafters.configuration.serialization.ConfigurationSerialization;
-import com.intellectualcrafters.plot.config.C;
 
 /**
  * Represents a formattable message. Such messages can use elements such as colors, formatting codes, hover and click data, and other features provided by the vanilla Minecraft <a href="http://minecraft.gamepedia.com/Tellraw#Raw_JSON_Text">JSON message formatter</a>.
@@ -47,797 +46,939 @@ import com.intellectualcrafters.plot.config.C;
  * optionally initializing it with text. Further property-setting method calls will affect that editing component.
  * </p>
  */
-public class FancyMessage implements JsonRepresentedObject, Cloneable, Iterable<MessagePart>, ConfigurationSerializable {
+public class FancyMessage implements JsonRepresentedObject, Cloneable, Iterable<MessagePart>, ConfigurationSerializable
+{
 
-	static{
-		ConfigurationSerialization.registerClass(FancyMessage.class);
-	}
+    static
+    {
+        ConfigurationSerialization.registerClass(FancyMessage.class);
+    }
 
-	private List<MessagePart> messageParts;
-	private String jsonString;
-	private boolean dirty;
+    private List<MessagePart> messageParts;
+    private String jsonString;
+    private boolean dirty;
 
-	private static Constructor<?> nmsPacketPlayOutChatConstructor;
+    private static Constructor<?> nmsPacketPlayOutChatConstructor;
 
-        @Override
-	public FancyMessage clone() throws CloneNotSupportedException{
-		FancyMessage instance = (FancyMessage)super.clone();
-		instance.messageParts = new ArrayList<MessagePart>(messageParts.size());
-		for(int i = 0; i < messageParts.size(); i++){
-			instance.messageParts.add(i, messageParts.get(i).clone());
-		}
-		instance.dirty = false;
-		instance.jsonString = null;
-		return instance;
-	}
+    @Override
+    public FancyMessage clone() throws CloneNotSupportedException
+    {
+        final FancyMessage instance = (FancyMessage) super.clone();
+        instance.messageParts = new ArrayList<MessagePart>(messageParts.size());
+        for (int i = 0; i < messageParts.size(); i++)
+        {
+            instance.messageParts.add(i, messageParts.get(i).clone());
+        }
+        instance.dirty = false;
+        instance.jsonString = null;
+        return instance;
+    }
 
-	/**
-	 * Creates a JSON message with text.
-	 * @param firstPartText The existing text in the message.
-	 */
-	public FancyMessage(final String firstPartText) {
-		this(rawText(firstPartText));
-	}
+    /**
+     * Creates a JSON message with text.
+     * @param firstPartText The existing text in the message.
+     */
+    public FancyMessage(final String firstPartText)
+    {
+        this(rawText(firstPartText));
+    }
 
-	public FancyMessage(final TextualComponent firstPartText) {
-		messageParts = new ArrayList<MessagePart>();
-		messageParts.add(new MessagePart(firstPartText));
-		jsonString = null;
-		dirty = false;
+    public FancyMessage(final TextualComponent firstPartText)
+    {
+        messageParts = new ArrayList<MessagePart>();
+        messageParts.add(new MessagePart(firstPartText));
+        jsonString = null;
+        dirty = false;
 
-		if(nmsPacketPlayOutChatConstructor == null){
-			try {
-				nmsPacketPlayOutChatConstructor = Reflection.getNMSClass("PacketPlayOutChat").getDeclaredConstructor(Reflection.getNMSClass("IChatBaseComponent"));
-				nmsPacketPlayOutChatConstructor.setAccessible(true);
-			} catch (NoSuchMethodException e) {
-				Bukkit.getLogger().log(Level.SEVERE, "Could not find Minecraft method or constructor.", e);
-			} catch (SecurityException e) {
-				Bukkit.getLogger().log(Level.WARNING, "Could not access constructor.", e);
-			}
-		}
-	}
+        if (nmsPacketPlayOutChatConstructor == null)
+        {
+            try
+            {
+                nmsPacketPlayOutChatConstructor = Reflection.getNMSClass("PacketPlayOutChat").getDeclaredConstructor(Reflection.getNMSClass("IChatBaseComponent"));
+                nmsPacketPlayOutChatConstructor.setAccessible(true);
+            }
+            catch (final NoSuchMethodException e)
+            {
+                Bukkit.getLogger().log(Level.SEVERE, "Could not find Minecraft method or constructor.", e);
+            }
+            catch (final SecurityException e)
+            {
+                Bukkit.getLogger().log(Level.WARNING, "Could not access constructor.", e);
+            }
+        }
+    }
 
-	/**
-	 * Creates a JSON message without text.
-	 */
-	public FancyMessage() {
-		this((TextualComponent)null);
-	}
+    /**
+     * Creates a JSON message without text.
+     */
+    public FancyMessage()
+    {
+        this((TextualComponent) null);
+    }
 
-	/**
-	 * Sets the text of the current editing component to a value.
-	 * @param text The new text of the current editing component.
-	 * @return This builder instance.
-	 */
-	public FancyMessage text(String text) {
-		MessagePart latest = latest();
-		latest.text = rawText(text);
-		dirty = true;
-		return this;
-	}
+    /**
+     * Sets the text of the current editing component to a value.
+     * @param text The new text of the current editing component.
+     * @return This builder instance.
+     */
+    public FancyMessage text(final String text)
+    {
+        final MessagePart latest = latest();
+        latest.text = rawText(text);
+        dirty = true;
+        return this;
+    }
 
-	/**
-	 * Sets the text of the current editing component to a value.
-	 * @param text The new text of the current editing component.
-	 * @return This builder instance.
-	 */
-	public FancyMessage text(TextualComponent text) {
-		MessagePart latest = latest();
-		latest.text = text;
-		dirty = true;
-		return this;
-	}
+    /**
+     * Sets the text of the current editing component to a value.
+     * @param text The new text of the current editing component.
+     * @return This builder instance.
+     */
+    public FancyMessage text(final TextualComponent text)
+    {
+        final MessagePart latest = latest();
+        latest.text = text;
+        dirty = true;
+        return this;
+    }
 
-	/**
-	 * Sets the color of the current editing component to a value.
-	 * @param color The new color of the current editing component.
-	 * @return This builder instance.
-	 * @exception IllegalArgumentException If the specified {@code ChatColor} enumeration value is not a color (but a format value).
-	 */
-	public FancyMessage color(final ChatColor color) {
-		latest().color = color;
-		dirty = true;
-		return this;
-	}
+    /**
+     * Sets the color of the current editing component to a value.
+     * @param color The new color of the current editing component.
+     * @return This builder instance.
+     * @exception IllegalArgumentException If the specified {@code ChatColor} enumeration value is not a color (but a format value).
+     */
+    public FancyMessage color(final ChatColor color)
+    {
+        latest().color = color;
+        dirty = true;
+        return this;
+    }
 
-	/**
-	 * Sets the stylization of the current editing component.
-	 * @param styles The array of styles to apply to the editing component.
-	 * @return This builder instance.
-	 * @exception IllegalArgumentException If any of the enumeration values in the array do not represent formatters.
-	 */
-	public FancyMessage style(ChatColor... styles) {
-		for (final ChatColor style : styles) {
-			if (!style.isFormat()) {
-				throw new IllegalArgumentException(style.name() + " is not a style");
-			}
-		}
-		latest().styles.addAll(Arrays.asList(styles));
-		dirty = true;
-		return this;
-	}
+    /**
+     * Sets the stylization of the current editing component.
+     * @param styles The array of styles to apply to the editing component.
+     * @return This builder instance.
+     * @exception IllegalArgumentException If any of the enumeration values in the array do not represent formatters.
+     */
+    public FancyMessage style(final ChatColor... styles)
+    {
+        for (final ChatColor style : styles)
+        {
+            if (!style.isFormat()) { throw new IllegalArgumentException(style.name() + " is not a style"); }
+        }
+        latest().styles.addAll(Arrays.asList(styles));
+        dirty = true;
+        return this;
+    }
 
-	/**
-	 * Set the behavior of the current editing component to instruct the client to open a file on the client side filesystem when the currently edited part of the {@code FancyMessage} is clicked.
-	 * @param path The path of the file on the client filesystem.
-	 * @return This builder instance.
-	 */
-	public FancyMessage file(final String path) {
-		onClick("open_file", path);
-		return this;
-	}
+    /**
+     * Set the behavior of the current editing component to instruct the client to open a file on the client side filesystem when the currently edited part of the {@code FancyMessage} is clicked.
+     * @param path The path of the file on the client filesystem.
+     * @return This builder instance.
+     */
+    public FancyMessage file(final String path)
+    {
+        onClick("open_file", path);
+        return this;
+    }
 
-	/**
-	 * Set the behavior of the current editing component to instruct the client to open a webpage in the client's web browser when the currently edited part of the {@code FancyMessage} is clicked.
-	 * @param url The URL of the page to open when the link is clicked.
-	 * @return This builder instance.
-	 */
-	public FancyMessage link(final String url) {
-		onClick("open_url", url);
-		return this;
-	}
+    /**
+     * Set the behavior of the current editing component to instruct the client to open a webpage in the client's web browser when the currently edited part of the {@code FancyMessage} is clicked.
+     * @param url The URL of the page to open when the link is clicked.
+     * @return This builder instance.
+     */
+    public FancyMessage link(final String url)
+    {
+        onClick("open_url", url);
+        return this;
+    }
 
-	/**
-	 * Set the behavior of the current editing component to instruct the client to replace the chat input box content with the specified string when the currently edited part of the {@code FancyMessage} is clicked.
-	 * The client will not immediately send the command to the server to be executed unless the client player submits the command/chat message, usually with the enter key.
-	 * @param command The text to display in the chat bar of the client.
-	 * @return This builder instance.
-	 */
-	public FancyMessage suggest(final String command) {
-		onClick("suggest_command", command);
-		return this;
-	}
-	
-	/**
-	 * Set the behavior of the current editing component to instruct the client to append the chat input box content with the specified string when the currently edited part of the {@code FancyMessage} is SHIFT-CLICKED.
-	 * The client will not immediately send the command to the server to be executed unless the client player submits the command/chat message, usually with the enter key.
-	 * @param command The text to append to the chat bar of the client.
-	 * @return This builder instance.
-	 */
-	public FancyMessage insert(final String command) {
-		latest().insertionData = command;
-		dirty = true;
-		return this;
-	}
+    /**
+     * Set the behavior of the current editing component to instruct the client to replace the chat input box content with the specified string when the currently edited part of the {@code FancyMessage} is clicked.
+     * The client will not immediately send the command to the server to be executed unless the client player submits the command/chat message, usually with the enter key.
+     * @param command The text to display in the chat bar of the client.
+     * @return This builder instance.
+     */
+    public FancyMessage suggest(final String command)
+    {
+        onClick("suggest_command", command);
+        return this;
+    }
 
-	/**
-	 * Set the behavior of the current editing component to instruct the client to send the specified string to the server as a chat message when the currently edited part of the {@code FancyMessage} is clicked.
-	 * The client <b>will</b> immediately send the command to the server to be executed when the editing component is clicked.
-	 * @param command The text to display in the chat bar of the client.
-	 * @return This builder instance.
-	 */
-	public FancyMessage command(final String command) {
-		onClick("run_command", command);
-		return this;
-	}
+    /**
+     * Set the behavior of the current editing component to instruct the client to append the chat input box content with the specified string when the currently edited part of the {@code FancyMessage} is SHIFT-CLICKED.
+     * The client will not immediately send the command to the server to be executed unless the client player submits the command/chat message, usually with the enter key.
+     * @param command The text to append to the chat bar of the client.
+     * @return This builder instance.
+     */
+    public FancyMessage insert(final String command)
+    {
+        latest().insertionData = command;
+        dirty = true;
+        return this;
+    }
 
-	/**
-	 * Set the behavior of the current editing component to display information about an achievement when the client hovers over the text.
-	 * <p>Tooltips do not inherit display characteristics, such as color and styles, from the message component on which they are applied.</p>
-	 * @param name The name of the achievement to display, excluding the "achievement." prefix.
-	 * @return This builder instance.
-	 */
-	public FancyMessage achievementTooltip(final String name) {
-		onHover("show_achievement", new JsonString("achievement." + name));
-		return this;
-	}
+    /**
+     * Set the behavior of the current editing component to instruct the client to send the specified string to the server as a chat message when the currently edited part of the {@code FancyMessage} is clicked.
+     * The client <b>will</b> immediately send the command to the server to be executed when the editing component is clicked.
+     * @param command The text to display in the chat bar of the client.
+     * @return This builder instance.
+     */
+    public FancyMessage command(final String command)
+    {
+        onClick("run_command", command);
+        return this;
+    }
 
-	/**
-	 * Set the behavior of the current editing component to display information about an achievement when the client hovers over the text.
-	 * <p>Tooltips do not inherit display characteristics, such as color and styles, from the message component on which they are applied.</p>
-	 * @param which The achievement to display.
-	 * @return This builder instance.
-	 */
-	public FancyMessage achievementTooltip(final Achievement which) {
-		try {
-			Object achievement = Reflection.getMethod(Reflection.getOBCClass("CraftStatistic"), "getNMSAchievement", Achievement.class).invoke(null, which);
-			return achievementTooltip((String) Reflection.getField(Reflection.getNMSClass("Achievement"), "name").get(achievement));
-		} catch (IllegalAccessException e) {
-                        Bukkit.getLogger().log(Level.WARNING, "Could not access method.", e);
-			return this;
-		} catch (IllegalArgumentException e) {
-                        Bukkit.getLogger().log(Level.WARNING, "Argument could not be passed.", e);
-                        return this;
-                } catch (InvocationTargetException e) {
-                        Bukkit.getLogger().log(Level.WARNING, "A error has occured durring invoking of method.", e);
-                        return this;
-                }
-	}
+    /**
+     * Set the behavior of the current editing component to display information about an achievement when the client hovers over the text.
+     * <p>Tooltips do not inherit display characteristics, such as color and styles, from the message component on which they are applied.</p>
+     * @param name The name of the achievement to display, excluding the "achievement." prefix.
+     * @return This builder instance.
+     */
+    public FancyMessage achievementTooltip(final String name)
+    {
+        onHover("show_achievement", new JsonString("achievement." + name));
+        return this;
+    }
 
-	/**
-	 * Set the behavior of the current editing component to display information about a parameterless statistic when the client hovers over the text.
-	 * <p>Tooltips do not inherit display characteristics, such as color and styles, from the message component on which they are applied.</p>
-	 * @param which The statistic to display.
-	 * @return This builder instance.
-	 * @exception IllegalArgumentException If the statistic requires a parameter which was not supplied.
-	 */
-	public FancyMessage statisticTooltip(final Statistic which) {
-		Type type = which.getType();
-		if (type != Type.UNTYPED) {
-			throw new IllegalArgumentException("That statistic requires an additional " + type + " parameter!");
-		}
-		try {
-			Object statistic = Reflection.getMethod(Reflection.getOBCClass("CraftStatistic"), "getNMSStatistic", Statistic.class).invoke(null, which);
-			return achievementTooltip((String) Reflection.getField(Reflection.getNMSClass("Statistic"), "name").get(statistic));
-		} catch (IllegalAccessException e) {
-                        Bukkit.getLogger().log(Level.WARNING, "Could not access method.", e);
-			return this;
-		} catch (IllegalArgumentException e) {
-                        Bukkit.getLogger().log(Level.WARNING, "Argument could not be passed.", e);
-                        return this;
-                } catch (InvocationTargetException e) {
-                        Bukkit.getLogger().log(Level.WARNING, "A error has occured durring invoking of method.", e);
-                        return this;
-                }
-	}
+    /**
+     * Set the behavior of the current editing component to display information about an achievement when the client hovers over the text.
+     * <p>Tooltips do not inherit display characteristics, such as color and styles, from the message component on which they are applied.</p>
+     * @param which The achievement to display.
+     * @return This builder instance.
+     */
+    public FancyMessage achievementTooltip(final Achievement which)
+    {
+        try
+        {
+            final Object achievement = Reflection.getMethod(Reflection.getOBCClass("CraftStatistic"), "getNMSAchievement", Achievement.class).invoke(null, which);
+            return achievementTooltip((String) Reflection.getField(Reflection.getNMSClass("Achievement"), "name").get(achievement));
+        }
+        catch (final IllegalAccessException e)
+        {
+            Bukkit.getLogger().log(Level.WARNING, "Could not access method.", e);
+            return this;
+        }
+        catch (final IllegalArgumentException e)
+        {
+            Bukkit.getLogger().log(Level.WARNING, "Argument could not be passed.", e);
+            return this;
+        }
+        catch (final InvocationTargetException e)
+        {
+            Bukkit.getLogger().log(Level.WARNING, "A error has occured durring invoking of method.", e);
+            return this;
+        }
+    }
 
-	/**
-	 * Set the behavior of the current editing component to display information about a statistic parameter with a material when the client hovers over the text.
-	 * <p>Tooltips do not inherit display characteristics, such as color and styles, from the message component on which they are applied.</p>
-	 * @param which The statistic to display.
-	 * @param item The sole material parameter to the statistic.
-	 * @return This builder instance.
-	 * @exception IllegalArgumentException If the statistic requires a parameter which was not supplied, or was supplied a parameter that was not required.
-	 */
-	public FancyMessage statisticTooltip(final Statistic which, Material item) {
-		Type type = which.getType();
-		if (type == Type.UNTYPED) {
-			throw new IllegalArgumentException("That statistic needs no additional parameter!");
-		}
-		if ((type == Type.BLOCK && item.isBlock()) || type == Type.ENTITY) {
-			throw new IllegalArgumentException("Wrong parameter type for that statistic - needs " + type + "!");
-		}
-		try {
-			Object statistic = Reflection.getMethod(Reflection.getOBCClass("CraftStatistic"), "getMaterialStatistic", Statistic.class, Material.class).invoke(null, which, item);
-			return achievementTooltip((String) Reflection.getField(Reflection.getNMSClass("Statistic"), "name").get(statistic));
-		} catch (IllegalAccessException e) {
-                        Bukkit.getLogger().log(Level.WARNING, "Could not access method.", e);
-			return this;
-		} catch (IllegalArgumentException e) {
-                        Bukkit.getLogger().log(Level.WARNING, "Argument could not be passed.", e);
-                        return this;
-                } catch (InvocationTargetException e) {
-                        Bukkit.getLogger().log(Level.WARNING, "A error has occured durring invoking of method.", e);
-                        return this;
-                }
-	}
+    /**
+     * Set the behavior of the current editing component to display information about a parameterless statistic when the client hovers over the text.
+     * <p>Tooltips do not inherit display characteristics, such as color and styles, from the message component on which they are applied.</p>
+     * @param which The statistic to display.
+     * @return This builder instance.
+     * @exception IllegalArgumentException If the statistic requires a parameter which was not supplied.
+     */
+    public FancyMessage statisticTooltip(final Statistic which)
+    {
+        final Type type = which.getType();
+        if (type != Type.UNTYPED) { throw new IllegalArgumentException("That statistic requires an additional " + type + " parameter!"); }
+        try
+        {
+            final Object statistic = Reflection.getMethod(Reflection.getOBCClass("CraftStatistic"), "getNMSStatistic", Statistic.class).invoke(null, which);
+            return achievementTooltip((String) Reflection.getField(Reflection.getNMSClass("Statistic"), "name").get(statistic));
+        }
+        catch (final IllegalAccessException e)
+        {
+            Bukkit.getLogger().log(Level.WARNING, "Could not access method.", e);
+            return this;
+        }
+        catch (final IllegalArgumentException e)
+        {
+            Bukkit.getLogger().log(Level.WARNING, "Argument could not be passed.", e);
+            return this;
+        }
+        catch (final InvocationTargetException e)
+        {
+            Bukkit.getLogger().log(Level.WARNING, "A error has occured durring invoking of method.", e);
+            return this;
+        }
+    }
 
-	/**
-	 * Set the behavior of the current editing component to display information about a statistic parameter with an entity type when the client hovers over the text.
-	 * <p>Tooltips do not inherit display characteristics, such as color and styles, from the message component on which they are applied.</p>
-	 * @param which The statistic to display.
-	 * @param entity The sole entity type parameter to the statistic.
-	 * @return This builder instance.
-	 * @exception IllegalArgumentException If the statistic requires a parameter which was not supplied, or was supplied a parameter that was not required.
-	 */
-	public FancyMessage statisticTooltip(final Statistic which, EntityType entity) {
-		Type type = which.getType();
-		if (type == Type.UNTYPED) {
-			throw new IllegalArgumentException("That statistic needs no additional parameter!");
-		}
-		if (type != Type.ENTITY) {
-			throw new IllegalArgumentException("Wrong parameter type for that statistic - needs " + type + "!");
-		}
-		try {
-			Object statistic = Reflection.getMethod(Reflection.getOBCClass("CraftStatistic"), "getEntityStatistic", Statistic.class, EntityType.class).invoke(null, which, entity);
-			return achievementTooltip((String) Reflection.getField(Reflection.getNMSClass("Statistic"), "name").get(statistic));
-		} catch (IllegalAccessException e) {
-                        Bukkit.getLogger().log(Level.WARNING, "Could not access method.", e);
-			return this;
-		} catch (IllegalArgumentException e) {
-                        Bukkit.getLogger().log(Level.WARNING, "Argument could not be passed.", e);
-                        return this;
-                } catch (InvocationTargetException e) {
-                        Bukkit.getLogger().log(Level.WARNING, "A error has occured durring invoking of method.", e);
-                        return this;
-                }
-	}
+    /**
+     * Set the behavior of the current editing component to display information about a statistic parameter with a material when the client hovers over the text.
+     * <p>Tooltips do not inherit display characteristics, such as color and styles, from the message component on which they are applied.</p>
+     * @param which The statistic to display.
+     * @param item The sole material parameter to the statistic.
+     * @return This builder instance.
+     * @exception IllegalArgumentException If the statistic requires a parameter which was not supplied, or was supplied a parameter that was not required.
+     */
+    public FancyMessage statisticTooltip(final Statistic which, final Material item)
+    {
+        final Type type = which.getType();
+        if (type == Type.UNTYPED) { throw new IllegalArgumentException("That statistic needs no additional parameter!"); }
+        if (((type == Type.BLOCK) && item.isBlock()) || (type == Type.ENTITY)) { throw new IllegalArgumentException("Wrong parameter type for that statistic - needs " + type + "!"); }
+        try
+        {
+            final Object statistic = Reflection.getMethod(Reflection.getOBCClass("CraftStatistic"), "getMaterialStatistic", Statistic.class, Material.class).invoke(null, which, item);
+            return achievementTooltip((String) Reflection.getField(Reflection.getNMSClass("Statistic"), "name").get(statistic));
+        }
+        catch (final IllegalAccessException e)
+        {
+            Bukkit.getLogger().log(Level.WARNING, "Could not access method.", e);
+            return this;
+        }
+        catch (final IllegalArgumentException e)
+        {
+            Bukkit.getLogger().log(Level.WARNING, "Argument could not be passed.", e);
+            return this;
+        }
+        catch (final InvocationTargetException e)
+        {
+            Bukkit.getLogger().log(Level.WARNING, "A error has occured durring invoking of method.", e);
+            return this;
+        }
+    }
 
-	/**
-	 * Set the behavior of the current editing component to display information about an item when the client hovers over the text.
-	 * <p>Tooltips do not inherit display characteristics, such as color and styles, from the message component on which they are applied.</p>
-	 * @param itemJSON A string representing the JSON-serialized NBT data tag of an {@link ItemStack}.
-	 * @return This builder instance.
-	 */
-	public FancyMessage itemTooltip(final String itemJSON) {
-		onHover("show_item", new JsonString(itemJSON)); // Seems a bit hacky, considering we have a JSON object as a parameter
-		return this;
-	}
+    /**
+     * Set the behavior of the current editing component to display information about a statistic parameter with an entity type when the client hovers over the text.
+     * <p>Tooltips do not inherit display characteristics, such as color and styles, from the message component on which they are applied.</p>
+     * @param which The statistic to display.
+     * @param entity The sole entity type parameter to the statistic.
+     * @return This builder instance.
+     * @exception IllegalArgumentException If the statistic requires a parameter which was not supplied, or was supplied a parameter that was not required.
+     */
+    public FancyMessage statisticTooltip(final Statistic which, final EntityType entity)
+    {
+        final Type type = which.getType();
+        if (type == Type.UNTYPED) { throw new IllegalArgumentException("That statistic needs no additional parameter!"); }
+        if (type != Type.ENTITY) { throw new IllegalArgumentException("Wrong parameter type for that statistic - needs " + type + "!"); }
+        try
+        {
+            final Object statistic = Reflection.getMethod(Reflection.getOBCClass("CraftStatistic"), "getEntityStatistic", Statistic.class, EntityType.class).invoke(null, which, entity);
+            return achievementTooltip((String) Reflection.getField(Reflection.getNMSClass("Statistic"), "name").get(statistic));
+        }
+        catch (final IllegalAccessException e)
+        {
+            Bukkit.getLogger().log(Level.WARNING, "Could not access method.", e);
+            return this;
+        }
+        catch (final IllegalArgumentException e)
+        {
+            Bukkit.getLogger().log(Level.WARNING, "Argument could not be passed.", e);
+            return this;
+        }
+        catch (final InvocationTargetException e)
+        {
+            Bukkit.getLogger().log(Level.WARNING, "A error has occured durring invoking of method.", e);
+            return this;
+        }
+    }
 
-	/**
-	 * Set the behavior of the current editing component to display information about an item when the client hovers over the text.
-	 * <p>Tooltips do not inherit display characteristics, such as color and styles, from the message component on which they are applied.</p>
-	 * @param itemStack The stack for which to display information.
-	 * @return This builder instance.
-	 */
-	public FancyMessage itemTooltip(final ItemStack itemStack) {
-		try {
-			Object nmsItem = Reflection.getMethod(Reflection.getOBCClass("inventory.CraftItemStack"), "asNMSCopy", ItemStack.class).invoke(null, itemStack);
-			return itemTooltip(Reflection.getMethod(Reflection.getNMSClass("ItemStack"), "save", Reflection.getNMSClass("NBTTagCompound")).invoke(nmsItem, Reflection.getNMSClass("NBTTagCompound").newInstance()).toString());
-		} catch (Exception e) {
-			e.printStackTrace();
-			return this;
-		}
-	}
-	
+    /**
+     * Set the behavior of the current editing component to display information about an item when the client hovers over the text.
+     * <p>Tooltips do not inherit display characteristics, such as color and styles, from the message component on which they are applied.</p>
+     * @param itemJSON A string representing the JSON-serialized NBT data tag of an {@link ItemStack}.
+     * @return This builder instance.
+     */
+    public FancyMessage itemTooltip(final String itemJSON)
+    {
+        onHover("show_item", new JsonString(itemJSON)); // Seems a bit hacky, considering we have a JSON object as a parameter
+        return this;
+    }
 
-	/**
-	 * Set the behavior of the current editing component to display raw text when the client hovers over the text.
-	 * <p>Tooltips do not inherit display characteristics, such as color and styles, from the message component on which they are applied.</p>
-	 * @param text The text, which supports newlines, which will be displayed to the client upon hovering.
-	 * @return This builder instance.
-	 */
-	public FancyMessage tooltip(final String text) {
-		onHover("show_text", new JsonString(text));
-		return this;
-	}
+    /**
+     * Set the behavior of the current editing component to display information about an item when the client hovers over the text.
+     * <p>Tooltips do not inherit display characteristics, such as color and styles, from the message component on which they are applied.</p>
+     * @param itemStack The stack for which to display information.
+     * @return This builder instance.
+     */
+    public FancyMessage itemTooltip(final ItemStack itemStack)
+    {
+        try
+        {
+            final Object nmsItem = Reflection.getMethod(Reflection.getOBCClass("inventory.CraftItemStack"), "asNMSCopy", ItemStack.class).invoke(null, itemStack);
+            return itemTooltip(Reflection.getMethod(Reflection.getNMSClass("ItemStack"), "save", Reflection.getNMSClass("NBTTagCompound"))
+            .invoke(nmsItem, Reflection.getNMSClass("NBTTagCompound").newInstance()).toString());
+        }
+        catch (final Exception e)
+        {
+            e.printStackTrace();
+            return this;
+        }
+    }
 
-	/**
-	 * Set the behavior of the current editing component to display raw text when the client hovers over the text.
-	 * <p>Tooltips do not inherit display characteristics, such as color and styles, from the message component on which they are applied.</p>
-	 * @param lines The lines of text which will be displayed to the client upon hovering. The iteration order of this object will be the order in which the lines of the tooltip are created.
-	 * @return This builder instance.
-	 */
-	public FancyMessage tooltip(final Iterable<String> lines) {
-		tooltip(ArrayWrapper.toArray(lines, String.class));
-		return this;
-	}
+    /**
+     * Set the behavior of the current editing component to display raw text when the client hovers over the text.
+     * <p>Tooltips do not inherit display characteristics, such as color and styles, from the message component on which they are applied.</p>
+     * @param text The text, which supports newlines, which will be displayed to the client upon hovering.
+     * @return This builder instance.
+     */
+    public FancyMessage tooltip(final String text)
+    {
+        onHover("show_text", new JsonString(text));
+        return this;
+    }
 
-	/**
-	 * Set the behavior of the current editing component to display raw text when the client hovers over the text.
-	 * <p>Tooltips do not inherit display characteristics, such as color and styles, from the message component on which they are applied.</p>
-	 * @param lines The lines of text which will be displayed to the client upon hovering.
-	 * @return This builder instance.
-	 */
-	public FancyMessage tooltip(final String... lines) {
-		StringBuilder builder = new StringBuilder();
-		for(int i = 0; i < lines.length; i++){
-			builder.append(lines[i]);
-			if(i != lines.length - 1){
-				builder.append('\n');
-			}
-		}
-		tooltip(builder.toString());
-		return this;
-	}
+    /**
+     * Set the behavior of the current editing component to display raw text when the client hovers over the text.
+     * <p>Tooltips do not inherit display characteristics, such as color and styles, from the message component on which they are applied.</p>
+     * @param lines The lines of text which will be displayed to the client upon hovering. The iteration order of this object will be the order in which the lines of the tooltip are created.
+     * @return This builder instance.
+     */
+    public FancyMessage tooltip(final Iterable<String> lines)
+    {
+        tooltip(ArrayWrapper.toArray(lines, String.class));
+        return this;
+    }
 
-	/**
-	 * Set the behavior of the current editing component to display formatted text when the client hovers over the text.
-	 * <p>Tooltips do not inherit display characteristics, such as color and styles, from the message component on which they are applied.</p>
-	 * @param text The formatted text which will be displayed to the client upon hovering.
-	 * @return This builder instance.
-	 */
-	public FancyMessage formattedTooltip(FancyMessage text){
-		for(MessagePart component : text.messageParts){
-			if(component.clickActionData != null && component.clickActionName != null){
-				throw new IllegalArgumentException("The tooltip text cannot have click data.");
-			}else if(component.hoverActionData != null && component.hoverActionName != null){
-				throw new IllegalArgumentException("The tooltip text cannot have a tooltip.");
-			}
-		}
-		onHover("show_text", text);
-		return this;
-	}
+    /**
+     * Set the behavior of the current editing component to display raw text when the client hovers over the text.
+     * <p>Tooltips do not inherit display characteristics, such as color and styles, from the message component on which they are applied.</p>
+     * @param lines The lines of text which will be displayed to the client upon hovering.
+     * @return This builder instance.
+     */
+    public FancyMessage tooltip(final String... lines)
+    {
+        final StringBuilder builder = new StringBuilder();
+        for (int i = 0; i < lines.length; i++)
+        {
+            builder.append(lines[i]);
+            if (i != (lines.length - 1))
+            {
+                builder.append('\n');
+            }
+        }
+        tooltip(builder.toString());
+        return this;
+    }
 
-	/**
-	 * Set the behavior of the current editing component to display the specified lines of formatted text when the client hovers over the text.
-	 * <p>Tooltips do not inherit display characteristics, such as color and styles, from the message component on which they are applied.</p>
-	 * @param lines The lines of formatted text which will be displayed to the client upon hovering.
-	 * @return This builder instance.
-	 */
-	public FancyMessage formattedTooltip(FancyMessage... lines){
-		if(lines.length < 1){
-			onHover(null, null); // Clear tooltip
-			return this;
-		}
+    /**
+     * Set the behavior of the current editing component to display formatted text when the client hovers over the text.
+     * <p>Tooltips do not inherit display characteristics, such as color and styles, from the message component on which they are applied.</p>
+     * @param text The formatted text which will be displayed to the client upon hovering.
+     * @return This builder instance.
+     */
+    public FancyMessage formattedTooltip(final FancyMessage text)
+    {
+        for (final MessagePart component : text.messageParts)
+        {
+            if ((component.clickActionData != null) && (component.clickActionName != null))
+            {
+                throw new IllegalArgumentException("The tooltip text cannot have click data.");
+            }
+            else if ((component.hoverActionData != null) && (component.hoverActionName != null)) { throw new IllegalArgumentException("The tooltip text cannot have a tooltip."); }
+        }
+        onHover("show_text", text);
+        return this;
+    }
 
-		FancyMessage result = new FancyMessage();
-		result.messageParts.clear(); // Remove the one existing text component that exists by default, which destabilizes the object
-
-		for(int i = 0; i < lines.length; i++){
-			try{
-				for(MessagePart component : lines[i]){
-					if(component.clickActionData != null && component.clickActionName != null){
-						throw new IllegalArgumentException("The tooltip text cannot have click data.");
-					}else if(component.hoverActionData != null && component.hoverActionName != null){
-						throw new IllegalArgumentException("The tooltip text cannot have a tooltip.");
-					}
-					if(component.hasText()){
-						result.messageParts.add(component.clone());
-					}
-				}
-				if(i != lines.length - 1){
-					result.messageParts.add(new MessagePart(rawText("\n")));
-				}
-			} catch (CloneNotSupportedException e) {
-				Bukkit.getLogger().log(Level.WARNING, "Failed to clone object", e);
-				return this;
-			}
-		} 
-		return formattedTooltip(result.messageParts.isEmpty() ? null : result); // Throws NPE if size is 0, intended
-	}
-
-	/**
-	 * Set the behavior of the current editing component to display the specified lines of formatted text when the client hovers over the text.
-	 * <p>Tooltips do not inherit display characteristics, such as color and styles, from the message component on which they are applied.</p>
-	 * @param lines The lines of text which will be displayed to the client upon hovering. The iteration order of this object will be the order in which the lines of the tooltip are created.
-	 * @return This builder instance.
-	 */
-	public FancyMessage formattedTooltip(final Iterable<FancyMessage> lines){
-		return formattedTooltip(ArrayWrapper.toArray(lines, FancyMessage.class));
-	}
-
-	/**
-	 * If the text is a translatable key, and it has replaceable values, this function can be used to set the replacements that will be used in the message.
-	 * @param replacements The replacements, in order, that will be used in the language-specific message.
-	 * @return This builder instance.
-	 */
-	public FancyMessage translationReplacements(final String... replacements){
-		for(String str : replacements){
-			latest().translationReplacements.add(new JsonString(str));
-		}
-		dirty = true;
-		
-		return this;
-	}
-	/*
-	
-	/**
-	 * If the text is a translatable key, and it has replaceable values, this function can be used to set the replacements that will be used in the message.
-	 * @param replacements The replacements, in order, that will be used in the language-specific message.
-	 * @return This builder instance.
-	 */   /* ------------
-	public FancyMessage translationReplacements(final Iterable<? extends CharSequence> replacements){
-		for(CharSequence str : replacements){
-			latest().translationReplacements.add(new JsonString(str));
-		}
-		
-		return this;
-	}
-	
-	*/
-	
-	/**
-	 * If the text is a translatable key, and it has replaceable values, this function can be used to set the replacements that will be used in the message.
-	 * @param replacements The replacements, in order, that will be used in the language-specific message.
-	 * @return This builder instance.
-	 */
-	public FancyMessage translationReplacements(final FancyMessage... replacements){
-		for(FancyMessage str : replacements){
-			latest().translationReplacements.add(str);
-		}
-		
-		dirty = true;
-		
-		return this;
-	}
-	
-	/**
-	 * If the text is a translatable key, and it has replaceable values, this function can be used to set the replacements that will be used in the message.
-	 * @param replacements The replacements, in order, that will be used in the language-specific message.
-	 * @return This builder instance.
-	 */
-	public FancyMessage translationReplacements(final Iterable<FancyMessage> replacements){		
-		return translationReplacements(ArrayWrapper.toArray(replacements, FancyMessage.class));
-	}
-	
-	/**
-	 * Terminate construction of the current editing component, and begin construction of a new message component.
-	 * After a successful call to this method, all setter methods will refer to a new message component, created as a result of the call to this method.
-	 * @param text The text which will populate the new message component.
-	 * @return This builder instance.
-	 */
-	public FancyMessage then(final String text) {
-		return then(rawText(text));
-	}
-
-	/**
-	 * Terminate construction of the current editing component, and begin construction of a new message component.
-	 * After a successful call to this method, all setter methods will refer to a new message component, created as a result of the call to this method.
-	 * @param text The text which will populate the new message component.
-	 * @return This builder instance.
-	 */
-	public FancyMessage then(final TextualComponent text) {
-		if (!latest().hasText()) {
-			throw new IllegalStateException("previous message part has no text");
-		}
-		messageParts.add(new MessagePart(text));
-		dirty = true;
-		return this;
-	}
-
-	/**
-	 * Terminate construction of the current editing component, and begin construction of a new message component.
-	 * After a successful call to this method, all setter methods will refer to a new message component, created as a result of the call to this method.
-	 * @return This builder instance.
-	 */
-	public FancyMessage then() {
-		if (!latest().hasText()) {
-			throw new IllegalStateException("previous message part has no text");
-		}
-		messageParts.add(new MessagePart());
-		dirty = true;
-		return this;
-	}
-
-	@Override
-	public void writeJson(JsonWriter writer) throws IOException{
-		if (messageParts.size() == 1) {
-			latest().writeJson(writer);
-		} else {
-			writer.beginObject().name("text").value("").name("extra").beginArray();
-			for (final MessagePart part : this) {
-				part.writeJson(writer);
-			}
-			writer.endArray().endObject();
-		}
-	}
-
-	/**
-	 * Serialize this fancy message, converting it into syntactically-valid JSON using a {@link JsonWriter}.
-	 * This JSON should be compatible with vanilla formatter commands such as {@code /tellraw}.
-	 * @return The JSON string representing this object.
-	 */
-	public String toJSONString() {
-		if (!dirty && jsonString != null) {
-			return jsonString;
-		}
-		StringWriter string = new StringWriter();
-		JsonWriter json = new JsonWriter(string);
-		try {
-			writeJson(json);
-			json.close();
-		} catch (IOException e) {
-			throw new RuntimeException("invalid message");
-		}
-		jsonString = string.toString();
-		dirty = false;
-		return jsonString;
-	}
-
-	/**
-	 * Sends this message to a player. The player will receive the fully-fledged formatted display of this message.
-	 * @param player The player who will receive the message.
-	 */
-	public void send(Player player){
-		send(player, toJSONString());
-	}
-        
-        private void send(CommandSender sender, String jsonString){
-                if (!(sender instanceof Player)){
-                        sender.sendMessage(toOldMessageFormat());
-                        return;
-                }
-                Player player = (Player) sender;
-                try {
-			Object handle = Reflection.getHandle(player);
-			Object connection = Reflection.getField(handle.getClass(), "playerConnection").get(handle);
-			Reflection.getMethod(connection.getClass(), "sendPacket", Reflection.getNMSClass("Packet")).invoke(connection, createChatPacket(jsonString));
-		} catch (IllegalArgumentException e) {
-                        Bukkit.getLogger().log(Level.WARNING, "Argument could not be passed.", e);
-		} catch (IllegalAccessException e) {
-                        Bukkit.getLogger().log(Level.WARNING, "Could not access method.", e);
-                } catch (InstantiationException e) {
-                        Bukkit.getLogger().log(Level.WARNING, "Underlying class is abstract.", e);
-                } catch (InvocationTargetException e) {
-                        Bukkit.getLogger().log(Level.WARNING, "A error has occured durring invoking of method.", e);
-                } catch (NoSuchMethodException e) {
-                        Bukkit.getLogger().log(Level.WARNING, "Could not find method.", e);
-                } catch (ClassNotFoundException e) {
-                        Bukkit.getLogger().log(Level.WARNING, "Could not find class.", e);
-                }
+    /**
+     * Set the behavior of the current editing component to display the specified lines of formatted text when the client hovers over the text.
+     * <p>Tooltips do not inherit display characteristics, such as color and styles, from the message component on which they are applied.</p>
+     * @param lines The lines of formatted text which will be displayed to the client upon hovering.
+     * @return This builder instance.
+     */
+    public FancyMessage formattedTooltip(final FancyMessage... lines)
+    {
+        if (lines.length < 1)
+        {
+            onHover(null, null); // Clear tooltip
+            return this;
         }
 
-	// The ChatSerializer's instance of Gson
-	private static Object nmsChatSerializerGsonInstance;
-	private static Method fromJsonMethod;
+        final FancyMessage result = new FancyMessage();
+        result.messageParts.clear(); // Remove the one existing text component that exists by default, which destabilizes the object
 
-	private Object createChatPacket(String json) throws IllegalArgumentException, IllegalAccessException, InstantiationException, InvocationTargetException, NoSuchMethodException, ClassNotFoundException {
-		if(nmsChatSerializerGsonInstance == null){
-			// Find the field and its value, completely bypassing obfuscation
-			Class<?> chatSerializerClazz;
+        for (int i = 0; i < lines.length; i++)
+        {
+            try
+            {
+                for (final MessagePart component : lines[i])
+                {
+                    if ((component.clickActionData != null) && (component.clickActionName != null))
+                    {
+                        throw new IllegalArgumentException("The tooltip text cannot have click data.");
+                    }
+                    else if ((component.hoverActionData != null) && (component.hoverActionName != null)) { throw new IllegalArgumentException("The tooltip text cannot have a tooltip."); }
+                    if (component.hasText())
+                    {
+                        result.messageParts.add(component.clone());
+                    }
+                }
+                if (i != (lines.length - 1))
+                {
+                    result.messageParts.add(new MessagePart(rawText("\n")));
+                }
+            }
+            catch (final CloneNotSupportedException e)
+            {
+                Bukkit.getLogger().log(Level.WARNING, "Failed to clone object", e);
+                return this;
+            }
+        }
+        return formattedTooltip(result.messageParts.isEmpty() ? null : result); // Throws NPE if size is 0, intended
+    }
 
-			String version = Reflection.getVersion();
-			double majorVersion = Double.parseDouble(version.replace('_', '.').substring(1, 4));
-			int lesserVersion = Integer.parseInt(version.substring(6, 7));
+    /**
+     * Set the behavior of the current editing component to display the specified lines of formatted text when the client hovers over the text.
+     * <p>Tooltips do not inherit display characteristics, such as color and styles, from the message component on which they are applied.</p>
+     * @param lines The lines of text which will be displayed to the client upon hovering. The iteration order of this object will be the order in which the lines of the tooltip are created.
+     * @return This builder instance.
+     */
+    public FancyMessage formattedTooltip(final Iterable<FancyMessage> lines)
+    {
+        return formattedTooltip(ArrayWrapper.toArray(lines, FancyMessage.class));
+    }
 
-			if (majorVersion < 1.8 || (majorVersion == 1.8 && lesserVersion == 1)) {
-				chatSerializerClazz = Reflection.getNMSClass("ChatSerializer");
-			} else {
-				chatSerializerClazz = Reflection.getNMSClass("IChatBaseComponent$ChatSerializer");
-			}
+    /**
+     * If the text is a translatable key, and it has replaceable values, this function can be used to set the replacements that will be used in the message.
+     * @param replacements The replacements, in order, that will be used in the language-specific message.
+     * @return This builder instance.
+     */
+    public FancyMessage translationReplacements(final String... replacements)
+    {
+        for (final String str : replacements)
+        {
+            latest().translationReplacements.add(new JsonString(str));
+        }
+        dirty = true;
 
-			if (chatSerializerClazz == null) {
-				throw new ClassNotFoundException("Can't find the ChatSerializer class");
-			}
+        return this;
+    }
 
-			for (Field declaredField : chatSerializerClazz.getDeclaredFields()) {
-				if (Modifier.isFinal(declaredField.getModifiers()) && Modifier.isStatic(declaredField.getModifiers()) && declaredField.getType().getName().endsWith("Gson")) {
-					// We've found our field
-					declaredField.setAccessible(true);
-					nmsChatSerializerGsonInstance = declaredField.get(null);
-					fromJsonMethod = nmsChatSerializerGsonInstance.getClass().getMethod("fromJson", String.class, Class.class);
-					break;
-				}
-			}
-		}
+    /*
 
-		// Since the method is so simple, and all the obfuscated methods have the same name, it's easier to reimplement 'IChatBaseComponent a(String)' than to reflectively call it
-		// Of course, the implementation may change, but fuzzy matches might break with signature changes
-		Object serializedChatComponent = fromJsonMethod.invoke(nmsChatSerializerGsonInstance, json, Reflection.getNMSClass("IChatBaseComponent"));
+    /**
+     * If the text is a translatable key, and it has replaceable values, this function can be used to set the replacements that will be used in the message.
+     * @param replacements The replacements, in order, that will be used in the language-specific message.
+     * @return This builder instance.
+     *//* ------------
+       public FancyMessage translationReplacements(final Iterable<? extends CharSequence> replacements){
+       for(CharSequence str : replacements){
+       latest().translationReplacements.add(new JsonString(str));
+       }
 
-		return nmsPacketPlayOutChatConstructor.newInstance(serializedChatComponent);
-	}
+       return this;
+       }
 
-	/**
-	 * Sends this message to a command sender.
-	 * If the sender is a player, they will receive the fully-fledged formatted display of this message.
-	 * Otherwise, they will receive a version of this message with less formatting.
-	 * @param sender The command sender who will receive the message.
-	 * @see #toOldMessageFormat()
-	 */
-	public void send(CommandSender sender) {
-                send(sender, toJSONString());
-	}
+       */
 
-	/**
-	 * Sends this message to multiple command senders.
-	 * @param senders The command senders who will receive the message.
-	 * @see #send(CommandSender)
-	 */
-	public void send(final Iterable<? extends CommandSender> senders) {
-                String string = toJSONString();
-		for (final CommandSender sender : senders) {
-			send(sender, string);
-		}
-	}
+    /**
+     * If the text is a translatable key, and it has replaceable values, this function can be used to set the replacements that will be used in the message.
+     * @param replacements The replacements, in order, that will be used in the language-specific message.
+     * @return This builder instance.
+     */
+    public FancyMessage translationReplacements(final FancyMessage... replacements)
+    {
+        for (final FancyMessage str : replacements)
+        {
+            latest().translationReplacements.add(str);
+        }
 
-	/**
-	 * Convert this message to a human-readable string with limited formatting.
-	 * This method is used to send this message to clients without JSON formatting support.
-	 * <p>
-	 * Serialization of this message by using this message will include (in this order for each message part):
-	 * <ol>
-	 * <li>The color of each message part.</li>
-	 * <li>The applicable stylizations for each message part.</li>
-	 * <li>The core text of the message part.</li>
-	 * </ol>
-	 * The primary omissions are tooltips and clickable actions. Consequently, this method should be used only as a last resort.
-	 * </p>
-	 * <p>
-	 * Color and formatting can be removed from the returned string by using {@link ChatColor#stripColor(String)}.</p>
-	 * @return A human-readable string representing limited formatting in addition to the core text of this message.
-	 */
-	public String toOldMessageFormat() {
-		StringBuilder result = new StringBuilder();
-		for (MessagePart part : this) {
-			result.append(part.color == null ? "" : part.color);
-			for(ChatColor formatSpecifier : part.styles){
-				result.append(formatSpecifier);
-			}
-			result.append(part.text);
-		}
-		return result.toString();
-	}
+        dirty = true;
 
-	private MessagePart latest() {
-		return messageParts.get(messageParts.size() - 1);
-	}
+        return this;
+    }
 
-	private void onClick(final String name, final String data) {
-		final MessagePart latest = latest();
-		latest.clickActionName = name;
-		latest.clickActionData = data;
-		dirty = true;
-	}
+    /**
+     * If the text is a translatable key, and it has replaceable values, this function can be used to set the replacements that will be used in the message.
+     * @param replacements The replacements, in order, that will be used in the language-specific message.
+     * @return This builder instance.
+     */
+    public FancyMessage translationReplacements(final Iterable<FancyMessage> replacements)
+    {
+        return translationReplacements(ArrayWrapper.toArray(replacements, FancyMessage.class));
+    }
 
-	private void onHover(final String name, final JsonRepresentedObject data) {
-		final MessagePart latest = latest();
-		latest.hoverActionName = name;
-		latest.hoverActionData = data;
-		dirty = true;
-	}
+    /**
+     * Terminate construction of the current editing component, and begin construction of a new message component.
+     * After a successful call to this method, all setter methods will refer to a new message component, created as a result of the call to this method.
+     * @param text The text which will populate the new message component.
+     * @return This builder instance.
+     */
+    public FancyMessage then(final String text)
+    {
+        return then(rawText(text));
+    }
 
-	// Doc copied from interface
-	public Map<String, Object> serialize() {
-		HashMap<String, Object> map = new HashMap<String, Object>();
-		map.put("messageParts", messageParts);
-//		map.put("JSON", toJSONString());
-		return map;
-	}
+    /**
+     * Terminate construction of the current editing component, and begin construction of a new message component.
+     * After a successful call to this method, all setter methods will refer to a new message component, created as a result of the call to this method.
+     * @param text The text which will populate the new message component.
+     * @return This builder instance.
+     */
+    public FancyMessage then(final TextualComponent text)
+    {
+        if (!latest().hasText()) { throw new IllegalStateException("previous message part has no text"); }
+        messageParts.add(new MessagePart(text));
+        dirty = true;
+        return this;
+    }
 
-	/**
-	 * Deserializes a JSON-represented message from a mapping of key-value pairs.
-	 * This is called by the Bukkit serialization API.
-	 * It is not intended for direct public API consumption.
-	 * @param serialized The key-value mapping which represents a fancy message.
-	 */
-	@SuppressWarnings("unchecked")
-	public static FancyMessage deserialize(Map<String, Object> serialized){
-		FancyMessage msg = new FancyMessage();
-		msg.messageParts = (List<MessagePart>)serialized.get("messageParts");
-		msg.jsonString = serialized.containsKey("JSON") ? serialized.get("JSON").toString() : null;
-		msg.dirty = !serialized.containsKey("JSON");
-		return msg;
-	}
+    /**
+     * Terminate construction of the current editing component, and begin construction of a new message component.
+     * After a successful call to this method, all setter methods will refer to a new message component, created as a result of the call to this method.
+     * @return This builder instance.
+     */
+    public FancyMessage then()
+    {
+        if (!latest().hasText()) { throw new IllegalStateException("previous message part has no text"); }
+        messageParts.add(new MessagePart());
+        dirty = true;
+        return this;
+    }
 
-	/**
-	 * <b>Internally called method. Not for API consumption.</b>
-	 */
-	public Iterator<MessagePart> iterator() {
-		return messageParts.iterator();
-	}
-	
-	private static JsonParser _stringParser = new JsonParser();
-	
-	/**
-	 * Deserializes a fancy message from its JSON representation. This JSON representation is of the format of
-	 * that returned by {@link #toJSONString()}, and is compatible with vanilla inputs.
-	 * @param json The JSON string which represents a fancy message.
-	 * @return A {@code FancyMessage} representing the parameterized JSON message.
-	 */
-	public static FancyMessage deserialize(String json){
-		JsonObject serialized = _stringParser.parse(json).getAsJsonObject();
-		JsonArray extra = serialized.getAsJsonArray("extra"); // Get the extra component
-		FancyMessage returnVal = new FancyMessage();
-		returnVal.messageParts.clear();
-		for(JsonElement mPrt : extra){
-			MessagePart component = new MessagePart();
-			JsonObject messagePart = mPrt.getAsJsonObject();
-			for(Map.Entry<String, JsonElement> entry : messagePart.entrySet()){
-				// Deserialize text
-				if(TextualComponent.isTextKey(entry.getKey())){
-					// The map mimics the YAML serialization, which has a "key" field and one or more "value" fields
-					Map<String, Object> serializedMapForm = new HashMap<String, Object>(); // Must be object due to Bukkit serializer API compliance
-					serializedMapForm.put("key", entry.getKey());
-					if(entry.getValue().isJsonPrimitive()){
-						// Assume string
-						serializedMapForm.put("value", entry.getValue().getAsString());
-					}else{
-						// Composite object, but we assume each element is a string
-						for(Map.Entry<String, JsonElement> compositeNestedElement : entry.getValue().getAsJsonObject().entrySet()){
-							serializedMapForm.put("value." + compositeNestedElement.getKey(), compositeNestedElement.getValue().getAsString());
-						}
-					}
-					component.text = TextualComponent.deserialize(serializedMapForm);
-				}else if(MessagePart.stylesToNames.inverse().containsKey(entry.getKey())){
-					if(entry.getValue().getAsBoolean()){
-						component.styles.add(MessagePart.stylesToNames.inverse().get(entry.getKey()));
-					}
-				}else if(entry.getKey().equals("color")){
-					component.color = ChatColor.valueOf(entry.getValue().getAsString().toUpperCase());
-				}else if(entry.getKey().equals("clickEvent")){
-					JsonObject object = entry.getValue().getAsJsonObject();
-					component.clickActionName = object.get("action").getAsString();
-					component.clickActionData = object.get("value").getAsString();
-				}else if(entry.getKey().equals("hoverEvent")){
-					JsonObject object = entry.getValue().getAsJsonObject();
-					component.hoverActionName = object.get("action").getAsString();
-					if(object.get("value").isJsonPrimitive()){
-						// Assume string
-						component.hoverActionData = new JsonString(object.get("value").getAsString());
-					}else{
-						// Assume composite type
-						// The only composite type we currently store is another FancyMessage
-						// Therefore, recursion time!
-						component.hoverActionData = deserialize(object.get("value").toString() /* This should properly serialize the JSON object as a JSON string */);
-					}
-				}else if(entry.getKey().equals("insertion")){
-					component.insertionData = entry.getValue().getAsString();
-				}else if(entry.getKey().equals("with")){
-					for(JsonElement object : entry.getValue().getAsJsonArray()){
-						if(object.isJsonPrimitive()){
-							component.translationReplacements.add(new JsonString(object.getAsString()));
-						}else{
-							// Only composite type stored in this array is - again - FancyMessages
-							// Recurse within this function to parse this as a translation replacement
-							component.translationReplacements.add(deserialize(object.toString()));
-						}
-					}
-				}
-			}
-			returnVal.messageParts.add(component);
-		}
-		return returnVal;
-	}
+    @Override
+    public void writeJson(final JsonWriter writer) throws IOException
+    {
+        if (messageParts.size() == 1)
+        {
+            latest().writeJson(writer);
+        }
+        else
+        {
+            writer.beginObject().name("text").value("").name("extra").beginArray();
+            for (final MessagePart part : this)
+            {
+                part.writeJson(writer);
+            }
+            writer.endArray().endObject();
+        }
+    }
+
+    /**
+     * Serialize this fancy message, converting it into syntactically-valid JSON using a {@link JsonWriter}.
+     * This JSON should be compatible with vanilla formatter commands such as {@code /tellraw}.
+     * @return The JSON string representing this object.
+     */
+    public String toJSONString()
+    {
+        if (!dirty && (jsonString != null)) { return jsonString; }
+        final StringWriter string = new StringWriter();
+        final JsonWriter json = new JsonWriter(string);
+        try
+        {
+            writeJson(json);
+            json.close();
+        }
+        catch (final IOException e)
+        {
+            throw new RuntimeException("invalid message");
+        }
+        jsonString = string.toString();
+        dirty = false;
+        return jsonString;
+    }
+
+    /**
+     * Sends this message to a player. The player will receive the fully-fledged formatted display of this message.
+     * @param player The player who will receive the message.
+     */
+    public void send(final Player player)
+    {
+        send(player, toJSONString());
+    }
+
+    private void send(final CommandSender sender, final String jsonString)
+    {
+        if (!(sender instanceof Player))
+        {
+            sender.sendMessage(toOldMessageFormat());
+            return;
+        }
+        final Player player = (Player) sender;
+        try
+        {
+            final Object handle = Reflection.getHandle(player);
+            final Object connection = Reflection.getField(handle.getClass(), "playerConnection").get(handle);
+            Reflection.getMethod(connection.getClass(), "sendPacket", Reflection.getNMSClass("Packet")).invoke(connection, createChatPacket(jsonString));
+        }
+        catch (final IllegalArgumentException e)
+        {
+            Bukkit.getLogger().log(Level.WARNING, "Argument could not be passed.", e);
+        }
+        catch (final IllegalAccessException e)
+        {
+            Bukkit.getLogger().log(Level.WARNING, "Could not access method.", e);
+        }
+        catch (final InstantiationException e)
+        {
+            Bukkit.getLogger().log(Level.WARNING, "Underlying class is abstract.", e);
+        }
+        catch (final InvocationTargetException e)
+        {
+            Bukkit.getLogger().log(Level.WARNING, "A error has occured durring invoking of method.", e);
+        }
+        catch (final NoSuchMethodException e)
+        {
+            Bukkit.getLogger().log(Level.WARNING, "Could not find method.", e);
+        }
+        catch (final ClassNotFoundException e)
+        {
+            Bukkit.getLogger().log(Level.WARNING, "Could not find class.", e);
+        }
+    }
+
+    // The ChatSerializer's instance of Gson
+    private static Object nmsChatSerializerGsonInstance;
+    private static Method fromJsonMethod;
+
+    private Object createChatPacket(final String json) throws IllegalArgumentException, IllegalAccessException, InstantiationException, InvocationTargetException, NoSuchMethodException,
+    ClassNotFoundException
+    {
+        if (nmsChatSerializerGsonInstance == null)
+        {
+            // Find the field and its value, completely bypassing obfuscation
+            Class<?> chatSerializerClazz;
+
+            final String version = Reflection.getVersion();
+            final double majorVersion = Double.parseDouble(version.replace('_', '.').substring(1, 4));
+            final int lesserVersion = Integer.parseInt(version.substring(6, 7));
+
+            if ((majorVersion < 1.8) || ((majorVersion == 1.8) && (lesserVersion == 1)))
+            {
+                chatSerializerClazz = Reflection.getNMSClass("ChatSerializer");
+            }
+            else
+            {
+                chatSerializerClazz = Reflection.getNMSClass("IChatBaseComponent$ChatSerializer");
+            }
+
+            if (chatSerializerClazz == null) { throw new ClassNotFoundException("Can't find the ChatSerializer class"); }
+
+            for (final Field declaredField : chatSerializerClazz.getDeclaredFields())
+            {
+                if (Modifier.isFinal(declaredField.getModifiers()) && Modifier.isStatic(declaredField.getModifiers()) && declaredField.getType().getName().endsWith("Gson"))
+                {
+                    // We've found our field
+                    declaredField.setAccessible(true);
+                    nmsChatSerializerGsonInstance = declaredField.get(null);
+                    fromJsonMethod = nmsChatSerializerGsonInstance.getClass().getMethod("fromJson", String.class, Class.class);
+                    break;
+                }
+            }
+        }
+
+        // Since the method is so simple, and all the obfuscated methods have the same name, it's easier to reimplement 'IChatBaseComponent a(String)' than to reflectively call it
+        // Of course, the implementation may change, but fuzzy matches might break with signature changes
+        final Object serializedChatComponent = fromJsonMethod.invoke(nmsChatSerializerGsonInstance, json, Reflection.getNMSClass("IChatBaseComponent"));
+
+        return nmsPacketPlayOutChatConstructor.newInstance(serializedChatComponent);
+    }
+
+    /**
+     * Sends this message to a command sender.
+     * If the sender is a player, they will receive the fully-fledged formatted display of this message.
+     * Otherwise, they will receive a version of this message with less formatting.
+     * @param sender The command sender who will receive the message.
+     * @see #toOldMessageFormat()
+     */
+    public void send(final CommandSender sender)
+    {
+        send(sender, toJSONString());
+    }
+
+    /**
+     * Sends this message to multiple command senders.
+     * @param senders The command senders who will receive the message.
+     * @see #send(CommandSender)
+     */
+    public void send(final Iterable<? extends CommandSender> senders)
+    {
+        final String string = toJSONString();
+        for (final CommandSender sender : senders)
+        {
+            send(sender, string);
+        }
+    }
+
+    /**
+     * Convert this message to a human-readable string with limited formatting.
+     * This method is used to send this message to clients without JSON formatting support.
+     * <p>
+     * Serialization of this message by using this message will include (in this order for each message part):
+     * <ol>
+     * <li>The color of each message part.</li>
+     * <li>The applicable stylizations for each message part.</li>
+     * <li>The core text of the message part.</li>
+     * </ol>
+     * The primary omissions are tooltips and clickable actions. Consequently, this method should be used only as a last resort.
+     * </p>
+     * <p>
+     * Color and formatting can be removed from the returned string by using {@link ChatColor#stripColor(String)}.</p>
+     * @return A human-readable string representing limited formatting in addition to the core text of this message.
+     */
+    public String toOldMessageFormat()
+    {
+        final StringBuilder result = new StringBuilder();
+        for (final MessagePart part : this)
+        {
+            result.append(part.color == null ? "" : part.color);
+            for (final ChatColor formatSpecifier : part.styles)
+            {
+                result.append(formatSpecifier);
+            }
+            result.append(part.text);
+        }
+        return result.toString();
+    }
+
+    private MessagePart latest()
+    {
+        return messageParts.get(messageParts.size() - 1);
+    }
+
+    private void onClick(final String name, final String data)
+    {
+        final MessagePart latest = latest();
+        latest.clickActionName = name;
+        latest.clickActionData = data;
+        dirty = true;
+    }
+
+    private void onHover(final String name, final JsonRepresentedObject data)
+    {
+        final MessagePart latest = latest();
+        latest.hoverActionName = name;
+        latest.hoverActionData = data;
+        dirty = true;
+    }
+
+    // Doc copied from interface
+    @Override
+    public Map<String, Object> serialize()
+    {
+        final HashMap<String, Object> map = new HashMap<String, Object>();
+        map.put("messageParts", messageParts);
+        //		map.put("JSON", toJSONString());
+        return map;
+    }
+
+    /**
+     * Deserializes a JSON-represented message from a mapping of key-value pairs.
+     * This is called by the Bukkit serialization API.
+     * It is not intended for direct public API consumption.
+     * @param serialized The key-value mapping which represents a fancy message.
+     */
+    @SuppressWarnings("unchecked")
+    public static FancyMessage deserialize(final Map<String, Object> serialized)
+    {
+        final FancyMessage msg = new FancyMessage();
+        msg.messageParts = (List<MessagePart>) serialized.get("messageParts");
+        msg.jsonString = serialized.containsKey("JSON") ? serialized.get("JSON").toString() : null;
+        msg.dirty = !serialized.containsKey("JSON");
+        return msg;
+    }
+
+    /**
+     * <b>Internally called method. Not for API consumption.</b>
+     */
+    @Override
+    public Iterator<MessagePart> iterator()
+    {
+        return messageParts.iterator();
+    }
+
+    private static JsonParser _stringParser = new JsonParser();
+
+    /**
+     * Deserializes a fancy message from its JSON representation. This JSON representation is of the format of
+     * that returned by {@link #toJSONString()}, and is compatible with vanilla inputs.
+     * @param json The JSON string which represents a fancy message.
+     * @return A {@code FancyMessage} representing the parameterized JSON message.
+     */
+    public static FancyMessage deserialize(final String json)
+    {
+        final JsonObject serialized = _stringParser.parse(json).getAsJsonObject();
+        final JsonArray extra = serialized.getAsJsonArray("extra"); // Get the extra component
+        final FancyMessage returnVal = new FancyMessage();
+        returnVal.messageParts.clear();
+        for (final JsonElement mPrt : extra)
+        {
+            final MessagePart component = new MessagePart();
+            final JsonObject messagePart = mPrt.getAsJsonObject();
+            for (final Map.Entry<String, JsonElement> entry : messagePart.entrySet())
+            {
+                // Deserialize text
+                if (TextualComponent.isTextKey(entry.getKey()))
+                {
+                    // The map mimics the YAML serialization, which has a "key" field and one or more "value" fields
+                    final Map<String, Object> serializedMapForm = new HashMap<String, Object>(); // Must be object due to Bukkit serializer API compliance
+                    serializedMapForm.put("key", entry.getKey());
+                    if (entry.getValue().isJsonPrimitive())
+                    {
+                        // Assume string
+                        serializedMapForm.put("value", entry.getValue().getAsString());
+                    }
+                    else
+                    {
+                        // Composite object, but we assume each element is a string
+                        for (final Map.Entry<String, JsonElement> compositeNestedElement : entry.getValue().getAsJsonObject().entrySet())
+                        {
+                            serializedMapForm.put("value." + compositeNestedElement.getKey(), compositeNestedElement.getValue().getAsString());
+                        }
+                    }
+                    component.text = TextualComponent.deserialize(serializedMapForm);
+                }
+                else if (MessagePart.stylesToNames.inverse().containsKey(entry.getKey()))
+                {
+                    if (entry.getValue().getAsBoolean())
+                    {
+                        component.styles.add(MessagePart.stylesToNames.inverse().get(entry.getKey()));
+                    }
+                }
+                else if (entry.getKey().equals("color"))
+                {
+                    component.color = ChatColor.valueOf(entry.getValue().getAsString().toUpperCase());
+                }
+                else if (entry.getKey().equals("clickEvent"))
+                {
+                    final JsonObject object = entry.getValue().getAsJsonObject();
+                    component.clickActionName = object.get("action").getAsString();
+                    component.clickActionData = object.get("value").getAsString();
+                }
+                else if (entry.getKey().equals("hoverEvent"))
+                {
+                    final JsonObject object = entry.getValue().getAsJsonObject();
+                    component.hoverActionName = object.get("action").getAsString();
+                    if (object.get("value").isJsonPrimitive())
+                    {
+                        // Assume string
+                        component.hoverActionData = new JsonString(object.get("value").getAsString());
+                    }
+                    else
+                    {
+                        // Assume composite type
+                        // The only composite type we currently store is another FancyMessage
+                        // Therefore, recursion time!
+                        component.hoverActionData = deserialize(object.get("value").toString() /* This should properly serialize the JSON object as a JSON string */);
+                    }
+                }
+                else if (entry.getKey().equals("insertion"))
+                {
+                    component.insertionData = entry.getValue().getAsString();
+                }
+                else if (entry.getKey().equals("with"))
+                {
+                    for (final JsonElement object : entry.getValue().getAsJsonArray())
+                    {
+                        if (object.isJsonPrimitive())
+                        {
+                            component.translationReplacements.add(new JsonString(object.getAsString()));
+                        }
+                        else
+                        {
+                            // Only composite type stored in this array is - again - FancyMessages
+                            // Recurse within this function to parse this as a translation replacement
+                            component.translationReplacements.add(deserialize(object.toString()));
+                        }
+                    }
+                }
+            }
+            returnVal.messageParts.add(component);
+        }
+        return returnVal;
+    }
 }
diff --git a/src/main/java/com/plotsquared/bukkit/chat/JsonRepresentedObject.java b/src/main/java/com/plotsquared/bukkit/chat/JsonRepresentedObject.java
index cffcaa621..22cd2ed07 100644
--- a/src/main/java/com/plotsquared/bukkit/chat/JsonRepresentedObject.java
+++ b/src/main/java/com/plotsquared/bukkit/chat/JsonRepresentedObject.java
@@ -7,13 +7,14 @@ import com.google.gson.stream.JsonWriter;
 /**
  * Represents an object that can be serialized to a JSON writer instance.
  */
-interface JsonRepresentedObject {
+interface JsonRepresentedObject
+{
+
+    /**
+     * Writes the JSON representation of this object to the specified writer.
+     * @param writer The JSON writer which will receive the object.
+     * @throws IOException If an error occurs writing to the stream.
+     */
+    void writeJson(final JsonWriter writer) throws IOException;
 
-	/**
-	 * Writes the JSON representation of this object to the specified writer.
-	 * @param writer The JSON writer which will receive the object.
-	 * @throws IOException If an error occurs writing to the stream.
-	 */
-	void writeJson(JsonWriter writer) throws IOException;
-	
 }
diff --git a/src/main/java/com/plotsquared/bukkit/chat/JsonString.java b/src/main/java/com/plotsquared/bukkit/chat/JsonString.java
index 3ee438c0f..21782828f 100644
--- a/src/main/java/com/plotsquared/bukkit/chat/JsonString.java
+++ b/src/main/java/com/plotsquared/bukkit/chat/JsonString.java
@@ -12,35 +12,43 @@ import com.intellectualcrafters.configuration.serialization.ConfigurationSeriali
  * Writes by this object will not write name values nor begin/end objects in the JSON stream.
  * All writes merely write the represented string value.
  */
-final class JsonString implements JsonRepresentedObject, ConfigurationSerializable {
+final class JsonString implements JsonRepresentedObject, ConfigurationSerializable
+{
 
-	private String _value;
-	
-	public JsonString(CharSequence value){
-		_value = value == null ? null : value.toString();
-	}
+    private final String _value;
 
-	@Override
-	public void writeJson(JsonWriter writer) throws IOException {
-		writer.value(getValue());
-	}
-	
-	public String getValue(){
-		return _value;
-	}
+    public JsonString(final CharSequence value)
+    {
+        _value = value == null ? null : value.toString();
+    }
 
-	public Map<String, Object> serialize() {
-		HashMap<String, Object> theSingleValue = new HashMap<String, Object>();
-		theSingleValue.put("stringValue", _value);
-		return theSingleValue;
-	}
-	
-	public static JsonString deserialize(Map<String, Object> map){
-		return new JsonString(map.get("stringValue").toString());
-	}
-	
-	@Override
-	public String toString(){
-		return _value;
-	}
+    @Override
+    public void writeJson(final JsonWriter writer) throws IOException
+    {
+        writer.value(getValue());
+    }
+
+    public String getValue()
+    {
+        return _value;
+    }
+
+    @Override
+    public Map<String, Object> serialize()
+    {
+        final HashMap<String, Object> theSingleValue = new HashMap<String, Object>();
+        theSingleValue.put("stringValue", _value);
+        return theSingleValue;
+    }
+
+    public static JsonString deserialize(final Map<String, Object> map)
+    {
+        return new JsonString(map.get("stringValue").toString());
+    }
+
+    @Override
+    public String toString()
+    {
+        return _value;
+    }
 }
diff --git a/src/main/java/com/plotsquared/bukkit/chat/MessagePart.java b/src/main/java/com/plotsquared/bukkit/chat/MessagePart.java
index 4669560c0..d89dbab0f 100644
--- a/src/main/java/com/plotsquared/bukkit/chat/MessagePart.java
+++ b/src/main/java/com/plotsquared/bukkit/chat/MessagePart.java
@@ -18,137 +18,167 @@ import com.intellectualcrafters.configuration.serialization.ConfigurationSeriali
 /**
  * Internal class: Represents a component of a JSON-serializable {@link FancyMessage}.
  */
-final class MessagePart implements JsonRepresentedObject, ConfigurationSerializable, Cloneable {
+final class MessagePart implements JsonRepresentedObject, ConfigurationSerializable, Cloneable
+{
 
-	ChatColor color = ChatColor.WHITE;
-	ArrayList<ChatColor> styles = new ArrayList<ChatColor>();
-	String clickActionName = null, clickActionData = null,
-			hoverActionName = null;
-	JsonRepresentedObject hoverActionData = null;
-	TextualComponent text = null;
-	String insertionData = null;
-	ArrayList<JsonRepresentedObject> translationReplacements = new ArrayList<JsonRepresentedObject>();
+    ChatColor color = ChatColor.WHITE;
+    ArrayList<ChatColor> styles = new ArrayList<ChatColor>();
+    String clickActionName = null, clickActionData = null,
+    hoverActionName = null;
+    JsonRepresentedObject hoverActionData = null;
+    TextualComponent text = null;
+    String insertionData = null;
+    ArrayList<JsonRepresentedObject> translationReplacements = new ArrayList<JsonRepresentedObject>();
 
-	MessagePart(final TextualComponent text){
-		this.text = text;
-	}
+    MessagePart(final TextualComponent text)
+    {
+        this.text = text;
+    }
 
-	MessagePart() {
-		this.text = null;
-	}
+    MessagePart()
+    {
+        text = null;
+    }
 
-	boolean hasText() {
-		return text != null;
-	}
+    boolean hasText()
+    {
+        return text != null;
+    }
 
-        @Override
-	@SuppressWarnings("unchecked")
-	public MessagePart clone() throws CloneNotSupportedException{
-		MessagePart obj = (MessagePart)super.clone();
-		obj.styles = (ArrayList<ChatColor>)styles.clone();
-		if(hoverActionData instanceof JsonString){
-			obj.hoverActionData = new JsonString(((JsonString)hoverActionData).getValue());
-		}else if(hoverActionData instanceof FancyMessage){
-			obj.hoverActionData = ((FancyMessage)hoverActionData).clone();
-		}
-		obj.translationReplacements = (ArrayList<JsonRepresentedObject>)translationReplacements.clone();
-		return obj;
+    @Override
+    @SuppressWarnings("unchecked")
+    public MessagePart clone() throws CloneNotSupportedException
+    {
+        final MessagePart obj = (MessagePart) super.clone();
+        obj.styles = (ArrayList<ChatColor>) styles.clone();
+        if (hoverActionData instanceof JsonString)
+        {
+            obj.hoverActionData = new JsonString(((JsonString) hoverActionData).getValue());
+        }
+        else if (hoverActionData instanceof FancyMessage)
+        {
+            obj.hoverActionData = ((FancyMessage) hoverActionData).clone();
+        }
+        obj.translationReplacements = (ArrayList<JsonRepresentedObject>) translationReplacements.clone();
+        return obj;
 
-	}
+    }
 
-	static final BiMap<ChatColor, String> stylesToNames;
+    static final BiMap<ChatColor, String> stylesToNames;
 
-	static{
-		ImmutableBiMap.Builder<ChatColor, String> builder = ImmutableBiMap.builder();
-		for (final ChatColor style : ChatColor.values()){
-			if(!style.isFormat()){
-				continue;
-			}
+    static
+    {
+        final ImmutableBiMap.Builder<ChatColor, String> builder = ImmutableBiMap.builder();
+        for (final ChatColor style : ChatColor.values())
+        {
+            if (!style.isFormat())
+            {
+                continue;
+            }
 
-			String styleName;
-			switch (style) {
-			case MAGIC:
-				styleName = "obfuscated"; break;
-			case UNDERLINE:
-				styleName = "underlined"; break;
-			default:
-				styleName = style.name().toLowerCase(); break;
-			}
-			
-			builder.put(style, styleName);
-		}
-		stylesToNames = builder.build();
-	}
+            String styleName;
+            switch (style)
+            {
+                case MAGIC:
+                    styleName = "obfuscated";
+                    break;
+                case UNDERLINE:
+                    styleName = "underlined";
+                    break;
+                default:
+                    styleName = style.name().toLowerCase();
+                    break;
+            }
 
-	public void writeJson(JsonWriter json) {
-		try {
-			json.beginObject();
-			text.writeJson(json);
-			json.name("color").value(color.name().toLowerCase());
-			for (final ChatColor style : styles) {
-				json.name(stylesToNames.get(style)).value(true);
-			}
-			if (clickActionName != null && clickActionData != null) {
-				json.name("clickEvent")
-				.beginObject()
-				.name("action").value(clickActionName)
-				.name("value").value(clickActionData)
-				.endObject();
-			}
-			if (hoverActionName != null && hoverActionData != null) {
-				json.name("hoverEvent")
-				.beginObject()
-				.name("action").value(hoverActionName)
-				.name("value");
-				hoverActionData.writeJson(json);
-				json.endObject();
-			}
-			if(insertionData != null){
-				json.name("insertion").value(insertionData);
-			}
-			if(translationReplacements.size() > 0 && text != null && TextualComponent.isTranslatableText(text)){
-				json.name("with").beginArray();
-				for(JsonRepresentedObject obj : translationReplacements){
-					obj.writeJson(json);
-				}
-				json.endArray();
-			}
-			json.endObject();
-		} catch(IOException e){
-			Bukkit.getLogger().log(Level.WARNING, "A problem occured during writing of JSON string", e);
-		}
-	}
+            builder.put(style, styleName);
+        }
+        stylesToNames = builder.build();
+    }
 
-	public Map<String, Object> serialize() {
-		HashMap<String, Object> map = new HashMap<String, Object>();
-		map.put("text", text);
-		map.put("styles", styles);
-		map.put("color", color.getChar());
-		map.put("hoverActionName", hoverActionName);
-		map.put("hoverActionData", hoverActionData);
-		map.put("clickActionName", clickActionName);
-		map.put("clickActionData", clickActionData);
-		map.put("insertion", insertionData);
-		map.put("translationReplacements", translationReplacements);
-		return map;
-	}
+    @Override
+    public void writeJson(final JsonWriter json)
+    {
+        try
+        {
+            json.beginObject();
+            text.writeJson(json);
+            json.name("color").value(color.name().toLowerCase());
+            for (final ChatColor style : styles)
+            {
+                json.name(stylesToNames.get(style)).value(true);
+            }
+            if ((clickActionName != null) && (clickActionData != null))
+            {
+                json.name("clickEvent")
+                .beginObject()
+                .name("action").value(clickActionName)
+                .name("value").value(clickActionData)
+                .endObject();
+            }
+            if ((hoverActionName != null) && (hoverActionData != null))
+            {
+                json.name("hoverEvent")
+                .beginObject()
+                .name("action").value(hoverActionName)
+                .name("value");
+                hoverActionData.writeJson(json);
+                json.endObject();
+            }
+            if (insertionData != null)
+            {
+                json.name("insertion").value(insertionData);
+            }
+            if ((translationReplacements.size() > 0) && (text != null) && TextualComponent.isTranslatableText(text))
+            {
+                json.name("with").beginArray();
+                for (final JsonRepresentedObject obj : translationReplacements)
+                {
+                    obj.writeJson(json);
+                }
+                json.endArray();
+            }
+            json.endObject();
+        }
+        catch (final IOException e)
+        {
+            Bukkit.getLogger().log(Level.WARNING, "A problem occured during writing of JSON string", e);
+        }
+    }
 
-	@SuppressWarnings("unchecked")
-	public static MessagePart deserialize(Map<String, Object> serialized){
-		MessagePart part = new MessagePart((TextualComponent)serialized.get("text"));
-		part.styles = (ArrayList<ChatColor>)serialized.get("styles");
-		part.color = ChatColor.getByChar(serialized.get("color").toString());
-		part.hoverActionName = (String)serialized.get("hoverActionName");
-		part.hoverActionData = (JsonRepresentedObject)serialized.get("hoverActionData");
-		part.clickActionName = (String)serialized.get("clickActionName");
-		part.clickActionData = (String)serialized.get("clickActionData");
-		part.insertionData = (String)serialized.get("insertion");
-		part.translationReplacements = (ArrayList<JsonRepresentedObject>)serialized.get("translationReplacements");
-		return part;
-	}
+    @Override
+    public Map<String, Object> serialize()
+    {
+        final HashMap<String, Object> map = new HashMap<String, Object>();
+        map.put("text", text);
+        map.put("styles", styles);
+        map.put("color", color.getChar());
+        map.put("hoverActionName", hoverActionName);
+        map.put("hoverActionData", hoverActionData);
+        map.put("clickActionName", clickActionName);
+        map.put("clickActionData", clickActionData);
+        map.put("insertion", insertionData);
+        map.put("translationReplacements", translationReplacements);
+        return map;
+    }
 
-	static{
-		ConfigurationSerialization.registerClass(MessagePart.class);
-	}
+    @SuppressWarnings("unchecked")
+    public static MessagePart deserialize(final Map<String, Object> serialized)
+    {
+        final MessagePart part = new MessagePart((TextualComponent) serialized.get("text"));
+        part.styles = (ArrayList<ChatColor>) serialized.get("styles");
+        part.color = ChatColor.getByChar(serialized.get("color").toString());
+        part.hoverActionName = (String) serialized.get("hoverActionName");
+        part.hoverActionData = (JsonRepresentedObject) serialized.get("hoverActionData");
+        part.clickActionName = (String) serialized.get("clickActionName");
+        part.clickActionData = (String) serialized.get("clickActionData");
+        part.insertionData = (String) serialized.get("insertion");
+        part.translationReplacements = (ArrayList<JsonRepresentedObject>) serialized.get("translationReplacements");
+        return part;
+    }
+
+    static
+    {
+        ConfigurationSerialization.registerClass(MessagePart.class);
+    }
 
 }
diff --git a/src/main/java/com/plotsquared/bukkit/chat/Reflection.java b/src/main/java/com/plotsquared/bukkit/chat/Reflection.java
index b02d6858d..24230f708 100644
--- a/src/main/java/com/plotsquared/bukkit/chat/Reflection.java
+++ b/src/main/java/com/plotsquared/bukkit/chat/Reflection.java
@@ -12,202 +12,227 @@ import org.bukkit.Bukkit;
  * A class containing static utility methods and caches which are intended as reflective conveniences.
  * Unless otherwise noted, upon failure methods will return {@code null}.
  */
-public final class Reflection {
+public final class Reflection
+{
 
-	private static String _versionString;
-	
-	private Reflection(){
-		
-	}
-	
-	/**
-	 * Gets the version string from the package name of the CraftBukkit server implementation.
-	 * This is needed to bypass the JAR package name changing on each update.
-	 * @return The version string of the OBC and NMS packages, <em>including the trailing dot</em>.
-	 */
-	public synchronized static String getVersion() {
-		if(_versionString == null){
-			if(Bukkit.getServer() == null){
-				// The server hasn't started, static initializer call?
-				return null;
-			}
-			String name = Bukkit.getServer().getClass().getPackage().getName();
-			_versionString = name.substring(name.lastIndexOf('.') + 1) + ".";
-		}
-		
-		return _versionString;
-	}
+    private static String _versionString;
 
-	/**
-	 * Stores loaded classes from the {@code net.minecraft.server} package.
-	 */
-	private static final Map<String, Class<?>> _loadedNMSClasses = new HashMap<String, Class<?>>();
-	/**
-	 * Stores loaded classes from the {@code org.bukkit.craftbukkit} package (and subpackages).
-	 */
-	private static final Map<String, Class<?>> _loadedOBCClasses = new HashMap<String, Class<?>>();
-	
-	/**
-	 * Gets a {@link Class} object representing a type contained within the {@code net.minecraft.server} versioned package.
-	 * The class instances returned by this method are cached, such that no lookup will be done twice (unless multiple threads are accessing this method simultaneously).
-	 * @param className The name of the class, excluding the package, within NMS.
-	 * @return The class instance representing the specified NMS class, or {@code null} if it could not be loaded.
-	 */
-	public synchronized static Class<?> getNMSClass(String className) {
-		if(_loadedNMSClasses.containsKey(className)){
-			return _loadedNMSClasses.get(className);
-		}
-		
-		String fullName = "net.minecraft.server." + getVersion() + className;
-		Class<?> clazz = null;
-		try {
-			clazz = Class.forName(fullName);
-		} catch (Exception e) {
-			e.printStackTrace();
-			_loadedNMSClasses.put(className, null);
-			return null;
-		}
-		_loadedNMSClasses.put(className, clazz);
-		return clazz;
-	}
+    private Reflection()
+    {
 
-	/**
-	 * Gets a {@link Class} object representing a type contained within the {@code org.bukkit.craftbukkit} versioned package.
-	 * The class instances returned by this method are cached, such that no lookup will be done twice (unless multiple threads are accessing this method simultaneously).
-	 * @param className The name of the class, excluding the package, within OBC. This name may contain a subpackage name, such as {@code inventory.CraftItemStack}.
-	 * @return The class instance representing the specified OBC class, or {@code null} if it could not be loaded.
-	 */
-	public synchronized static Class<?> getOBCClass(String className) {
-		if(_loadedOBCClasses.containsKey(className)){
-			return _loadedOBCClasses.get(className);
-		}
-		
-		String fullName = "org.bukkit.craftbukkit." + getVersion() + className;
-		Class<?> clazz = null;
-		try {
-			clazz = Class.forName(fullName);
-		} catch (Exception e) {
-			e.printStackTrace();
-			_loadedOBCClasses.put(className, null);
-			return null;
-		}
-		_loadedOBCClasses.put(className, clazz);
-		return clazz;
-	}
+    }
 
-	/**
-	 * Attempts to get the NMS handle of a CraftBukkit object.
-	 * <p>
-	 * The only match currently attempted by this method is a retrieval by using a parameterless {@code getHandle()} method implemented by the runtime type of the specified object.
-	 * </p>
-	 * @param obj The object for which to retrieve an NMS handle.
-	 * @return The NMS handle of the specified object, or {@code null} if it could not be retrieved using {@code getHandle()}.
-	 */
-	public synchronized static Object getHandle(Object obj) {
-		try {
-			return getMethod(obj.getClass(), "getHandle").invoke(obj);
-		} catch (Exception e) {
-			e.printStackTrace();
-			return null;
-		}
-	}
+    /**
+     * Gets the version string from the package name of the CraftBukkit server implementation.
+     * This is needed to bypass the JAR package name changing on each update.
+     * @return The version string of the OBC and NMS packages, <em>including the trailing dot</em>.
+     */
+    public synchronized static String getVersion()
+    {
+        if (_versionString == null)
+        {
+            if (Bukkit.getServer() == null)
+            {
+                // The server hasn't started, static initializer call?
+                return null;
+            }
+            final String name = Bukkit.getServer().getClass().getPackage().getName();
+            _versionString = name.substring(name.lastIndexOf('.') + 1) + ".";
+        }
 
-	private static final Map<Class<?>, Map<String, Field>> _loadedFields = new HashMap<Class<?>, Map<String, Field>>();
-	
-	/**
-	 * Retrieves a {@link Field} instance declared by the specified class with the specified name.
-	 * Java access modifiers are ignored during this retrieval. No guarantee is made as to whether the field
-	 * returned will be an instance or static field.
-	 * <p>
-	 * A global caching mechanism within this class is used to store fields. Combined with synchronization, this guarantees that
-	 * no field will be reflectively looked up twice.
-	 * </p>
-	 * <p>
-	 * If a field is deemed suitable for return, {@link Field#setAccessible(boolean) setAccessible} will be invoked with an argument of {@code true} before it is returned.
-	 * This ensures that callers do not have to check or worry about Java access modifiers when dealing with the returned instance.
-	 * </p>
-	 * @param clazz The class which contains the field to retrieve.
-	 * @param name The declared name of the field in the class.
-	 * @return A field object with the specified name declared by the specified class.
-	 * @see Class#getDeclaredField(String)
-	 */
-	public synchronized static Field getField(Class<?> clazz, String name) {
-		Map<String, Field> loaded;
-		if(!_loadedFields.containsKey(clazz)){
-			loaded = new HashMap<String, Field>();
-			_loadedFields.put(clazz, loaded);
-		}else{
-			loaded = _loadedFields.get(clazz);
-		}
-		if(loaded.containsKey(name)){
-			// If the field is loaded (or cached as not existing), return the relevant value, which might be null
-			return loaded.get(name);
-		}
-		try {
-			Field field = clazz.getDeclaredField(name);
-			field.setAccessible(true);
-			loaded.put(name, field);
-			return field;
-		} catch (Exception e) {
-			// Error loading
-			e.printStackTrace();
-			// Cache field as not existing
-			loaded.put(name, null);
-			return null;
-		}
-	}
+        return _versionString;
+    }
 
-	/**
-	 * Contains loaded methods in a cache.
-	 * The map maps [types to maps of [method names to maps of [parameter types to method instances]]].
-	 */
-	private static final Map<Class<?>, Map<String, Map<ArrayWrapper<Class<?>>, Method>>> _loadedMethods = new HashMap<Class<?>, Map<String, Map<ArrayWrapper<Class<?>>, Method>>>();
-	
-	/**
-	 * Retrieves a {@link Method} instance declared by the specified class with the specified name and argument types.
-	 * Java access modifiers are ignored during this retrieval. No guarantee is made as to whether the field
-	 * returned will be an instance or static field.
-	 * <p>
-	 * A global caching mechanism within this class is used to store method. Combined with synchronization, this guarantees that
-	 * no method will be reflectively looked up twice.
-	 * </p>
-	 * <p>
-	 * If a method is deemed suitable for return, {@link Method#setAccessible(boolean) setAccessible} will be invoked with an argument of {@code true} before it is returned.
-	 * This ensures that callers do not have to check or worry about Java access modifiers when dealing with the returned instance.
-	 * </p>
-	 * <p>
-	 * This method does <em>not</em> search superclasses of the specified type for methods with the specified signature.
-	 * Callers wishing this behavior should use {@link Class#getDeclaredMethod(String, Class...)}.
-	 * @param clazz The class which contains the method to retrieve.
-	 * @param name The declared name of the method in the class.
-	 * @param args The formal argument types of the method.
-	 * @return A method object with the specified name declared by the specified class.
-	 */
-	public synchronized static Method getMethod(Class<?> clazz, String name,
-			Class<?>... args) {
-		if(!_loadedMethods.containsKey(clazz)){
-			_loadedMethods.put(clazz, new HashMap<String, Map<ArrayWrapper<Class<?>>, Method>>());
-		}
-		
-		Map<String, Map<ArrayWrapper<Class<?>>, Method>> loadedMethodNames = _loadedMethods.get(clazz);
-		if(!loadedMethodNames.containsKey(name)){
-			loadedMethodNames.put(name, new HashMap<ArrayWrapper<Class<?>>, Method>());
-		}
-		
-		Map<ArrayWrapper<Class<?>>, Method> loadedSignatures = loadedMethodNames.get(name);
-		ArrayWrapper<Class<?>> wrappedArg = new ArrayWrapper<Class<?>>(args);
-		if(loadedSignatures.containsKey(wrappedArg)){
-			return loadedSignatures.get(wrappedArg);
-		}
-		
-		for (Method m : clazz.getMethods())
-			if (m.getName().equals(name) && Arrays.equals(args, m.getParameterTypes())) {
-				m.setAccessible(true);
-				loadedSignatures.put(wrappedArg, m);
-				return m;
-			}
-		loadedSignatures.put(wrappedArg, null);
-		return null;
-	}
+    /**
+     * Stores loaded classes from the {@code net.minecraft.server} package.
+     */
+    private static final Map<String, Class<?>> _loadedNMSClasses = new HashMap<String, Class<?>>();
+    /**
+     * Stores loaded classes from the {@code org.bukkit.craftbukkit} package (and subpackages).
+     */
+    private static final Map<String, Class<?>> _loadedOBCClasses = new HashMap<String, Class<?>>();
+
+    /**
+     * Gets a {@link Class} object representing a type contained within the {@code net.minecraft.server} versioned package.
+     * The class instances returned by this method are cached, such that no lookup will be done twice (unless multiple threads are accessing this method simultaneously).
+     * @param className The name of the class, excluding the package, within NMS.
+     * @return The class instance representing the specified NMS class, or {@code null} if it could not be loaded.
+     */
+    public synchronized static Class<?> getNMSClass(final String className)
+    {
+        if (_loadedNMSClasses.containsKey(className)) { return _loadedNMSClasses.get(className); }
+
+        final String fullName = "net.minecraft.server." + getVersion() + className;
+        Class<?> clazz = null;
+        try
+        {
+            clazz = Class.forName(fullName);
+        }
+        catch (final Exception e)
+        {
+            e.printStackTrace();
+            _loadedNMSClasses.put(className, null);
+            return null;
+        }
+        _loadedNMSClasses.put(className, clazz);
+        return clazz;
+    }
+
+    /**
+     * Gets a {@link Class} object representing a type contained within the {@code org.bukkit.craftbukkit} versioned package.
+     * The class instances returned by this method are cached, such that no lookup will be done twice (unless multiple threads are accessing this method simultaneously).
+     * @param className The name of the class, excluding the package, within OBC. This name may contain a subpackage name, such as {@code inventory.CraftItemStack}.
+     * @return The class instance representing the specified OBC class, or {@code null} if it could not be loaded.
+     */
+    public synchronized static Class<?> getOBCClass(final String className)
+    {
+        if (_loadedOBCClasses.containsKey(className)) { return _loadedOBCClasses.get(className); }
+
+        final String fullName = "org.bukkit.craftbukkit." + getVersion() + className;
+        Class<?> clazz = null;
+        try
+        {
+            clazz = Class.forName(fullName);
+        }
+        catch (final Exception e)
+        {
+            e.printStackTrace();
+            _loadedOBCClasses.put(className, null);
+            return null;
+        }
+        _loadedOBCClasses.put(className, clazz);
+        return clazz;
+    }
+
+    /**
+     * Attempts to get the NMS handle of a CraftBukkit object.
+     * <p>
+     * The only match currently attempted by this method is a retrieval by using a parameterless {@code getHandle()} method implemented by the runtime type of the specified object.
+     * </p>
+     * @param obj The object for which to retrieve an NMS handle.
+     * @return The NMS handle of the specified object, or {@code null} if it could not be retrieved using {@code getHandle()}.
+     */
+    public synchronized static Object getHandle(final Object obj)
+    {
+        try
+        {
+            return getMethod(obj.getClass(), "getHandle").invoke(obj);
+        }
+        catch (final Exception e)
+        {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    private static final Map<Class<?>, Map<String, Field>> _loadedFields = new HashMap<Class<?>, Map<String, Field>>();
+
+    /**
+     * Retrieves a {@link Field} instance declared by the specified class with the specified name.
+     * Java access modifiers are ignored during this retrieval. No guarantee is made as to whether the field
+     * returned will be an instance or static field.
+     * <p>
+     * A global caching mechanism within this class is used to store fields. Combined with synchronization, this guarantees that
+     * no field will be reflectively looked up twice.
+     * </p>
+     * <p>
+     * If a field is deemed suitable for return, {@link Field#setAccessible(boolean) setAccessible} will be invoked with an argument of {@code true} before it is returned.
+     * This ensures that callers do not have to check or worry about Java access modifiers when dealing with the returned instance.
+     * </p>
+     * @param clazz The class which contains the field to retrieve.
+     * @param name The declared name of the field in the class.
+     * @return A field object with the specified name declared by the specified class.
+     * @see Class#getDeclaredField(String)
+     */
+    public synchronized static Field getField(final Class<?> clazz, final String name)
+    {
+        Map<String, Field> loaded;
+        if (!_loadedFields.containsKey(clazz))
+        {
+            loaded = new HashMap<String, Field>();
+            _loadedFields.put(clazz, loaded);
+        }
+        else
+        {
+            loaded = _loadedFields.get(clazz);
+        }
+        if (loaded.containsKey(name))
+        {
+            // If the field is loaded (or cached as not existing), return the relevant value, which might be null
+            return loaded.get(name);
+        }
+        try
+        {
+            final Field field = clazz.getDeclaredField(name);
+            field.setAccessible(true);
+            loaded.put(name, field);
+            return field;
+        }
+        catch (final Exception e)
+        {
+            // Error loading
+            e.printStackTrace();
+            // Cache field as not existing
+            loaded.put(name, null);
+            return null;
+        }
+    }
+
+    /**
+     * Contains loaded methods in a cache.
+     * The map maps [types to maps of [method names to maps of [parameter types to method instances]]].
+     */
+    private static final Map<Class<?>, Map<String, Map<ArrayWrapper<Class<?>>, Method>>> _loadedMethods = new HashMap<Class<?>, Map<String, Map<ArrayWrapper<Class<?>>, Method>>>();
+
+    /**
+     * Retrieves a {@link Method} instance declared by the specified class with the specified name and argument types.
+     * Java access modifiers are ignored during this retrieval. No guarantee is made as to whether the field
+     * returned will be an instance or static field.
+     * <p>
+     * A global caching mechanism within this class is used to store method. Combined with synchronization, this guarantees that
+     * no method will be reflectively looked up twice.
+     * </p>
+     * <p>
+     * If a method is deemed suitable for return, {@link Method#setAccessible(boolean) setAccessible} will be invoked with an argument of {@code true} before it is returned.
+     * This ensures that callers do not have to check or worry about Java access modifiers when dealing with the returned instance.
+     * </p>
+     * <p>
+     * This method does <em>not</em> search superclasses of the specified type for methods with the specified signature.
+     * Callers wishing this behavior should use {@link Class#getDeclaredMethod(String, Class...)}.
+     * @param clazz The class which contains the method to retrieve.
+     * @param name The declared name of the method in the class.
+     * @param args The formal argument types of the method.
+     * @return A method object with the specified name declared by the specified class.
+     */
+    public synchronized static Method getMethod(final Class<?> clazz, final String name,
+    final Class<?>... args)
+    {
+        if (!_loadedMethods.containsKey(clazz))
+        {
+            _loadedMethods.put(clazz, new HashMap<String, Map<ArrayWrapper<Class<?>>, Method>>());
+        }
+
+        final Map<String, Map<ArrayWrapper<Class<?>>, Method>> loadedMethodNames = _loadedMethods.get(clazz);
+        if (!loadedMethodNames.containsKey(name))
+        {
+            loadedMethodNames.put(name, new HashMap<ArrayWrapper<Class<?>>, Method>());
+        }
+
+        final Map<ArrayWrapper<Class<?>>, Method> loadedSignatures = loadedMethodNames.get(name);
+        final ArrayWrapper<Class<?>> wrappedArg = new ArrayWrapper<Class<?>>(args);
+        if (loadedSignatures.containsKey(wrappedArg)) { return loadedSignatures.get(wrappedArg); }
+
+        for (final Method m : clazz.getMethods())
+        {
+            if (m.getName().equals(name) && Arrays.equals(args, m.getParameterTypes()))
+            {
+                m.setAccessible(true);
+                loadedSignatures.put(wrappedArg, m);
+                return m;
+            }
+        }
+        loadedSignatures.put(wrappedArg, null);
+        return null;
+    }
 
 }
diff --git a/src/main/java/com/plotsquared/bukkit/chat/TextualComponent.java b/src/main/java/com/plotsquared/bukkit/chat/TextualComponent.java
index 08c491f5f..4f9fce1bf 100644
--- a/src/main/java/com/plotsquared/bukkit/chat/TextualComponent.java
+++ b/src/main/java/com/plotsquared/bukkit/chat/TextualComponent.java
@@ -16,276 +16,326 @@ import com.intellectualcrafters.configuration.serialization.ConfigurationSeriali
  * but also to represent localized strings and other text values.
  * <p>Different instances of this class can be created with static constructor methods.</p>
  */
-public abstract class TextualComponent implements Cloneable {
+public abstract class TextualComponent implements Cloneable
+{
 
-	static{
-		ConfigurationSerialization.registerClass(TextualComponent.ArbitraryTextTypeComponent.class);
-		ConfigurationSerialization.registerClass(TextualComponent.ComplexTextTypeComponent.class);
-	}
-	
-	@Override
-	public String toString() {
-		return getReadableString();
-	}
-	
-	/**
-         * @return The JSON key used to represent text components of this type.
-	 */
-	public abstract String getKey();
-	
-        /**
-         * @return A readable String
-	 */
-	public abstract String getReadableString();
-        
-	/**
-	 * Clones a textual component instance.
-	 * The returned object should not reference this textual component instance, but should maintain the same key and value.
-	 */
-	@Override
-	public abstract TextualComponent clone() throws CloneNotSupportedException;
-	
-	/**
-	 * Writes the text data represented by this textual component to the specified JSON writer object.
-	 * A new object within the writer is not started.
-	 * @param writer The object to which to write the JSON data.
-	 * @throws IOException If an error occurs while writing to the stream.
-	 */
-	public abstract void writeJson(JsonWriter writer) throws IOException;
-	
-	static TextualComponent deserialize(Map<String, Object> map){
-		if(map.containsKey("key") && map.size() == 2 && map.containsKey("value")){
-			// Arbitrary text component
-			return ArbitraryTextTypeComponent.deserialize(map);
-		}else if(map.size() >= 2 && map.containsKey("key") && !map.containsKey("value") /* It contains keys that START WITH value */){
-			// Complex JSON object
-			return ComplexTextTypeComponent.deserialize(map);
-		}
-		
-		return null;
-	}
-	
-	static boolean isTextKey(String key){
-		return key.equals("translate") || key.equals("text") || key.equals("score") || key.equals("selector");
-	}
-	
-	static boolean isTranslatableText(TextualComponent component){
-		return component instanceof ComplexTextTypeComponent && ((ComplexTextTypeComponent)component).getKey().equals("translate");
-	}
-	
-	/**
-	 * Internal class used to represent all types of text components.
-	 * Exception validating done is on keys and values.
-	 */
-	private static final class ArbitraryTextTypeComponent extends TextualComponent implements ConfigurationSerializable {
+    static
+    {
+        ConfigurationSerialization.registerClass(TextualComponent.ArbitraryTextTypeComponent.class);
+        ConfigurationSerialization.registerClass(TextualComponent.ComplexTextTypeComponent.class);
+    }
 
-		public ArbitraryTextTypeComponent(String key, String value){
-			setKey(key);
-			setValue(value);
-		}
-		
-		@Override
-		public String getKey() {
-			return _key;
-		}
+    @Override
+    public String toString()
+    {
+        return getReadableString();
+    }
 
-		public void setKey(String key) {
-			Preconditions.checkArgument(key != null && !key.isEmpty(), "The key must be specified.");
-			_key = key;
-		}
-		
-		public String getValue() {
-			return _value;
-		}
+    /**
+     * @return The JSON key used to represent text components of this type.
+     */
+    public abstract String getKey();
 
-		public void setValue(String value) {
-			Preconditions.checkArgument(value != null, "The value must be specified.");
-			_value = value;
-		}
+    /**
+     * @return A readable String
+     */
+    public abstract String getReadableString();
 
-		private String _key;
-		private String _value;
-		
-		@Override
-		public TextualComponent clone() throws CloneNotSupportedException {
-			// Since this is a private and final class, we can just reinstantiate this class instead of casting super.clone
-			return new ArbitraryTextTypeComponent(getKey(), getValue());
-		}
+    /**
+     * Clones a textual component instance.
+     * The returned object should not reference this textual component instance, but should maintain the same key and value.
+     */
+    @Override
+    public abstract TextualComponent clone() throws CloneNotSupportedException;
 
-		@Override
-		public void writeJson(JsonWriter writer) throws IOException {
-			writer.name(getKey()).value(getValue());
-		}
+    /**
+     * Writes the text data represented by this textual component to the specified JSON writer object.
+     * A new object within the writer is not started.
+     * @param writer The object to which to write the JSON data.
+     * @throws IOException If an error occurs while writing to the stream.
+     */
+    public abstract void writeJson(final JsonWriter writer) throws IOException;
 
-		@SuppressWarnings("serial")
-		public Map<String, Object> serialize() {
-			return new HashMap<String, Object>(){{
-				put("key", getKey());
-				put("value", getValue());
-			}};
-		}
-		
-		public static ArbitraryTextTypeComponent deserialize(Map<String, Object> map){
-			return new ArbitraryTextTypeComponent(map.get("key").toString(), map.get("value").toString());
-		}
+    static TextualComponent deserialize(final Map<String, Object> map)
+    {
+        if (map.containsKey("key") && (map.size() == 2) && map.containsKey("value"))
+        {
+            // Arbitrary text component
+            return ArbitraryTextTypeComponent.deserialize(map);
+        }
+        else if ((map.size() >= 2) && map.containsKey("key") && !map.containsKey("value") /* It contains keys that START WITH value */)
+        {
+            // Complex JSON object
+            return ComplexTextTypeComponent.deserialize(map);
+        }
 
-		@Override
-        public String getReadableString() {
-			return getValue();
-		}
-	}
-	
-	/**
-	 * Internal class used to represent a text component with a nested JSON value.
-	 * Exception validating done is on keys and values.
-	 */
-	private static final class ComplexTextTypeComponent extends TextualComponent implements ConfigurationSerializable{
+        return null;
+    }
 
-		public ComplexTextTypeComponent(String key, Map<String, String> values){
-			setKey(key);
-			setValue(values);
-		}
-		
-		@Override
-		public String getKey() {
-			return _key;
-		}
+    static boolean isTextKey(final String key)
+    {
+        return key.equals("translate") || key.equals("text") || key.equals("score") || key.equals("selector");
+    }
 
-		public void setKey(String key) {
-			Preconditions.checkArgument(key != null && !key.isEmpty(), "The key must be specified.");
-			_key = key;
-		}
-		
-		public Map<String, String> getValue() {
-			return _value;
-		}
+    static boolean isTranslatableText(final TextualComponent component)
+    {
+        return (component instanceof ComplexTextTypeComponent) && ((ComplexTextTypeComponent) component).getKey().equals("translate");
+    }
 
-		public void setValue(Map<String, String> value) {
-			Preconditions.checkArgument(value != null, "The value must be specified.");
-			_value = value;
-		}
+    /**
+     * Internal class used to represent all types of text components.
+     * Exception validating done is on keys and values.
+     */
+    private static final class ArbitraryTextTypeComponent extends TextualComponent implements ConfigurationSerializable
+    {
 
-		private String _key;
-		private Map<String, String> _value;
-		
-		@Override
-		public TextualComponent clone() throws CloneNotSupportedException {
-			// Since this is a private and final class, we can just reinstantiate this class instead of casting super.clone
-			return new ComplexTextTypeComponent(getKey(), getValue());
-		}
+        public ArbitraryTextTypeComponent(final String key, final String value)
+        {
+            setKey(key);
+            setValue(value);
+        }
 
-		@Override
-		public void writeJson(JsonWriter writer) throws IOException {
-			writer.name(getKey());
-			writer.beginObject();
-			for(Map.Entry<String, String> jsonPair : _value.entrySet()){
-				writer.name(jsonPair.getKey()).value(jsonPair.getValue());
-			}
-			writer.endObject();
-		}
-		
-		@SuppressWarnings("serial")
-		public Map<String, Object> serialize() {
-			return new java.util.HashMap<String, Object>(){{
-				put("key", getKey());
-				for(Map.Entry<String, String> valEntry : getValue().entrySet()){
-					put("value." + valEntry.getKey(), valEntry.getValue());
-				}
-			}};
-		}
-		
-		public static ComplexTextTypeComponent deserialize(Map<String, Object> map){
-			String key = null;
-			Map<String, String> value = new HashMap<String, String>();
-			for(Map.Entry<String, Object> valEntry : map.entrySet()){
-				if(valEntry.getKey().equals("key")){
-					key = (String) valEntry.getValue();
-				}else if(valEntry.getKey().startsWith("value.")){
-					value.put(((String) valEntry.getKey()).substring(6) /* Strips out the value prefix */, valEntry.getValue().toString());
-				}
-			}
-			return new ComplexTextTypeComponent(key, value);
-		}
-		
-		@Override
-		public String getReadableString() {
-			return getKey();
-		}
-	}
-	
-	/**
-	 * Create a textual component representing a string literal.
-	 * This is the default type of textual component when a single string literal is given to a method.
-	 * @param textValue The text which will be represented.
-	 * @return The text component representing the specified literal text.
-	 */
-	public static TextualComponent rawText(String textValue){
-		return new ArbitraryTextTypeComponent("text", textValue);
-	}
-	
+        @Override
+        public String getKey()
+        {
+            return _key;
+        }
 
-	/**
-	 * Create a textual component representing a localized string.
-	 * The client will see this text component as their localized version of the specified string <em>key</em>, which can be overridden by a resource pack.
-	 * <p>
-	 * If the specified translation key is not present on the client resource pack, the translation key will be displayed as a string literal to the client.
-	 * </p>
-	 * @param translateKey The string key which maps to localized text.
-	 * @return The text component representing the specified localized text.
-	 */
-	public static TextualComponent localizedText(String translateKey){
-		return new ArbitraryTextTypeComponent("translate", translateKey);
-	}
-	
-	private static void throwUnsupportedSnapshot(){
-		throw new UnsupportedOperationException("This feature is only supported in snapshot releases.");
-	}
-	
-	/**
-	 * Create a textual component representing a scoreboard value.
-	 * The client will see their own score for the specified objective as the text represented by this component.
-	 * <p>
-	 * <b>This method is currently guaranteed to throw an {@code UnsupportedOperationException} as it is only supported on snapshot clients.</b>
-	 * </p>
-	 * @param scoreboardObjective The name of the objective for which to display the score.
-	 * @return The text component representing the specified scoreboard score (for the viewing player), or {@code null} if an error occurs during JSON serialization.
-	 */
-	public static TextualComponent objectiveScore(String scoreboardObjective){
-		return objectiveScore("*", scoreboardObjective);
-	}
-	
-	/**
-	 * Create a textual component representing a scoreboard value.
-	 * The client will see the score of the specified player for the specified objective as the text represented by this component.
-	 * <p>
-	 * <b>This method is currently guaranteed to throw an {@code UnsupportedOperationException} as it is only supported on snapshot clients.</b>
-	 * </p>
-	 * @param playerName The name of the player whos score will be shown. If this string represents the single-character sequence "*", the viewing player's score will be displayed.
-	 * Standard minecraft selectors (@a, @p, etc) are <em>not</em> supported.
-	 * @param scoreboardObjective The name of the objective for which to display the score.
-	 * @return The text component representing the specified scoreboard score for the specified player, or {@code null} if an error occurs during JSON serialization.
-	 */
-	public static TextualComponent objectiveScore(String playerName, String scoreboardObjective){
-		throwUnsupportedSnapshot(); // Remove this line when the feature is released to non-snapshot versions, in addition to updating ALL THE OVERLOADS documentation accordingly
-		
-		return new ComplexTextTypeComponent("score", ImmutableMap.<String, String>builder()
-				.put("name", playerName)
-				.put("objective", scoreboardObjective)
-				.build());
-	}
-	
-	/**
-	 * Create a textual component representing a player name, retrievable by using a standard minecraft selector.
-	 * The client will see the players or entities captured by the specified selector as the text represented by this component.
-	 * <p>
-	 * <b>This method is currently guaranteed to throw an {@code UnsupportedOperationException} as it is only supported on snapshot clients.</b>
-	 * </p>
-	 * @param selector The minecraft player or entity selector which will capture the entities whose string representations will be displayed in the place of this text component.
-	 * @return The text component representing the name of the entities captured by the selector.
-	 */
-	public static TextualComponent selector(String selector){
-		throwUnsupportedSnapshot(); // Remove this line when the feature is released to non-snapshot versions, in addition to updating ALL THE OVERLOADS documentation accordingly
-		
-		return new ArbitraryTextTypeComponent("selector", selector);
-	}
+        public void setKey(final String key)
+        {
+            Preconditions.checkArgument((key != null) && !key.isEmpty(), "The key must be specified.");
+            _key = key;
+        }
+
+        public String getValue()
+        {
+            return _value;
+        }
+
+        public void setValue(final String value)
+        {
+            Preconditions.checkArgument(value != null, "The value must be specified.");
+            _value = value;
+        }
+
+        private String _key;
+        private String _value;
+
+        @Override
+        public TextualComponent clone() throws CloneNotSupportedException
+        {
+            // Since this is a private and final class, we can just reinstantiate this class instead of casting super.clone
+            return new ArbitraryTextTypeComponent(getKey(), getValue());
+        }
+
+        @Override
+        public void writeJson(final JsonWriter writer) throws IOException
+        {
+            writer.name(getKey()).value(getValue());
+        }
+
+        @Override
+        @SuppressWarnings("serial")
+        public Map<String, Object> serialize()
+        {
+            return new HashMap<String, Object>()
+            {
+                {
+                    put("key", getKey());
+                    put("value", getValue());
+                }
+            };
+        }
+
+        public static ArbitraryTextTypeComponent deserialize(final Map<String, Object> map)
+        {
+            return new ArbitraryTextTypeComponent(map.get("key").toString(), map.get("value").toString());
+        }
+
+        @Override
+        public String getReadableString()
+        {
+            return getValue();
+        }
+    }
+
+    /**
+     * Internal class used to represent a text component with a nested JSON value.
+     * Exception validating done is on keys and values.
+     */
+    private static final class ComplexTextTypeComponent extends TextualComponent implements ConfigurationSerializable
+    {
+
+        public ComplexTextTypeComponent(final String key, final Map<String, String> values)
+        {
+            setKey(key);
+            setValue(values);
+        }
+
+        @Override
+        public String getKey()
+        {
+            return _key;
+        }
+
+        public void setKey(final String key)
+        {
+            Preconditions.checkArgument((key != null) && !key.isEmpty(), "The key must be specified.");
+            _key = key;
+        }
+
+        public Map<String, String> getValue()
+        {
+            return _value;
+        }
+
+        public void setValue(final Map<String, String> value)
+        {
+            Preconditions.checkArgument(value != null, "The value must be specified.");
+            _value = value;
+        }
+
+        private String _key;
+        private Map<String, String> _value;
+
+        @Override
+        public TextualComponent clone() throws CloneNotSupportedException
+        {
+            // Since this is a private and final class, we can just reinstantiate this class instead of casting super.clone
+            return new ComplexTextTypeComponent(getKey(), getValue());
+        }
+
+        @Override
+        public void writeJson(final JsonWriter writer) throws IOException
+        {
+            writer.name(getKey());
+            writer.beginObject();
+            for (final Map.Entry<String, String> jsonPair : _value.entrySet())
+            {
+                writer.name(jsonPair.getKey()).value(jsonPair.getValue());
+            }
+            writer.endObject();
+        }
+
+        @Override
+        @SuppressWarnings("serial")
+        public Map<String, Object> serialize()
+        {
+            return new java.util.HashMap<String, Object>()
+            {
+                {
+                    put("key", getKey());
+                    for (final Map.Entry<String, String> valEntry : getValue().entrySet())
+                    {
+                        put("value." + valEntry.getKey(), valEntry.getValue());
+                    }
+                }
+            };
+        }
+
+        public static ComplexTextTypeComponent deserialize(final Map<String, Object> map)
+        {
+            String key = null;
+            final Map<String, String> value = new HashMap<String, String>();
+            for (final Map.Entry<String, Object> valEntry : map.entrySet())
+            {
+                if (valEntry.getKey().equals("key"))
+                {
+                    key = (String) valEntry.getValue();
+                }
+                else if (valEntry.getKey().startsWith("value."))
+                {
+                    value.put(valEntry.getKey().substring(6) /* Strips out the value prefix */, valEntry.getValue().toString());
+                }
+            }
+            return new ComplexTextTypeComponent(key, value);
+        }
+
+        @Override
+        public String getReadableString()
+        {
+            return getKey();
+        }
+    }
+
+    /**
+     * Create a textual component representing a string literal.
+     * This is the default type of textual component when a single string literal is given to a method.
+     * @param textValue The text which will be represented.
+     * @return The text component representing the specified literal text.
+     */
+    public static TextualComponent rawText(final String textValue)
+    {
+        return new ArbitraryTextTypeComponent("text", textValue);
+    }
+
+    /**
+     * Create a textual component representing a localized string.
+     * The client will see this text component as their localized version of the specified string <em>key</em>, which can be overridden by a resource pack.
+     * <p>
+     * If the specified translation key is not present on the client resource pack, the translation key will be displayed as a string literal to the client.
+     * </p>
+     * @param translateKey The string key which maps to localized text.
+     * @return The text component representing the specified localized text.
+     */
+    public static TextualComponent localizedText(final String translateKey)
+    {
+        return new ArbitraryTextTypeComponent("translate", translateKey);
+    }
+
+    private static void throwUnsupportedSnapshot()
+    {
+        throw new UnsupportedOperationException("This feature is only supported in snapshot releases.");
+    }
+
+    /**
+     * Create a textual component representing a scoreboard value.
+     * The client will see their own score for the specified objective as the text represented by this component.
+     * <p>
+     * <b>This method is currently guaranteed to throw an {@code UnsupportedOperationException} as it is only supported on snapshot clients.</b>
+     * </p>
+     * @param scoreboardObjective The name of the objective for which to display the score.
+     * @return The text component representing the specified scoreboard score (for the viewing player), or {@code null} if an error occurs during JSON serialization.
+     */
+    public static TextualComponent objectiveScore(final String scoreboardObjective)
+    {
+        return objectiveScore("*", scoreboardObjective);
+    }
+
+    /**
+     * Create a textual component representing a scoreboard value.
+     * The client will see the score of the specified player for the specified objective as the text represented by this component.
+     * <p>
+     * <b>This method is currently guaranteed to throw an {@code UnsupportedOperationException} as it is only supported on snapshot clients.</b>
+     * </p>
+     * @param playerName The name of the player whos score will be shown. If this string represents the single-character sequence "*", the viewing player's score will be displayed.
+     * Standard minecraft selectors (@a, @p, etc) are <em>not</em> supported.
+     * @param scoreboardObjective The name of the objective for which to display the score.
+     * @return The text component representing the specified scoreboard score for the specified player, or {@code null} if an error occurs during JSON serialization.
+     */
+    public static TextualComponent objectiveScore(final String playerName, final String scoreboardObjective)
+    {
+        throwUnsupportedSnapshot(); // Remove this line when the feature is released to non-snapshot versions, in addition to updating ALL THE OVERLOADS documentation accordingly
+
+        return new ComplexTextTypeComponent("score", ImmutableMap.<String, String> builder()
+        .put("name", playerName)
+        .put("objective", scoreboardObjective)
+        .build());
+    }
+
+    /**
+     * Create a textual component representing a player name, retrievable by using a standard minecraft selector.
+     * The client will see the players or entities captured by the specified selector as the text represented by this component.
+     * <p>
+     * <b>This method is currently guaranteed to throw an {@code UnsupportedOperationException} as it is only supported on snapshot clients.</b>
+     * </p>
+     * @param selector The minecraft player or entity selector which will capture the entities whose string representations will be displayed in the place of this text component.
+     * @return The text component representing the name of the entities captured by the selector.
+     */
+    public static TextualComponent selector(final String selector)
+    {
+        throwUnsupportedSnapshot(); // Remove this line when the feature is released to non-snapshot versions, in addition to updating ALL THE OVERLOADS documentation accordingly
+
+        return new ArbitraryTextTypeComponent("selector", selector);
+    }
 }
diff --git a/src/main/java/com/plotsquared/bukkit/database/plotme/APlotMeConnector.java b/src/main/java/com/plotsquared/bukkit/database/plotme/APlotMeConnector.java
index dce18505e..a15383876 100644
--- a/src/main/java/com/plotsquared/bukkit/database/plotme/APlotMeConnector.java
+++ b/src/main/java/com/plotsquared/bukkit/database/plotme/APlotMeConnector.java
@@ -14,27 +14,30 @@ import com.intellectualcrafters.plot.object.Location;
 import com.intellectualcrafters.plot.object.Plot;
 import com.intellectualcrafters.plot.object.PlotId;
 
-public abstract class APlotMeConnector {
-    public abstract Connection getPlotMeConnection(String plugin, FileConfiguration plotConfig, String dataFolder);
-    
-    public abstract HashMap<String, HashMap<PlotId, Plot>> getPlotMePlots(Connection connection) throws SQLException;
-    
-    public abstract boolean accepts(String version);
-    
-    public String getWorld(final String world) {
-        for (final World newworld : Bukkit.getWorlds()) {
-            if (newworld.getName().equalsIgnoreCase(world)) {
-                return newworld.getName();
-            }
+public abstract class APlotMeConnector
+{
+    public abstract Connection getPlotMeConnection(final String plugin, final FileConfiguration plotConfig, final String dataFolder);
+
+    public abstract HashMap<String, HashMap<PlotId, Plot>> getPlotMePlots(final Connection connection) throws SQLException;
+
+    public abstract boolean accepts(final String version);
+
+    public String getWorld(final String world)
+    {
+        for (final World newworld : Bukkit.getWorlds())
+        {
+            if (newworld.getName().equalsIgnoreCase(world)) { return newworld.getName(); }
         }
         return world;
     }
-    
-    public boolean isValidConnection(Connection connection) {
+
+    public boolean isValidConnection(final Connection connection)
+    {
         return connection != null;
     }
-    
-    public void copyConfig(FileConfiguration plotConfig, String world, String actualWorldName) {
+
+    public void copyConfig(final FileConfiguration plotConfig, final String world, final String actualWorldName)
+    {
         final Integer pathwidth = plotConfig.getInt("worlds." + world + ".PathWidth"); //
         PS.get().config.set("worlds." + actualWorldName + ".road.width", pathwidth);
         final Integer plotsize = plotConfig.getInt("worlds." + world + ".PlotSize"); //
@@ -48,70 +51,84 @@ public abstract class APlotMeConnector {
         final String road = plotConfig.getString("worlds." + world + ".RoadMainBlockId");
         PS.get().config.set("worlds." + actualWorldName + ".road.block", road);
         Integer height = plotConfig.getInt("worlds." + world + ".RoadHeight"); //
-        if (height == null) {
+        if (height == null)
+        {
             height = 64;
         }
         PS.get().config.set("worlds." + actualWorldName + ".road.height", height);
     }
-    
-    public Location getPlotTopLocAbs(int path, int plot, final PlotId plotid) {
+
+    public Location getPlotTopLocAbs(final int path, final int plot, final PlotId plotid)
+    {
         final int px = plotid.x;
         final int pz = plotid.y;
         final int x = (px * (path + plot)) - ((int) Math.floor(path / 2)) - 1;
         final int z = (pz * (path + plot)) - ((int) Math.floor(path / 2)) - 1;
         return new Location(null, x, 256, z);
     }
-    
-    public Location getPlotBottomLocAbs(int path, int plot, final PlotId plotid) {
+
+    public Location getPlotBottomLocAbs(final int path, final int plot, final PlotId plotid)
+    {
         final int px = plotid.x;
         final int pz = plotid.y;
         final int x = (px * (path + plot)) - plot - ((int) Math.floor(path / 2)) - 1;
         final int z = (pz * (path + plot)) - plot - ((int) Math.floor(path / 2)) - 1;
         return new Location(null, x, 1, z);
     }
-    
-    public void setMerged(HashMap<String, HashMap<PlotId, boolean[]>> merges, String world, PlotId id, int direction) {
-        HashMap<PlotId, boolean[]> plots = merges.get(world);
+
+    public void setMerged(final HashMap<String, HashMap<PlotId, boolean[]>> merges, final String world, final PlotId id, final int direction)
+    {
+        final HashMap<PlotId, boolean[]> plots = merges.get(world);
         PlotId id2;
-        switch (direction) {
-            case 0: {
+        switch (direction)
+        {
+            case 0:
+            {
                 id2 = new PlotId(id.x, id.y);
                 break;
             }
-            case 1: {
+            case 1:
+            {
                 id2 = new PlotId(id.x, id.y);
                 break;
             }
-            case 2: {
+            case 2:
+            {
                 id2 = new PlotId(id.x, id.y);
                 break;
             }
-            case 3: {
+            case 3:
+            {
                 id2 = new PlotId(id.x, id.y);
                 break;
             }
-            default: {
+            default:
+            {
                 return;
             }
         }
         boolean[] merge1;
         boolean[] merge2;
-        if (plots.containsKey(id)) {
+        if (plots.containsKey(id))
+        {
             merge1 = plots.get(id);
         }
-        else {
-            merge1 = new boolean[]{false, false, false, false};
+        else
+        {
+            merge1 = new boolean[] { false, false, false, false };
         }
-        if (plots.containsKey(id2)) {
+        if (plots.containsKey(id2))
+        {
             merge2 = plots.get(id2);
         }
-        else {
-            merge2 = new boolean[]{false, false, false, false};
+        else
+        {
+            merge2 = new boolean[] { false, false, false, false };
         }
         merge1[direction] = true;
         merge2[(direction + 2) % 4] = true;
         plots.put(id, merge1);
         plots.put(id2, merge1);
     }
-    
+
 }
diff --git a/src/main/java/com/plotsquared/bukkit/database/plotme/ClassicPlotMeConnector.java b/src/main/java/com/plotsquared/bukkit/database/plotme/ClassicPlotMeConnector.java
index 7a9f86006..d63f952a0 100644
--- a/src/main/java/com/plotsquared/bukkit/database/plotme/ClassicPlotMeConnector.java
+++ b/src/main/java/com/plotsquared/bukkit/database/plotme/ClassicPlotMeConnector.java
@@ -1,5 +1,16 @@
 package com.plotsquared.bukkit.database.plotme;
 
+import java.io.File;
+import java.nio.ByteBuffer;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.HashMap;
+import java.util.Map.Entry;
+import java.util.UUID;
+
 import com.intellectualcrafters.configuration.file.FileConfiguration;
 import com.intellectualcrafters.plot.PS;
 import com.intellectualcrafters.plot.config.Settings;
@@ -12,41 +23,38 @@ import com.intellectualcrafters.plot.object.StringWrapper;
 import com.intellectualcrafters.plot.util.MainUtil;
 import com.intellectualcrafters.plot.util.UUIDHandler;
 
-import java.io.File;
-import java.nio.ByteBuffer;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.HashMap;
-import java.util.Map.Entry;
-import java.util.UUID;
-
-public class ClassicPlotMeConnector extends APlotMeConnector {
+public class ClassicPlotMeConnector extends APlotMeConnector
+{
 
     private String plugin;
 
     @Override
-    public Connection getPlotMeConnection(String plugin, FileConfiguration plotConfig, String dataFolder) {
+    public Connection getPlotMeConnection(final String plugin, final FileConfiguration plotConfig, final String dataFolder)
+    {
         this.plugin = plugin.toLowerCase();
-        try {
-            if (plotConfig.getBoolean("usemySQL")) {
+        try
+        {
+            if (plotConfig.getBoolean("usemySQL"))
+            {
                 final String user = plotConfig.getString("mySQLuname");
                 final String password = plotConfig.getString("mySQLpass");
                 final String con = plotConfig.getString("mySQLconn");
                 return DriverManager.getConnection(con, user, password);
-//                return new MySQL(plotsquared, hostname, port, database, username, password)
-            } else {
+                //                return new MySQL(plotsquared, hostname, port, database, username, password)
+            }
+            else
+            {
                 return new SQLite(dataFolder + File.separator + "plots.db").openConnection();
             }
         }
-        catch (SQLException | ClassNotFoundException e) {}
+        catch (SQLException | ClassNotFoundException e)
+        {}
         return null;
     }
 
     @Override
-    public HashMap<String, HashMap<PlotId, Plot>> getPlotMePlots(Connection connection) throws SQLException {
+    public HashMap<String, HashMap<PlotId, Plot>> getPlotMePlots(final Connection connection) throws SQLException
+    {
         ResultSet r;
         PreparedStatement stmt;
         final HashMap<String, Integer> plotWidth = new HashMap<>();
@@ -56,211 +64,269 @@ public class ClassicPlotMeConnector extends APlotMeConnector {
         stmt = connection.prepareStatement("SELECT * FROM `" + plugin + "Plots`");
         r = stmt.executeQuery();
         String column = null;
-        boolean checkUUID = DBFunc.hasColumn(r, "ownerid");
-        boolean checkUUID2 = DBFunc.hasColumn(r, "ownerId");
-        if (checkUUID) {
+        final boolean checkUUID = DBFunc.hasColumn(r, "ownerid");
+        final boolean checkUUID2 = DBFunc.hasColumn(r, "ownerId");
+        if (checkUUID)
+        {
             column = "ownerid";
         }
-        else if (checkUUID2) {
+        else if (checkUUID2)
+        {
             column = "ownerId";
         }
-        boolean merge = !plugin.equals("plotme") && Settings.CONVERT_PLOTME;
-        while (r.next()) {
+        final boolean merge = !plugin.equals("plotme") && Settings.CONVERT_PLOTME;
+        while (r.next())
+        {
             final PlotId id = new PlotId(r.getInt("idX"), r.getInt("idZ"));
             final String name = r.getString("owner");
             final String world = LikePlotMeConverter.getWorld(r.getString("world"));
-            if (!plots.containsKey(world)) {
+            if (!plots.containsKey(world))
+            {
                 plots.put(world, new HashMap<PlotId, Plot>());
-                if (merge) {
-                    int plot = PS.get().config.getInt("worlds." + world + ".plot.size");
-                    int path = PS.get().config.getInt("worlds." + world + ".road.width");
+                if (merge)
+                {
+                    final int plot = PS.get().config.getInt("worlds." + world + ".plot.size");
+                    final int path = PS.get().config.getInt("worlds." + world + ".road.width");
                     plotWidth.put(world, plot);
                     roadWidth.put(world, path);
-                    merges.put(world, new HashMap<PlotId,boolean[]>());
+                    merges.put(world, new HashMap<PlotId, boolean[]>());
                 }
             }
-            if (merge) {
-                int tx = r.getInt("topX");
-                int tz = r.getInt("topZ");
-                int bx = r.getInt("bottomX") - 1;
-                int bz = r.getInt("bottomZ") - 1;
-                int path = roadWidth.get(world);
-                int plot = plotWidth.get(world);
-                Location top = getPlotTopLocAbs(path, plot, id);
-                Location bot = getPlotBottomLocAbs(path, plot, id);
-                if (tx > top.getX()) {
+            if (merge)
+            {
+                final int tx = r.getInt("topX");
+                final int tz = r.getInt("topZ");
+                final int bx = r.getInt("bottomX") - 1;
+                final int bz = r.getInt("bottomZ") - 1;
+                final int path = roadWidth.get(world);
+                final int plot = plotWidth.get(world);
+                final Location top = getPlotTopLocAbs(path, plot, id);
+                final Location bot = getPlotBottomLocAbs(path, plot, id);
+                if (tx > top.getX())
+                {
                     setMerged(merges, world, id, 1);
                 }
-                if (tz > top.getZ()) {
+                if (tz > top.getZ())
+                {
                     setMerged(merges, world, id, 2);
                 }
-                if (bx < bot.getX()) {
+                if (bx < bot.getX())
+                {
                     setMerged(merges, world, id, 3);
                 }
-                if (bz > bot.getZ()) {
+                if (bz > bot.getZ())
+                {
                     setMerged(merges, world, id, 0);
                 }
             }
             UUID owner = UUIDHandler.getUUID(name, null);
-            if (owner == null) {
-                if (name.equals("*")) {
+            if (owner == null)
+            {
+                if (name.equals("*"))
+                {
                     owner = DBFunc.everyone;
                 }
-                else {
-                    if (checkUUID || checkUUID2){
-                        try {
-                            byte[] bytes = r.getBytes(column);
-                            if (bytes != null) {
-                                try {
-                                    ByteBuffer bb = ByteBuffer.wrap(bytes);
-                                    long high = bb.getLong();
-                                    long low = bb.getLong();
+                else
+                {
+                    if (checkUUID || checkUUID2)
+                    {
+                        try
+                        {
+                            final byte[] bytes = r.getBytes(column);
+                            if (bytes != null)
+                            {
+                                try
+                                {
+                                    final ByteBuffer bb = ByteBuffer.wrap(bytes);
+                                    final long high = bb.getLong();
+                                    final long low = bb.getLong();
                                     owner = new UUID(high, low);
                                 }
-                                catch (Exception e) {
+                                catch (final Exception e)
+                                {
                                     e.printStackTrace();
                                     owner = UUID.nameUUIDFromBytes(bytes);
                                 }
-                                if (owner != null) {
+                                if (owner != null)
+                                {
                                     UUIDHandler.add(new StringWrapper(name), owner);
                                 }
                             }
                         }
-                        catch (Exception e) {
+                        catch (final Exception e)
+                        {
                             e.printStackTrace();
                         }
                     }
-                    if (owner == null) {
+                    if (owner == null)
+                    {
                         MainUtil.sendConsoleMessage("&cCould not identify owner for plot: " + id + " -> '" + name + "'");
                         continue;
                     }
                 }
             }
-            else {
+            else
+            {
                 UUIDHandler.add(new StringWrapper(name), owner);
             }
             final Plot plot = new Plot(world, id, owner);
             plots.get(world).put(id, plot);
         }
-        
-        for (Entry<String, HashMap<PlotId, boolean[]>> entry : merges.entrySet()) {
-            String world = entry.getKey();
-            for (Entry<PlotId, boolean[]> entry2 : entry.getValue().entrySet()) {
-                HashMap<PlotId, Plot> newplots = plots.get(world);
-                Plot plot = newplots.get(entry2.getKey());
-                if (plot != null) {
+
+        for (final Entry<String, HashMap<PlotId, boolean[]>> entry : merges.entrySet())
+        {
+            final String world = entry.getKey();
+            for (final Entry<PlotId, boolean[]> entry2 : entry.getValue().entrySet())
+            {
+                final HashMap<PlotId, Plot> newplots = plots.get(world);
+                final Plot plot = newplots.get(entry2.getKey());
+                if (plot != null)
+                {
                     plot.getSettings().setMerged(entry2.getValue());
                 }
             }
         }
-        
+
         r.close();
         stmt.close();
-        
-        try {
-        
+
+        try
+        {
+
             MainUtil.sendConsoleMessage(" - " + plugin + "Denied");
             stmt = connection.prepareStatement("SELECT * FROM `" + plugin + "Denied`");
             r = stmt.executeQuery();
-            
-            while (r.next()) {
+
+            while (r.next())
+            {
                 final PlotId id = new PlotId(r.getInt("idX"), r.getInt("idZ"));
                 final String name = r.getString("player");
                 final String world = LikePlotMeConverter.getWorld(r.getString("world"));
                 UUID denied = UUIDHandler.getUUID(name, null);
-                if (denied == null) {
-                    if (name.equals("*")) {
+                if (denied == null)
+                {
+                    if (name.equals("*"))
+                    {
                         denied = DBFunc.everyone;
-                    } else {
-                        if (DBFunc.hasColumn(r, "playerid")) {
-                            try {
-                                byte[] bytes = r.getBytes("playerid");
-                                if (bytes != null) {
-                                    try {
-                                        ByteBuffer bb = ByteBuffer.wrap(bytes);
-                                        long high = bb.getLong();
-                                        long low = bb.getLong();
+                    }
+                    else
+                    {
+                        if (DBFunc.hasColumn(r, "playerid"))
+                        {
+                            try
+                            {
+                                final byte[] bytes = r.getBytes("playerid");
+                                if (bytes != null)
+                                {
+                                    try
+                                    {
+                                        final ByteBuffer bb = ByteBuffer.wrap(bytes);
+                                        final long high = bb.getLong();
+                                        final long low = bb.getLong();
                                         denied = new UUID(high, low);
-                                    } catch (Exception e) {
+                                    }
+                                    catch (final Exception e)
+                                    {
                                         e.printStackTrace();
                                         denied = UUID.nameUUIDFromBytes(bytes);
                                     }
-                                    if (denied != null) {
+                                    if (denied != null)
+                                    {
                                         UUIDHandler.add(new StringWrapper(name), denied);
                                     }
                                 }
-                            } catch (Exception e) {
+                            }
+                            catch (final Exception e)
+                            {
                                 e.printStackTrace();
                             }
                         }
                     }
-                    if (denied == null){
+                    if (denied == null)
+                    {
                         MainUtil.sendConsoleMessage("&6Could not identify denied for plot: " + id);
                         continue;
                     }
                 }
-                if (plots.get(world).containsKey(id)) {
+                if (plots.get(world).containsKey(id))
+                {
                     plots.get(world).get(id).getDenied().add(denied);
                 }
             }
-            
+
             stmt = connection.prepareStatement("SELECT * FROM `" + plugin + "Allowed`");
             r = stmt.executeQuery();
-            
-            while (r.next()) {
+
+            while (r.next())
+            {
                 final PlotId id = new PlotId(r.getInt("idX"), r.getInt("idZ"));
                 final String name = r.getString("player");
                 final String world = LikePlotMeConverter.getWorld(r.getString("world"));
                 UUID helper = UUIDHandler.getUUID(name, null);
-                if (helper == null) {
-                    if (name.equals("*")) {
+                if (helper == null)
+                {
+                    if (name.equals("*"))
+                    {
                         helper = DBFunc.everyone;
-                    } else {
-                        if (DBFunc.hasColumn(r, "playerid")) {
-                            try {
-                                byte[] bytes = r.getBytes("playerid");
-                                if (bytes != null) {
-                                    try {
-                                        ByteBuffer bb = ByteBuffer.wrap(bytes);
-                                        long high = bb.getLong();
-                                        long low = bb.getLong();
+                    }
+                    else
+                    {
+                        if (DBFunc.hasColumn(r, "playerid"))
+                        {
+                            try
+                            {
+                                final byte[] bytes = r.getBytes("playerid");
+                                if (bytes != null)
+                                {
+                                    try
+                                    {
+                                        final ByteBuffer bb = ByteBuffer.wrap(bytes);
+                                        final long high = bb.getLong();
+                                        final long low = bb.getLong();
                                         helper = new UUID(high, low);
-                                    } catch (Exception e) {
+                                    }
+                                    catch (final Exception e)
+                                    {
                                         e.printStackTrace();
                                         helper = UUID.nameUUIDFromBytes(bytes);
                                     }
-                                    if (helper != null) {
+                                    if (helper != null)
+                                    {
                                         UUIDHandler.add(new StringWrapper(name), helper);
                                     }
                                 }
-                            } catch (Exception e) {
+                            }
+                            catch (final Exception e)
+                            {
                                 e.printStackTrace();
                             }
                         }
                     }
-                    if (helper == null){
+                    if (helper == null)
+                    {
                         MainUtil.sendConsoleMessage("&6Could not identify helper for plot: " + id);
                         continue;
                     }
                 }
-                if (plots.get(world).containsKey(id)) {
+                if (plots.get(world).containsKey(id))
+                {
                     plots.get(world).get(id).getTrusted().add(helper);
                 }
             }
-            
+
             r.close();
             stmt.close();
-        
+
         }
-        catch (Exception e) {}
+        catch (final Exception e)
+        {}
         return plots;
     }
 
     @Override
-    public boolean accepts(String version) {
-        if (version ==  null) {
-            return true;
-        }
+    public boolean accepts(final String version)
+    {
+        if (version == null) { return true; }
         return PS.get().canUpdate(version, "0.17.0");
     }
 }
diff --git a/src/main/java/com/plotsquared/bukkit/database/plotme/LikePlotMeConverter.java b/src/main/java/com/plotsquared/bukkit/database/plotme/LikePlotMeConverter.java
index e6929826c..66613fb50 100644
--- a/src/main/java/com/plotsquared/bukkit/database/plotme/LikePlotMeConverter.java
+++ b/src/main/java/com/plotsquared/bukkit/database/plotme/LikePlotMeConverter.java
@@ -1,349 +1,410 @@
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// PlotSquared - A plot manager and world generator for the Bukkit API                             /
-// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
-//                                                                                                 /
-// This program is free software; you can redistribute it and/or modify                            /
-// it under the terms of the GNU General Public License as published by                            /
-// the Free Software Foundation; either version 3 of the License, or                               /
-// (at your option) any later version.                                                             /
-//                                                                                                 /
-// This program is distributed in the hope that it will be useful,                                 /
-// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
-// GNU General Public License for more details.                                                    /
-//                                                                                                 /
-// You should have received a copy of the GNU General Public License                               /
-// along with this program; if not, write to the Free Software Foundation,                         /
-// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
-//                                                                                                 /
-// You can contact us via: support@intellectualsites.com                                           /
-////////////////////////////////////////////////////////////////////////////////////////////////////
-package com.plotsquared.bukkit.database.plotme;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.sql.Connection;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map.Entry;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.Set;
-
-import org.bukkit.Bukkit;
-import org.bukkit.World;
-import org.bukkit.WorldCreator;
-
-import com.intellectualcrafters.configuration.file.FileConfiguration;
-import com.intellectualcrafters.configuration.file.YamlConfiguration;
-import com.intellectualcrafters.plot.PS;
-import com.intellectualcrafters.plot.config.Settings;
-import com.intellectualcrafters.plot.database.DBFunc;
-import com.intellectualcrafters.plot.object.Plot;
-import com.intellectualcrafters.plot.object.PlotId;
-import com.intellectualcrafters.plot.util.TaskManager;
-import com.plotsquared.bukkit.generator.HybridGen;
-
-/**
- * Created 2014-08-17 for PlotSquared
- *
- * @author Citymonstret
- * @author Empire92
- */
-public class LikePlotMeConverter {
-    private String plugin;
-
-    /**
-     * Constructor
-     *
-     * @param plugin Plugin Used to run the converter
-     */
-    public LikePlotMeConverter(String plugin) {
-        this.plugin = plugin;
-    }
-
-    public static String getWorld(final String world) {
-        for (final World newworld : Bukkit.getWorlds()) {
-            if (newworld.getName().equalsIgnoreCase(world)) {
-                return newworld.getName();
-            }
-        }
-        return world;
-    }
-    
-    private void sendMessage(final String message) {
-        PS.debug("&3PlotMe&8->&3PlotSquared&8: &7" + message);
-    }
-    
-    public String getPlotMePath() {
-        return new File(".").getAbsolutePath() + File.separator + "plugins" + File.separator + plugin + File.separator;
-    }
-    
-    public String getAthionPlotsPath() {
-        return new File(".").getAbsolutePath() + File.separator + "plugins" + File.separator + plugin + File.separator;
-    }
-    
-    public FileConfiguration getPlotMeConfig(String dataFolder) {
-        final File plotMeFile = new File(dataFolder + "config.yml");
-        if (!plotMeFile.exists()) {
-            return null;
-        }
-        return YamlConfiguration.loadConfiguration(plotMeFile);
-    }
-    
-    public Set<String> getPlotMeWorlds(FileConfiguration plotConfig) {
-        return plotConfig.getConfigurationSection("worlds").getKeys(false);
-    }
-
-    public void updateWorldYml(String plugin, String location) {
-        try {
-            Path path = Paths.get(location);
-            File file = new File(location);
-            if (!file.exists()) {
-                return;
-            }
-            Charset charset = StandardCharsets.UTF_8;
-            String content = new String(Files.readAllBytes(path), charset);
-            content = content.replaceAll("PlotMe-DefaultGenerator", "PlotSquared");
-            content = content.replaceAll(plugin, "PlotSquared");
-            Files.write(path, content.getBytes(charset));
-        } catch (Exception e) {
-        }
-    }
-
-    public boolean run(final APlotMeConnector connector) {
-        try {
-            String dataFolder = getPlotMePath();
-            FileConfiguration plotConfig = getPlotMeConfig(dataFolder);
-            if (plotConfig == null) {
-                return false;
-            }
-            
-            String version = plotConfig.getString("Version");
-            if (version == null) version = plotConfig.getString("version");
-            if (!connector.accepts(version)) {
-                return false;
-            }
-            
-            PS.debug("&3Using connector: " + connector.getClass().getCanonicalName());
-            
-            Connection connection = connector.getPlotMeConnection(plugin, plotConfig, dataFolder);
-
-            if (!connector.isValidConnection(connection)) {
-                sendMessage("Cannot connect to PlotMe DB. Conversion process will not continue");
-                return false;
-            }
-
-            sendMessage(plugin + " conversion has started. To disable this, please set 'plotme-convert.enabled' in the 'settings.yml'");
-            sendMessage("Connecting to " + plugin + " DB");
-
-            int plotCount = 0;
-            final ArrayList<Plot> createdPlots = new ArrayList<>();
-
-            sendMessage("Collecting plot data");
-
-            String dbPrefix = plugin.toLowerCase();
-            sendMessage(" - " + dbPrefix + "Plots");
-            final Set<String> worlds = getPlotMeWorlds(plotConfig);
-
-            if (Settings.CONVERT_PLOTME) {
-                sendMessage("Updating bukkit.yml");
-                updateWorldYml(plugin, "bukkit.yml");
-                updateWorldYml(plugin, "plugins/Multiverse-Core/worlds.yml");
-                for (final String world : plotConfig.getConfigurationSection("worlds").getKeys(false)) {
-                    sendMessage("Copying config for: " + world);
-                    try {
-                        String actualWorldName = getWorld(world);
-                        connector.copyConfig(plotConfig, world, actualWorldName);
-                        PS.get().config.save(PS.get().configFile);
-                    } catch (final Exception e) {
-                        e.printStackTrace();
-                        sendMessage("&c-- &lFailed to save configuration for world '" + world + "'\nThis will need to be done using the setup command, or manually");
-                    }
-                }
-            }
-            HashMap<String, HashMap<PlotId, Plot>> plots = connector.getPlotMePlots(connection);
-            for (Entry<String, HashMap<PlotId, Plot>> entry : plots.entrySet()) {
-                plotCount += entry.getValue().size();
-            }
-            if (!Settings.CONVERT_PLOTME) {
-                return false;
-            }
-
-            sendMessage(" - " + dbPrefix + "Allowed");
-
-            sendMessage("Collected " + plotCount + " plots from PlotMe");
-            final File PLOTME_DG_FILE = new File(dataFolder + File.separator + "PlotMe-DefaultGenerator" + File.separator + "config.yml");
-            if (PLOTME_DG_FILE.exists()) {
-                final YamlConfiguration PLOTME_DG_YML = YamlConfiguration.loadConfiguration(PLOTME_DG_FILE);
-                try {
-                    for (final String world : plots.keySet()) {
-                        String actualWorldName = getWorld(world);
-                        final String plotMeWorldName = world.toLowerCase();
-                        Integer pathwidth = PLOTME_DG_YML.getInt("worlds." + plotMeWorldName + ".PathWidth"); //
-                        if (pathwidth == null) {
-                            pathwidth = 7;
-                        }
-                        PS.get().config.set("worlds." + world + ".road.width", pathwidth);
-                        
-                        Integer pathheight = PLOTME_DG_YML.getInt("worlds." + plotMeWorldName + ".RoadHeight"); //
-                        if (pathheight == null || pathheight == 0) {
-                            pathheight = 64;
-                        }
-                        PS.get().config.set("worlds." + world + ".road.height", pathheight);
-                        PS.get().config.set("worlds." + world + ".wall.height", pathheight);
-                        PS.get().config.set("worlds." + world + ".plot.height", pathheight);
-                        Integer plotsize = PLOTME_DG_YML.getInt("worlds." + plotMeWorldName + ".PlotSize"); //
-                        if (plotsize == null || plotsize == 0) {
-                            plotsize = 32;
-                        }
-                        PS.get().config.set("worlds." + world + ".plot.size", plotsize);
-                        String wallblock = PLOTME_DG_YML.getString("worlds." + plotMeWorldName + ".WallBlock"); //
-                        if (wallblock == null) {
-                            wallblock = "44";
-                        }
-                        PS.get().config.set("worlds." + world + ".wall.block", wallblock);
-                        String floor = PLOTME_DG_YML.getString("worlds." + plotMeWorldName + ".PlotFloorBlock"); //
-                        if (floor == null) {
-                            floor = "2";
-                        }
-                        PS.get().config.set("worlds." + world + ".plot.floor", Arrays.asList(floor));
-                        String filling = PLOTME_DG_YML.getString("worlds." + plotMeWorldName + ".FillBlock"); //
-                        if (filling == null) {
-                            filling = "3";
-                        }
-                        PS.get().config.set("worlds." + world + ".plot.filling", Arrays.asList(filling));
-                        String road = PLOTME_DG_YML.getString("worlds." + plotMeWorldName + ".RoadMainBlock");
-                        if (road == null) {
-                            road = "5";
-                        }
-                        PS.get().config.set("worlds." + world + ".road.block", road);
-                        Integer height = PLOTME_DG_YML.getInt("worlds." + plotMeWorldName + ".RoadHeight"); //
-                        if ((height == null) || (height == 0)) {
-                            height = PLOTME_DG_YML.getInt("worlds." + plotMeWorldName + ".GroundHeight"); //
-                            if ((height == null) || (height == 0)) {
-                                height = 64;
-                            }
-                        }
-                        PS.get().config.set("worlds." + actualWorldName + ".road.height", height);
-                        PS.get().config.set("worlds." + actualWorldName + ".plot.height", height);
-                        PS.get().config.set("worlds." + actualWorldName + ".wall.height", height);
-                        PS.get().config.save(PS.get().configFile);
-                    }
-                } catch (final Exception e) {
-                }
-            }
-            for (final String world : plots.keySet()) {
-                int duplicate = 0;
-                for (final Plot plot : plots.get(world).values()) {
-                    if (PS.get().getPlot(world, plot.id) == null) {
-                        createdPlots.add(plot);
-                    } else {
-                        duplicate++;
-                    }
-                }
-                if (duplicate > 0) {
-                    PS.debug("&c[WARNING] Found " + duplicate + " duplicate plots already in DB for world: '" + world + "'. Have you run the converter already?");
-                }
-            }
-            sendMessage("Creating plot DB");
-            Thread.sleep(1000);
-            final AtomicBoolean done = new AtomicBoolean(false);
-            DBFunc.createPlotsAndData(createdPlots, new Runnable() {
-                @Override
-                public void run() {
-                    if (done.get()) {
-                        sendMessage("&aDatabase conversion is now complete!");
-                        PS.debug("&c - Stop the server");
-                        PS.debug("&c - Disable 'plotme-convert.enabled' and 'plotme-convert.cache-uuids' in the settings.yml");
-                        PS.debug("&c - Correct any generator settings that haven't copied to 'settings.yml' properly");
-                        PS.debug("&c - Start the server");
-                        PS.get().setAllPlotsRaw(DBFunc.getPlots());
-                    }
-                    else {
-                        sendMessage("&cPlease wait until database conversion is complete. You will be notified with instructions when this happens!");
-                        done.set(true);
-                    }
-                }
-            });
-            sendMessage("Saving configuration...");
-            try {
-                PS.get().config.save(PS.get().configFile);
-            } catch (final IOException e) {
-                sendMessage(" - &cFailed to save configuration.");
-            }
-            TaskManager.runTask(new Runnable() {
-                @Override
-                public void run() {
-                    try {
-                        boolean MV = false;
-                        boolean MW = false;
-                        if ((Bukkit.getPluginManager().getPlugin("Multiverse-Core") != null) && Bukkit.getPluginManager().getPlugin("Multiverse-Core").isEnabled()) {
-                            MV = true;
-                        } else if ((Bukkit.getPluginManager().getPlugin("MultiWorld") != null) && Bukkit.getPluginManager().getPlugin("MultiWorld").isEnabled()) {
-                            MW = true;
-                        }
-                        for (final String worldname : worlds) {
-                            final World world = Bukkit.getWorld(getWorld(worldname));
-                            if (world == null) {
-                                sendMessage("&cInvalid world in PlotMe configuration: " + worldname);
-                            }
-                            final String actualWorldName = world.getName();
-                            sendMessage("Reloading generator for world: '" + actualWorldName + "'...");
-                            PS.get().removePlotWorld(actualWorldName);
-                            if (MV) {
-                                // unload world with MV
-                                Bukkit.getServer().dispatchCommand(Bukkit.getServer().getConsoleSender(), "mv unload " + actualWorldName);
-                                try {
-                                    Thread.sleep(1000);
-                                } catch (final InterruptedException ex) {
-                                    Thread.currentThread().interrupt();
-                                }
-                                // load world with MV
-                                Bukkit.getServer().dispatchCommand(Bukkit.getServer().getConsoleSender(), "mv import " + actualWorldName + " normal -g PlotSquared");
-                            } else if (MW) {
-                                // unload world with MW
-                                Bukkit.getServer().dispatchCommand(Bukkit.getServer().getConsoleSender(), "mw unload " + actualWorldName);
-                                try {
-                                    Thread.sleep(1000);
-                                } catch (final InterruptedException ex) {
-                                    Thread.currentThread().interrupt();
-                                }
-                                // load world with MW
-                                Bukkit.getServer().dispatchCommand(Bukkit.getServer().getConsoleSender(), "mw create " + actualWorldName + " plugin:PlotSquared");
-                            } else {
-                                // Load using Bukkit API
-                                // - User must set generator manually
-                                Bukkit.getServer().unloadWorld(world, true);
-                                final World myworld = WorldCreator.name(actualWorldName).generator(new HybridGen(actualWorldName)).createWorld();
-                                myworld.save();
-                            }
-                        }
-                    } catch (final Exception e) {
-                        e.printStackTrace();
-                    }
-                    if (done.get()) {
-                        sendMessage("&aDatabase conversion is now complete!");
-                        PS.debug("&c - Stop the server");
-                        PS.debug("&c - Disable 'plotme-convert.enabled' and 'plotme-convert.cache-uuids' in the settings.yml");
-                        PS.debug("&c - Correct any generator settings that haven't copied to 'settings.yml' properly");
-                        PS.debug("&c - Start the server");
-                    }
-                    else {
-                        sendMessage("&cPlease wait until database conversion is complete. You will be notified with instructions when this happens!");
-                        done.set(true);
-                    }
-                }
-            });
-        } catch (final Exception e) {
-            e.printStackTrace();
-            PS.debug("&/end/");
-        }
-        return true;
-    }
-}
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// PlotSquared - A plot manager and world generator for the Bukkit API                             /
+// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
+//                                                                                                 /
+// This program is free software; you can redistribute it and/or modify                            /
+// it under the terms of the GNU General Public License as published by                            /
+// the Free Software Foundation; either version 3 of the License, or                               /
+// (at your option) any later version.                                                             /
+//                                                                                                 /
+// This program is distributed in the hope that it will be useful,                                 /
+// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
+// GNU General Public License for more details.                                                    /
+//                                                                                                 /
+// You should have received a copy of the GNU General Public License                               /
+// along with this program; if not, write to the Free Software Foundation,                         /
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
+//                                                                                                 /
+// You can contact us via: support@intellectualsites.com                                           /
+////////////////////////////////////////////////////////////////////////////////////////////////////
+package com.plotsquared.bukkit.database.plotme;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.sql.Connection;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import org.bukkit.Bukkit;
+import org.bukkit.World;
+import org.bukkit.WorldCreator;
+
+import com.intellectualcrafters.configuration.file.FileConfiguration;
+import com.intellectualcrafters.configuration.file.YamlConfiguration;
+import com.intellectualcrafters.plot.PS;
+import com.intellectualcrafters.plot.config.Settings;
+import com.intellectualcrafters.plot.database.DBFunc;
+import com.intellectualcrafters.plot.object.Plot;
+import com.intellectualcrafters.plot.object.PlotId;
+import com.intellectualcrafters.plot.util.TaskManager;
+import com.plotsquared.bukkit.generator.HybridGen;
+
+/**
+ * Created 2014-08-17 for PlotSquared
+ *


+ */
+public class LikePlotMeConverter
+{
+    private final String plugin;
+
+    /**
+     * Constructor
+     *
+     * @param plugin Plugin Used to run the converter
+     */
+    public LikePlotMeConverter(final String plugin)
+    {
+        this.plugin = plugin;
+    }
+
+    public static String getWorld(final String world)
+    {
+        for (final World newworld : Bukkit.getWorlds())
+        {
+            if (newworld.getName().equalsIgnoreCase(world)) { return newworld.getName(); }
+        }
+        return world;
+    }
+
+    private void sendMessage(final String message)
+    {
+        PS.debug("&3PlotMe&8->&3PlotSquared&8: &7" + message);
+    }
+
+    public String getPlotMePath()
+    {
+        return new File(".").getAbsolutePath() + File.separator + "plugins" + File.separator + plugin + File.separator;
+    }
+
+    public String getAthionPlotsPath()
+    {
+        return new File(".").getAbsolutePath() + File.separator + "plugins" + File.separator + plugin + File.separator;
+    }
+
+    public FileConfiguration getPlotMeConfig(final String dataFolder)
+    {
+        final File plotMeFile = new File(dataFolder + "config.yml");
+        if (!plotMeFile.exists()) { return null; }
+        return YamlConfiguration.loadConfiguration(plotMeFile);
+    }
+
+    public Set<String> getPlotMeWorlds(final FileConfiguration plotConfig)
+    {
+        return plotConfig.getConfigurationSection("worlds").getKeys(false);
+    }
+
+    public void updateWorldYml(final String plugin, final String location)
+    {
+        try
+        {
+            final Path path = Paths.get(location);
+            final File file = new File(location);
+            if (!file.exists()) { return; }
+            final Charset charset = StandardCharsets.UTF_8;
+            String content = new String(Files.readAllBytes(path), charset);
+            content = content.replaceAll("PlotMe-DefaultGenerator", "PlotSquared");
+            content = content.replaceAll(plugin, "PlotSquared");
+            Files.write(path, content.getBytes(charset));
+        }
+        catch (final Exception e)
+        {}
+    }
+
+    public boolean run(final APlotMeConnector connector)
+    {
+        try
+        {
+            final String dataFolder = getPlotMePath();
+            final FileConfiguration plotConfig = getPlotMeConfig(dataFolder);
+            if (plotConfig == null) { return false; }
+
+            String version = plotConfig.getString("Version");
+            if (version == null)
+            {
+                version = plotConfig.getString("version");
+            }
+            if (!connector.accepts(version)) { return false; }
+
+            PS.debug("&3Using connector: " + connector.getClass().getCanonicalName());
+
+            final Connection connection = connector.getPlotMeConnection(plugin, plotConfig, dataFolder);
+
+            if (!connector.isValidConnection(connection))
+            {
+                sendMessage("Cannot connect to PlotMe DB. Conversion process will not continue");
+                return false;
+            }
+
+            sendMessage(plugin + " conversion has started. To disable this, please set 'plotme-convert.enabled' in the 'settings.yml'");
+            sendMessage("Connecting to " + plugin + " DB");
+
+            int plotCount = 0;
+            final ArrayList<Plot> createdPlots = new ArrayList<>();
+
+            sendMessage("Collecting plot data");
+
+            final String dbPrefix = plugin.toLowerCase();
+            sendMessage(" - " + dbPrefix + "Plots");
+            final Set<String> worlds = getPlotMeWorlds(plotConfig);
+
+            if (Settings.CONVERT_PLOTME)
+            {
+                sendMessage("Updating bukkit.yml");
+                updateWorldYml(plugin, "bukkit.yml");
+                updateWorldYml(plugin, "plugins/Multiverse-Core/worlds.yml");
+                for (final String world : plotConfig.getConfigurationSection("worlds").getKeys(false))
+                {
+                    sendMessage("Copying config for: " + world);
+                    try
+                    {
+                        final String actualWorldName = getWorld(world);
+                        connector.copyConfig(plotConfig, world, actualWorldName);
+                        PS.get().config.save(PS.get().configFile);
+                    }
+                    catch (final Exception e)
+                    {
+                        e.printStackTrace();
+                        sendMessage("&c-- &lFailed to save configuration for world '" + world + "'\nThis will need to be done using the setup command, or manually");
+                    }
+                }
+            }
+            final HashMap<String, HashMap<PlotId, Plot>> plots = connector.getPlotMePlots(connection);
+            for (final Entry<String, HashMap<PlotId, Plot>> entry : plots.entrySet())
+            {
+                plotCount += entry.getValue().size();
+            }
+            if (!Settings.CONVERT_PLOTME) { return false; }
+
+            sendMessage(" - " + dbPrefix + "Allowed");
+
+            sendMessage("Collected " + plotCount + " plots from PlotMe");
+            final File PLOTME_DG_FILE = new File(dataFolder + File.separator + "PlotMe-DefaultGenerator" + File.separator + "config.yml");
+            if (PLOTME_DG_FILE.exists())
+            {
+                final YamlConfiguration PLOTME_DG_YML = YamlConfiguration.loadConfiguration(PLOTME_DG_FILE);
+                try
+                {
+                    for (final String world : plots.keySet())
+                    {
+                        final String actualWorldName = getWorld(world);
+                        final String plotMeWorldName = world.toLowerCase();
+                        Integer pathwidth = PLOTME_DG_YML.getInt("worlds." + plotMeWorldName + ".PathWidth"); //
+                        if (pathwidth == null)
+                        {
+                            pathwidth = 7;
+                        }
+                        PS.get().config.set("worlds." + world + ".road.width", pathwidth);
+
+                        Integer pathheight = PLOTME_DG_YML.getInt("worlds." + plotMeWorldName + ".RoadHeight"); //
+                        if ((pathheight == null) || (pathheight == 0))
+                        {
+                            pathheight = 64;
+                        }
+                        PS.get().config.set("worlds." + world + ".road.height", pathheight);
+                        PS.get().config.set("worlds." + world + ".wall.height", pathheight);
+                        PS.get().config.set("worlds." + world + ".plot.height", pathheight);
+                        Integer plotsize = PLOTME_DG_YML.getInt("worlds." + plotMeWorldName + ".PlotSize"); //
+                        if ((plotsize == null) || (plotsize == 0))
+                        {
+                            plotsize = 32;
+                        }
+                        PS.get().config.set("worlds." + world + ".plot.size", plotsize);
+                        String wallblock = PLOTME_DG_YML.getString("worlds." + plotMeWorldName + ".WallBlock"); //
+                        if (wallblock == null)
+                        {
+                            wallblock = "44";
+                        }
+                        PS.get().config.set("worlds." + world + ".wall.block", wallblock);
+                        String floor = PLOTME_DG_YML.getString("worlds." + plotMeWorldName + ".PlotFloorBlock"); //
+                        if (floor == null)
+                        {
+                            floor = "2";
+                        }
+                        PS.get().config.set("worlds." + world + ".plot.floor", Arrays.asList(floor));
+                        String filling = PLOTME_DG_YML.getString("worlds." + plotMeWorldName + ".FillBlock"); //
+                        if (filling == null)
+                        {
+                            filling = "3";
+                        }
+                        PS.get().config.set("worlds." + world + ".plot.filling", Arrays.asList(filling));
+                        String road = PLOTME_DG_YML.getString("worlds." + plotMeWorldName + ".RoadMainBlock");
+                        if (road == null)
+                        {
+                            road = "5";
+                        }
+                        PS.get().config.set("worlds." + world + ".road.block", road);
+                        Integer height = PLOTME_DG_YML.getInt("worlds." + plotMeWorldName + ".RoadHeight"); //
+                        if ((height == null) || (height == 0))
+                        {
+                            height = PLOTME_DG_YML.getInt("worlds." + plotMeWorldName + ".GroundHeight"); //
+                            if ((height == null) || (height == 0))
+                            {
+                                height = 64;
+                            }
+                        }
+                        PS.get().config.set("worlds." + actualWorldName + ".road.height", height);
+                        PS.get().config.set("worlds." + actualWorldName + ".plot.height", height);
+                        PS.get().config.set("worlds." + actualWorldName + ".wall.height", height);
+                        PS.get().config.save(PS.get().configFile);
+                    }
+                }
+                catch (final Exception e)
+                {}
+            }
+            for (final String world : plots.keySet())
+            {
+                int duplicate = 0;
+                for (final Plot plot : plots.get(world).values())
+                {
+                    if (PS.get().getPlot(world, plot.id) == null)
+                    {
+                        createdPlots.add(plot);
+                    }
+                    else
+                    {
+                        duplicate++;
+                    }
+                }
+                if (duplicate > 0)
+                {
+                    PS.debug("&c[WARNING] Found " + duplicate + " duplicate plots already in DB for world: '" + world + "'. Have you run the converter already?");
+                }
+            }
+            sendMessage("Creating plot DB");
+            Thread.sleep(1000);
+            final AtomicBoolean done = new AtomicBoolean(false);
+            DBFunc.createPlotsAndData(createdPlots, new Runnable()
+            {
+                @Override
+                public void run()
+                {
+                    if (done.get())
+                    {
+                        sendMessage("&aDatabase conversion is now complete!");
+                        PS.debug("&c - Stop the server");
+                        PS.debug("&c - Disable 'plotme-convert.enabled' and 'plotme-convert.cache-uuids' in the settings.yml");
+                        PS.debug("&c - Correct any generator settings that haven't copied to 'settings.yml' properly");
+                        PS.debug("&c - Start the server");
+                        PS.get().setAllPlotsRaw(DBFunc.getPlots());
+                    }
+                    else
+                    {
+                        sendMessage("&cPlease wait until database conversion is complete. You will be notified with instructions when this happens!");
+                        done.set(true);
+                    }
+                }
+            });
+            sendMessage("Saving configuration...");
+            try
+            {
+                PS.get().config.save(PS.get().configFile);
+            }
+            catch (final IOException e)
+            {
+                sendMessage(" - &cFailed to save configuration.");
+            }
+            TaskManager.runTask(new Runnable()
+            {
+                @Override
+                public void run()
+                {
+                    try
+                    {
+                        boolean MV = false;
+                        boolean MW = false;
+                        if ((Bukkit.getPluginManager().getPlugin("Multiverse-Core") != null) && Bukkit.getPluginManager().getPlugin("Multiverse-Core").isEnabled())
+                        {
+                            MV = true;
+                        }
+                        else if ((Bukkit.getPluginManager().getPlugin("MultiWorld") != null) && Bukkit.getPluginManager().getPlugin("MultiWorld").isEnabled())
+                        {
+                            MW = true;
+                        }
+                        for (final String worldname : worlds)
+                        {
+                            final World world = Bukkit.getWorld(getWorld(worldname));
+                            if (world == null)
+                            {
+                                sendMessage("&cInvalid world in PlotMe configuration: " + worldname);
+                            }
+                            final String actualWorldName = world.getName();
+                            sendMessage("Reloading generator for world: '" + actualWorldName + "'...");
+                            PS.get().removePlotWorld(actualWorldName);
+                            if (MV)
+                            {
+                                // unload world with MV
+                                Bukkit.getServer().dispatchCommand(Bukkit.getServer().getConsoleSender(), "mv unload " + actualWorldName);
+                                try
+                                {
+                                    Thread.sleep(1000);
+                                }
+                                catch (final InterruptedException ex)
+                                {
+                                    Thread.currentThread().interrupt();
+                                }
+                                // load world with MV
+                                Bukkit.getServer().dispatchCommand(Bukkit.getServer().getConsoleSender(), "mv import " + actualWorldName + " normal -g PlotSquared");
+                            }
+                            else if (MW)
+                            {
+                                // unload world with MW
+                                Bukkit.getServer().dispatchCommand(Bukkit.getServer().getConsoleSender(), "mw unload " + actualWorldName);
+                                try
+                                {
+                                    Thread.sleep(1000);
+                                }
+                                catch (final InterruptedException ex)
+                                {
+                                    Thread.currentThread().interrupt();
+                                }
+                                // load world with MW
+                                Bukkit.getServer().dispatchCommand(Bukkit.getServer().getConsoleSender(), "mw create " + actualWorldName + " plugin:PlotSquared");
+                            }
+                            else
+                            {
+                                // Load using Bukkit API
+                                // - User must set generator manually
+                                Bukkit.getServer().unloadWorld(world, true);
+                                final World myworld = WorldCreator.name(actualWorldName).generator(new HybridGen(actualWorldName)).createWorld();
+                                myworld.save();
+                            }
+                        }
+                    }
+                    catch (final Exception e)
+                    {
+                        e.printStackTrace();
+                    }
+                    if (done.get())
+                    {
+                        sendMessage("&aDatabase conversion is now complete!");
+                        PS.debug("&c - Stop the server");
+                        PS.debug("&c - Disable 'plotme-convert.enabled' and 'plotme-convert.cache-uuids' in the settings.yml");
+                        PS.debug("&c - Correct any generator settings that haven't copied to 'settings.yml' properly");
+                        PS.debug("&c - Start the server");
+                    }
+                    else
+                    {
+                        sendMessage("&cPlease wait until database conversion is complete. You will be notified with instructions when this happens!");
+                        done.set(true);
+                    }
+                }
+            });
+        }
+        catch (final Exception e)
+        {
+            e.printStackTrace();
+            PS.debug("&/end/");
+        }
+        return true;
+    }
+}
diff --git a/src/main/java/com/plotsquared/bukkit/database/plotme/PlotMeConnector_017.java b/src/main/java/com/plotsquared/bukkit/database/plotme/PlotMeConnector_017.java
index 3d0978664..4bf1425fc 100644
--- a/src/main/java/com/plotsquared/bukkit/database/plotme/PlotMeConnector_017.java
+++ b/src/main/java/com/plotsquared/bukkit/database/plotme/PlotMeConnector_017.java
@@ -22,177 +22,211 @@ import com.intellectualcrafters.plot.object.StringWrapper;
 import com.intellectualcrafters.plot.util.MainUtil;
 import com.intellectualcrafters.plot.util.UUIDHandler;
 
-public class PlotMeConnector_017 extends APlotMeConnector {
+public class PlotMeConnector_017 extends APlotMeConnector
+{
     private String plugin;
 
     @Override
-    public Connection getPlotMeConnection(String plugin, FileConfiguration plotConfig, String dataFolder) {
+    public Connection getPlotMeConnection(final String plugin, final FileConfiguration plotConfig, final String dataFolder)
+    {
         this.plugin = plugin.toLowerCase();
-        try {
-            if (plotConfig.getBoolean("usemySQL")) {
-                String user = plotConfig.getString("mySQLuname");
-                String password = plotConfig.getString("mySQLpass");
-                String con = plotConfig.getString("mySQLconn");
+        try
+        {
+            if (plotConfig.getBoolean("usemySQL"))
+            {
+                final String user = plotConfig.getString("mySQLuname");
+                final String password = plotConfig.getString("mySQLpass");
+                final String con = plotConfig.getString("mySQLconn");
                 return DriverManager.getConnection(con, user, password);
-            } else {
-                File file = new File(dataFolder + File.separator + "plotmecore.db");
-                if (file.exists()) {
-                    return new SQLite(dataFolder + File.separator + "plotmecore.db").openConnection();
-                }
+            }
+            else
+            {
+                final File file = new File(dataFolder + File.separator + "plotmecore.db");
+                if (file.exists()) { return new SQLite(dataFolder + File.separator + "plotmecore.db").openConnection(); }
                 return new SQLite(dataFolder + File.separator + "plots.db").openConnection();
             }
         }
-        catch (SQLException | ClassNotFoundException e) {}
+        catch (SQLException | ClassNotFoundException e)
+        {}
         return null;
     }
 
     @Override
-    public HashMap<String, HashMap<PlotId, Plot>> getPlotMePlots(Connection connection) throws SQLException {
+    public HashMap<String, HashMap<PlotId, Plot>> getPlotMePlots(final Connection connection) throws SQLException
+    {
         ResultSet r;
         PreparedStatement stmt;
-        HashMap<String, Integer> plotWidth = new HashMap<>();
-        HashMap<String, Integer> roadWidth = new HashMap<>();
+        final HashMap<String, Integer> plotWidth = new HashMap<>();
+        final HashMap<String, Integer> roadWidth = new HashMap<>();
         final HashMap<Integer, Plot> plots = new HashMap<>();
-        HashMap<String, HashMap<PlotId, boolean[]>> merges = new HashMap<>();
+        final HashMap<String, HashMap<PlotId, boolean[]>> merges = new HashMap<>();
         stmt = connection.prepareStatement("SELECT * FROM `" + plugin + "core_plots`");
         r = stmt.executeQuery();
-        boolean checkUUID = DBFunc.hasColumn(r, "ownerID");
-        boolean merge = !plugin.equals("plotme") && Settings.CONVERT_PLOTME;
-        while (r.next()) {
-            int key = r.getInt("plot_id");
-            PlotId id = new PlotId(r.getInt("plotX"), r.getInt("plotZ"));
-            String name = r.getString("owner");
-            String world = LikePlotMeConverter.getWorld(r.getString("world"));
-            if (!plots.containsKey(world)) {
-                if (merge) {
-                    int plot = PS.get().config.getInt("worlds." + world + ".plot.size");
-                    int path = PS.get().config.getInt("worlds." + world + ".road.width");
+        final boolean checkUUID = DBFunc.hasColumn(r, "ownerID");
+        final boolean merge = !plugin.equals("plotme") && Settings.CONVERT_PLOTME;
+        while (r.next())
+        {
+            final int key = r.getInt("plot_id");
+            final PlotId id = new PlotId(r.getInt("plotX"), r.getInt("plotZ"));
+            final String name = r.getString("owner");
+            final String world = LikePlotMeConverter.getWorld(r.getString("world"));
+            if (!plots.containsKey(world))
+            {
+                if (merge)
+                {
+                    final int plot = PS.get().config.getInt("worlds." + world + ".plot.size");
+                    final int path = PS.get().config.getInt("worlds." + world + ".road.width");
                     plotWidth.put(world, plot);
                     roadWidth.put(world, path);
-                    merges.put(world, new HashMap<PlotId,boolean[]>());
+                    merges.put(world, new HashMap<PlotId, boolean[]>());
                 }
             }
-            if (merge) {
-                int tx = r.getInt("topX");
-                int tz = r.getInt("topZ");
-                int bx = r.getInt("bottomX") - 1;
-                int bz = r.getInt("bottomZ") - 1;
-                int path = roadWidth.get(world);
-                int plot = plotWidth.get(world);
-                Location top = getPlotTopLocAbs(path, plot, id);
-                Location bot = getPlotBottomLocAbs(path, plot, id);
-                if (tx > top.getX()) {
+            if (merge)
+            {
+                final int tx = r.getInt("topX");
+                final int tz = r.getInt("topZ");
+                final int bx = r.getInt("bottomX") - 1;
+                final int bz = r.getInt("bottomZ") - 1;
+                final int path = roadWidth.get(world);
+                final int plot = plotWidth.get(world);
+                final Location top = getPlotTopLocAbs(path, plot, id);
+                final Location bot = getPlotBottomLocAbs(path, plot, id);
+                if (tx > top.getX())
+                {
                     setMerged(merges, world, id, 1);
                 }
-                if (tz > top.getZ()) {
+                if (tz > top.getZ())
+                {
                     setMerged(merges, world, id, 2);
                 }
-                if (bx < bot.getX()) {
+                if (bx < bot.getX())
+                {
                     setMerged(merges, world, id, 3);
                 }
-                if (bz > bot.getZ()) {
+                if (bz > bot.getZ())
+                {
                     setMerged(merges, world, id, 0);
                 }
             }
             UUID owner = UUIDHandler.getUUID(name, null);
-            if (owner == null) {
-                if (name.equals("*")) {
+            if (owner == null)
+            {
+                if (name.equals("*"))
+                {
                     owner = DBFunc.everyone;
                 }
-                else {
-                    if (checkUUID){
-                        try {
-                            byte[] bytes = r.getBytes("ownerid");
-                            if (bytes != null) {
+                else
+                {
+                    if (checkUUID)
+                    {
+                        try
+                        {
+                            final byte[] bytes = r.getBytes("ownerid");
+                            if (bytes != null)
+                            {
                                 owner = UUID.nameUUIDFromBytes(bytes);
-                                if (owner != null) {
+                                if (owner != null)
+                                {
                                     UUIDHandler.add(new StringWrapper(name), owner);
                                 }
                             }
                         }
-                        catch (Exception e) {
+                        catch (final Exception e)
+                        {
                             e.printStackTrace();
                         }
                     }
-                    if (owner == null) {
+                    if (owner == null)
+                    {
                         MainUtil.sendConsoleMessage("&cCould not identify owner for plot: " + id + " -> '" + name + "'");
                         continue;
                     }
                 }
             }
-            else {
+            else
+            {
                 UUIDHandler.add(new StringWrapper(name), owner);
             }
-            Plot plot = new Plot(world, id, owner);
+            final Plot plot = new Plot(world, id, owner);
             plots.put(key, plot);
         }
-        for (Entry<Integer, Plot> entry : plots.entrySet()) {
-            Plot plot = entry.getValue();
-            HashMap<PlotId, boolean[]> mergeMap = merges.get(plot.world);
-            if (mergeMap != null) {
-                if (mergeMap.containsKey(plot.id)) {
+        for (final Entry<Integer, Plot> entry : plots.entrySet())
+        {
+            final Plot plot = entry.getValue();
+            final HashMap<PlotId, boolean[]> mergeMap = merges.get(plot.world);
+            if (mergeMap != null)
+            {
+                if (mergeMap.containsKey(plot.id))
+                {
                     plot.getSettings().setMerged(mergeMap.get(plot.id));
                 }
             }
         }
         r.close();
         stmt.close();
-        try {
+        try
+        {
             MainUtil.sendConsoleMessage(" - " + plugin + "core_denied");
             stmt = connection.prepareStatement("SELECT * FROM `" + plugin + "core_denied`");
             r = stmt.executeQuery();
-            
-            while (r.next()) {
-                int key = r.getInt("plot_id");
-                Plot plot = plots.get(key);
-                if (plot == null) {
+
+            while (r.next())
+            {
+                final int key = r.getInt("plot_id");
+                final Plot plot = plots.get(key);
+                if (plot == null)
+                {
                     MainUtil.sendConsoleMessage("&6Denied (" + key + ") references deleted plot; ignoring entry.");
                     continue;
                 }
-                UUID denied = UUID.fromString(r.getString("player"));
+                final UUID denied = UUID.fromString(r.getString("player"));
                 plot.getDenied().add(denied);
             }
-            
+
             MainUtil.sendConsoleMessage(" - " + plugin + "core_allowed");
             stmt = connection.prepareStatement("SELECT * FROM `" + plugin + "core_allowed`");
             r = stmt.executeQuery();
-            
-            while (r.next()) {
-                int key = r.getInt("plot_id");
-                Plot plot = plots.get(key);
-                if (plot == null) {
+
+            while (r.next())
+            {
+                final int key = r.getInt("plot_id");
+                final Plot plot = plots.get(key);
+                if (plot == null)
+                {
                     MainUtil.sendConsoleMessage("&6Allowed (" + key + ") references deleted plot; ignoring entry.");
                     continue;
                 }
-                UUID allowed = UUID.fromString(r.getString("player"));
+                final UUID allowed = UUID.fromString(r.getString("player"));
                 plot.getTrusted().add(allowed);
             }
             r.close();
             stmt.close();
-        
+
         }
-        catch (Exception e) {
+        catch (final Exception e)
+        {
             e.printStackTrace();
         }
-        HashMap<String, HashMap<PlotId, Plot>> processed = new HashMap<>();
-        
-        for (Entry<Integer, Plot> entry : plots.entrySet()) {
-            Plot plot = entry.getValue();
+        final HashMap<String, HashMap<PlotId, Plot>> processed = new HashMap<>();
+
+        for (final Entry<Integer, Plot> entry : plots.entrySet())
+        {
+            final Plot plot = entry.getValue();
             HashMap<PlotId, Plot> map = processed.get(plot.world);
-            if (map == null) {
+            if (map == null)
+            {
                 map = new HashMap<>();
                 processed.put(plot.world, map);
             }
             map.put(plot.id, plot);
         }
-        return processed ;
+        return processed;
     }
 
     @Override
-    public boolean accepts(String version) {
-        if (version == null) {
-            return false;
-        }
+    public boolean accepts(final String version)
+    {
+        if (version == null) { return false; }
         return !PS.get().canUpdate(version, "0.17");
     }
 }
diff --git a/src/main/java/com/plotsquared/bukkit/events/ClusterFlagRemoveEvent.java b/src/main/java/com/plotsquared/bukkit/events/ClusterFlagRemoveEvent.java
index ee71aaf0b..eec566cfb 100644
--- a/src/main/java/com/plotsquared/bukkit/events/ClusterFlagRemoveEvent.java
+++ b/src/main/java/com/plotsquared/bukkit/events/ClusterFlagRemoveEvent.java
@@ -1,89 +1,95 @@
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// PlotSquared - A plot manager and world generator for the Bukkit API                             /
-// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
-//                                                                                                 /
-// This program is free software; you can redistribute it and/or modify                            /
-// it under the terms of the GNU General Public License as published by                            /
-// the Free Software Foundation; either version 3 of the License, or                               /
-// (at your option) any later version.                                                             /
-//                                                                                                 /
-// This program is distributed in the hope that it will be useful,                                 /
-// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
-// GNU General Public License for more details.                                                    /
-//                                                                                                 /
-// You should have received a copy of the GNU General Public License                               /
-// along with this program; if not, write to the Free Software Foundation,                         /
-// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
-//                                                                                                 /
-// You can contact us via: support@intellectualsites.com                                           /
-////////////////////////////////////////////////////////////////////////////////////////////////////
-package com.plotsquared.bukkit.events;
-
-import org.bukkit.event.Cancellable;
-import org.bukkit.event.Event;
-import org.bukkit.event.HandlerList;
-
-import com.intellectualcrafters.plot.flag.Flag;
-import com.intellectualcrafters.plot.object.PlotCluster;
-
-/**
- * Called when a flag is removed from a plot
- *
- * @author Citymonstret
- * @author Empire92
- */
-public class ClusterFlagRemoveEvent extends Event implements Cancellable {
-    private static HandlerList handlers = new HandlerList();
-    private final PlotCluster cluster;
-    private final Flag flag;
-    private boolean cancelled;
-
-    /**
-     * PlotFlagRemoveEvent: Called when a flag is removed from a plot
-     *
-     * @param flag Flag that was removed
-     * @param plot Plot from which the flag was removed
-     */
-    public ClusterFlagRemoveEvent(final Flag flag, final PlotCluster cluster) {
-        this.cluster = cluster;
-        this.flag = flag;
-    }
-
-    public static HandlerList getHandlerList() {
-        return handlers;
-    }
-
-    /**
-     * Get the cluster involved
-     *
-     * @return PlotCluster
-     */
-    public PlotCluster getCluster() {
-        return this.cluster;
-    }
-
-    /**
-     * Get the flag involved
-     *
-     * @return Flag
-     */
-    public Flag getFlag() {
-        return this.flag;
-    }
-
-    @Override
-    public HandlerList getHandlers() {
-        return handlers;
-    }
-
-    @Override
-    public boolean isCancelled() {
-        return this.cancelled;
-    }
-
-    @Override
-    public void setCancelled(final boolean b) {
-        this.cancelled = b;
-    }
-}
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// PlotSquared - A plot manager and world generator for the Bukkit API                             /
+// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
+//                                                                                                 /
+// This program is free software; you can redistribute it and/or modify                            /
+// it under the terms of the GNU General Public License as published by                            /
+// the Free Software Foundation; either version 3 of the License, or                               /
+// (at your option) any later version.                                                             /
+//                                                                                                 /
+// This program is distributed in the hope that it will be useful,                                 /
+// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
+// GNU General Public License for more details.                                                    /
+//                                                                                                 /
+// You should have received a copy of the GNU General Public License                               /
+// along with this program; if not, write to the Free Software Foundation,                         /
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
+//                                                                                                 /
+// You can contact us via: support@intellectualsites.com                                           /
+////////////////////////////////////////////////////////////////////////////////////////////////////
+package com.plotsquared.bukkit.events;
+
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+
+import com.intellectualcrafters.plot.flag.Flag;
+import com.intellectualcrafters.plot.object.PlotCluster;
+
+/**
+ * Called when a flag is removed from a plot
+ *


+ */
+public class ClusterFlagRemoveEvent extends Event implements Cancellable
+{
+    private static HandlerList handlers = new HandlerList();
+    private final PlotCluster cluster;
+    private final Flag flag;
+    private boolean cancelled;
+
+    /**
+     * PlotFlagRemoveEvent: Called when a flag is removed from a plot
+     *
+     * @param flag Flag that was removed
+     * @param plot Plot from which the flag was removed
+     */
+    public ClusterFlagRemoveEvent(final Flag flag, final PlotCluster cluster)
+    {
+        this.cluster = cluster;
+        this.flag = flag;
+    }
+
+    public static HandlerList getHandlerList()
+    {
+        return handlers;
+    }
+
+    /**
+     * Get the cluster involved
+     *
+     * @return PlotCluster
+     */
+    public PlotCluster getCluster()
+    {
+        return cluster;
+    }
+
+    /**
+     * Get the flag involved
+     *
+     * @return Flag
+     */
+    public Flag getFlag()
+    {
+        return flag;
+    }
+
+    @Override
+    public HandlerList getHandlers()
+    {
+        return handlers;
+    }
+
+    @Override
+    public boolean isCancelled()
+    {
+        return cancelled;
+    }
+
+    @Override
+    public void setCancelled(final boolean b)
+    {
+        cancelled = b;
+    }
+}
diff --git a/src/main/java/com/plotsquared/bukkit/events/PlayerClaimPlotEvent.java b/src/main/java/com/plotsquared/bukkit/events/PlayerClaimPlotEvent.java
index b9616c300..ee02e731e 100644
--- a/src/main/java/com/plotsquared/bukkit/events/PlayerClaimPlotEvent.java
+++ b/src/main/java/com/plotsquared/bukkit/events/PlayerClaimPlotEvent.java
@@ -1,86 +1,92 @@
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// PlotSquared - A plot manager and world generator for the Bukkit API                             /
-// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
-//                                                                                                 /
-// This program is free software; you can redistribute it and/or modify                            /
-// it under the terms of the GNU General Public License as published by                            /
-// the Free Software Foundation; either version 3 of the License, or                               /
-// (at your option) any later version.                                                             /
-//                                                                                                 /
-// This program is distributed in the hope that it will be useful,                                 /
-// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
-// GNU General Public License for more details.                                                    /
-//                                                                                                 /
-// You should have received a copy of the GNU General Public License                               /
-// along with this program; if not, write to the Free Software Foundation,                         /
-// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
-//                                                                                                 /
-// You can contact us via: support@intellectualsites.com                                           /
-////////////////////////////////////////////////////////////////////////////////////////////////////
-package com.plotsquared.bukkit.events;
-
-import org.bukkit.entity.Player;
-import org.bukkit.event.Cancellable;
-import org.bukkit.event.HandlerList;
-import org.bukkit.event.player.PlayerEvent;
-
-import com.intellectualcrafters.plot.object.Plot;
-
-/**
- * @author Citymonstret
- * @author Empire92
- */
-public class PlayerClaimPlotEvent extends PlayerEvent implements Cancellable {
-    private static HandlerList handlers = new HandlerList();
-    private final Plot plot;
-    private final boolean auto;
-    private boolean cancelled;
-
-    /**
-     * PlayerClaimPlotEvent: Called when a plot is claimed
-     *
-     * @param player Player that claimed the plot
-     * @param plot   Plot that was claimed
-     */
-    public PlayerClaimPlotEvent(final Player player, final Plot plot, final boolean auto) {
-        super(player);
-        this.plot = plot;
-        this.auto = auto;
-    }
-
-    public static HandlerList getHandlerList() {
-        return handlers;
-    }
-
-    /**
-     * Get the plot involved
-     *
-     * @return Plot
-     */
-    public Plot getPlot() {
-        return this.plot;
-    }
-
-    /**
-     * @return true if it was an automated claim, else false
-     */
-    public boolean wasAuto() {
-        return this.auto;
-    }
-
-    @Override
-    public HandlerList getHandlers() {
-        return handlers;
-    }
-
-    @Override
-    public boolean isCancelled() {
-        return this.cancelled;
-    }
-
-    @Override
-    public void setCancelled(final boolean b) {
-        this.cancelled = b;
-    }
-}
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// PlotSquared - A plot manager and world generator for the Bukkit API                             /
+// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
+//                                                                                                 /
+// This program is free software; you can redistribute it and/or modify                            /
+// it under the terms of the GNU General Public License as published by                            /
+// the Free Software Foundation; either version 3 of the License, or                               /
+// (at your option) any later version.                                                             /
+//                                                                                                 /
+// This program is distributed in the hope that it will be useful,                                 /
+// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
+// GNU General Public License for more details.                                                    /
+//                                                                                                 /
+// You should have received a copy of the GNU General Public License                               /
+// along with this program; if not, write to the Free Software Foundation,                         /
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
+//                                                                                                 /
+// You can contact us via: support@intellectualsites.com                                           /
+////////////////////////////////////////////////////////////////////////////////////////////////////
+package com.plotsquared.bukkit.events;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.player.PlayerEvent;
+
+import com.intellectualcrafters.plot.object.Plot;
+
+/**


+ */
+public class PlayerClaimPlotEvent extends PlayerEvent implements Cancellable
+{
+    private static HandlerList handlers = new HandlerList();
+    private final Plot plot;
+    private final boolean auto;
+    private boolean cancelled;
+
+    /**
+     * PlayerClaimPlotEvent: Called when a plot is claimed
+     *
+     * @param player Player that claimed the plot
+     * @param plot   Plot that was claimed
+     */
+    public PlayerClaimPlotEvent(final Player player, final Plot plot, final boolean auto)
+    {
+        super(player);
+        this.plot = plot;
+        this.auto = auto;
+    }
+
+    public static HandlerList getHandlerList()
+    {
+        return handlers;
+    }
+
+    /**
+     * Get the plot involved
+     *
+     * @return Plot
+     */
+    public Plot getPlot()
+    {
+        return plot;
+    }
+
+    /**
+     * @return true if it was an automated claim, else false
+     */
+    public boolean wasAuto()
+    {
+        return auto;
+    }
+
+    @Override
+    public HandlerList getHandlers()
+    {
+        return handlers;
+    }
+
+    @Override
+    public boolean isCancelled()
+    {
+        return cancelled;
+    }
+
+    @Override
+    public void setCancelled(final boolean b)
+    {
+        cancelled = b;
+    }
+}
diff --git a/src/main/java/com/plotsquared/bukkit/events/PlayerEnterPlotEvent.java b/src/main/java/com/plotsquared/bukkit/events/PlayerEnterPlotEvent.java
index ba203cebe..36befdb4c 100644
--- a/src/main/java/com/plotsquared/bukkit/events/PlayerEnterPlotEvent.java
+++ b/src/main/java/com/plotsquared/bukkit/events/PlayerEnterPlotEvent.java
@@ -1,65 +1,68 @@
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// PlotSquared - A plot manager and world generator for the Bukkit API                             /
-// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
-//                                                                                                 /
-// This program is free software; you can redistribute it and/or modify                            /
-// it under the terms of the GNU General Public License as published by                            /
-// the Free Software Foundation; either version 3 of the License, or                               /
-// (at your option) any later version.                                                             /
-//                                                                                                 /
-// This program is distributed in the hope that it will be useful,                                 /
-// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
-// GNU General Public License for more details.                                                    /
-//                                                                                                 /
-// You should have received a copy of the GNU General Public License                               /
-// along with this program; if not, write to the Free Software Foundation,                         /
-// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
-//                                                                                                 /
-// You can contact us via: support@intellectualsites.com                                           /
-////////////////////////////////////////////////////////////////////////////////////////////////////
-package com.plotsquared.bukkit.events;
-
-import org.bukkit.entity.Player;
-import org.bukkit.event.HandlerList;
-import org.bukkit.event.player.PlayerEvent;
-
-import com.intellectualcrafters.plot.object.Plot;
-
-/**
- * @author Citymonstret
- * @author Empire92
- */
-public class PlayerEnterPlotEvent extends PlayerEvent {
-    private static HandlerList handlers = new HandlerList();
-    private final Plot plot;
-
-    /**
-     * PlayerEnterPlotEvent: Called when a player leaves a plot
-     *
-     * @param player Player that entered the plot
-     * @param plot   Plot that was entered
-     */
-    public PlayerEnterPlotEvent(final Player player, final Plot plot) {
-        super(player);
-        this.plot = plot;
-    }
-
-    public static HandlerList getHandlerList() {
-        return handlers;
-    }
-
-    /**
-     * Get the plot involved
-     *
-     * @return Plot
-     */
-    public Plot getPlot() {
-        return this.plot;
-    }
-
-    @Override
-    public HandlerList getHandlers() {
-        return handlers;
-    }
-}
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// PlotSquared - A plot manager and world generator for the Bukkit API                             /
+// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
+//                                                                                                 /
+// This program is free software; you can redistribute it and/or modify                            /
+// it under the terms of the GNU General Public License as published by                            /
+// the Free Software Foundation; either version 3 of the License, or                               /
+// (at your option) any later version.                                                             /
+//                                                                                                 /
+// This program is distributed in the hope that it will be useful,                                 /
+// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
+// GNU General Public License for more details.                                                    /
+//                                                                                                 /
+// You should have received a copy of the GNU General Public License                               /
+// along with this program; if not, write to the Free Software Foundation,                         /
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
+//                                                                                                 /
+// You can contact us via: support@intellectualsites.com                                           /
+////////////////////////////////////////////////////////////////////////////////////////////////////
+package com.plotsquared.bukkit.events;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.player.PlayerEvent;
+
+import com.intellectualcrafters.plot.object.Plot;
+
+/**


+ */
+public class PlayerEnterPlotEvent extends PlayerEvent
+{
+    private static HandlerList handlers = new HandlerList();
+    private final Plot plot;
+
+    /**
+     * PlayerEnterPlotEvent: Called when a player leaves a plot
+     *
+     * @param player Player that entered the plot
+     * @param plot   Plot that was entered
+     */
+    public PlayerEnterPlotEvent(final Player player, final Plot plot)
+    {
+        super(player);
+        this.plot = plot;
+    }
+
+    public static HandlerList getHandlerList()
+    {
+        return handlers;
+    }
+
+    /**
+     * Get the plot involved
+     *
+     * @return Plot
+     */
+    public Plot getPlot()
+    {
+        return plot;
+    }
+
+    @Override
+    public HandlerList getHandlers()
+    {
+        return handlers;
+    }
+}
diff --git a/src/main/java/com/plotsquared/bukkit/events/PlayerLeavePlotEvent.java b/src/main/java/com/plotsquared/bukkit/events/PlayerLeavePlotEvent.java
index c493388ea..080d889d6 100644
--- a/src/main/java/com/plotsquared/bukkit/events/PlayerLeavePlotEvent.java
+++ b/src/main/java/com/plotsquared/bukkit/events/PlayerLeavePlotEvent.java
@@ -1,66 +1,69 @@
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// PlotSquared - A plot manager and world generator for the Bukkit API                             /
-// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
-//                                                                                                 /
-// This program is free software; you can redistribute it and/or modify                            /
-// it under the terms of the GNU General Public License as published by                            /
-// the Free Software Foundation; either version 3 of the License, or                               /
-// (at your option) any later version.                                                             /
-//                                                                                                 /
-// This program is distributed in the hope that it will be useful,                                 /
-// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
-// GNU General Public License for more details.                                                    /
-//                                                                                                 /
-// You should have received a copy of the GNU General Public License                               /
-// along with this program; if not, write to the Free Software Foundation,                         /
-// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
-//                                                                                                 /
-// You can contact us via: support@intellectualsites.com                                           /
-////////////////////////////////////////////////////////////////////////////////////////////////////
-package com.plotsquared.bukkit.events;
-
-import org.bukkit.entity.Player;
-import org.bukkit.event.HandlerList;
-import org.bukkit.event.player.PlayerEvent;
-
-import com.intellectualcrafters.plot.object.Plot;
-
-/**
- * @author Citymonstret
- * @author Empire92
- */
-public class PlayerLeavePlotEvent extends PlayerEvent {
-
-    private static HandlerList handlers = new HandlerList();
-    private final Plot plot;
-
-    /**
-     * PlayerLeavePlotEvent: Called when a player leaves a plot
-     *
-     * @param player Player that left the plot
-     * @param plot   Plot that was left
-     */
-    public PlayerLeavePlotEvent(final Player player, final Plot plot) {
-        super(player);
-        this.plot = plot;
-    }
-
-    public static HandlerList getHandlerList() {
-        return handlers;
-    }
-
-    /**
-     * Get the plot involved
-     *
-     * @return Plot
-     */
-    public Plot getPlot() {
-        return this.plot;
-    }
-
-    @Override
-    public HandlerList getHandlers() {
-        return handlers;
-    }
-}
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// PlotSquared - A plot manager and world generator for the Bukkit API                             /
+// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
+//                                                                                                 /
+// This program is free software; you can redistribute it and/or modify                            /
+// it under the terms of the GNU General Public License as published by                            /
+// the Free Software Foundation; either version 3 of the License, or                               /
+// (at your option) any later version.                                                             /
+//                                                                                                 /
+// This program is distributed in the hope that it will be useful,                                 /
+// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
+// GNU General Public License for more details.                                                    /
+//                                                                                                 /
+// You should have received a copy of the GNU General Public License                               /
+// along with this program; if not, write to the Free Software Foundation,                         /
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
+//                                                                                                 /
+// You can contact us via: support@intellectualsites.com                                           /
+////////////////////////////////////////////////////////////////////////////////////////////////////
+package com.plotsquared.bukkit.events;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.player.PlayerEvent;
+
+import com.intellectualcrafters.plot.object.Plot;
+
+/**


+ */
+public class PlayerLeavePlotEvent extends PlayerEvent
+{
+
+    private static HandlerList handlers = new HandlerList();
+    private final Plot plot;
+
+    /**
+     * PlayerLeavePlotEvent: Called when a player leaves a plot
+     *
+     * @param player Player that left the plot
+     * @param plot   Plot that was left
+     */
+    public PlayerLeavePlotEvent(final Player player, final Plot plot)
+    {
+        super(player);
+        this.plot = plot;
+    }
+
+    public static HandlerList getHandlerList()
+    {
+        return handlers;
+    }
+
+    /**
+     * Get the plot involved
+     *
+     * @return Plot
+     */
+    public Plot getPlot()
+    {
+        return plot;
+    }
+
+    @Override
+    public HandlerList getHandlers()
+    {
+        return handlers;
+    }
+}
diff --git a/src/main/java/com/plotsquared/bukkit/events/PlayerPlotDeniedEvent.java b/src/main/java/com/plotsquared/bukkit/events/PlayerPlotDeniedEvent.java
index 2fd73d28d..223b9165f 100644
--- a/src/main/java/com/plotsquared/bukkit/events/PlayerPlotDeniedEvent.java
+++ b/src/main/java/com/plotsquared/bukkit/events/PlayerPlotDeniedEvent.java
@@ -1,91 +1,96 @@
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// PlotSquared - A plot manager and world generator for the Bukkit API                             /
-// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
-//                                                                                                 /
-// This program is free software; you can redistribute it and/or modify                            /
-// it under the terms of the GNU General Public License as published by                            /
-// the Free Software Foundation; either version 3 of the License, or                               /
-// (at your option) any later version.                                                             /
-//                                                                                                 /
-// This program is distributed in the hope that it will be useful,                                 /
-// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
-// GNU General Public License for more details.                                                    /
-//                                                                                                 /
-// You should have received a copy of the GNU General Public License                               /
-// along with this program; if not, write to the Free Software Foundation,                         /
-// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
-//                                                                                                 /
-// You can contact us via: support@intellectualsites.com                                           /
-////////////////////////////////////////////////////////////////////////////////////////////////////
-package com.plotsquared.bukkit.events;
-
-import java.util.UUID;
-
-import org.bukkit.entity.Player;
-import org.bukkit.event.HandlerList;
-
-import com.intellectualcrafters.plot.object.Plot;
-
-/**
- * @author Citymonstret
- * @author Empire92
- */
-public class PlayerPlotDeniedEvent extends PlotEvent {
-
-    private static HandlerList handlers = new HandlerList();
-    private final Player initiator;
-    private final boolean added;
-    private final UUID player;
-
-    /**
-     * PlayerPlotDeniedEvent: Called when the denied UUID list is modified for a plot
-     *
-     * @param initiator Player that initiated the event
-     * @param plot      Plot in which the event occurred
-     * @param player    Player that was denied/un-denied
-     * @param added     true of add to deny list, false if removed
-     */
-    public PlayerPlotDeniedEvent(final Player initiator, final Plot plot, final UUID player, final boolean added) {
-        super(plot);
-        this.initiator = initiator;
-        this.added = added;
-        this.player = player;
-    }
-
-    public static HandlerList getHandlerList() {
-        return handlers;
-    }
-
-    /**
-     * If a user was added
-     *
-     * @return boolean
-     */
-    public boolean wasAdded() {
-        return this.added;
-    }
-
-    /**
-     * The player added/removed
-     *
-     * @return UUID
-     */
-    public UUID getPlayer() {
-        return this.player;
-    }
-
-    /**
-     * The player initiating the action
-     *
-     * @return Player
-     */
-    public Player getInitiator() {
-        return this.initiator;
-    }
-
-    @Override
-    public HandlerList getHandlers() {
-        return handlers;
-    }
-}
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// PlotSquared - A plot manager and world generator for the Bukkit API                             /
+// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
+//                                                                                                 /
+// This program is free software; you can redistribute it and/or modify                            /
+// it under the terms of the GNU General Public License as published by                            /
+// the Free Software Foundation; either version 3 of the License, or                               /
+// (at your option) any later version.                                                             /
+//                                                                                                 /
+// This program is distributed in the hope that it will be useful,                                 /
+// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
+// GNU General Public License for more details.                                                    /
+//                                                                                                 /
+// You should have received a copy of the GNU General Public License                               /
+// along with this program; if not, write to the Free Software Foundation,                         /
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
+//                                                                                                 /
+// You can contact us via: support@intellectualsites.com                                           /
+////////////////////////////////////////////////////////////////////////////////////////////////////
+package com.plotsquared.bukkit.events;
+
+import java.util.UUID;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.HandlerList;
+
+import com.intellectualcrafters.plot.object.Plot;
+
+/**


+ */
+public class PlayerPlotDeniedEvent extends PlotEvent
+{
+
+    private static HandlerList handlers = new HandlerList();
+    private final Player initiator;
+    private final boolean added;
+    private final UUID player;
+
+    /**
+     * PlayerPlotDeniedEvent: Called when the denied UUID list is modified for a plot
+     *
+     * @param initiator Player that initiated the event
+     * @param plot      Plot in which the event occurred
+     * @param player    Player that was denied/un-denied
+     * @param added     true of add to deny list, false if removed
+     */
+    public PlayerPlotDeniedEvent(final Player initiator, final Plot plot, final UUID player, final boolean added)
+    {
+        super(plot);
+        this.initiator = initiator;
+        this.added = added;
+        this.player = player;
+    }
+
+    public static HandlerList getHandlerList()
+    {
+        return handlers;
+    }
+
+    /**
+     * If a user was added
+     *
+     * @return boolean
+     */
+    public boolean wasAdded()
+    {
+        return added;
+    }
+
+    /**
+     * The player added/removed
+     *
+     * @return UUID
+     */
+    public UUID getPlayer()
+    {
+        return player;
+    }
+
+    /**
+     * The player initiating the action
+     *
+     * @return Player
+     */
+    public Player getInitiator()
+    {
+        return initiator;
+    }
+
+    @Override
+    public HandlerList getHandlers()
+    {
+        return handlers;
+    }
+}
diff --git a/src/main/java/com/plotsquared/bukkit/events/PlayerPlotHelperEvent.java b/src/main/java/com/plotsquared/bukkit/events/PlayerPlotHelperEvent.java
index c44156f51..a775a4388 100644
--- a/src/main/java/com/plotsquared/bukkit/events/PlayerPlotHelperEvent.java
+++ b/src/main/java/com/plotsquared/bukkit/events/PlayerPlotHelperEvent.java
@@ -1,91 +1,96 @@
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// PlotSquared - A plot manager and world generator for the Bukkit API                             /
-// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
-//                                                                                                 /
-// This program is free software; you can redistribute it and/or modify                            /
-// it under the terms of the GNU General Public License as published by                            /
-// the Free Software Foundation; either version 3 of the License, or                               /
-// (at your option) any later version.                                                             /
-//                                                                                                 /
-// This program is distributed in the hope that it will be useful,                                 /
-// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
-// GNU General Public License for more details.                                                    /
-//                                                                                                 /
-// You should have received a copy of the GNU General Public License                               /
-// along with this program; if not, write to the Free Software Foundation,                         /
-// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
-//                                                                                                 /
-// You can contact us via: support@intellectualsites.com                                           /
-////////////////////////////////////////////////////////////////////////////////////////////////////
-package com.plotsquared.bukkit.events;
-
-import java.util.UUID;
-
-import org.bukkit.entity.Player;
-import org.bukkit.event.HandlerList;
-
-import com.intellectualcrafters.plot.object.Plot;
-
-/**
- * @author Empire92
- * @author Citymonstret
- */
-public class PlayerPlotHelperEvent extends PlotEvent {
-
-    private static HandlerList handlers = new HandlerList();
-    private final Player initiator;
-    private final boolean added;
-    private final UUID player;
-
-    /**
-     * PlayerPlotHelperEvent: Called when a plot helper is added/removed
-     *
-     * @param initiator Player that initiated the event
-     * @param plot      Plot in which the event occurred
-     * @param player    Player that was added/removed from the helper list
-     * @param added     true of the player was added, false if the player was removed
-     */
-    public PlayerPlotHelperEvent(final Player initiator, final Plot plot, final UUID player, final boolean added) {
-        super(plot);
-        this.initiator = initiator;
-        this.added = added;
-        this.player = player;
-    }
-
-    public static HandlerList getHandlerList() {
-        return handlers;
-    }
-
-    /**
-     * If a player was added
-     *
-     * @return boolean
-     */
-    public boolean wasAdded() {
-        return this.added;
-    }
-
-    /**
-     * The UUID added/removed
-     *
-     * @return UUID
-     */
-    public UUID getPlayer() {
-        return this.player;
-    }
-
-    /**
-     * The player initiating the action
-     *
-     * @return Player
-     */
-    public Player getInitiator() {
-        return this.initiator;
-    }
-
-    @Override
-    public HandlerList getHandlers() {
-        return handlers;
-    }
-}
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// PlotSquared - A plot manager and world generator for the Bukkit API                             /
+// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
+//                                                                                                 /
+// This program is free software; you can redistribute it and/or modify                            /
+// it under the terms of the GNU General Public License as published by                            /
+// the Free Software Foundation; either version 3 of the License, or                               /
+// (at your option) any later version.                                                             /
+//                                                                                                 /
+// This program is distributed in the hope that it will be useful,                                 /
+// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
+// GNU General Public License for more details.                                                    /
+//                                                                                                 /
+// You should have received a copy of the GNU General Public License                               /
+// along with this program; if not, write to the Free Software Foundation,                         /
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
+//                                                                                                 /
+// You can contact us via: support@intellectualsites.com                                           /
+////////////////////////////////////////////////////////////////////////////////////////////////////
+package com.plotsquared.bukkit.events;
+
+import java.util.UUID;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.HandlerList;
+
+import com.intellectualcrafters.plot.object.Plot;
+
+/**


+ */
+public class PlayerPlotHelperEvent extends PlotEvent
+{
+
+    private static HandlerList handlers = new HandlerList();
+    private final Player initiator;
+    private final boolean added;
+    private final UUID player;
+
+    /**
+     * PlayerPlotHelperEvent: Called when a plot helper is added/removed
+     *
+     * @param initiator Player that initiated the event
+     * @param plot      Plot in which the event occurred
+     * @param player    Player that was added/removed from the helper list
+     * @param added     true of the player was added, false if the player was removed
+     */
+    public PlayerPlotHelperEvent(final Player initiator, final Plot plot, final UUID player, final boolean added)
+    {
+        super(plot);
+        this.initiator = initiator;
+        this.added = added;
+        this.player = player;
+    }
+
+    public static HandlerList getHandlerList()
+    {
+        return handlers;
+    }
+
+    /**
+     * If a player was added
+     *
+     * @return boolean
+     */
+    public boolean wasAdded()
+    {
+        return added;
+    }
+
+    /**
+     * The UUID added/removed
+     *
+     * @return UUID
+     */
+    public UUID getPlayer()
+    {
+        return player;
+    }
+
+    /**
+     * The player initiating the action
+     *
+     * @return Player
+     */
+    public Player getInitiator()
+    {
+        return initiator;
+    }
+
+    @Override
+    public HandlerList getHandlers()
+    {
+        return handlers;
+    }
+}
diff --git a/src/main/java/com/plotsquared/bukkit/events/PlayerPlotTrustedEvent.java b/src/main/java/com/plotsquared/bukkit/events/PlayerPlotTrustedEvent.java
index 189cd575c..d1862c571 100644
--- a/src/main/java/com/plotsquared/bukkit/events/PlayerPlotTrustedEvent.java
+++ b/src/main/java/com/plotsquared/bukkit/events/PlayerPlotTrustedEvent.java
@@ -1,91 +1,96 @@
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// PlotSquared - A plot manager and world generator for the Bukkit API                             /
-// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
-//                                                                                                 /
-// This program is free software; you can redistribute it and/or modify                            /
-// it under the terms of the GNU General Public License as published by                            /
-// the Free Software Foundation; either version 3 of the License, or                               /
-// (at your option) any later version.                                                             /
-//                                                                                                 /
-// This program is distributed in the hope that it will be useful,                                 /
-// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
-// GNU General Public License for more details.                                                    /
-//                                                                                                 /
-// You should have received a copy of the GNU General Public License                               /
-// along with this program; if not, write to the Free Software Foundation,                         /
-// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
-//                                                                                                 /
-// You can contact us via: support@intellectualsites.com                                           /
-////////////////////////////////////////////////////////////////////////////////////////////////////
-package com.plotsquared.bukkit.events;
-
-import java.util.UUID;
-
-import org.bukkit.entity.Player;
-import org.bukkit.event.HandlerList;
-
-import com.intellectualcrafters.plot.object.Plot;
-
-/**
- * @author Citymonstret
- * @author Empire92
- */
-public class PlayerPlotTrustedEvent extends PlotEvent {
-
-    private static HandlerList handlers = new HandlerList();
-    private final Player initiator;
-    private final boolean added;
-    private final UUID player;
-
-    /**
-     * PlayerPlotTrustedEvent: Called when a plot trusted user is added/removed
-     *
-     * @param initiator Player that initiated the event
-     * @param plot      Plot in which the event occurred
-     * @param player    Player that was added/removed from the trusted list
-     * @param added     true of the player was added, false if the player was removed
-     */
-    public PlayerPlotTrustedEvent(final Player initiator, final Plot plot, final UUID player, final boolean added) {
-        super(plot);
-        this.initiator = initiator;
-        this.added = added;
-        this.player = player;
-    }
-
-    public static HandlerList getHandlerList() {
-        return handlers;
-    }
-
-    /**
-     * If a player was added
-     *
-     * @return boolean
-     */
-    public boolean wasAdded() {
-        return this.added;
-    }
-
-    /**
-     * The UUID added/removed
-     *
-     * @return UUID
-     */
-    public UUID getPlayer() {
-        return this.player;
-    }
-
-    /**
-     * The player initiating the action
-     *
-     * @return Player
-     */
-    public Player getInitiator() {
-        return this.initiator;
-    }
-
-    @Override
-    public HandlerList getHandlers() {
-        return handlers;
-    }
-}
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// PlotSquared - A plot manager and world generator for the Bukkit API                             /
+// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
+//                                                                                                 /
+// This program is free software; you can redistribute it and/or modify                            /
+// it under the terms of the GNU General Public License as published by                            /
+// the Free Software Foundation; either version 3 of the License, or                               /
+// (at your option) any later version.                                                             /
+//                                                                                                 /
+// This program is distributed in the hope that it will be useful,                                 /
+// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
+// GNU General Public License for more details.                                                    /
+//                                                                                                 /
+// You should have received a copy of the GNU General Public License                               /
+// along with this program; if not, write to the Free Software Foundation,                         /
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
+//                                                                                                 /
+// You can contact us via: support@intellectualsites.com                                           /
+////////////////////////////////////////////////////////////////////////////////////////////////////
+package com.plotsquared.bukkit.events;
+
+import java.util.UUID;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.HandlerList;
+
+import com.intellectualcrafters.plot.object.Plot;
+
+/**


+ */
+public class PlayerPlotTrustedEvent extends PlotEvent
+{
+
+    private static HandlerList handlers = new HandlerList();
+    private final Player initiator;
+    private final boolean added;
+    private final UUID player;
+
+    /**
+     * PlayerPlotTrustedEvent: Called when a plot trusted user is added/removed
+     *
+     * @param initiator Player that initiated the event
+     * @param plot      Plot in which the event occurred
+     * @param player    Player that was added/removed from the trusted list
+     * @param added     true of the player was added, false if the player was removed
+     */
+    public PlayerPlotTrustedEvent(final Player initiator, final Plot plot, final UUID player, final boolean added)
+    {
+        super(plot);
+        this.initiator = initiator;
+        this.added = added;
+        this.player = player;
+    }
+
+    public static HandlerList getHandlerList()
+    {
+        return handlers;
+    }
+
+    /**
+     * If a player was added
+     *
+     * @return boolean
+     */
+    public boolean wasAdded()
+    {
+        return added;
+    }
+
+    /**
+     * The UUID added/removed
+     *
+     * @return UUID
+     */
+    public UUID getPlayer()
+    {
+        return player;
+    }
+
+    /**
+     * The player initiating the action
+     *
+     * @return Player
+     */
+    public Player getInitiator()
+    {
+        return initiator;
+    }
+
+    @Override
+    public HandlerList getHandlers()
+    {
+        return handlers;
+    }
+}
diff --git a/src/main/java/com/plotsquared/bukkit/events/PlayerTeleportToPlotEvent.java b/src/main/java/com/plotsquared/bukkit/events/PlayerTeleportToPlotEvent.java
index d8af3de51..8e326e346 100644
--- a/src/main/java/com/plotsquared/bukkit/events/PlayerTeleportToPlotEvent.java
+++ b/src/main/java/com/plotsquared/bukkit/events/PlayerTeleportToPlotEvent.java
@@ -1,92 +1,98 @@
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// PlotSquared - A plot manager and world generator for the Bukkit API                             /
-// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
-//                                                                                                 /
-// This program is free software; you can redistribute it and/or modify                            /
-// it under the terms of the GNU General Public License as published by                            /
-// the Free Software Foundation; either version 3 of the License, or                               /
-// (at your option) any later version.                                                             /
-//                                                                                                 /
-// This program is distributed in the hope that it will be useful,                                 /
-// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
-// GNU General Public License for more details.                                                    /
-//                                                                                                 /
-// You should have received a copy of the GNU General Public License                               /
-// along with this program; if not, write to the Free Software Foundation,                         /
-// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
-//                                                                                                 /
-// You can contact us via: support@intellectualsites.com                                           /
-////////////////////////////////////////////////////////////////////////////////////////////////////
-package com.plotsquared.bukkit.events;
-
-import org.bukkit.entity.Player;
-import org.bukkit.event.Cancellable;
-import org.bukkit.event.HandlerList;
-import org.bukkit.event.player.PlayerEvent;
-
-import com.intellectualcrafters.plot.object.Location;
-import com.intellectualcrafters.plot.object.Plot;
-
-/**
- * Called when a player teleports to a plot
- *
- * @author Citymonstret
- * @author Empire92
- */
-public class PlayerTeleportToPlotEvent extends PlayerEvent implements Cancellable {
-    private static final HandlerList handlers = new HandlerList();
-    private final Location from;
-    private final Plot plot;
-    private boolean cancelled;
-
-    /**
-     * PlayerTeleportToPlotEvent: Called when a player teleports to a plot
-     *
-     * @param player That was teleported
-     * @param from   Start location
-     * @param plot   Plot to which the player was teleported
-     */
-    public PlayerTeleportToPlotEvent(final Player player, final Location from, final Plot plot) {
-        super(player);
-        this.from = from;
-        this.plot = plot;
-    }
-
-    public static HandlerList getHandlerList() {
-        return handlers;
-    }
-
-    @Override
-    public HandlerList getHandlers() {
-        return handlers;
-    }
-
-    /**
-     * Get the from location
-     *
-     * @return Location
-     */
-    public Location getFrom() {
-        return this.from;
-    }
-
-    /**
-     * Get the plot involved
-     *
-     * @return Plot
-     */
-    public Plot getPlot() {
-        return this.plot;
-    }
-
-    @Override
-    public boolean isCancelled() {
-        return this.cancelled;
-    }
-
-    @Override
-    public void setCancelled(final boolean cancelled) {
-        this.cancelled = cancelled;
-    }
-}
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// PlotSquared - A plot manager and world generator for the Bukkit API                             /
+// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
+//                                                                                                 /
+// This program is free software; you can redistribute it and/or modify                            /
+// it under the terms of the GNU General Public License as published by                            /
+// the Free Software Foundation; either version 3 of the License, or                               /
+// (at your option) any later version.                                                             /
+//                                                                                                 /
+// This program is distributed in the hope that it will be useful,                                 /
+// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
+// GNU General Public License for more details.                                                    /
+//                                                                                                 /
+// You should have received a copy of the GNU General Public License                               /
+// along with this program; if not, write to the Free Software Foundation,                         /
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
+//                                                                                                 /
+// You can contact us via: support@intellectualsites.com                                           /
+////////////////////////////////////////////////////////////////////////////////////////////////////
+package com.plotsquared.bukkit.events;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.player.PlayerEvent;
+
+import com.intellectualcrafters.plot.object.Location;
+import com.intellectualcrafters.plot.object.Plot;
+
+/**
+ * Called when a player teleports to a plot
+ *


+ */
+public class PlayerTeleportToPlotEvent extends PlayerEvent implements Cancellable
+{
+    private static final HandlerList handlers = new HandlerList();
+    private final Location from;
+    private final Plot plot;
+    private boolean cancelled;
+
+    /**
+     * PlayerTeleportToPlotEvent: Called when a player teleports to a plot
+     *
+     * @param player That was teleported
+     * @param from   Start location
+     * @param plot   Plot to which the player was teleported
+     */
+    public PlayerTeleportToPlotEvent(final Player player, final Location from, final Plot plot)
+    {
+        super(player);
+        this.from = from;
+        this.plot = plot;
+    }
+
+    public static HandlerList getHandlerList()
+    {
+        return handlers;
+    }
+
+    @Override
+    public HandlerList getHandlers()
+    {
+        return handlers;
+    }
+
+    /**
+     * Get the from location
+     *
+     * @return Location
+     */
+    public Location getFrom()
+    {
+        return from;
+    }
+
+    /**
+     * Get the plot involved
+     *
+     * @return Plot
+     */
+    public Plot getPlot()
+    {
+        return plot;
+    }
+
+    @Override
+    public boolean isCancelled()
+    {
+        return cancelled;
+    }
+
+    @Override
+    public void setCancelled(final boolean cancelled)
+    {
+        this.cancelled = cancelled;
+    }
+}
diff --git a/src/main/java/com/plotsquared/bukkit/events/PlotClearEvent.java b/src/main/java/com/plotsquared/bukkit/events/PlotClearEvent.java
index 036c1c634..6b0ba6def 100644
--- a/src/main/java/com/plotsquared/bukkit/events/PlotClearEvent.java
+++ b/src/main/java/com/plotsquared/bukkit/events/PlotClearEvent.java
@@ -1,88 +1,94 @@
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// PlotSquared - A plot manager and world generator for the Bukkit API                             /
-// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
-//                                                                                                 /
-// This program is free software; you can redistribute it and/or modify                            /
-// it under the terms of the GNU General Public License as published by                            /
-// the Free Software Foundation; either version 3 of the License, or                               /
-// (at your option) any later version.                                                             /
-//                                                                                                 /
-// This program is distributed in the hope that it will be useful,                                 /
-// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
-// GNU General Public License for more details.                                                    /
-//                                                                                                 /
-// You should have received a copy of the GNU General Public License                               /
-// along with this program; if not, write to the Free Software Foundation,                         /
-// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
-//                                                                                                 /
-// You can contact us via: support@intellectualsites.com                                           /
-////////////////////////////////////////////////////////////////////////////////////////////////////
-package com.plotsquared.bukkit.events;
-
-import org.bukkit.event.Cancellable;
-import org.bukkit.event.Event;
-import org.bukkit.event.HandlerList;
-
-import com.intellectualcrafters.plot.object.PlotId;
-
-/**
- * Called when a plot is cleared
- *
- * @author Citymonstret
- * @author Empire92
- */
-public class PlotClearEvent extends Event implements Cancellable {
-    private static HandlerList handlers = new HandlerList();
-    private final PlotId id;
-    private final String world;
-    private boolean cancelled;
-
-    /**
-     * PlotClearEvent: Called when a plot is cleared
-     *
-     * @param world The world in which the plot was cleared
-     * @param id    The plot that was cleared
-     */
-    public PlotClearEvent(final String world, final PlotId id) {
-        this.id = id;
-        this.world = world;
-    }
-
-    public static HandlerList getHandlerList() {
-        return handlers;
-    }
-
-    /**
-     * Get the PlotId
-     *
-     * @return PlotId
-     */
-    public PlotId getPlotId() {
-        return this.id;
-    }
-
-    /**
-     * Get the world name
-     *
-     * @return String
-     */
-    public String getWorld() {
-        return this.world;
-    }
-
-    @Override
-    public HandlerList getHandlers() {
-        return handlers;
-    }
-
-    @Override
-    public boolean isCancelled() {
-        return this.cancelled;
-    }
-
-    @Override
-    public void setCancelled(final boolean b) {
-        this.cancelled = b;
-    }
-}
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// PlotSquared - A plot manager and world generator for the Bukkit API                             /
+// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
+//                                                                                                 /
+// This program is free software; you can redistribute it and/or modify                            /
+// it under the terms of the GNU General Public License as published by                            /
+// the Free Software Foundation; either version 3 of the License, or                               /
+// (at your option) any later version.                                                             /
+//                                                                                                 /
+// This program is distributed in the hope that it will be useful,                                 /
+// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
+// GNU General Public License for more details.                                                    /
+//                                                                                                 /
+// You should have received a copy of the GNU General Public License                               /
+// along with this program; if not, write to the Free Software Foundation,                         /
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
+//                                                                                                 /
+// You can contact us via: support@intellectualsites.com                                           /
+////////////////////////////////////////////////////////////////////////////////////////////////////
+package com.plotsquared.bukkit.events;
+
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+
+import com.intellectualcrafters.plot.object.PlotId;
+
+/**
+ * Called when a plot is cleared
+ *


+ */
+public class PlotClearEvent extends Event implements Cancellable
+{
+    private static HandlerList handlers = new HandlerList();
+    private final PlotId id;
+    private final String world;
+    private boolean cancelled;
+
+    /**
+     * PlotClearEvent: Called when a plot is cleared
+     *
+     * @param world The world in which the plot was cleared
+     * @param id    The plot that was cleared
+     */
+    public PlotClearEvent(final String world, final PlotId id)
+    {
+        this.id = id;
+        this.world = world;
+    }
+
+    public static HandlerList getHandlerList()
+    {
+        return handlers;
+    }
+
+    /**
+     * Get the PlotId
+     *
+     * @return PlotId
+     */
+    public PlotId getPlotId()
+    {
+        return id;
+    }
+
+    /**
+     * Get the world name
+     *
+     * @return String
+     */
+    public String getWorld()
+    {
+        return world;
+    }
+
+    @Override
+    public HandlerList getHandlers()
+    {
+        return handlers;
+    }
+
+    @Override
+    public boolean isCancelled()
+    {
+        return cancelled;
+    }
+
+    @Override
+    public void setCancelled(final boolean b)
+    {
+        cancelled = b;
+    }
+}
diff --git a/src/main/java/com/plotsquared/bukkit/events/PlotDeleteEvent.java b/src/main/java/com/plotsquared/bukkit/events/PlotDeleteEvent.java
index 5f5b0aa38..a576746c5 100644
--- a/src/main/java/com/plotsquared/bukkit/events/PlotDeleteEvent.java
+++ b/src/main/java/com/plotsquared/bukkit/events/PlotDeleteEvent.java
@@ -1,76 +1,80 @@
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// PlotSquared - A plot manager and world generator for the Bukkit API                             /
-// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
-//                                                                                                 /
-// This program is free software; you can redistribute it and/or modify                            /
-// it under the terms of the GNU General Public License as published by                            /
-// the Free Software Foundation; either version 3 of the License, or                               /
-// (at your option) any later version.                                                             /
-//                                                                                                 /
-// This program is distributed in the hope that it will be useful,                                 /
-// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
-// GNU General Public License for more details.                                                    /
-//                                                                                                 /
-// You should have received a copy of the GNU General Public License                               /
-// along with this program; if not, write to the Free Software Foundation,                         /
-// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
-//                                                                                                 /
-// You can contact us via: support@intellectualsites.com                                           /
-////////////////////////////////////////////////////////////////////////////////////////////////////
-package com.plotsquared.bukkit.events;
-
-import org.bukkit.event.Event;
-import org.bukkit.event.HandlerList;
-
-import com.intellectualcrafters.plot.object.PlotId;
-
-/**
- * Called when a plot is deleted
- *
- * @author Citymonstret
- * @author Empire92
- */
-public class PlotDeleteEvent extends Event {
-    private static HandlerList handlers = new HandlerList();
-    private final PlotId id;
-    private final String world;
-
-    /**
-     * PlotDeleteEvent: Called when a plot is deleted
-     *
-     * @param world The world in which the plot was deleted
-     * @param id    The ID of the plot that was deleted
-     */
-    public PlotDeleteEvent(final String world, final PlotId id) {
-        this.id = id;
-        this.world = world;
-    }
-
-    public static HandlerList getHandlerList() {
-        return handlers;
-    }
-
-    /**
-     * Get the PlotId
-     *
-     * @return PlotId
-     */
-    public PlotId getPlotId() {
-        return this.id;
-    }
-
-    /**
-     * Get the world name
-     *
-     * @return String
-     */
-    public String getWorld() {
-        return this.world;
-    }
-
-    @Override
-    public HandlerList getHandlers() {
-        return handlers;
-    }
-}
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// PlotSquared - A plot manager and world generator for the Bukkit API                             /
+// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
+//                                                                                                 /
+// This program is free software; you can redistribute it and/or modify                            /
+// it under the terms of the GNU General Public License as published by                            /
+// the Free Software Foundation; either version 3 of the License, or                               /
+// (at your option) any later version.                                                             /
+//                                                                                                 /
+// This program is distributed in the hope that it will be useful,                                 /
+// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
+// GNU General Public License for more details.                                                    /
+//                                                                                                 /
+// You should have received a copy of the GNU General Public License                               /
+// along with this program; if not, write to the Free Software Foundation,                         /
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
+//                                                                                                 /
+// You can contact us via: support@intellectualsites.com                                           /
+////////////////////////////////////////////////////////////////////////////////////////////////////
+package com.plotsquared.bukkit.events;
+
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+
+import com.intellectualcrafters.plot.object.PlotId;
+
+/**
+ * Called when a plot is deleted
+ *


+ */
+public class PlotDeleteEvent extends Event
+{
+    private static HandlerList handlers = new HandlerList();
+    private final PlotId id;
+    private final String world;
+
+    /**
+     * PlotDeleteEvent: Called when a plot is deleted
+     *
+     * @param world The world in which the plot was deleted
+     * @param id    The ID of the plot that was deleted
+     */
+    public PlotDeleteEvent(final String world, final PlotId id)
+    {
+        this.id = id;
+        this.world = world;
+    }
+
+    public static HandlerList getHandlerList()
+    {
+        return handlers;
+    }
+
+    /**
+     * Get the PlotId
+     *
+     * @return PlotId
+     */
+    public PlotId getPlotId()
+    {
+        return id;
+    }
+
+    /**
+     * Get the world name
+     *
+     * @return String
+     */
+    public String getWorld()
+    {
+        return world;
+    }
+
+    @Override
+    public HandlerList getHandlers()
+    {
+        return handlers;
+    }
+}
diff --git a/src/main/java/com/plotsquared/bukkit/events/PlotEvent.java b/src/main/java/com/plotsquared/bukkit/events/PlotEvent.java
index 1e45b9fbf..678e49f01 100644
--- a/src/main/java/com/plotsquared/bukkit/events/PlotEvent.java
+++ b/src/main/java/com/plotsquared/bukkit/events/PlotEvent.java
@@ -4,16 +4,19 @@ import org.bukkit.event.Event;
 
 import com.intellectualcrafters.plot.object.Plot;
 
-public abstract class PlotEvent extends Event {
+public abstract class PlotEvent extends Event
+{
 
     private final Plot plot;
 
-    public PlotEvent(final Plot plot) {
+    public PlotEvent(final Plot plot)
+    {
         this.plot = plot;
     }
 
-    public final Plot getPlot() {
-        return this.plot;
+    public final Plot getPlot()
+    {
+        return plot;
     }
 
 }
diff --git a/src/main/java/com/plotsquared/bukkit/events/PlotFlagAddEvent.java b/src/main/java/com/plotsquared/bukkit/events/PlotFlagAddEvent.java
index eefd61555..c325739da 100644
--- a/src/main/java/com/plotsquared/bukkit/events/PlotFlagAddEvent.java
+++ b/src/main/java/com/plotsquared/bukkit/events/PlotFlagAddEvent.java
@@ -1,79 +1,84 @@
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// PlotSquared - A plot manager and world generator for the Bukkit API                             /
-// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
-//                                                                                                 /
-// This program is free software; you can redistribute it and/or modify                            /
-// it under the terms of the GNU General Public License as published by                            /
-// the Free Software Foundation; either version 3 of the License, or                               /
-// (at your option) any later version.                                                             /
-//                                                                                                 /
-// This program is distributed in the hope that it will be useful,                                 /
-// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
-// GNU General Public License for more details.                                                    /
-//                                                                                                 /
-// You should have received a copy of the GNU General Public License                               /
-// along with this program; if not, write to the Free Software Foundation,                         /
-// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
-//                                                                                                 /
-// You can contact us via: support@intellectualsites.com                                           /
-////////////////////////////////////////////////////////////////////////////////////////////////////
-package com.plotsquared.bukkit.events;
-
-import org.bukkit.event.Cancellable;
-import org.bukkit.event.HandlerList;
-
-import com.intellectualcrafters.plot.flag.Flag;
-import com.intellectualcrafters.plot.object.Plot;
-
-/**
- * Called when a Flag is added to a plot
- *
- * @author Citymonstret
- * @author Empire92
- */
-public class PlotFlagAddEvent extends PlotEvent implements Cancellable {
-
-    private static HandlerList handlers = new HandlerList();
-    private final Flag flag;
-    private boolean cancelled;
-
-    /**
-     * PlotFlagAddEvent: Called when a Flag is added to a plot
-     *
-     * @param flag Flag that was added
-     * @param plot Plot to which the flag was added
-     */
-    public PlotFlagAddEvent(final Flag flag, final Plot plot) {
-        super(plot);
-        this.flag = flag;
-    }
-
-    public static HandlerList getHandlerList() {
-        return handlers;
-    }
-
-    /**
-     * Get the flag involved
-     *
-     * @return Flag
-     */
-    public Flag getFlag() {
-        return this.flag;
-    }
-
-    @Override
-    public HandlerList getHandlers() {
-        return handlers;
-    }
-
-    @Override
-    public final boolean isCancelled() {
-        return this.cancelled;
-    }
-
-    @Override
-    public final void setCancelled(boolean cancelled) {
-        this.cancelled = cancelled;
-    }
-}
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// PlotSquared - A plot manager and world generator for the Bukkit API                             /
+// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
+//                                                                                                 /
+// This program is free software; you can redistribute it and/or modify                            /
+// it under the terms of the GNU General Public License as published by                            /
+// the Free Software Foundation; either version 3 of the License, or                               /
+// (at your option) any later version.                                                             /
+//                                                                                                 /
+// This program is distributed in the hope that it will be useful,                                 /
+// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
+// GNU General Public License for more details.                                                    /
+//                                                                                                 /
+// You should have received a copy of the GNU General Public License                               /
+// along with this program; if not, write to the Free Software Foundation,                         /
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
+//                                                                                                 /
+// You can contact us via: support@intellectualsites.com                                           /
+////////////////////////////////////////////////////////////////////////////////////////////////////
+package com.plotsquared.bukkit.events;
+
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.HandlerList;
+
+import com.intellectualcrafters.plot.flag.Flag;
+import com.intellectualcrafters.plot.object.Plot;
+
+/**
+ * Called when a Flag is added to a plot
+ *


+ */
+public class PlotFlagAddEvent extends PlotEvent implements Cancellable
+{
+
+    private static HandlerList handlers = new HandlerList();
+    private final Flag flag;
+    private boolean cancelled;
+
+    /**
+     * PlotFlagAddEvent: Called when a Flag is added to a plot
+     *
+     * @param flag Flag that was added
+     * @param plot Plot to which the flag was added
+     */
+    public PlotFlagAddEvent(final Flag flag, final Plot plot)
+    {
+        super(plot);
+        this.flag = flag;
+    }
+
+    public static HandlerList getHandlerList()
+    {
+        return handlers;
+    }
+
+    /**
+     * Get the flag involved
+     *
+     * @return Flag
+     */
+    public Flag getFlag()
+    {
+        return flag;
+    }
+
+    @Override
+    public HandlerList getHandlers()
+    {
+        return handlers;
+    }
+
+    @Override
+    public final boolean isCancelled()
+    {
+        return cancelled;
+    }
+
+    @Override
+    public final void setCancelled(final boolean cancelled)
+    {
+        this.cancelled = cancelled;
+    }
+}
diff --git a/src/main/java/com/plotsquared/bukkit/events/PlotFlagRemoveEvent.java b/src/main/java/com/plotsquared/bukkit/events/PlotFlagRemoveEvent.java
index cce59834f..da195bc44 100644
--- a/src/main/java/com/plotsquared/bukkit/events/PlotFlagRemoveEvent.java
+++ b/src/main/java/com/plotsquared/bukkit/events/PlotFlagRemoveEvent.java
@@ -1,80 +1,84 @@
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// PlotSquared - A plot manager and world generator for the Bukkit API                             /
-// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
-//                                                                                                 /
-// This program is free software; you can redistribute it and/or modify                            /
-// it under the terms of the GNU General Public License as published by                            /
-// the Free Software Foundation; either version 3 of the License, or                               /
-// (at your option) any later version.                                                             /
-//                                                                                                 /
-// This program is distributed in the hope that it will be useful,                                 /
-// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
-// GNU General Public License for more details.                                                    /
-//                                                                                                 /
-// You should have received a copy of the GNU General Public License                               /
-// along with this program; if not, write to the Free Software Foundation,                         /
-// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
-//                                                                                                 /
-// You can contact us via: support@intellectualsites.com                                           /
-////////////////////////////////////////////////////////////////////////////////////////////////////
-package com.plotsquared.bukkit.events;
-
-import org.bukkit.event.Cancellable;
-import org.bukkit.event.HandlerList;
-
-import com.intellectualcrafters.plot.flag.Flag;
-import com.intellectualcrafters.plot.object.Plot;
-
-/**
- * Called when a flag is removed from a plot
- *
- * @author Citymonstret
- * @author Empire92
- */
-public class PlotFlagRemoveEvent extends PlotEvent implements Cancellable {
-
-    private static HandlerList handlers = new HandlerList();
-    private final Flag flag;
-    private boolean cancelled;
-
-    /**
-     * PlotFlagRemoveEvent: Called when a flag is removed from a plot
-     *
-     * @param flag Flag that was removed
-     * @param plot Plot from which the flag was removed
-     */
-    public PlotFlagRemoveEvent(final Flag flag, final Plot plot) {
-        super(plot);
-        this.flag = flag;
-    }
-
-    public static HandlerList getHandlerList() {
-        return handlers;
-    }
-
-
-    /**
-     * Get the flag involved
-     *
-     * @return Flag
-     */
-    public Flag getFlag() {
-        return this.flag;
-    }
-
-    @Override
-    public HandlerList getHandlers() {
-        return handlers;
-    }
-
-    @Override
-    public final boolean isCancelled() {
-        return this.cancelled;
-    }
-
-    @Override
-    public final void setCancelled(boolean cancelled) {
-        this.cancelled = cancelled;
-    }
-}
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// PlotSquared - A plot manager and world generator for the Bukkit API                             /
+// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
+//                                                                                                 /
+// This program is free software; you can redistribute it and/or modify                            /
+// it under the terms of the GNU General Public License as published by                            /
+// the Free Software Foundation; either version 3 of the License, or                               /
+// (at your option) any later version.                                                             /
+//                                                                                                 /
+// This program is distributed in the hope that it will be useful,                                 /
+// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
+// GNU General Public License for more details.                                                    /
+//                                                                                                 /
+// You should have received a copy of the GNU General Public License                               /
+// along with this program; if not, write to the Free Software Foundation,                         /
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
+//                                                                                                 /
+// You can contact us via: support@intellectualsites.com                                           /
+////////////////////////////////////////////////////////////////////////////////////////////////////
+package com.plotsquared.bukkit.events;
+
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.HandlerList;
+
+import com.intellectualcrafters.plot.flag.Flag;
+import com.intellectualcrafters.plot.object.Plot;
+
+/**
+ * Called when a flag is removed from a plot
+ *


+ */
+public class PlotFlagRemoveEvent extends PlotEvent implements Cancellable
+{
+
+    private static HandlerList handlers = new HandlerList();
+    private final Flag flag;
+    private boolean cancelled;
+
+    /**
+     * PlotFlagRemoveEvent: Called when a flag is removed from a plot
+     *
+     * @param flag Flag that was removed
+     * @param plot Plot from which the flag was removed
+     */
+    public PlotFlagRemoveEvent(final Flag flag, final Plot plot)
+    {
+        super(plot);
+        this.flag = flag;
+    }
+
+    public static HandlerList getHandlerList()
+    {
+        return handlers;
+    }
+
+    /**
+     * Get the flag involved
+     *
+     * @return Flag
+     */
+    public Flag getFlag()
+    {
+        return flag;
+    }
+
+    @Override
+    public HandlerList getHandlers()
+    {
+        return handlers;
+    }
+
+    @Override
+    public final boolean isCancelled()
+    {
+        return cancelled;
+    }
+
+    @Override
+    public final void setCancelled(final boolean cancelled)
+    {
+        this.cancelled = cancelled;
+    }
+}
diff --git a/src/main/java/com/plotsquared/bukkit/events/PlotMergeEvent.java b/src/main/java/com/plotsquared/bukkit/events/PlotMergeEvent.java
index 99ca03ddb..7410bff1c 100644
--- a/src/main/java/com/plotsquared/bukkit/events/PlotMergeEvent.java
+++ b/src/main/java/com/plotsquared/bukkit/events/PlotMergeEvent.java
@@ -1,94 +1,102 @@
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// PlotSquared - A plot manager and world generator for the Bukkit API                             /
-// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
-//                                                                                                 /
-// This program is free software; you can redistribute it and/or modify                            /
-// it under the terms of the GNU General Public License as published by                            /
-// the Free Software Foundation; either version 3 of the License, or                               /
-// (at your option) any later version.                                                             /
-//                                                                                                 /
-// This program is distributed in the hope that it will be useful,                                 /
-// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
-// GNU General Public License for more details.                                                    /
-//                                                                                                 /
-// You should have received a copy of the GNU General Public License                               /
-// along with this program; if not, write to the Free Software Foundation,                         /
-// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
-//                                                                                                 /
-// You can contact us via: support@intellectualsites.com                                           /
-////////////////////////////////////////////////////////////////////////////////////////////////////
-package com.plotsquared.bukkit.events;
-
-import java.util.ArrayList;
-
-import org.bukkit.World;
-import org.bukkit.event.Cancellable;
-import org.bukkit.event.Event;
-import org.bukkit.event.HandlerList;
-
-import com.intellectualcrafters.plot.object.Plot;
-import com.intellectualcrafters.plot.object.PlotId;
-
-/**
- * @author Empire92
- */
-public class PlotMergeEvent extends Event implements Cancellable {
-    private static HandlerList handlers = new HandlerList();
-    private final ArrayList<PlotId> plots;
-    private boolean cancelled;
-    private Plot plot;
-    private World world;
-
-    /**
-     * PlotMergeEvent: Called when plots are merged
-     *
-     * @param world World in which the event occurred
-     * @param plot  Plot that was merged
-     * @param plots A list of plots involved in the event
-     */
-    public PlotMergeEvent(final World world, final Plot plot, final ArrayList<PlotId> plots) {
-        this.plots = plots;
-    }
-
-    public static HandlerList getHandlerList() {
-        return handlers;
-    }
-
-    /**
-     * Get the plots being added;
-     *
-     * @return Plot
-     */
-    public ArrayList<PlotId> getPlots() {
-        return this.plots;
-    }
-
-    /**
-     * Get the main plot
-     *
-     * @return Plot
-     */
-    public Plot getPlot() {
-        return this.plot;
-    }
-
-    public World getWorld() {
-        return this.world;
-    }
-
-    @Override
-    public HandlerList getHandlers() {
-        return handlers;
-    }
-
-    @Override
-    public boolean isCancelled() {
-        return this.cancelled;
-    }
-
-    @Override
-    public void setCancelled(final boolean b) {
-        this.cancelled = b;
-    }
-}
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// PlotSquared - A plot manager and world generator for the Bukkit API                             /
+// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
+//                                                                                                 /
+// This program is free software; you can redistribute it and/or modify                            /
+// it under the terms of the GNU General Public License as published by                            /
+// the Free Software Foundation; either version 3 of the License, or                               /
+// (at your option) any later version.                                                             /
+//                                                                                                 /
+// This program is distributed in the hope that it will be useful,                                 /
+// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
+// GNU General Public License for more details.                                                    /
+//                                                                                                 /
+// You should have received a copy of the GNU General Public License                               /
+// along with this program; if not, write to the Free Software Foundation,                         /
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
+//                                                                                                 /
+// You can contact us via: support@intellectualsites.com                                           /
+////////////////////////////////////////////////////////////////////////////////////////////////////
+package com.plotsquared.bukkit.events;
+
+import java.util.ArrayList;
+
+import org.bukkit.World;
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+
+import com.intellectualcrafters.plot.object.Plot;
+import com.intellectualcrafters.plot.object.PlotId;
+
+/**

+ */
+public class PlotMergeEvent extends Event implements Cancellable
+{
+    private static HandlerList handlers = new HandlerList();
+    private final ArrayList<PlotId> plots;
+    private boolean cancelled;
+    private Plot plot;
+    private World world;
+
+    /**
+     * PlotMergeEvent: Called when plots are merged
+     *
+     * @param world World in which the event occurred
+     * @param plot  Plot that was merged
+     * @param plots A list of plots involved in the event
+     */
+    public PlotMergeEvent(final World world, final Plot plot, final ArrayList<PlotId> plots)
+    {
+        this.plots = plots;
+    }
+
+    public static HandlerList getHandlerList()
+    {
+        return handlers;
+    }
+
+    /**
+     * Get the plots being added;
+     *
+     * @return Plot
+     */
+    public ArrayList<PlotId> getPlots()
+    {
+        return plots;
+    }
+
+    /**
+     * Get the main plot
+     *
+     * @return Plot
+     */
+    public Plot getPlot()
+    {
+        return plot;
+    }
+
+    public World getWorld()
+    {
+        return world;
+    }
+
+    @Override
+    public HandlerList getHandlers()
+    {
+        return handlers;
+    }
+
+    @Override
+    public boolean isCancelled()
+    {
+        return cancelled;
+    }
+
+    @Override
+    public void setCancelled(final boolean b)
+    {
+        cancelled = b;
+    }
+}
diff --git a/src/main/java/com/plotsquared/bukkit/events/PlotRateEvent.java b/src/main/java/com/plotsquared/bukkit/events/PlotRateEvent.java
index b888ffd06..62d8712b7 100644
--- a/src/main/java/com/plotsquared/bukkit/events/PlotRateEvent.java
+++ b/src/main/java/com/plotsquared/bukkit/events/PlotRateEvent.java
@@ -1,47 +1,53 @@
-package com.plotsquared.bukkit.events;
-
-import org.bukkit.event.HandlerList;
-
-import com.intellectualcrafters.plot.object.Plot;
-import com.intellectualcrafters.plot.object.PlotPlayer;
-import com.intellectualcrafters.plot.object.Rating;
-
-/**
- * Created 2015-07-13 for PlotSquaredGit
- *
- * @author Citymonstret
- */
-public class PlotRateEvent extends PlotEvent {
-
-    private static HandlerList handlers = new HandlerList();
-    private final PlotPlayer rater;
-    private Rating rating;
-
-    public PlotRateEvent(final PlotPlayer rater, final Rating rating, final Plot plot) {
-        super(plot);
-        this.rater = rater;
-        this.rating = rating;
-    }
-
-    public static HandlerList getHandlerList() {
-        return handlers;
-    }
-
-    public PlotPlayer getRater() {
-        return this.rater;
-    }
-
-    public void setRating(Rating rating) {
-        this.rating = rating;
-    }
-
-    public Rating getRating() {
-        return this.rating;
-    }
-
-    @Override
-    public HandlerList getHandlers() {
-        return handlers;
-    }
-
-}
+package com.plotsquared.bukkit.events;
+
+import org.bukkit.event.HandlerList;
+
+import com.intellectualcrafters.plot.object.Plot;
+import com.intellectualcrafters.plot.object.PlotPlayer;
+import com.intellectualcrafters.plot.object.Rating;
+
+/**
+ * Created 2015-07-13 for PlotSquaredGit
+ *

+ */
+public class PlotRateEvent extends PlotEvent
+{
+
+    private static HandlerList handlers = new HandlerList();
+    private final PlotPlayer rater;
+    private Rating rating;
+
+    public PlotRateEvent(final PlotPlayer rater, final Rating rating, final Plot plot)
+    {
+        super(plot);
+        this.rater = rater;
+        this.rating = rating;
+    }
+
+    public static HandlerList getHandlerList()
+    {
+        return handlers;
+    }
+
+    public PlotPlayer getRater()
+    {
+        return rater;
+    }
+
+    public void setRating(final Rating rating)
+    {
+        this.rating = rating;
+    }
+
+    public Rating getRating()
+    {
+        return rating;
+    }
+
+    @Override
+    public HandlerList getHandlers()
+    {
+        return handlers;
+    }
+
+}
diff --git a/src/main/java/com/plotsquared/bukkit/events/PlotUnlinkEvent.java b/src/main/java/com/plotsquared/bukkit/events/PlotUnlinkEvent.java
index a8d4e8854..0f091bc75 100644
--- a/src/main/java/com/plotsquared/bukkit/events/PlotUnlinkEvent.java
+++ b/src/main/java/com/plotsquared/bukkit/events/PlotUnlinkEvent.java
@@ -1,83 +1,90 @@
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// PlotSquared - A plot manager and world generator for the Bukkit API                             /
-// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
-//                                                                                                 /
-// This program is free software; you can redistribute it and/or modify                            /
-// it under the terms of the GNU General Public License as published by                            /
-// the Free Software Foundation; either version 3 of the License, or                               /
-// (at your option) any later version.                                                             /
-//                                                                                                 /
-// This program is distributed in the hope that it will be useful,                                 /
-// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
-// GNU General Public License for more details.                                                    /
-//                                                                                                 /
-// You should have received a copy of the GNU General Public License                               /
-// along with this program; if not, write to the Free Software Foundation,                         /
-// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
-//                                                                                                 /
-// You can contact us via: support@intellectualsites.com                                           /
-////////////////////////////////////////////////////////////////////////////////////////////////////
-package com.plotsquared.bukkit.events;
-
-import java.util.ArrayList;
-
-import org.bukkit.World;
-import org.bukkit.event.Cancellable;
-import org.bukkit.event.Event;
-import org.bukkit.event.HandlerList;
-
-import com.intellectualcrafters.plot.object.PlotId;
-
-/**
- * @author Empire92
- */
-public class PlotUnlinkEvent extends Event implements Cancellable {
-    private static HandlerList handlers = new HandlerList();
-    private final ArrayList<PlotId> plots;
-    private final World world;
-    private boolean cancelled;
-
-    /**
-     * Called when a mega-plot is unlinked.
-     *
-     * @param world World in which the event occurred
-     * @param plots Plots that are involved in the event
-     */
-    public PlotUnlinkEvent(final World world, final ArrayList<PlotId> plots) {
-        this.plots = plots;
-        this.world = world;
-    }
-
-    public static HandlerList getHandlerList() {
-        return handlers;
-    }
-
-    /**
-     * Get the plots involved
-     *
-     * @return PlotId
-     */
-    public ArrayList<PlotId> getPlots() {
-        return this.plots;
-    }
-
-    public World getWorld() {
-        return this.world;
-    }
-
-    @Override
-    public HandlerList getHandlers() {
-        return handlers;
-    }
-
-    @Override
-    public boolean isCancelled() {
-        return this.cancelled;
-    }
-
-    @Override
-    public void setCancelled(final boolean b) {
-        this.cancelled = b;
-    }
-}
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// PlotSquared - A plot manager and world generator for the Bukkit API                             /
+// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
+//                                                                                                 /
+// This program is free software; you can redistribute it and/or modify                            /
+// it under the terms of the GNU General Public License as published by                            /
+// the Free Software Foundation; either version 3 of the License, or                               /
+// (at your option) any later version.                                                             /
+//                                                                                                 /
+// This program is distributed in the hope that it will be useful,                                 /
+// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
+// GNU General Public License for more details.                                                    /
+//                                                                                                 /
+// You should have received a copy of the GNU General Public License                               /
+// along with this program; if not, write to the Free Software Foundation,                         /
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
+//                                                                                                 /
+// You can contact us via: support@intellectualsites.com                                           /
+////////////////////////////////////////////////////////////////////////////////////////////////////
+package com.plotsquared.bukkit.events;
+
+import java.util.ArrayList;
+
+import org.bukkit.World;
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+
+import com.intellectualcrafters.plot.object.PlotId;
+
+/**

+ */
+public class PlotUnlinkEvent extends Event implements Cancellable
+{
+    private static HandlerList handlers = new HandlerList();
+    private final ArrayList<PlotId> plots;
+    private final World world;
+    private boolean cancelled;
+
+    /**
+     * Called when a mega-plot is unlinked.
+     *
+     * @param world World in which the event occurred
+     * @param plots Plots that are involved in the event
+     */
+    public PlotUnlinkEvent(final World world, final ArrayList<PlotId> plots)
+    {
+        this.plots = plots;
+        this.world = world;
+    }
+
+    public static HandlerList getHandlerList()
+    {
+        return handlers;
+    }
+
+    /**
+     * Get the plots involved
+     *
+     * @return PlotId
+     */
+    public ArrayList<PlotId> getPlots()
+    {
+        return plots;
+    }
+
+    public World getWorld()
+    {
+        return world;
+    }
+
+    @Override
+    public HandlerList getHandlers()
+    {
+        return handlers;
+    }
+
+    @Override
+    public boolean isCancelled()
+    {
+        return cancelled;
+    }
+
+    @Override
+    public void setCancelled(final boolean b)
+    {
+        cancelled = b;
+    }
+}
diff --git a/src/main/java/com/plotsquared/bukkit/generator/AugmentedPopulator.java b/src/main/java/com/plotsquared/bukkit/generator/AugmentedPopulator.java
index 38a8f3ca4..91b796f71 100644
--- a/src/main/java/com/plotsquared/bukkit/generator/AugmentedPopulator.java
+++ b/src/main/java/com/plotsquared/bukkit/generator/AugmentedPopulator.java
@@ -25,7 +25,8 @@ import com.intellectualcrafters.plot.util.TaskManager;
 import com.plotsquared.bukkit.util.BukkitChunkManager;
 import com.plotsquared.bukkit.util.BukkitSetBlockManager;
 
-public class AugmentedPopulator extends BlockPopulator {
+public class AugmentedPopulator extends BlockPopulator
+{
     public final PlotWorld plotworld;
     public final PlotManager manager;
     public final BukkitPlotGenerator generator;
@@ -39,64 +40,80 @@ public class AugmentedPopulator extends BlockPopulator {
     private final int tx;
     private final int tz;
 
-    public AugmentedPopulator(final String world, final BukkitPlotGenerator generator, final PlotCluster cluster, final boolean p, final boolean b) {
+    public AugmentedPopulator(final String world, final BukkitPlotGenerator generator, final PlotCluster cluster, final boolean p, final boolean b)
+    {
         MainUtil.initCache();
         PS.log("== NEW AUGMENTED POPULATOR FOR: " + world);
         this.cluster = cluster;
         this.generator = generator;
-        this.plotworld = PS.get().getPlotWorld(world);
-        this.manager = generator.getPlotManager();
+        plotworld = PS.get().getPlotWorld(world);
+        manager = generator.getPlotManager();
         this.p = p;
         this.b = b;
-        this.o = (this.plotworld.TERRAIN == 1) || (this.plotworld.TERRAIN == 2);
+        o = (plotworld.TERRAIN == 1) || (plotworld.TERRAIN == 2);
         final World bukkitWorld = Bukkit.getWorld(world);
-        if (cluster != null) {
-            final Location bl = this.manager.getPlotBottomLocAbs(this.plotworld, cluster.getP1());
-            final Location tl = this.manager.getPlotTopLocAbs(this.plotworld, cluster.getP2()).add(1, 0, 1);
-            this.bx = bl.getX();
-            this.bz = bl.getZ();
-            this.tx = tl.getX();
-            this.tz = tl.getZ();
-        } else {
-            this.bx = Integer.MIN_VALUE;
-            this.bz = Integer.MIN_VALUE;
-            this.tx = Integer.MAX_VALUE;
-            this.tz = Integer.MAX_VALUE;
+        if (cluster != null)
+        {
+            final Location bl = manager.getPlotBottomLocAbs(plotworld, cluster.getP1());
+            final Location tl = manager.getPlotTopLocAbs(plotworld, cluster.getP2()).add(1, 0, 1);
+            bx = bl.getX();
+            bz = bl.getZ();
+            tx = tl.getX();
+            tz = tl.getZ();
+        }
+        else
+        {
+            bx = Integer.MIN_VALUE;
+            bz = Integer.MIN_VALUE;
+            tx = Integer.MAX_VALUE;
+            tz = Integer.MAX_VALUE;
         }
         // Add the populator
-        if (this.o) {
+        if (o)
+        {
             bukkitWorld.getPopulators().add(0, this);
-        } else {
+        }
+        else
+        {
             bukkitWorld.getPopulators().add(this);
         }
     }
 
-    public static void removePopulator(final String worldname, final PlotCluster cluster) {
+    public static void removePopulator(final String worldname, final PlotCluster cluster)
+    {
         final World world = Bukkit.getWorld(worldname);
-        for (final Iterator<BlockPopulator> iterator = world.getPopulators().iterator(); iterator.hasNext();) {
+        for (final Iterator<BlockPopulator> iterator = world.getPopulators().iterator(); iterator.hasNext();)
+        {
             final BlockPopulator populator = iterator.next();
-            if (populator instanceof AugmentedPopulator) {
-                if (((AugmentedPopulator) populator).cluster.equals(cluster)) {
+            if (populator instanceof AugmentedPopulator)
+            {
+                if (((AugmentedPopulator) populator).cluster.equals(cluster))
+                {
                     iterator.remove();
                 }
             }
         }
     }
-    
-    public BlockWrapper get(final int x, final int z, final int i, final int j, final short[][] r, final boolean c) {
+
+    public BlockWrapper get(final int x, final int z, final int i, final int j, final short[][] r, final boolean c)
+    {
         final int y = (i << 4) + (j >> 8);
         final int a = (j - ((y & 0xF) << 8));
         final int z1 = (a >> 4);
         final int x1 = a - (z1 << 4);
-        if (r[i] == null) {
-            return (c && (((z + z1) < this.bz) || ((z + z1) > this.tz) || ((x + x1) < this.bx) || ((x + x1) > this.tx))) ? null : new BlockWrapper(x1, y, z1, (short) 0, (byte) 0);
-        } else {
-            return (c && (((z + z1) < this.bz) || ((z + z1) > this.tz) || ((x + x1) < this.bx) || ((x + x1) > this.tx))) ? null : new BlockWrapper(x1, y, z1, r[i][j], (byte) 0);
+        if (r[i] == null)
+        {
+            return (c && (((z + z1) < bz) || ((z + z1) > tz) || ((x + x1) < bx) || ((x + x1) > tx))) ? null : new BlockWrapper(x1, y, z1, (short) 0, (byte) 0);
+        }
+        else
+        {
+            return (c && (((z + z1) < bz) || ((z + z1) > tz) || ((x + x1) < bx) || ((x + x1) > tx))) ? null : new BlockWrapper(x1, y, z1, r[i][j], (byte) 0);
         }
     }
 
     @Override
-    public void populate(final World world, final Random rand, final Chunk chunk) {
+    public void populate(final World world, final Random rand, final Chunk chunk)
+    {
         final int cx = chunk.getX();
         final int cz = chunk.getZ();
         final int bx = cx << 4;
@@ -109,25 +126,30 @@ public class AugmentedPopulator extends BlockPopulator {
         final boolean inZ2 = ((tz >= this.bz) && (tz <= this.tz));
         final boolean inX = inX1 || inX2;
         final boolean inZ = inZ1 || inZ2;
-        if (!inX || !inZ) {
-            return;
-        }
-        if (this.plotworld.TERRAIN == 3) {
-            int X = chunk.getX() << 4;
-            int Z = chunk.getZ() << 4;
-            if (ChunkManager.FORCE_PASTE) {
-                for (short x = 0; x < 16; x++) {
-                    for (short z = 0; z < 16; z++) {
+        if (!inX || !inZ) { return; }
+        if (plotworld.TERRAIN == 3)
+        {
+            final int X = chunk.getX() << 4;
+            final int Z = chunk.getZ() << 4;
+            if (ChunkManager.FORCE_PASTE)
+            {
+                for (short x = 0; x < 16; x++)
+                {
+                    for (short z = 0; z < 16; z++)
+                    {
                         final PlotLoc loc = new PlotLoc((short) (X + x), (short) (Z + z));
                         final HashMap<Short, Short> blocks = ChunkManager.GENERATE_BLOCKS.get(loc);
-                        HashMap<Short, Byte> datas = ChunkManager.GENERATE_DATA.get(loc);
-                        for (final Entry<Short, Short> entry : blocks.entrySet()) {
-                            int y = entry.getKey();
+                        final HashMap<Short, Byte> datas = ChunkManager.GENERATE_DATA.get(loc);
+                        for (final Entry<Short, Short> entry : blocks.entrySet())
+                        {
+                            final int y = entry.getKey();
                             byte data;
-                            if (datas != null) {
+                            if (datas != null)
+                            {
                                 data = datas.get(y);
                             }
-                            else {
+                            else
+                            {
                                 data = 0;
                             }
                             BukkitSetBlockManager.setBlockManager.set(world, x, y, z, blocks.get(y), data);
@@ -136,24 +158,31 @@ public class AugmentedPopulator extends BlockPopulator {
                 }
                 return;
             }
-            if (ChunkManager.CURRENT_PLOT_CLEAR != null) {
+            if (ChunkManager.CURRENT_PLOT_CLEAR != null)
+            {
                 PlotLoc loc;
-                for (Entry<PlotLoc, HashMap<Short, Byte>> entry : ChunkManager.GENERATE_DATA.entrySet()) {
-                    HashMap<Short, Byte> datas = ChunkManager.GENERATE_DATA.get(entry.getKey());
-                    for (Entry<Short, Byte> entry2 : entry.getValue().entrySet()) {
-                        Short y = entry2.getKey();
+                for (final Entry<PlotLoc, HashMap<Short, Byte>> entry : ChunkManager.GENERATE_DATA.entrySet())
+                {
+                    final HashMap<Short, Byte> datas = ChunkManager.GENERATE_DATA.get(entry.getKey());
+                    for (final Entry<Short, Byte> entry2 : entry.getValue().entrySet())
+                    {
+                        final Short y = entry2.getKey();
                         byte data;
-                        if (datas != null) {
+                        if (datas != null)
+                        {
                             data = datas.get(y);
                         }
-                        else {
+                        else
+                        {
                             data = 0;
                         }
                         loc = entry.getKey();
-                        int xx = loc.x - X;
-                        int zz = loc.z - Z;
-                        if (xx >= 0 && xx < 16) {
-                            if (zz >= 0 && zz < 16) {
+                        final int xx = loc.x - X;
+                        final int zz = loc.z - Z;
+                        if ((xx >= 0) && (xx < 16))
+                        {
+                            if ((zz >= 0) && (zz < 16))
+                            {
                                 BukkitSetBlockManager.setBlockManager.set(world, xx, y, zz, entry2.getValue(), data);
                             }
                         }
@@ -164,25 +193,31 @@ public class AugmentedPopulator extends BlockPopulator {
         }
         final boolean check;
         check = !inX1 || !inX2 || !inZ1 || !inZ2;
-        if (this.plotworld.TERRAIN > 1) {
-            final PlotId plot1 = this.manager.getPlotIdAbs(this.plotworld, bx, 0, bz);
-            final PlotId plot2 = this.manager.getPlotIdAbs(this.plotworld, tx, 0, tz);
-            if ((plot1 != null) && (plot2 != null) && plot1.equals(plot2)) {
-                return;
-            }
+        if (plotworld.TERRAIN > 1)
+        {
+            final PlotId plot1 = manager.getPlotIdAbs(plotworld, bx, 0, bz);
+            final PlotId plot2 = manager.getPlotIdAbs(plotworld, tx, 0, tz);
+            if ((plot1 != null) && (plot2 != null) && plot1.equals(plot2)) { return; }
         }
-        if (this.o) {
+        if (o)
+        {
             populateBlocks(world, rand, cx, cz, bx, bz, check);
-        } else {
-            TaskManager.runTaskLater(new Runnable() {
+        }
+        else
+        {
+            TaskManager.runTaskLater(new Runnable()
+            {
                 @Override
-                public void run() {
+                public void run()
+                {
                     populateBiome(world, bx, bz);
                 }
             }, 20 + rand.nextInt(10));
-            TaskManager.runTaskLater(new Runnable() {
+            TaskManager.runTaskLater(new Runnable()
+            {
                 @Override
-                public void run() {
+                public void run()
+                {
                     chunk.load(true);
                     populateBlocks(world, rand, cx, cz, bx, bz, check);
                 }
@@ -190,61 +225,86 @@ public class AugmentedPopulator extends BlockPopulator {
         }
     }
 
-    private void populateBiome(final World world, final int x, final int z) {
-        final Biome biome = Biome.valueOf(this.plotworld.PLOT_BIOME);
-        if (this.b) {
-            for (int i = 0; i < 16; i++) {
-                for (int j = 0; j < 16; j++) {
+    private void populateBiome(final World world, final int x, final int z)
+    {
+        final Biome biome = Biome.valueOf(plotworld.PLOT_BIOME);
+        if (b)
+        {
+            for (int i = 0; i < 16; i++)
+            {
+                for (int j = 0; j < 16; j++)
+                {
                     world.setBiome(x + i, z + j, biome);
                 }
             }
         }
     }
-    
-    private void populateBlocks(final World world, final Random rand, final int X, final int Z, final int x, final int z, final boolean check) {
-        final short[][] result = this.generator.generateExtBlockSections(world, rand, X, Z, null);
-        for (int i = 0; i < result.length; i++) {
-            if (result[i] != null) {
-                for (int j = 0; j < 4096; j++) {
-                    int x1 = MainUtil.x_loc[i][j];
-                    int y = MainUtil.y_loc[i][j];
-                    int z1 = MainUtil.z_loc[i][j];
-                    short id = result[i][j];
+
+    private void populateBlocks(final World world, final Random rand, final int X, final int Z, final int x, final int z, final boolean check)
+    {
+        final short[][] result = generator.generateExtBlockSections(world, rand, X, Z, null);
+        for (int i = 0; i < result.length; i++)
+        {
+            if (result[i] != null)
+            {
+                for (int j = 0; j < 4096; j++)
+                {
+                    final int x1 = MainUtil.x_loc[i][j];
+                    final int y = MainUtil.y_loc[i][j];
+                    final int z1 = MainUtil.z_loc[i][j];
+                    final short id = result[i][j];
                     final int xx = x + x1;
                     final int zz = z + z1;
-                    if (check && (((zz) < this.bz) || ((zz) > this.tz) || ((xx) < this.bx) || ((xx) > this.tx))) {
+                    if (check && (((zz) < bz) || ((zz) > tz) || ((xx) < bx) || ((xx) > tx)))
+                    {
                         continue;
                     }
-                    if (this.p) {
-                        if (ChunkManager.CURRENT_PLOT_CLEAR != null) {
-                            if (BukkitChunkManager.isIn(ChunkManager.CURRENT_PLOT_CLEAR, xx, zz)) {
+                    if (p)
+                    {
+                        if (ChunkManager.CURRENT_PLOT_CLEAR != null)
+                        {
+                            if (BukkitChunkManager.isIn(ChunkManager.CURRENT_PLOT_CLEAR, xx, zz))
+                            {
                                 continue;
                             }
-                        } else if (this.manager.getPlotIdAbs(this.plotworld, xx, 0, zz) != null) {
+                        }
+                        else if (manager.getPlotIdAbs(plotworld, xx, 0, zz) != null)
+                        {
                             continue;
                         }
                     }
                     BukkitSetBlockManager.setBlockManager.set(world, xx, y, zz, id, (byte) 0);
                 }
             }
-            else {
-                short y_min = MainUtil.y_loc[i][0];
-                if (y_min < 128) {
-                    for (int x1 = x; x1 < x + 16; x1++) {
-                        for (int z1 = z; z1 < z + 16; z1++) {
-                            if (check && (((z1) < this.bz) || ((z1) > this.tz) || ((x1) < this.bx) || ((x1) > this.tx))) {
+            else
+            {
+                final short y_min = MainUtil.y_loc[i][0];
+                if (y_min < 128)
+                {
+                    for (int x1 = x; x1 < (x + 16); x1++)
+                    {
+                        for (int z1 = z; z1 < (z + 16); z1++)
+                        {
+                            if (check && (((z1) < bz) || ((z1) > tz) || ((x1) < bx) || ((x1) > tx)))
+                            {
                                 continue;
                             }
-                            if (this.p) {
-                                if (ChunkManager.CURRENT_PLOT_CLEAR != null) {
-                                    if (BukkitChunkManager.isIn(ChunkManager.CURRENT_PLOT_CLEAR, x1, z1)) {
+                            if (p)
+                            {
+                                if (ChunkManager.CURRENT_PLOT_CLEAR != null)
+                                {
+                                    if (BukkitChunkManager.isIn(ChunkManager.CURRENT_PLOT_CLEAR, x1, z1))
+                                    {
                                         continue;
                                     }
-                                } else if (this.manager.getPlotIdAbs(this.plotworld, x1, 0, z1) != null) {
+                                }
+                                else if (manager.getPlotIdAbs(plotworld, x1, 0, z1) != null)
+                                {
                                     continue;
                                 }
                             }
-                            for (int y = y_min; y < y_min + 16; y++) {
+                            for (int y = y_min; y < (y_min + 16); y++)
+                            {
                                 BukkitSetBlockManager.setBlockManager.set(world, x1, y, z1, 0, (byte) 0);
                             }
                         }
@@ -252,9 +312,10 @@ public class AugmentedPopulator extends BlockPopulator {
                 }
             }
         }
-        for (final BlockPopulator populator : this.generator.getPopulators(world.getName())) {
-            Chunk chunk = world.getChunkAt(X, Z);
-            populator.populate(world, this.r, chunk);
+        for (final BlockPopulator populator : generator.getPopulators(world.getName()))
+        {
+            final Chunk chunk = world.getChunkAt(X, Z);
+            populator.populate(world, r, chunk);
         }
     }
 }
diff --git a/src/main/java/com/plotsquared/bukkit/generator/BukkitGeneratorWrapper.java b/src/main/java/com/plotsquared/bukkit/generator/BukkitGeneratorWrapper.java
index 795624b92..7664313fb 100644
--- a/src/main/java/com/plotsquared/bukkit/generator/BukkitGeneratorWrapper.java
+++ b/src/main/java/com/plotsquared/bukkit/generator/BukkitGeneratorWrapper.java
@@ -9,81 +9,94 @@ import com.intellectualcrafters.plot.object.PlotManager;
 import com.intellectualcrafters.plot.object.PlotWorld;
 import com.intellectualcrafters.plot.object.SetupObject;
 
-public class BukkitGeneratorWrapper extends PlotGenerator<ChunkGenerator> {
+public class BukkitGeneratorWrapper extends PlotGenerator<ChunkGenerator>
+{
 
     public final boolean full;
-    
-    public BukkitGeneratorWrapper(String world, ChunkGenerator generator) {
+
+    public BukkitGeneratorWrapper(final String world, final ChunkGenerator generator)
+    {
         super(world, generator);
         full = (generator instanceof BukkitPlotGenerator);
     }
 
     @Override
-    public void initialize(PlotWorld plotworld) {
-        if (generator instanceof BukkitPlotGenerator) {
+    public void initialize(final PlotWorld plotworld)
+    {
+        if (generator instanceof BukkitPlotGenerator)
+        {
             ((BukkitPlotGenerator) generator).init(plotworld);
         }
     }
 
     @Override
-    public void augment(PlotCluster cluster, PlotWorld plotworld) {
-        if (generator instanceof BukkitPlotGenerator) {
-            BukkitPlotGenerator plotgen = (BukkitPlotGenerator) generator;
-            if (cluster != null) {
+    public void augment(final PlotCluster cluster, final PlotWorld plotworld)
+    {
+        if (generator instanceof BukkitPlotGenerator)
+        {
+            final BukkitPlotGenerator plotgen = (BukkitPlotGenerator) generator;
+            if (cluster != null)
+            {
                 new AugmentedPopulator(world, plotgen, cluster, plotworld.TERRAIN == 2, plotworld.TERRAIN != 2);
             }
-            else {
+            else
+            {
                 new AugmentedPopulator(world, plotgen, null, plotworld.TERRAIN == 2, plotworld.TERRAIN != 2);
             }
         }
     }
 
     @Override
-    public void setGenerator(String gen_string) {
-        if (gen_string == null) {
+    public void setGenerator(final String gen_string)
+    {
+        if (gen_string == null)
+        {
             generator = new HybridGen(world);
-        } else {
-            PlotGenerator<ChunkGenerator> gen_wrapper = (PlotGenerator<ChunkGenerator>) PS.get().IMP.getGenerator(world, gen_string);
-            if (gen_wrapper != null) {
+        }
+        else
+        {
+            final PlotGenerator<ChunkGenerator> gen_wrapper = (PlotGenerator<ChunkGenerator>) PS.get().IMP.getGenerator(world, gen_string);
+            if (gen_wrapper != null)
+            {
                 generator = gen_wrapper.generator;
             }
         }
     }
 
     @Override
-    public PlotWorld getNewPlotWorld(String world) {
-        if (!(generator instanceof BukkitPlotGenerator)) {
-            return null;
-        }
+    public PlotWorld getNewPlotWorld(final String world)
+    {
+        if (!(generator instanceof BukkitPlotGenerator)) { return null; }
         return ((BukkitPlotGenerator) generator).getNewPlotWorld(world);
     }
 
     @Override
-    public PlotManager getPlotManager() {
-        if (!(generator instanceof BukkitPlotGenerator)) {
-            return null;
-        }
+    public PlotManager getPlotManager()
+    {
+        if (!(generator instanceof BukkitPlotGenerator)) { return null; }
         return ((BukkitPlotGenerator) generator).getPlotManager();
     }
 
     @Override
-    public boolean isFull() {
+    public boolean isFull()
+    {
         return full;
     }
 
     @Override
-    public String getName() {
-        if (generator == null) {
-            return "Null";
-        }
+    public String getName()
+    {
+        if (generator == null) { return "Null"; }
         return generator.getClass().getName();
     }
 
     @Override
-    public void processSetup(SetupObject object) {
-        if (generator instanceof BukkitPlotGenerator) {
+    public void processSetup(final SetupObject object)
+    {
+        if (generator instanceof BukkitPlotGenerator)
+        {
             ((BukkitPlotGenerator) generator).processSetup(object);
         }
     }
-    
+
 }
diff --git a/src/main/java/com/plotsquared/bukkit/generator/BukkitPlotGenerator.java b/src/main/java/com/plotsquared/bukkit/generator/BukkitPlotGenerator.java
index 1505a3f2e..b7b8673d1 100644
--- a/src/main/java/com/plotsquared/bukkit/generator/BukkitPlotGenerator.java
+++ b/src/main/java/com/plotsquared/bukkit/generator/BukkitPlotGenerator.java
@@ -41,7 +41,8 @@ import com.intellectualcrafters.plot.object.SetupObject;
 import com.intellectualcrafters.plot.util.ChunkManager;
 import com.plotsquared.bukkit.listeners.WorldEvents;
 
-public abstract class BukkitPlotGenerator extends ChunkGenerator {
+public abstract class BukkitPlotGenerator extends ChunkGenerator
+{
 
     public static short[][][] CACHE_I = null;
     public static short[][][] CACHE_J = null;
@@ -49,22 +50,28 @@ public abstract class BukkitPlotGenerator extends ChunkGenerator {
     public int Z;
     private boolean loaded = false;
     private short[][] result;
-    private PseudoRandom random = new PseudoRandom();
-    
-    public BukkitPlotGenerator(String world) {
+    private final PseudoRandom random = new PseudoRandom();
+
+    public BukkitPlotGenerator(final String world)
+    {
         WorldEvents.lastWorld = world;
         initCache();
     }
-    
-    public void initCache() {
-        if (CACHE_I == null) {
+
+    public void initCache()
+    {
+        if (CACHE_I == null)
+        {
             CACHE_I = new short[256][16][16];
             CACHE_J = new short[256][16][16];
-            for (int x = 0; x < 16; x++) {
-                for (int z = 0; z < 16; z++) {
-                    for (int y = 0; y < 256; y++) {
-                        short i = (short) (y >> 4);
-                        short j = (short) (((y & 0xF) << 8) | (z << 4) | x);
+            for (int x = 0; x < 16; x++)
+            {
+                for (int z = 0; z < 16; z++)
+                {
+                    for (int y = 0; y < 256; y++)
+                    {
+                        final short i = (short) (y >> 4);
+                        final short j = (short) (((y & 0xF) << 8) | (z << 4) | x);
                         CACHE_I[y][x][z] = i;
                         CACHE_J[y][x][z] = j;
                     }
@@ -75,14 +82,19 @@ public abstract class BukkitPlotGenerator extends ChunkGenerator {
 
     @SuppressWarnings("unchecked")
     @Override
-    public List<BlockPopulator> getDefaultPopulators(World world) {
-        try {
-            if (!loaded) {
-                String name = WorldEvents.getName(world);
+    public List<BlockPopulator> getDefaultPopulators(final World world)
+    {
+        try
+        {
+            if (!loaded)
+            {
+                final String name = WorldEvents.getName(world);
                 PS.get().loadWorld(name, new BukkitGeneratorWrapper(name, this));
-                PlotWorld plotworld = PS.get().getPlotWorld(WorldEvents.getName(world));
-                if (!plotworld.MOB_SPAWNING) {
-                    if (!plotworld.SPAWN_EGGS) {
+                final PlotWorld plotworld = PS.get().getPlotWorld(WorldEvents.getName(world));
+                if (!plotworld.MOB_SPAWNING)
+                {
+                    if (!plotworld.SPAWN_EGGS)
+                    {
                         world.setSpawnFlags(false, false);
                     }
                     world.setAmbientSpawnLimit(0);
@@ -90,7 +102,8 @@ public abstract class BukkitPlotGenerator extends ChunkGenerator {
                     world.setMonsterSpawnLimit(0);
                     world.setWaterAnimalSpawnLimit(0);
                 }
-                else {
+                else
+                {
                     world.setSpawnFlags(true, true);
                     world.setAmbientSpawnLimit(-1);
                     world.setAnimalSpawnLimit(-1);
@@ -98,28 +111,33 @@ public abstract class BukkitPlotGenerator extends ChunkGenerator {
                     world.setWaterAnimalSpawnLimit(-1);
                 }
                 loaded = true;
-                return (List<BlockPopulator>)(List<?>) getPopulators(WorldEvents.getName(world));
+                return (List<BlockPopulator>) (List<?>) getPopulators(WorldEvents.getName(world));
             }
         }
-        catch (Exception e) {
+        catch (final Exception e)
+        {
             e.printStackTrace();
         }
         return new ArrayList<BlockPopulator>();
     }
-    
+
     /**
      * Set the result;
      * @param result
      */
-    public void setResult(short[][] result) {
+    public void setResult(final short[][] result)
+    {
         this.result = result;
     }
-    
+
     @Override
-    public short[][] generateExtBlockSections(World world, Random r, int cx, int cz, BiomeGrid biomes) {
-        try {
-            if (!loaded) {
-                String name = WorldEvents.getName(world);
+    public short[][] generateExtBlockSections(final World world, final Random r, final int cx, final int cz, final BiomeGrid biomes)
+    {
+        try
+        {
+            if (!loaded)
+            {
+                final String name = WorldEvents.getName(world);
                 PS.get().loadWorld(name, new BukkitGeneratorWrapper(name, this));
                 loaded = true;
             }
@@ -127,37 +145,47 @@ public abstract class BukkitPlotGenerator extends ChunkGenerator {
             int h = 1;
             h = (prime * h) + cx;
             h = (prime * h) + cz;
-            this.random.state = h;
-            this.result = new short[16][];
-            this.X = cx << 4;
-            this.Z = cz << 4;
-            if (ChunkManager.FORCE_PASTE) {
-                PlotWorld plotworld = PS.get().getPlotWorld(world.getName());
-                Biome biome = Biome.valueOf(plotworld.PLOT_BIOME);
-                for (short x = 0; x < 16; x++) {
-                    for (short z = 0; z < 16; z++) {
-                        if (biomes != null) {
+            random.state = h;
+            result = new short[16][];
+            X = cx << 4;
+            Z = cz << 4;
+            if (ChunkManager.FORCE_PASTE)
+            {
+                final PlotWorld plotworld = PS.get().getPlotWorld(world.getName());
+                final Biome biome = Biome.valueOf(plotworld.PLOT_BIOME);
+                for (short x = 0; x < 16; x++)
+                {
+                    for (short z = 0; z < 16; z++)
+                    {
+                        if (biomes != null)
+                        {
                             biomes.setBiome(x, z, biome);
                         }
                         final PlotLoc loc = new PlotLoc((X + x), (Z + z));
                         final HashMap<Short, Short> blocks = ChunkManager.GENERATE_BLOCKS.get(loc);
-                        for (final Entry<Short, Short> entry : blocks.entrySet()) {
+                        for (final Entry<Short, Short> entry : blocks.entrySet())
+                        {
                             setBlock(x, entry.getKey(), z, entry.getValue());
                         }
                     }
                 }
-                return this.result;
+                return result;
             }
             generateChunk(world, ChunkManager.CURRENT_PLOT_CLEAR, random, cx, cz, biomes);
-            if (ChunkManager.CURRENT_PLOT_CLEAR != null) {
+            if (ChunkManager.CURRENT_PLOT_CLEAR != null)
+            {
                 PlotLoc loc;
-                for (Entry<PlotLoc, HashMap<Short, Short>> entry : ChunkManager.GENERATE_BLOCKS.entrySet()) {
-                    for (Entry<Short, Short> entry2 : entry.getValue().entrySet()) {
+                for (final Entry<PlotLoc, HashMap<Short, Short>> entry : ChunkManager.GENERATE_BLOCKS.entrySet())
+                {
+                    for (final Entry<Short, Short> entry2 : entry.getValue().entrySet())
+                    {
                         loc = entry.getKey();
-                        int xx = loc.x - X;
-                        int zz = loc.z - Z;
-                        if (xx >= 0 && xx < 16) {
-                            if (zz >= 0 && zz < 16) {
+                        final int xx = loc.x - X;
+                        final int zz = loc.z - Z;
+                        if ((xx >= 0) && (xx < 16))
+                        {
+                            if ((zz >= 0) && (zz < 16))
+                            {
                                 setBlock(xx, entry2.getKey(), zz, entry2.getValue());
                             }
                         }
@@ -165,30 +193,36 @@ public abstract class BukkitPlotGenerator extends ChunkGenerator {
                 }
             }
         }
-        catch (Exception e) {
+        catch (final Exception e)
+        {
             e.printStackTrace();
         }
         return result;
     }
-    
-    public void setBlock(final int x, final int y, final int z, final short blkid) {
-        if (result[CACHE_I[y][x][z]] == null) {
+
+    public void setBlock(final int x, final int y, final int z, final short blkid)
+    {
+        if (result[CACHE_I[y][x][z]] == null)
+        {
             result[CACHE_I[y][x][z]] = new short[4096];
         }
         result[CACHE_I[y][x][z]][CACHE_J[y][x][z]] = blkid;
     }
-    
-    public void setBlock(final int x, final int y, final int z, final short[] blkid) {
-        if (blkid.length == 1) {
+
+    public void setBlock(final int x, final int y, final int z, final short[] blkid)
+    {
+        if (blkid.length == 1)
+        {
             setBlock(x, y, z, blkid[0]);
         }
-        short id = blkid[random.random(blkid.length)];
-        if (result[CACHE_I[y][x][z]] == null) {
+        final short id = blkid[random.random(blkid.length)];
+        if (result[CACHE_I[y][x][z]] == null)
+        {
             result[CACHE_I[y][x][z]] = new short[4096];
         }
         result[CACHE_I[y][x][z]][CACHE_J[y][x][z]] = id;
     }
-    
+
     /**
      * check if a region contains a location. (x, z) must be between [0,15], [0,15]
      * @param plot
@@ -196,22 +230,24 @@ public abstract class BukkitPlotGenerator extends ChunkGenerator {
      * @param z
      * @return
      */
-    public boolean contains(final RegionWrapper plot, final int x, final int z) {
-        int xx = X + x;
-        int zz = Z + z;
+    public boolean contains(final RegionWrapper plot, final int x, final int z)
+    {
+        final int xx = X + x;
+        final int zz = Z + z;
         return ((xx >= plot.minX) && (xx <= plot.maxX) && (zz >= plot.minZ) && (zz <= plot.maxZ));
     }
-    
+
     /**
      * Allow spawning everywhere
      */
     @Override
-    public boolean canSpawn(final World world, final int x, final int z) {
+    public boolean canSpawn(final World world, final int x, final int z)
+    {
         return true;
     }
-    
+
     /**
-     * <b>random</b> is an optimized random number generator.<br> 
+     * <b>random</b> is an optimized random number generator.<br>
      *  - Change the state to have the same chunk random each time it generates<br>
      *  <b>requiredRegion</b> If a plot is being regenerated, you are only required to generate content in this area<br>
      *   - use the contains(RegionWrapper, x, z) method to check if the region contains a location<br>
@@ -219,7 +255,7 @@ public abstract class BukkitPlotGenerator extends ChunkGenerator {
      *   - will be null if no restrictions are set<br>
      *   <b>result</b> is the standard 2D block data array used for generation<br>
      *   <b>biomes</b> is the standard BiomeGrid used for generation
-     * 
+     *
      * @param world
      * @param random
      * @param cx
@@ -229,19 +265,19 @@ public abstract class BukkitPlotGenerator extends ChunkGenerator {
      * @param result
      * @return
      */
-    public abstract void generateChunk(final World world, RegionWrapper requiredRegion, final PseudoRandom random, final int cx, final int cz, final BiomeGrid biomes);
-    
-    public abstract List<BukkitPlotPopulator> getPopulators(String world);
-    
+    public abstract void generateChunk(final World world, final RegionWrapper requiredRegion, final PseudoRandom random, final int cx, final int cz, final BiomeGrid biomes);
+
+    public abstract List<BukkitPlotPopulator> getPopulators(final String world);
+
     /**
-     * This is called when the generator is initialized. 
+     * This is called when the generator is initialized.
      * You don't need to do anything with it necessarily.
      * @param plotworld
      */
-    public abstract void init(PlotWorld plotworld);
-    
+    public abstract void init(final PlotWorld plotworld);
+
     /**
-     * Return a new instance of the PlotWorld for a world 
+     * Return a new instance of the PlotWorld for a world
      * @param world
      * @return
      */
@@ -252,13 +288,13 @@ public abstract class BukkitPlotGenerator extends ChunkGenerator {
      * @return
      */
     public abstract PlotManager getPlotManager();
-    
+
     /**
      * If you need to do anything fancy for /plot setup<br>
      *  - Otherwise it will just use the PlotWorld configuration<br>
      * Feel free to extend BukkitSetupUtils and customize world creation
      * @param object
      */
-    public void processSetup(SetupObject object) {
-    }
+    public void processSetup(final SetupObject object)
+    {}
 }
diff --git a/src/main/java/com/plotsquared/bukkit/generator/BukkitPlotPopulator.java b/src/main/java/com/plotsquared/bukkit/generator/BukkitPlotPopulator.java
index 4f71a76d3..87e7a9d67 100644
--- a/src/main/java/com/plotsquared/bukkit/generator/BukkitPlotPopulator.java
+++ b/src/main/java/com/plotsquared/bukkit/generator/BukkitPlotPopulator.java
@@ -15,28 +15,33 @@ import com.intellectualcrafters.plot.object.RegionWrapper;
 import com.intellectualcrafters.plot.util.ChunkManager;
 import com.intellectualcrafters.plot.util.SetBlockQueue;
 
-public abstract class BukkitPlotPopulator extends BlockPopulator {
-    
-    private PseudoRandom random = new PseudoRandom();
-    
+public abstract class BukkitPlotPopulator extends BlockPopulator
+{
+
+    private final PseudoRandom random = new PseudoRandom();
+
     public int X;
     public int Z;
     public String worldname;
     private World world;
-    
-    
+
     @Override
-    public void populate(World world, Random rand, Chunk chunk) {
+    public void populate(final World world, final Random rand, final Chunk chunk)
+    {
         this.world = world;
-        this.worldname = world.getName();
-        this.X = chunk.getX() << 4;
-        this.Z = chunk.getZ() << 4;
-        if (ChunkManager.FORCE_PASTE) {
-            for (short x = 0; x < 16; x++) {
-                for (short z = 0; z < 16; z++) {
+        worldname = world.getName();
+        X = chunk.getX() << 4;
+        Z = chunk.getZ() << 4;
+        if (ChunkManager.FORCE_PASTE)
+        {
+            for (short x = 0; x < 16; x++)
+            {
+                for (short z = 0; z < 16; z++)
+                {
                     final PlotLoc loc = new PlotLoc((short) (X + x), (short) (Z + z));
                     final HashMap<Short, Byte> blocks = ChunkManager.GENERATE_DATA.get(loc);
-                    for (final Entry<Short, Byte> entry : blocks.entrySet()) {
+                    for (final Entry<Short, Byte> entry : blocks.entrySet())
+                    {
                         setBlock(x, entry.getKey(), z, entry.getValue());
                     }
                 }
@@ -44,25 +49,30 @@ public abstract class BukkitPlotPopulator extends BlockPopulator {
             return;
         }
         populate(world, ChunkManager.CURRENT_PLOT_CLEAR, random, X, Z);
-        if (ChunkManager.CURRENT_PLOT_CLEAR != null) {
+        if (ChunkManager.CURRENT_PLOT_CLEAR != null)
+        {
             PlotLoc loc;
-            for (Entry<PlotLoc, HashMap<Short, Byte>> entry : ChunkManager.GENERATE_DATA.entrySet()) {
-                for (Entry<Short, Byte> entry2 : entry.getValue().entrySet()) {
+            for (final Entry<PlotLoc, HashMap<Short, Byte>> entry : ChunkManager.GENERATE_DATA.entrySet())
+            {
+                for (final Entry<Short, Byte> entry2 : entry.getValue().entrySet())
+                {
                     loc = entry.getKey();
-                    int xx = loc.x - X;
-                    int zz = loc.z - Z;
-                    if (xx >= 0 && xx < 16) {
-                    	if (zz >= 0 && zz < 16) {
-                    		setBlock(xx, entry2.getKey(), zz, entry2.getValue());
-                    	}
+                    final int xx = loc.x - X;
+                    final int zz = loc.z - Z;
+                    if ((xx >= 0) && (xx < 16))
+                    {
+                        if ((zz >= 0) && (zz < 16))
+                        {
+                            setBlock(xx, entry2.getKey(), zz, entry2.getValue());
+                        }
                     }
                 }
             }
         }
     }
-    
-    public abstract void populate(World world, RegionWrapper requiredRegion, PseudoRandom random, int cx, int cz);
-    
+
+    public abstract void populate(final World world, final RegionWrapper requiredRegion, final PseudoRandom random, final int cx, final int cz);
+
     /**
      * Set the id and data at a location. (x, y, z) must be between [0,15], [0,255], [0,15]
      * @param x
@@ -71,15 +81,18 @@ public abstract class BukkitPlotPopulator extends BlockPopulator {
      * @param id
      * @param data
      */
-    public void setBlock(int x, int y, int z, short id, byte data) {
-        if (data == 0) {
+    public void setBlock(final int x, final int y, final int z, final short id, final byte data)
+    {
+        if (data == 0)
+        {
             SetBlockQueue.setBlock(worldname, x, y, z, id);
         }
-        else {
+        else
+        {
             SetBlockQueue.setBlock(worldname, x, y, z, new PlotBlock(id, data));
         }
     }
-    
+
     /**
      * Set the data at a location. (x, y, z) must be between [0,15], [0,255], [0,15]
      * @param x
@@ -87,12 +100,14 @@ public abstract class BukkitPlotPopulator extends BlockPopulator {
      * @param z
      * @param data
      */
-    public void setBlock(int x, int y, int z, byte data) {
-        if (data != 0) {
+    public void setBlock(final int x, final int y, final int z, final byte data)
+    {
+        if (data != 0)
+        {
             world.getBlockAt(X + x, y, Z + z).setData(data);
         }
     }
-    
+
     /**
      * Like setblock, but lacks the data != 0 check
      * @param x
@@ -100,10 +115,11 @@ public abstract class BukkitPlotPopulator extends BlockPopulator {
      * @param z
      * @param data
      */
-    public void setBlockAbs(int x, int y, int z, byte data) {
+    public void setBlockAbs(final int x, final int y, final int z, final byte data)
+    {
         world.getBlockAt(X + x, y, Z + z).setData(data);
     }
-    
+
     /**
      * check if a region contains a location. (x, z) must be between [0,15], [0,15]
      * @param plot
@@ -111,10 +127,11 @@ public abstract class BukkitPlotPopulator extends BlockPopulator {
      * @param z
      * @return
      */
-    public boolean contains(final RegionWrapper plot, final int x, final int z) {
-        int xx = X + x;
-        int zz = Z + z;
+    public boolean contains(final RegionWrapper plot, final int x, final int z)
+    {
+        final int xx = X + x;
+        final int zz = Z + z;
         return ((xx >= plot.minX) && (xx <= plot.maxX) && (zz >= plot.minZ) && (zz <= plot.maxZ));
     }
-    
+
 }
diff --git a/src/main/java/com/plotsquared/bukkit/generator/HybridGen.java b/src/main/java/com/plotsquared/bukkit/generator/HybridGen.java
index 1b8f742f0..98f55f7a2 100644
--- a/src/main/java/com/plotsquared/bukkit/generator/HybridGen.java
+++ b/src/main/java/com/plotsquared/bukkit/generator/HybridGen.java
@@ -1,294 +1,358 @@
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// PlotSquared - A plot manager and world generator for the Bukkit API                             /
-// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
-//                                                                                                 /
-// This program is free software; you can redistribute it and/or modify                            /
-// it under the terms of the GNU General Public License as published by                            /
-// the Free Software Foundation; either version 3 of the License, or                               /
-// (at your option) any later version.                                                             /
-//                                                                                                 /
-// This program is distributed in the hope that it will be useful,                                 /
-// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
-// GNU General Public License for more details.                                                    /
-//                                                                                                 /
-// You should have received a copy of the GNU General Public License                               /
-// along with this program; if not, write to the Free Software Foundation,                         /
-// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
-//                                                                                                 /
-// You can contact us via: support@intellectualsites.com                                           /
-////////////////////////////////////////////////////////////////////////////////////////////////////
-package com.plotsquared.bukkit.generator;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map.Entry;
-
-import org.bukkit.Bukkit;
-import org.bukkit.World;
-import org.bukkit.block.Biome;
-
-import com.intellectualcrafters.plot.generator.HybridPlotManager;
-import com.intellectualcrafters.plot.generator.HybridPlotWorld;
-import com.intellectualcrafters.plot.object.PlotLoc;
-import com.intellectualcrafters.plot.object.PlotManager;
-import com.intellectualcrafters.plot.object.PlotWorld;
-import com.intellectualcrafters.plot.object.PseudoRandom;
-import com.intellectualcrafters.plot.object.RegionWrapper;
-
-/**
- * The default generator is very messy, as we have decided to try externalize all calculations from within the loop. -
- * You will see a lot of slower implementations have a single for loop. - This is perfectly fine to do, it will just
- * mean world generation may take somewhat longer
- *
- * @author Citymonstret
- * @author Empire92
- */
-public class HybridGen extends BukkitPlotGenerator {
-    
-    public HybridGen(String world) {
-        super(world);
-    }
-
-    /**
-     * Set to static to re-use the same managet for all Default World Generators
-     */
-    private static PlotManager manager = null;
-    /**
-     * plotworld object
-     */
-    public HybridPlotWorld plotworld = null;
-    /**
-     * Some generator specific variables (implementation dependent)
-     */
-    int plotsize;
-    int pathsize;
-    short wall;
-    short wallfilling;
-    short roadblock;
-    int size;
-    Biome biome;
-    int roadheight;
-    int wallheight;
-    int plotheight;
-    short[] plotfloors;
-    short[] filling;
-    short pathWidthLower;
-    short pathWidthUpper;
-    boolean doState = false;
-    int maxY = 0;
-    short[][] cached;
-
-    /**
-     * Initialize variables, and create plotworld object used in calculations
-     */
-    public void init(PlotWorld plotworld) {
-        if (plotworld != null) {
-            this.plotworld = (HybridPlotWorld) plotworld;
-        }
-        this.plotsize = this.plotworld.PLOT_WIDTH;
-        this.pathsize = this.plotworld.ROAD_WIDTH;
-        this.roadblock = this.plotworld.ROAD_BLOCK.id;
-        this.wallfilling = this.plotworld.WALL_FILLING.id;
-        this.size = this.pathsize + this.plotsize;
-        this.wall = this.plotworld.WALL_BLOCK.id;
-        this.plotfloors = new short[this.plotworld.TOP_BLOCK.length];
-        for (int i = 0; i < this.plotworld.TOP_BLOCK.length; i++) {
-            this.plotfloors[i] = this.plotworld.TOP_BLOCK[i].id;
-        }
-        this.filling = new short[this.plotworld.MAIN_BLOCK.length];
-        for (int i = 0; i < this.plotworld.MAIN_BLOCK.length; i++) {
-            this.filling[i] = this.plotworld.MAIN_BLOCK[i].id;
-        }
-        if ((this.filling.length > 1) || (this.plotfloors.length > 1)) {
-            this.doState = true;
-        }
-        this.wallheight = this.plotworld.WALL_HEIGHT;
-        this.roadheight = this.plotworld.ROAD_HEIGHT;
-        this.plotheight = this.plotworld.PLOT_HEIGHT;
-        if (this.pathsize == 0) {
-            this.pathWidthLower = (short) -1;
-            this.pathWidthUpper = (short) (this.plotsize + 1);
-        }
-        else {
-            if ((this.pathsize % 2) == 0) {
-                this.pathWidthLower = (short) (Math.floor(this.pathsize / 2) - 1);
-            } else {
-                this.pathWidthLower = (short) (Math.floor(this.pathsize / 2));
-            }
-            this.pathWidthUpper = (short) (this.pathWidthLower + this.plotsize + 1);
-        }
-        this.biome = Biome.valueOf(this.plotworld.PLOT_BIOME);
-        try {
-            this.maxY = Bukkit.getWorld(plotworld.worldname).getMaxHeight();
-        } catch (final NullPointerException e) {}
-        if (this.maxY == 0) {
-            this.maxY = 256;
-        }
-        
-        // create cached chunk (for optimized chunk generation)
-        if (!this.plotworld.PLOT_SCHEMATIC) {
-            this.cached = new short[(plotheight + 16) / 16][];
-            for (int i = 0; i < cached.length; i++) {
-                cached[i] = new short[4096];
-            }
-            PseudoRandom random = new PseudoRandom();
-            for (int x = 0; x < 16; x++) {
-                for (int z = 0; z < 16; z++) {
-                    cached[CACHE_I[plotheight][x][z]][CACHE_J[plotheight][x][z]] = plotfloors[random.random(plotfloors.length)];
-                    if (this.plotworld.PLOT_BEDROCK) {
-                        cached[CACHE_I[0][x][z]][CACHE_J[0][x][z]] = 7;
-                    }
-                    for (int y = 1; y < plotheight; y++) {
-                        cached[CACHE_I[y][x][z]][CACHE_J[y][x][z]] = filling[random.random(filling.length)];
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Return the plot manager for this type of generator, or create one For square plots you may as well use the
-     * default plot manager which comes with PlotSquared
-     */
-    public PlotManager getPlotManager() {
-        if (HybridGen.manager == null) {
-            HybridGen.manager = new HybridPlotManager();
-        }
-        return HybridGen.manager;
-    }
-
-    /**
-     * Get a new plotworld class For square plots you can use the DefaultPlotWorld class which comes with PlotSquared
-     */
-    public PlotWorld getNewPlotWorld(final String world) {
-        if (this.plotworld == null) {
-            this.plotworld = new HybridPlotWorld(world); 
-        }
-        return this.plotworld;
-    }
-
-    /**
-     * Return the block populator
-     */
-    public List<BukkitPlotPopulator> getPopulators(final String world) {
-        // You can have as many populators as you would like, e.g. tree
-        // populator, ore populator
-        return Arrays.asList((BukkitPlotPopulator) new HybridPop(this.plotworld));
-    }
-
-
-    /**
-     * This part is a fucking mess. - Refer to a proper tutorial if you would like to learn how to make a world
-     * generator
-     */
-    public void generateChunk(final World world, RegionWrapper region, final PseudoRandom random, final int cx, final int cz, final BiomeGrid biomes) {
-        int sx = (short) ((this.X - this.plotworld.ROAD_OFFSET_X) % this.size);
-        int sz = (short) ((this.Z - this.plotworld.ROAD_OFFSET_Z) % this.size);
-        if (sx < 0) {
-            sx += this.size;
-        }
-        if (sz < 0) {
-            sz += this.size;
-        }
-        
-        if (biomes != null) {
-            for (short x = 0; x < 16; x++) {
-                for (short z = 0; z < 16; z++) {
-                    biomes.setBiome(x, z, this.biome);
-                }
-            }
-        }
-
-        if (cached != null) {
-            if (sx > pathWidthLower && sz > pathWidthLower && sx + 15 < pathWidthUpper&& sz + 15 < pathWidthUpper) {
-                setResult(cached);
-                return;
-            }
-        }
-        
-        if (this.plotworld.PLOT_BEDROCK) {
-            for (short x = 0; x < 16; x++) {
-                for (short z = 0; z < 16; z++) {
-                    setBlock(x, 0, z, (short) 7);
-                }
-            }
-        }
-        if (region != null) {
-            for (short x = 0; x < 16; x++) {
-                final int absX = ((sx + x) % this.size);
-                for (short z = 0; z < 16; z++) {
-                    if (contains(region, x, z)) {
-                        for (short y = 1; y < this.plotheight; y++) {
-                            setBlock(x, y, z, this.filling);
-                        }
-                        setBlock(x, this.plotheight, z, this.plotfloors);
-                        final int absZ = ((sz + z) % this.size);
-                        final PlotLoc loc = new PlotLoc(absX, absZ);
-                        final HashMap<Short, Short> blocks = plotworld.G_SCH.get(loc);
-                        if (blocks != null) {
-                            for (final Entry<Short, Short> entry : blocks.entrySet()) {
-                                setBlock(x, this.plotheight + entry.getKey(), z, entry.getValue());
-                            }
-                        }
-                    }
-                }
-            }
-            return;
-        }
-        
-        for (short x = 0; x < 16; x++) {
-            final int absX = ((sx + x) % this.size);
-            final boolean gx = absX > this.pathWidthLower;
-            final boolean lx = absX < this.pathWidthUpper;
-            for (short z = 0; z < 16; z++) {
-                final int absZ = ((sz + z) % this.size);
-                final boolean gz = absZ > this.pathWidthLower;
-                final boolean lz = absZ < this.pathWidthUpper;
-                // inside plot
-                if (gx && gz && lx && lz) {
-                    for (short y = 1; y < this.plotheight; y++) {
-                        setBlock(x, y, z, this.filling);
-                    }
-                    setBlock(x, this.plotheight, z, this.plotfloors);
-                    if (this.plotworld.PLOT_SCHEMATIC) {
-                        final PlotLoc loc = new PlotLoc(absX, absZ);
-                        final HashMap<Short, Short> blocks = this.plotworld.G_SCH.get(loc);
-                        if (blocks != null) {
-                            for (final Entry<Short, Short> entry : blocks.entrySet()) {
-                                setBlock(x, this.plotheight + entry.getKey(), z, entry.getValue());
-                            }
-                        }
-                    }
-                } else if (pathsize != 0) {
-                    // wall
-                    if (((absX >= this.pathWidthLower) && (absX <= this.pathWidthUpper) && (absZ >= this.pathWidthLower) && (absZ <= this.pathWidthUpper))) {
-                        for (short y = 1; y <= this.wallheight; y++) {
-                            setBlock(x, y, z, this.wallfilling);
-                        }
-                        if (!this.plotworld.ROAD_SCHEMATIC_ENABLED) {
-                            setBlock(x, this.wallheight + 1, z, this.wall);
-                        }
-                    }
-                    // road
-                    else {
-                        for (short y = 1; y <= this.roadheight; y++) {
-                            setBlock(x, y, z, this.roadblock);
-                        }
-                    }
-                    if (this.plotworld.ROAD_SCHEMATIC_ENABLED) {
-                        final PlotLoc loc = new PlotLoc(absX, absZ);
-                        final HashMap<Short, Short> blocks = this.plotworld.G_SCH.get(loc);
-                        if (blocks != null) {
-                            for (final Entry<Short, Short> entry : blocks.entrySet()) {
-                                setBlock(x, this.roadheight + entry.getKey(), z, entry.getValue());
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        return;
-    }
-}
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// PlotSquared - A plot manager and world generator for the Bukkit API                             /
+// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
+//                                                                                                 /
+// This program is free software; you can redistribute it and/or modify                            /
+// it under the terms of the GNU General Public License as published by                            /
+// the Free Software Foundation; either version 3 of the License, or                               /
+// (at your option) any later version.                                                             /
+//                                                                                                 /
+// This program is distributed in the hope that it will be useful,                                 /
+// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
+// GNU General Public License for more details.                                                    /
+//                                                                                                 /
+// You should have received a copy of the GNU General Public License                               /
+// along with this program; if not, write to the Free Software Foundation,                         /
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
+//                                                                                                 /
+// You can contact us via: support@intellectualsites.com                                           /
+////////////////////////////////////////////////////////////////////////////////////////////////////
+package com.plotsquared.bukkit.generator;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map.Entry;
+
+import org.bukkit.Bukkit;
+import org.bukkit.World;
+import org.bukkit.block.Biome;
+
+import com.intellectualcrafters.plot.generator.HybridPlotManager;
+import com.intellectualcrafters.plot.generator.HybridPlotWorld;
+import com.intellectualcrafters.plot.object.PlotLoc;
+import com.intellectualcrafters.plot.object.PlotManager;
+import com.intellectualcrafters.plot.object.PlotWorld;
+import com.intellectualcrafters.plot.object.PseudoRandom;
+import com.intellectualcrafters.plot.object.RegionWrapper;
+
+/**
+ * The default generator is very messy, as we have decided to try externalize all calculations from within the loop. -
+ * You will see a lot of slower implementations have a single for loop. - This is perfectly fine to do, it will just
+ * mean world generation may take somewhat longer
+ *


+ */
+public class HybridGen extends BukkitPlotGenerator
+{
+
+    public HybridGen(final String world)
+    {
+        super(world);
+    }
+
+    /**
+     * Set to static to re-use the same managet for all Default World Generators
+     */
+    private static PlotManager manager = null;
+    /**
+     * plotworld object
+     */
+    public HybridPlotWorld plotworld = null;
+    /**
+     * Some generator specific variables (implementation dependent)
+     */
+    int plotsize;
+    int pathsize;
+    short wall;
+    short wallfilling;
+    short roadblock;
+    int size;
+    Biome biome;
+    int roadheight;
+    int wallheight;
+    int plotheight;
+    short[] plotfloors;
+    short[] filling;
+    short pathWidthLower;
+    short pathWidthUpper;
+    boolean doState = false;
+    int maxY = 0;
+    short[][] cached;
+
+    /**
+     * Initialize variables, and create plotworld object used in calculations
+     */
+    @Override
+    public void init(final PlotWorld plotworld)
+    {
+        if (plotworld != null)
+        {
+            this.plotworld = (HybridPlotWorld) plotworld;
+        }
+        plotsize = this.plotworld.PLOT_WIDTH;
+        pathsize = this.plotworld.ROAD_WIDTH;
+        roadblock = this.plotworld.ROAD_BLOCK.id;
+        wallfilling = this.plotworld.WALL_FILLING.id;
+        size = pathsize + plotsize;
+        wall = this.plotworld.WALL_BLOCK.id;
+        plotfloors = new short[this.plotworld.TOP_BLOCK.length];
+        for (int i = 0; i < this.plotworld.TOP_BLOCK.length; i++)
+        {
+            plotfloors[i] = this.plotworld.TOP_BLOCK[i].id;
+        }
+        filling = new short[this.plotworld.MAIN_BLOCK.length];
+        for (int i = 0; i < this.plotworld.MAIN_BLOCK.length; i++)
+        {
+            filling[i] = this.plotworld.MAIN_BLOCK[i].id;
+        }
+        if ((filling.length > 1) || (plotfloors.length > 1))
+        {
+            doState = true;
+        }
+        wallheight = this.plotworld.WALL_HEIGHT;
+        roadheight = this.plotworld.ROAD_HEIGHT;
+        plotheight = this.plotworld.PLOT_HEIGHT;
+        if (pathsize == 0)
+        {
+            pathWidthLower = (short) -1;
+            pathWidthUpper = (short) (plotsize + 1);
+        }
+        else
+        {
+            if ((pathsize % 2) == 0)
+            {
+                pathWidthLower = (short) (Math.floor(pathsize / 2) - 1);
+            }
+            else
+            {
+                pathWidthLower = (short) (Math.floor(pathsize / 2));
+            }
+            pathWidthUpper = (short) (pathWidthLower + plotsize + 1);
+        }
+        biome = Biome.valueOf(this.plotworld.PLOT_BIOME);
+        try
+        {
+            maxY = Bukkit.getWorld(plotworld.worldname).getMaxHeight();
+        }
+        catch (final NullPointerException e)
+        {}
+        if (maxY == 0)
+        {
+            maxY = 256;
+        }
+
+        // create cached chunk (for optimized chunk generation)
+        if (!this.plotworld.PLOT_SCHEMATIC)
+        {
+            cached = new short[(plotheight + 16) / 16][];
+            for (int i = 0; i < cached.length; i++)
+            {
+                cached[i] = new short[4096];
+            }
+            final PseudoRandom random = new PseudoRandom();
+            for (int x = 0; x < 16; x++)
+            {
+                for (int z = 0; z < 16; z++)
+                {
+                    cached[CACHE_I[plotheight][x][z]][CACHE_J[plotheight][x][z]] = plotfloors[random.random(plotfloors.length)];
+                    if (this.plotworld.PLOT_BEDROCK)
+                    {
+                        cached[CACHE_I[0][x][z]][CACHE_J[0][x][z]] = 7;
+                    }
+                    for (int y = 1; y < plotheight; y++)
+                    {
+                        cached[CACHE_I[y][x][z]][CACHE_J[y][x][z]] = filling[random.random(filling.length)];
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Return the plot manager for this type of generator, or create one For square plots you may as well use the
+     * default plot manager which comes with PlotSquared
+     */
+    @Override
+    public PlotManager getPlotManager()
+    {
+        if (HybridGen.manager == null)
+        {
+            HybridGen.manager = new HybridPlotManager();
+        }
+        return HybridGen.manager;
+    }
+
+    /**
+     * Get a new plotworld class For square plots you can use the DefaultPlotWorld class which comes with PlotSquared
+     */
+    @Override
+    public PlotWorld getNewPlotWorld(final String world)
+    {
+        if (plotworld == null)
+        {
+            plotworld = new HybridPlotWorld(world);
+        }
+        return plotworld;
+    }
+
+    /**
+     * Return the block populator
+     */
+    @Override
+    public List<BukkitPlotPopulator> getPopulators(final String world)
+    {
+        // You can have as many populators as you would like, e.g. tree
+        // populator, ore populator
+        return Arrays.asList((BukkitPlotPopulator) new HybridPop(plotworld));
+    }
+
+    /**
+     * This part is a fucking mess. - Refer to a proper tutorial if you would like to learn how to make a world
+     * generator
+     */
+    @Override
+    public void generateChunk(final World world, final RegionWrapper region, final PseudoRandom random, final int cx, final int cz, final BiomeGrid biomes)
+    {
+        int sx = (short) ((X - plotworld.ROAD_OFFSET_X) % size);
+        int sz = (short) ((Z - plotworld.ROAD_OFFSET_Z) % size);
+        if (sx < 0)
+        {
+            sx += size;
+        }
+        if (sz < 0)
+        {
+            sz += size;
+        }
+
+        if (biomes != null)
+        {
+            for (short x = 0; x < 16; x++)
+            {
+                for (short z = 0; z < 16; z++)
+                {
+                    biomes.setBiome(x, z, biome);
+                }
+            }
+        }
+
+        if (cached != null)
+        {
+            if ((sx > pathWidthLower) && (sz > pathWidthLower) && ((sx + 15) < pathWidthUpper) && ((sz + 15) < pathWidthUpper))
+            {
+                setResult(cached);
+                return;
+            }
+        }
+
+        if (plotworld.PLOT_BEDROCK)
+        {
+            for (short x = 0; x < 16; x++)
+            {
+                for (short z = 0; z < 16; z++)
+                {
+                    setBlock(x, 0, z, (short) 7);
+                }
+            }
+        }
+        if (region != null)
+        {
+            for (short x = 0; x < 16; x++)
+            {
+                final int absX = ((sx + x) % size);
+                for (short z = 0; z < 16; z++)
+                {
+                    if (contains(region, x, z))
+                    {
+                        for (short y = 1; y < plotheight; y++)
+                        {
+                            setBlock(x, y, z, filling);
+                        }
+                        setBlock(x, plotheight, z, plotfloors);
+                        final int absZ = ((sz + z) % size);
+                        final PlotLoc loc = new PlotLoc(absX, absZ);
+                        final HashMap<Short, Short> blocks = plotworld.G_SCH.get(loc);
+                        if (blocks != null)
+                        {
+                            for (final Entry<Short, Short> entry : blocks.entrySet())
+                            {
+                                setBlock(x, plotheight + entry.getKey(), z, entry.getValue());
+                            }
+                        }
+                    }
+                }
+            }
+            return;
+        }
+
+        for (short x = 0; x < 16; x++)
+        {
+            final int absX = ((sx + x) % size);
+            final boolean gx = absX > pathWidthLower;
+            final boolean lx = absX < pathWidthUpper;
+            for (short z = 0; z < 16; z++)
+            {
+                final int absZ = ((sz + z) % size);
+                final boolean gz = absZ > pathWidthLower;
+                final boolean lz = absZ < pathWidthUpper;
+                // inside plot
+                if (gx && gz && lx && lz)
+                {
+                    for (short y = 1; y < plotheight; y++)
+                    {
+                        setBlock(x, y, z, filling);
+                    }
+                    setBlock(x, plotheight, z, plotfloors);
+                    if (plotworld.PLOT_SCHEMATIC)
+                    {
+                        final PlotLoc loc = new PlotLoc(absX, absZ);
+                        final HashMap<Short, Short> blocks = plotworld.G_SCH.get(loc);
+                        if (blocks != null)
+                        {
+                            for (final Entry<Short, Short> entry : blocks.entrySet())
+                            {
+                                setBlock(x, plotheight + entry.getKey(), z, entry.getValue());
+                            }
+                        }
+                    }
+                }
+                else if (pathsize != 0)
+                {
+                    // wall
+                    if (((absX >= pathWidthLower) && (absX <= pathWidthUpper) && (absZ >= pathWidthLower) && (absZ <= pathWidthUpper)))
+                    {
+                        for (short y = 1; y <= wallheight; y++)
+                        {
+                            setBlock(x, y, z, wallfilling);
+                        }
+                        if (!plotworld.ROAD_SCHEMATIC_ENABLED)
+                        {
+                            setBlock(x, wallheight + 1, z, wall);
+                        }
+                    }
+                    // road
+                    else
+                    {
+                        for (short y = 1; y <= roadheight; y++)
+                        {
+                            setBlock(x, y, z, roadblock);
+                        }
+                    }
+                    if (plotworld.ROAD_SCHEMATIC_ENABLED)
+                    {
+                        final PlotLoc loc = new PlotLoc(absX, absZ);
+                        final HashMap<Short, Short> blocks = plotworld.G_SCH.get(loc);
+                        if (blocks != null)
+                        {
+                            for (final Entry<Short, Short> entry : blocks.entrySet())
+                            {
+                                setBlock(x, roadheight + entry.getKey(), z, entry.getValue());
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        return;
+    }
+}
diff --git a/src/main/java/com/plotsquared/bukkit/generator/HybridPop.java b/src/main/java/com/plotsquared/bukkit/generator/HybridPop.java
index 38051e082..84fedefa8 100644
--- a/src/main/java/com/plotsquared/bukkit/generator/HybridPop.java
+++ b/src/main/java/com/plotsquared/bukkit/generator/HybridPop.java
@@ -1,233 +1,284 @@
-package com.plotsquared.bukkit.generator;
-
-import java.util.HashMap;
-import java.util.HashSet;
-
-import org.bukkit.World;
-import org.bukkit.block.Biome;
-
-import com.intellectualcrafters.plot.PS;
-import com.intellectualcrafters.plot.generator.HybridPlotWorld;
-import com.intellectualcrafters.plot.object.PlotLoc;
-import com.intellectualcrafters.plot.object.PlotWorld;
-import com.intellectualcrafters.plot.object.PseudoRandom;
-import com.intellectualcrafters.plot.object.RegionWrapper;
-import com.intellectualcrafters.plot.object.schematic.PlotItem;
-import com.intellectualcrafters.plot.util.BlockManager;
-
-/**
- * @author Citymonstret
- */
-public class HybridPop extends BukkitPlotPopulator {
-    /*
-     * Sorry, this isn't well documented at the moment.
-     * We advise you to take a look at a world generation tutorial for
-     * information about how a BlockPopulator works.
-     */
-    final short plotsize;
-    final short pathsize;
-    final byte wall;
-    final byte wallfilling;
-    final byte roadblock;
-    final int size;
-    final int roadheight;
-    final int wallheight;
-    final int plotheight;
-    final byte[] plotfloors;
-    final byte[] filling;
-    final short pathWidthLower;
-    final short pathWidthUpper;
-    private final HybridPlotWorld plotworld;
-    Biome biome;
-    private long state;
-    private boolean doFilling = false;
-    private boolean doFloor = false;
-    private boolean doState = false;
-
-    public HybridPop(final PlotWorld pw) {
-        this.plotworld = (HybridPlotWorld) pw;
-        // save configuration
-        this.plotsize = (short) this.plotworld.PLOT_WIDTH;
-        this.pathsize = (short) this.plotworld.ROAD_WIDTH;
-        this.roadblock = this.plotworld.ROAD_BLOCK.data;
-        this.wallfilling = this.plotworld.WALL_FILLING.data;
-        this.size = this.pathsize + this.plotsize;
-        this.wall = this.plotworld.WALL_BLOCK.data;
-        int count1 = 0;
-        int count2 = 0;
-        this.plotfloors = new byte[this.plotworld.TOP_BLOCK.length];
-        for (int i = 0; i < this.plotworld.TOP_BLOCK.length; i++) {
-            count1++;
-            this.plotfloors[i] = this.plotworld.TOP_BLOCK[i].data;
-            if (this.plotworld.TOP_BLOCK[i].data != 0) {
-                this.doFloor = true;
-            }
-        }
-        this.filling = new byte[this.plotworld.MAIN_BLOCK.length];
-        for (int i = 0; i < this.plotworld.MAIN_BLOCK.length; i++) {
-            count2++;
-            this.filling[i] = this.plotworld.MAIN_BLOCK[i].data;
-            if (this.plotworld.MAIN_BLOCK[i].data != 0) {
-                this.doFilling = true;
-            }
-        }
-        if (((count1 > 0) && this.doFloor) || ((count2 > 0) && this.doFilling)) {
-            this.doState = true;
-        }
-        this.wallheight = this.plotworld.WALL_HEIGHT;
-        this.roadheight = this.plotworld.ROAD_HEIGHT;
-        this.plotheight = this.plotworld.PLOT_HEIGHT;
-        if (this.pathsize == 0) {
-            this.pathWidthLower = (short) -1;
-            this.pathWidthUpper = (short) (this.plotsize + 1);
-        }
-        else {
-            if ((this.pathsize % 2) == 0) {
-                this.pathWidthLower = (short) (Math.floor(this.pathsize / 2) - 1);
-            } else {
-                this.pathWidthLower = (short) (Math.floor(this.pathsize / 2));
-            }
-            this.pathWidthUpper = (short) (this.pathWidthLower + this.plotsize + 1);
-        }
-    }
-
-    public final long nextLong() {
-        final long a = this.state;
-        this.state = xorShift64(a);
-        return a;
-    }
-
-    public final long xorShift64(long a) {
-        a ^= (a << 21);
-        a ^= (a >>> 35);
-        a ^= (a << 4);
-        return a;
-    }
-
-    public final int random(final int n) {
-        final long result = ((nextLong() >>> 32) * n) >> 32;
-        return (int) result;
-    }
-
-    @Override
-    public void populate(World world, RegionWrapper requiredRegion, PseudoRandom random, int cx, int cz) {
-        PS.get().getPlotManager(world.getName());
-
-        int sx = (short) ((this.X - this.plotworld.ROAD_OFFSET_X) % this.size);
-        int sz = (short) ((this.Z - this.plotworld.ROAD_OFFSET_Z) % this.size);
-        if (sx < 0) {
-            sx += this.size;
-        }
-        if (sz < 0) {
-            sz += this.size;
-        }
-
-        if (requiredRegion != null) {
-            for (short x = 0; x < 16; x++) {
-                for (short z = 0; z < 16; z++) {
-                    if (contains(requiredRegion, x, z)) {
-                        if (this.doFilling) {
-                            for (short y = 1; y < this.plotheight; y++) {
-                                setBlock(x, y, z, this.filling);
-                            }
-                        }
-                        if (this.doFloor) {
-                            setBlock(x, (short) this.plotheight, z, this.plotfloors);
-                        }
-                        if (this.plotworld.PLOT_SCHEMATIC) {
-                            final int absX = ((sx + x) % this.size);
-                            final int absZ = ((sz + z) % this.size);
-                            final PlotLoc loc = new PlotLoc(absX, absZ);
-                            final HashMap<Short, Byte> blocks = this.plotworld.G_SCH_DATA.get(loc);
-                            if (blocks != null) {
-                                for (final short y : blocks.keySet()) {
-                                    setBlockAbs(x, (short) (this.plotheight + y), z, blocks.get(y));
-                                }
-                            }
-                            if (this.plotworld.G_SCH_STATE != null) {
-                                HashSet<PlotItem> states = this.plotworld.G_SCH_STATE.get(loc);
-                                if (states != null) {
-                                    for (PlotItem items : states) {
-                                        BlockManager.manager.addItems(this.plotworld.worldname, items);
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            return;
-        }
-        
-        for (short x = 0; x < 16; x++) {
-            for (short z = 0; z < 16; z++) {
-                final int absX = ((sx + x) % this.size);
-                final int absZ = ((sz + z) % this.size);
-                final boolean gx = absX > this.pathWidthLower;
-                final boolean gz = absZ > this.pathWidthLower;
-                final boolean lx = absX < this.pathWidthUpper;
-                final boolean lz = absZ < this.pathWidthUpper;
-                // inside plot
-                if (gx && gz && lx && lz) {
-                    for (short y = 1; y < this.plotheight; y++) {
-                        setBlock(x, y, z, this.filling);
-                    }
-                    setBlock(x, (short) this.plotheight, z, this.plotfloors);
-                    if (this.plotworld.PLOT_SCHEMATIC) {
-                        final PlotLoc loc = new PlotLoc(absX, absZ);
-                        final HashMap<Short, Byte> blocks = this.plotworld.G_SCH_DATA.get(loc);
-                        if (blocks != null) {
-                            for (final short y : blocks.keySet()) {
-                                setBlockAbs(x, (short) (this.plotheight + y), z, blocks.get(y));
-                            }
-                        }
-                        if (this.plotworld.G_SCH_STATE != null) {
-                            HashSet<PlotItem> states = this.plotworld.G_SCH_STATE.get(loc);
-                            if (states != null) {
-                                for (PlotItem items : states) {
-                                    items.x = this.X + x;
-                                    items.z = this.Z + z;
-                                    BlockManager.manager.addItems(this.plotworld.worldname, items);
-                                }
-                            }
-                        }
-                    }
-                } else if (pathsize != 0) {
-                    // wall
-                    if (((absX >= this.pathWidthLower) && (absX <= this.pathWidthUpper) && (absZ >= this.pathWidthLower) && (absZ <= this.pathWidthUpper))) {
-                        for (short y = 1; y <= this.wallheight; y++) {
-                            setBlock(x, y, z, this.wallfilling);
-                        }
-                        if (!this.plotworld.ROAD_SCHEMATIC_ENABLED) {
-                            setBlock(x, this.wallheight + 1, z, this.wall);
-                        }
-                    }
-                    // road
-                    else {
-                        for (short y = 1; y <= this.roadheight; y++) {
-                            setBlock(x, y, z, this.roadblock);
-                        }
-                    }
-                    if (this.plotworld.ROAD_SCHEMATIC_ENABLED) {
-                        final PlotLoc loc = new PlotLoc(absX, absZ);
-                        final HashMap<Short, Byte> blocks = this.plotworld.G_SCH_DATA.get(loc);
-                        if (blocks != null) {
-                            for (final short y : blocks.keySet()) {
-                                setBlockAbs(x, (short) (this.roadheight + y), z, blocks.get(y));
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    private void setBlock(final short x, final short y, final short z, final byte[] blkids) {
-        if (blkids.length == 1) {
-            setBlock(x, y, z, blkids[0]);
-        } else {
-            final int i = random(blkids.length);
-            setBlock(x, y, z, blkids[i]);
-        }
-    }
-}
+package com.plotsquared.bukkit.generator;
+
+import java.util.HashMap;
+import java.util.HashSet;
+
+import org.bukkit.World;
+import org.bukkit.block.Biome;
+
+import com.intellectualcrafters.plot.PS;
+import com.intellectualcrafters.plot.generator.HybridPlotWorld;
+import com.intellectualcrafters.plot.object.PlotLoc;
+import com.intellectualcrafters.plot.object.PlotWorld;
+import com.intellectualcrafters.plot.object.PseudoRandom;
+import com.intellectualcrafters.plot.object.RegionWrapper;
+import com.intellectualcrafters.plot.object.schematic.PlotItem;
+import com.intellectualcrafters.plot.util.BlockManager;
+
+/**

+ */
+public class HybridPop extends BukkitPlotPopulator
+{
+    /*
+     * Sorry, this isn't well documented at the moment.
+     * We advise you to take a look at a world generation tutorial for
+     * information about how a BlockPopulator works.
+     */
+    final short plotsize;
+    final short pathsize;
+    final byte wall;
+    final byte wallfilling;
+    final byte roadblock;
+    final int size;
+    final int roadheight;
+    final int wallheight;
+    final int plotheight;
+    final byte[] plotfloors;
+    final byte[] filling;
+    final short pathWidthLower;
+    final short pathWidthUpper;
+    private final HybridPlotWorld plotworld;
+    Biome biome;
+    private long state;
+    private boolean doFilling = false;
+    private boolean doFloor = false;
+
+    public HybridPop(final PlotWorld pw)
+    {
+        plotworld = (HybridPlotWorld) pw;
+        // save configuration
+        plotsize = (short) plotworld.PLOT_WIDTH;
+        pathsize = (short) plotworld.ROAD_WIDTH;
+        roadblock = plotworld.ROAD_BLOCK.data;
+        wallfilling = plotworld.WALL_FILLING.data;
+        size = pathsize + plotsize;
+        wall = plotworld.WALL_BLOCK.data;
+        int count1 = 0;
+        int count2 = 0;
+        plotfloors = new byte[plotworld.TOP_BLOCK.length];
+        for (int i = 0; i < plotworld.TOP_BLOCK.length; i++)
+        {
+            count1++;
+            plotfloors[i] = plotworld.TOP_BLOCK[i].data;
+            if (plotworld.TOP_BLOCK[i].data != 0)
+            {
+                doFloor = true;
+            }
+        }
+        filling = new byte[plotworld.MAIN_BLOCK.length];
+        for (int i = 0; i < plotworld.MAIN_BLOCK.length; i++)
+        {
+            count2++;
+            filling[i] = plotworld.MAIN_BLOCK[i].data;
+            if (plotworld.MAIN_BLOCK[i].data != 0)
+            {
+                doFilling = true;
+            }
+        }
+        if (((count1 > 0) && doFloor) || ((count2 > 0) && doFilling))
+        {}
+        wallheight = plotworld.WALL_HEIGHT;
+        roadheight = plotworld.ROAD_HEIGHT;
+        plotheight = plotworld.PLOT_HEIGHT;
+        if (pathsize == 0)
+        {
+            pathWidthLower = (short) -1;
+            pathWidthUpper = (short) (plotsize + 1);
+        }
+        else
+        {
+            if ((pathsize % 2) == 0)
+            {
+                pathWidthLower = (short) (Math.floor(pathsize / 2) - 1);
+            }
+            else
+            {
+                pathWidthLower = (short) (Math.floor(pathsize / 2));
+            }
+            pathWidthUpper = (short) (pathWidthLower + plotsize + 1);
+        }
+    }
+
+    public final long nextLong()
+    {
+        final long a = state;
+        state = xorShift64(a);
+        return a;
+    }
+
+    public final long xorShift64(long a)
+    {
+        a ^= (a << 21);
+        a ^= (a >>> 35);
+        a ^= (a << 4);
+        return a;
+    }
+
+    public final int random(final int n)
+    {
+        final long result = ((nextLong() >>> 32) * n) >> 32;
+        return (int) result;
+    }
+
+    @Override
+    public void populate(final World world, final RegionWrapper requiredRegion, final PseudoRandom random, final int cx, final int cz)
+    {
+        PS.get().getPlotManager(world.getName());
+
+        int sx = (short) ((X - plotworld.ROAD_OFFSET_X) % size);
+        int sz = (short) ((Z - plotworld.ROAD_OFFSET_Z) % size);
+        if (sx < 0)
+        {
+            sx += size;
+        }
+        if (sz < 0)
+        {
+            sz += size;
+        }
+
+        if (requiredRegion != null)
+        {
+            for (short x = 0; x < 16; x++)
+            {
+                for (short z = 0; z < 16; z++)
+                {
+                    if (contains(requiredRegion, x, z))
+                    {
+                        if (doFilling)
+                        {
+                            for (short y = 1; y < plotheight; y++)
+                            {
+                                setBlock(x, y, z, filling);
+                            }
+                        }
+                        if (doFloor)
+                        {
+                            setBlock(x, (short) plotheight, z, plotfloors);
+                        }
+                        if (plotworld.PLOT_SCHEMATIC)
+                        {
+                            final int absX = ((sx + x) % size);
+                            final int absZ = ((sz + z) % size);
+                            final PlotLoc loc = new PlotLoc(absX, absZ);
+                            final HashMap<Short, Byte> blocks = plotworld.G_SCH_DATA.get(loc);
+                            if (blocks != null)
+                            {
+                                for (final short y : blocks.keySet())
+                                {
+                                    setBlockAbs(x, (short) (plotheight + y), z, blocks.get(y));
+                                }
+                            }
+                            if (plotworld.G_SCH_STATE != null)
+                            {
+                                final HashSet<PlotItem> states = plotworld.G_SCH_STATE.get(loc);
+                                if (states != null)
+                                {
+                                    for (final PlotItem items : states)
+                                    {
+                                        BlockManager.manager.addItems(plotworld.worldname, items);
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            return;
+        }
+
+        for (short x = 0; x < 16; x++)
+        {
+            for (short z = 0; z < 16; z++)
+            {
+                final int absX = ((sx + x) % size);
+                final int absZ = ((sz + z) % size);
+                final boolean gx = absX > pathWidthLower;
+                final boolean gz = absZ > pathWidthLower;
+                final boolean lx = absX < pathWidthUpper;
+                final boolean lz = absZ < pathWidthUpper;
+                // inside plot
+                if (gx && gz && lx && lz)
+                {
+                    for (short y = 1; y < plotheight; y++)
+                    {
+                        setBlock(x, y, z, filling);
+                    }
+                    setBlock(x, (short) plotheight, z, plotfloors);
+                    if (plotworld.PLOT_SCHEMATIC)
+                    {
+                        final PlotLoc loc = new PlotLoc(absX, absZ);
+                        final HashMap<Short, Byte> blocks = plotworld.G_SCH_DATA.get(loc);
+                        if (blocks != null)
+                        {
+                            for (final short y : blocks.keySet())
+                            {
+                                setBlockAbs(x, (short) (plotheight + y), z, blocks.get(y));
+                            }
+                        }
+                        if (plotworld.G_SCH_STATE != null)
+                        {
+                            final HashSet<PlotItem> states = plotworld.G_SCH_STATE.get(loc);
+                            if (states != null)
+                            {
+                                for (final PlotItem items : states)
+                                {
+                                    items.x = X + x;
+                                    items.z = Z + z;
+                                    BlockManager.manager.addItems(plotworld.worldname, items);
+                                }
+                            }
+                        }
+                    }
+                }
+                else if (pathsize != 0)
+                {
+                    // wall
+                    if (((absX >= pathWidthLower) && (absX <= pathWidthUpper) && (absZ >= pathWidthLower) && (absZ <= pathWidthUpper)))
+                    {
+                        for (short y = 1; y <= wallheight; y++)
+                        {
+                            setBlock(x, y, z, wallfilling);
+                        }
+                        if (!plotworld.ROAD_SCHEMATIC_ENABLED)
+                        {
+                            setBlock(x, wallheight + 1, z, wall);
+                        }
+                    }
+                    // road
+                    else
+                    {
+                        for (short y = 1; y <= roadheight; y++)
+                        {
+                            setBlock(x, y, z, roadblock);
+                        }
+                    }
+                    if (plotworld.ROAD_SCHEMATIC_ENABLED)
+                    {
+                        final PlotLoc loc = new PlotLoc(absX, absZ);
+                        final HashMap<Short, Byte> blocks = plotworld.G_SCH_DATA.get(loc);
+                        if (blocks != null)
+                        {
+                            for (final short y : blocks.keySet())
+                            {
+                                setBlockAbs(x, (short) (roadheight + y), z, blocks.get(y));
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    private void setBlock(final short x, final short y, final short z, final byte[] blkids)
+    {
+        if (blkids.length == 1)
+        {
+            setBlock(x, y, z, blkids[0]);
+        }
+        else
+        {
+            final int i = random(blkids.length);
+            setBlock(x, y, z, blkids[i]);
+        }
+    }
+}
diff --git a/src/main/java/com/plotsquared/bukkit/listeners/ChunkListener.java b/src/main/java/com/plotsquared/bukkit/listeners/ChunkListener.java
index d2885b8a4..e644f447d 100644
--- a/src/main/java/com/plotsquared/bukkit/listeners/ChunkListener.java
+++ b/src/main/java/com/plotsquared/bukkit/listeners/ChunkListener.java
@@ -36,231 +36,270 @@ import com.intellectualcrafters.plot.util.ReflectionUtils.RefMethod;
 import com.intellectualcrafters.plot.util.TaskManager;
 import com.intellectualcrafters.plot.util.UUIDHandler;
 
-public class ChunkListener implements Listener {
+public class ChunkListener implements Listener
+{
 
     private Chunk lastChunk = null;
-    
+
     final RefClass classChunk = getRefClass("{nms}.Chunk");
     final RefClass classCraftChunk = getRefClass("{cb}.CraftChunk");
     final RefMethod methodGetHandleChunk;
     final RefField mustSave = classChunk.getField("mustSave");
-    
-    public ChunkListener() {
+
+    public ChunkListener()
+    {
         RefMethod method;
-        try {
+        try
+        {
             method = classCraftChunk.getMethod("getHandle");
         }
-        catch (Exception e) {
+        catch (final Exception e)
+        {
             method = null;
             e.printStackTrace();
         }
         methodGetHandleChunk = method;
-        
-        if (!Settings.CHUNK_PROCESSOR_GC) {
-            return;
-        }
-        TaskManager.runTaskRepeat(new Runnable() {
+
+        if (!Settings.CHUNK_PROCESSOR_GC) { return; }
+        TaskManager.runTaskRepeat(new Runnable()
+        {
             @Override
-            public void run() {
-                int distance = Bukkit.getViewDistance() + 1;
-                HashMap<String, HashMap<ChunkLoc, Integer>> players = new HashMap<>();
-                for (Entry<String, PlotPlayer> entry : UUIDHandler.getPlayers().entrySet()) {
-                    PlotPlayer pp = entry.getValue();
-                    Location loc = pp.getLocation();
-                    String world = loc.getWorld();
-                    if (!PS.get().isPlotWorld(world)) {
+            public void run()
+            {
+                final int distance = Bukkit.getViewDistance() + 1;
+                final HashMap<String, HashMap<ChunkLoc, Integer>> players = new HashMap<>();
+                for (final Entry<String, PlotPlayer> entry : UUIDHandler.getPlayers().entrySet())
+                {
+                    final PlotPlayer pp = entry.getValue();
+                    final Location loc = pp.getLocation();
+                    final String world = loc.getWorld();
+                    if (!PS.get().isPlotWorld(world))
+                    {
                         continue;
                     }
                     HashMap<ChunkLoc, Integer> map = players.get(world);
-                    if (map == null) {
+                    if (map == null)
+                    {
                         map = new HashMap<>();
                         players.put(world, map);
                     }
-                    ChunkLoc origin = new ChunkLoc(loc.getX() >> 4, loc.getZ() >> 4);
+                    final ChunkLoc origin = new ChunkLoc(loc.getX() >> 4, loc.getZ() >> 4);
                     Integer val = map.get(origin);
                     int check;
-                    if (val != null) {
-                        if (val == distance) {
+                    if (val != null)
+                    {
+                        if (val == distance)
+                        {
                             continue;
                         }
                         check = distance - val;
                     }
-                    else {
+                    else
+                    {
                         check = distance;
                         map.put(origin, distance);
                     }
-                    for (int x = -distance; x <= distance; x++) {
-                        if (x >= check || -x >= check) {
+                    for (int x = -distance; x <= distance; x++)
+                    {
+                        if ((x >= check) || (-x >= check))
+                        {
                             continue;
                         }
-                        for (int z = -distance; z <= distance; z++) {
-                            if (z >= check || -z >= check) {
+                        for (int z = -distance; z <= distance; z++)
+                        {
+                            if ((z >= check) || (-z >= check))
+                            {
                                 continue;
                             }
-                            int weight = distance - Math.max(Math.abs(x), Math.abs(z));
-                            ChunkLoc chunk = new ChunkLoc(x + origin.x, z + origin.z);
+                            final int weight = distance - Math.max(Math.abs(x), Math.abs(z));
+                            final ChunkLoc chunk = new ChunkLoc(x + origin.x, z + origin.z);
                             val = map.get(chunk);
-                            if (val == null || val < weight) {
+                            if ((val == null) || (val < weight))
+                            {
                                 map.put(chunk, weight);
                             }
-                            
+
                         }
                     }
                 }
-                for (World world : Bukkit.getWorlds()) {
-                    String name = world.getName();
-                    boolean autosave = world.isAutoSave();
-                    if (!PS.get().isPlotWorld(name)) {
+                for (final World world : Bukkit.getWorlds())
+                {
+                    final String name = world.getName();
+                    final boolean autosave = world.isAutoSave();
+                    if (!PS.get().isPlotWorld(name))
+                    {
                         continue;
                     }
-                    if (!Settings.CHUNK_PROCESSOR_TRIM_ON_SAVE && autosave) {
+                    if (!Settings.CHUNK_PROCESSOR_TRIM_ON_SAVE && autosave)
+                    {
                         world.setAutoSave(false);
                     }
-                    HashMap<ChunkLoc, Integer> map = players.get(name);
-                    if (map == null || map.size() == 0) {
+                    final HashMap<ChunkLoc, Integer> map = players.get(name);
+                    if ((map == null) || (map.size() == 0))
+                    {
                         continue;
                     }
-                    for (Chunk chunk : world.getLoadedChunks()) {
-                        int x = chunk.getX();
-                        int z = chunk.getZ();
-                        if (!map.containsKey(new ChunkLoc(x, z))) {
-                            if (!Settings.CHUNK_PROCESSOR_TRIM_ON_SAVE || !unloadChunk(name, chunk)) {
+                    for (final Chunk chunk : world.getLoadedChunks())
+                    {
+                        final int x = chunk.getX();
+                        final int z = chunk.getZ();
+                        if (!map.containsKey(new ChunkLoc(x, z)))
+                        {
+                            if (!Settings.CHUNK_PROCESSOR_TRIM_ON_SAVE || !unloadChunk(name, chunk))
+                            {
                                 chunk.unload(true, false);
                             }
                         }
                     }
-                    if (!Settings.CHUNK_PROCESSOR_TRIM_ON_SAVE && autosave) {
+                    if (!Settings.CHUNK_PROCESSOR_TRIM_ON_SAVE && autosave)
+                    {
                         world.setAutoSave(true);
                     }
                 }
             }
         }, 300);
     }
-    
-    public boolean unloadChunk(String world, Chunk chunk) {
-        int X = chunk.getX();
-        int Z = chunk.getZ();
-        int x = X << 4;
-        int z = Z << 4;
-        int x2 = x + 15;
-        int z2 = z + 15;
+
+    public boolean unloadChunk(final String world, final Chunk chunk)
+    {
+        final int X = chunk.getX();
+        final int Z = chunk.getZ();
+        final int x = X << 4;
+        final int z = Z << 4;
+        final int x2 = x + 15;
+        final int z2 = z + 15;
         Plot plot;
         plot = MainUtil.getPlot(new Location(world, x, 1, z));
-        if (plot != null && plot.owner != null) return false;
+        if ((plot != null) && (plot.owner != null)) { return false; }
         plot = MainUtil.getPlot(new Location(world, x2, 1, z2));
-        if (plot != null && plot.owner != null) return false;
+        if ((plot != null) && (plot.owner != null)) { return false; }
         plot = MainUtil.getPlot(new Location(world, x2, 1, z));
-        if (plot != null && plot.owner != null) return false;
+        if ((plot != null) && (plot.owner != null)) { return false; }
         plot = MainUtil.getPlot(new Location(world, x, 1, z2));
-        if (plot != null && plot.owner != null) return false;
+        if ((plot != null) && (plot.owner != null)) { return false; }
         plot = MainUtil.getPlot(new Location(world, x + 7, 1, z + 7));
-        if (plot != null && plot.owner != null) return false;
-        Object c = methodGetHandleChunk.of(chunk).call();
+        if ((plot != null) && (plot.owner != null)) { return false; }
+        final Object c = methodGetHandleChunk.of(chunk).call();
         mustSave.of(c).set(false);
         chunk.unload(false, false);
         return true;
     }
-    
+
     @EventHandler
-    public void onChunkUnload(ChunkUnloadEvent event) {
-        if (Settings.CHUNK_PROCESSOR_TRIM_ON_SAVE) {
-            Chunk chunk = event.getChunk();
-            String world = chunk.getWorld().getName();
-            if (PS.get().isPlotWorld(world)) {
-                if (unloadChunk(world, chunk)) {
-                    return;
-                }
+    public void onChunkUnload(final ChunkUnloadEvent event)
+    {
+        if (Settings.CHUNK_PROCESSOR_TRIM_ON_SAVE)
+        {
+            final Chunk chunk = event.getChunk();
+            final String world = chunk.getWorld().getName();
+            if (PS.get().isPlotWorld(world))
+            {
+                if (unloadChunk(world, chunk)) { return; }
             }
         }
-        if (processChunk(event.getChunk(), true)) {
+        if (processChunk(event.getChunk(), true))
+        {
             event.setCancelled(true);
         }
     }
-    
 
     @EventHandler
-    public void onChunkLoad(ChunkLoadEvent event) {
+    public void onChunkLoad(final ChunkLoadEvent event)
+    {
         processChunk(event.getChunk(), false);
     }
 
-    @EventHandler(priority=EventPriority.LOWEST)
-    public void onItemSpawn(ItemSpawnEvent event) {
-        Item entity = event.getEntity();
-        Chunk chunk = entity.getLocation().getChunk();
-        if (chunk == lastChunk) {
+    @EventHandler(priority = EventPriority.LOWEST)
+    public void onItemSpawn(final ItemSpawnEvent event)
+    {
+        final Item entity = event.getEntity();
+        final Chunk chunk = entity.getLocation().getChunk();
+        if (chunk == lastChunk)
+        {
             event.getEntity().remove();
             event.setCancelled(true);
             return;
         }
-        if (!PS.get().isPlotWorld(chunk.getWorld().getName())) {
-            return;
-        }
-        Entity[] entities = chunk.getEntities();
-        if (entities.length > Settings.CHUNK_PROCESSOR_MAX_ENTITIES) {
+        if (!PS.get().isPlotWorld(chunk.getWorld().getName())) { return; }
+        final Entity[] entities = chunk.getEntities();
+        if (entities.length > Settings.CHUNK_PROCESSOR_MAX_ENTITIES)
+        {
             event.getEntity().remove();
             event.setCancelled(true);
             lastChunk = chunk;
         }
-        else {
-            lastChunk = null;
-        }
-    }
-    
-    @EventHandler(priority=EventPriority.HIGHEST, ignoreCancelled=true)
-    public void onBlockPhysics(BlockPhysicsEvent event) {
-        if (Settings.CHUNK_PROCESSOR_DISABLE_PHYSICS) {
-            event.setCancelled(true);
-        }
-    }
-    
-    @EventHandler(priority=EventPriority.LOWEST)
-    public void onEntitySpawn(CreatureSpawnEvent event) {
-        LivingEntity entity = event.getEntity();
-        Chunk chunk = entity.getLocation().getChunk();
-        if (chunk == lastChunk) {
-            event.getEntity().remove();
-            event.setCancelled(true);
-            return;
-        }
-        if (!PS.get().isPlotWorld(chunk.getWorld().getName())) {
-            return;
-        }
-        Entity[] entities = chunk.getEntities();
-        if (entities.length > Settings.CHUNK_PROCESSOR_MAX_ENTITIES) {
-            event.getEntity().remove();
-            event.setCancelled(true);
-            lastChunk = chunk;
-        }
-        else {
+        else
+        {
             lastChunk = null;
         }
     }
 
-    public void cleanChunk(final Chunk chunk) {
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onBlockPhysics(final BlockPhysicsEvent event)
+    {
+        if (Settings.CHUNK_PROCESSOR_DISABLE_PHYSICS)
+        {
+            event.setCancelled(true);
+        }
+    }
+
+    @EventHandler(priority = EventPriority.LOWEST)
+    public void onEntitySpawn(final CreatureSpawnEvent event)
+    {
+        final LivingEntity entity = event.getEntity();
+        final Chunk chunk = entity.getLocation().getChunk();
+        if (chunk == lastChunk)
+        {
+            event.getEntity().remove();
+            event.setCancelled(true);
+            return;
+        }
+        if (!PS.get().isPlotWorld(chunk.getWorld().getName())) { return; }
+        final Entity[] entities = chunk.getEntities();
+        if (entities.length > Settings.CHUNK_PROCESSOR_MAX_ENTITIES)
+        {
+            event.getEntity().remove();
+            event.setCancelled(true);
+            lastChunk = chunk;
+        }
+        else
+        {
+            lastChunk = null;
+        }
+    }
+
+    public void cleanChunk(final Chunk chunk)
+    {
         TaskManager.index.incrementAndGet();
         final Integer currentIndex = TaskManager.index.get();
-        final Integer task = TaskManager.runTaskRepeat(new Runnable() {
+        final Integer task = TaskManager.runTaskRepeat(new Runnable()
+        {
             @Override
-            public void run() {
-                if (!chunk.isLoaded()) {
+            public void run()
+            {
+                if (!chunk.isLoaded())
+                {
                     Bukkit.getScheduler().cancelTask(TaskManager.tasks.get(currentIndex));
                     TaskManager.tasks.remove(currentIndex);
                     PS.debug("[PlotSquared] &aSuccessfully processed and unloaded chunk!");
                     chunk.unload(true, true);
                     return;
                 }
-                BlockState[] tiles = chunk.getTileEntities();
-                if (tiles.length == 0) {
+                final BlockState[] tiles = chunk.getTileEntities();
+                if (tiles.length == 0)
+                {
                     Bukkit.getScheduler().cancelTask(TaskManager.tasks.get(currentIndex));
                     TaskManager.tasks.remove(currentIndex);
                     PS.debug("[PlotSquared] &aSuccessfully processed and unloaded chunk!");
                     chunk.unload(true, true);
                     return;
                 }
-                long start = System.currentTimeMillis();
+                final long start = System.currentTimeMillis();
                 int i = 0;
-                while (System.currentTimeMillis() - start < 250) {
-                    if (i >= tiles.length) {
+                while ((System.currentTimeMillis() - start) < 250)
+                {
+                    if (i >= tiles.length)
+                    {
                         Bukkit.getScheduler().cancelTask(TaskManager.tasks.get(currentIndex));
                         TaskManager.tasks.remove(currentIndex);
                         PS.debug("[PlotSquared] &aSuccessfully processed and unloaded chunk!");
@@ -274,28 +313,33 @@ public class ChunkListener implements Listener {
         }, 5);
         TaskManager.tasks.put(currentIndex, task);
     }
-    
-    public boolean processChunk(Chunk chunk, boolean unload) {
-        if (!PS.get().isPlotWorld(chunk.getWorld().getName())) {
-            return false;
-        }
-        Entity[] entities = chunk.getEntities();
-        BlockState[] tiles = chunk.getTileEntities();
-        if (entities.length > Settings.CHUNK_PROCESSOR_MAX_ENTITIES) {
-            for (Entity ent : entities) {
-                if (!(ent instanceof Player)) {
+
+    public boolean processChunk(final Chunk chunk, final boolean unload)
+    {
+        if (!PS.get().isPlotWorld(chunk.getWorld().getName())) { return false; }
+        final Entity[] entities = chunk.getEntities();
+        final BlockState[] tiles = chunk.getTileEntities();
+        if (entities.length > Settings.CHUNK_PROCESSOR_MAX_ENTITIES)
+        {
+            for (final Entity ent : entities)
+            {
+                if (!(ent instanceof Player))
+                {
                     ent.remove();
                 }
             }
             PS.debug("[PlotSquared] &a detected unsafe chunk and processed: " + (chunk.getX() << 4) + "," + (chunk.getX() << 4));
         }
-        if (tiles.length > Settings.CHUNK_PROCESSOR_MAX_BLOCKSTATES) {
-            if (unload) {
+        if (tiles.length > Settings.CHUNK_PROCESSOR_MAX_BLOCKSTATES)
+        {
+            if (unload)
+            {
                 PS.debug("[PlotSquared] &c detected unsafe chunk: " + (chunk.getX() << 4) + "," + (chunk.getX() << 4));
                 cleanChunk(chunk);
                 return true;
             }
-            for (BlockState tile : tiles) {
+            for (final BlockState tile : tiles)
+            {
                 tile.getBlock().setType(Material.AIR, false);
             }
         }
diff --git a/src/main/java/com/plotsquared/bukkit/listeners/ForceFieldListener.java b/src/main/java/com/plotsquared/bukkit/listeners/ForceFieldListener.java
index 6ef613717..f5a15f4ca 100644
--- a/src/main/java/com/plotsquared/bukkit/listeners/ForceFieldListener.java
+++ b/src/main/java/com/plotsquared/bukkit/listeners/ForceFieldListener.java
@@ -1,125 +1,143 @@
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// PlotSquared - A plot manager and world generator for the Bukkit API                             /
-// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
-//                                                                                                 /
-// This program is free software; you can redistribute it and/or modify                            /
-// it under the terms of the GNU General Public License as published by                            /
-// the Free Software Foundation; either version 3 of the License, or                               /
-// (at your option) any later version.                                                             /
-//                                                                                                 /
-// This program is distributed in the hope that it will be useful,                                 /
-// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
-// GNU General Public License for more details.                                                    /
-//                                                                                                 /
-// You should have received a copy of the GNU General Public License                               /
-// along with this program; if not, write to the Free Software Foundation,                         /
-// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
-//                                                                                                 /
-// You can contact us via: support@intellectualsites.com                                           /
-////////////////////////////////////////////////////////////////////////////////////////////////////
-package com.plotsquared.bukkit.listeners;
-
-import java.util.HashSet;
-import java.util.Set;
-import java.util.UUID;
-
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.util.Vector;
-
-import com.intellectualcrafters.plot.flag.FlagManager;
-import com.intellectualcrafters.plot.object.Location;
-import com.intellectualcrafters.plot.object.Plot;
-import com.intellectualcrafters.plot.object.PlotPlayer;
-import com.intellectualcrafters.plot.util.UUIDHandler;
-import com.plotsquared.bukkit.events.PlayerEnterPlotEvent;
-import com.plotsquared.bukkit.util.BukkitPlayerFunctions;
-import com.plotsquared.bukkit.util.BukkitUtil;
-
-/**
- * @author Citymonstret
- */
-public class ForceFieldListener implements Listener {
-    private Set<Player> getNearbyPlayers(final Player player, final Plot plot) {
-        final Set<Player> players = new HashSet<>();
-        Player oPlayer;
-        for (final Entity entity : player.getNearbyEntities(5d, 5d, 5d)) {
-            if (!(entity instanceof Player) || ((oPlayer = (Player) entity) == null) || !BukkitPlayerFunctions.isInPlot(oPlayer) || !BukkitPlayerFunctions.getCurrentPlot(oPlayer).equals(plot)) {
-                continue;
-            }
-            final UUID uuid = UUIDHandler.getUUID(BukkitUtil.getPlayer(oPlayer));
-            if (!plot.isAdded(uuid)) {
-                players.add(oPlayer);
-            }
-        }
-        return players;
-    }
-
-    private Player hasNearbyPermitted(final Player player, final Plot plot) {
-        Player oPlayer;
-        for (final Entity entity : player.getNearbyEntities(5d, 5d, 5d)) {
-            if (!(entity instanceof Player) || ((oPlayer = (Player) entity) == null) || !BukkitPlayerFunctions.isInPlot(oPlayer) || !BukkitPlayerFunctions.getCurrentPlot(oPlayer).equals(plot)) {
-                continue;
-            }
-            final UUID uuid = UUIDHandler.getUUID(BukkitUtil.getPlayer(oPlayer));
-            if (plot.isAdded(uuid)) {
-                return oPlayer;
-            }
-        }
-        return null;
-    }
-
-    public Vector calculateVelocity(final Player p, final Player e) {
-        final org.bukkit.Location playerLocation = p.getLocation();
-        final org.bukkit.Location oPlayerLocation = e.getLocation();
-        final double playerX = playerLocation.getX(), playerY = playerLocation.getY(), playerZ = playerLocation.getZ(), oPlayerX = oPlayerLocation.getX(), oPlayerY = oPlayerLocation.getY(), oPlayerZ = oPlayerLocation.getZ();
-        double x = 0d, y = 0d, z = 0d;
-        if (playerX < oPlayerX) {
-            x = 1.0d;
-        } else if (playerX > oPlayerX) {
-            x = -1.0d;
-        }
-        if (playerY < oPlayerY) {
-            y = 0.5d;
-        } else if (playerY > oPlayerY) {
-            y = -0.5d;
-        }
-        if (playerZ < oPlayerZ) {
-            z = 1.0d;
-        } else if (playerZ > oPlayerZ) {
-            z = -1.0d;
-        }
-        return new Vector(x, y, z);
-    }
-
-    @EventHandler
-    public void onPlotEntry(final PlayerEnterPlotEvent event) {
-        final Player player = event.getPlayer();
-        final PlotPlayer pp = BukkitUtil.getPlayer(player);
-        final Location loc = pp.getLocation();
-        final Plot plot = event.getPlot();
-        if (plot == null) {
-            return;
-        }
-        if ((FlagManager.getPlotFlag(plot, "forcefield") != null) && FlagManager.getPlotFlag(plot, "forcefield").getValue().equals("true")) {
-            if (!FlagManager.isBooleanFlag(plot, "forcefield", false)) {
-                final UUID uuid = pp.getUUID();
-                if (plot.isAdded(uuid)) {
-                    final Set<Player> players = getNearbyPlayers(player, plot);
-                    for (final Player oPlayer : players) {
-                        oPlayer.setVelocity(calculateVelocity(player, oPlayer));
-                    }
-                } else {
-                    final Player oPlayer = hasNearbyPermitted(player, plot);
-                    if (oPlayer == null) {
-                        return;
-                    }
-                    player.setVelocity(calculateVelocity(oPlayer, player));
-                }
-            }
-        }
-    }
-}
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// PlotSquared - A plot manager and world generator for the Bukkit API                             /
+// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
+//                                                                                                 /
+// This program is free software; you can redistribute it and/or modify                            /
+// it under the terms of the GNU General Public License as published by                            /
+// the Free Software Foundation; either version 3 of the License, or                               /
+// (at your option) any later version.                                                             /
+//                                                                                                 /
+// This program is distributed in the hope that it will be useful,                                 /
+// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
+// GNU General Public License for more details.                                                    /
+//                                                                                                 /
+// You should have received a copy of the GNU General Public License                               /
+// along with this program; if not, write to the Free Software Foundation,                         /
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
+//                                                                                                 /
+// You can contact us via: support@intellectualsites.com                                           /
+////////////////////////////////////////////////////////////////////////////////////////////////////
+package com.plotsquared.bukkit.listeners;
+
+import java.util.HashSet;
+import java.util.Set;
+import java.util.UUID;
+
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.util.Vector;
+
+import com.intellectualcrafters.plot.flag.FlagManager;
+import com.intellectualcrafters.plot.object.Plot;
+import com.intellectualcrafters.plot.object.PlotPlayer;
+import com.intellectualcrafters.plot.util.UUIDHandler;
+import com.plotsquared.bukkit.events.PlayerEnterPlotEvent;
+import com.plotsquared.bukkit.util.BukkitPlayerFunctions;
+import com.plotsquared.bukkit.util.BukkitUtil;
+
+/**

+ */
+public class ForceFieldListener implements Listener
+{
+    private Set<Player> getNearbyPlayers(final Player player, final Plot plot)
+    {
+        final Set<Player> players = new HashSet<>();
+        Player oPlayer;
+        for (final Entity entity : player.getNearbyEntities(5d, 5d, 5d))
+        {
+            if (!(entity instanceof Player) || ((oPlayer = (Player) entity) == null) || !BukkitPlayerFunctions.isInPlot(oPlayer) || !BukkitPlayerFunctions.getCurrentPlot(oPlayer).equals(plot))
+            {
+                continue;
+            }
+            final UUID uuid = UUIDHandler.getUUID(BukkitUtil.getPlayer(oPlayer));
+            if (!plot.isAdded(uuid))
+            {
+                players.add(oPlayer);
+            }
+        }
+        return players;
+    }
+
+    private Player hasNearbyPermitted(final Player player, final Plot plot)
+    {
+        Player oPlayer;
+        for (final Entity entity : player.getNearbyEntities(5d, 5d, 5d))
+        {
+            if (!(entity instanceof Player) || ((oPlayer = (Player) entity) == null) || !BukkitPlayerFunctions.isInPlot(oPlayer) || !BukkitPlayerFunctions.getCurrentPlot(oPlayer).equals(plot))
+            {
+                continue;
+            }
+            final UUID uuid = UUIDHandler.getUUID(BukkitUtil.getPlayer(oPlayer));
+            if (plot.isAdded(uuid)) { return oPlayer; }
+        }
+        return null;
+    }
+
+    public Vector calculateVelocity(final Player p, final Player e)
+    {
+        final org.bukkit.Location playerLocation = p.getLocation();
+        final org.bukkit.Location oPlayerLocation = e.getLocation();
+        final double playerX = playerLocation.getX(), playerY = playerLocation.getY(), playerZ = playerLocation.getZ(), oPlayerX = oPlayerLocation.getX(), oPlayerY = oPlayerLocation.getY(), oPlayerZ = oPlayerLocation
+        .getZ();
+        double x = 0d, y = 0d, z = 0d;
+        if (playerX < oPlayerX)
+        {
+            x = 1.0d;
+        }
+        else if (playerX > oPlayerX)
+        {
+            x = -1.0d;
+        }
+        if (playerY < oPlayerY)
+        {
+            y = 0.5d;
+        }
+        else if (playerY > oPlayerY)
+        {
+            y = -0.5d;
+        }
+        if (playerZ < oPlayerZ)
+        {
+            z = 1.0d;
+        }
+        else if (playerZ > oPlayerZ)
+        {
+            z = -1.0d;
+        }
+        return new Vector(x, y, z);
+    }
+
+    @EventHandler
+    public void onPlotEntry(final PlayerEnterPlotEvent event)
+    {
+        final Player player = event.getPlayer();
+        final PlotPlayer pp = BukkitUtil.getPlayer(player);
+        pp.getLocation();
+        final Plot plot = event.getPlot();
+        if (plot == null) { return; }
+        if ((FlagManager.getPlotFlag(plot, "forcefield") != null) && FlagManager.getPlotFlag(plot, "forcefield").getValue().equals("true"))
+        {
+            if (!FlagManager.isBooleanFlag(plot, "forcefield", false))
+            {
+                final UUID uuid = pp.getUUID();
+                if (plot.isAdded(uuid))
+                {
+                    final Set<Player> players = getNearbyPlayers(player, plot);
+                    for (final Player oPlayer : players)
+                    {
+                        oPlayer.setVelocity(calculateVelocity(player, oPlayer));
+                    }
+                }
+                else
+                {
+                    final Player oPlayer = hasNearbyPermitted(player, plot);
+                    if (oPlayer == null) { return; }
+                    player.setVelocity(calculateVelocity(oPlayer, player));
+                }
+            }
+        }
+    }
+}
diff --git a/src/main/java/com/plotsquared/bukkit/listeners/PlayerBlockEventType.java b/src/main/java/com/plotsquared/bukkit/listeners/PlayerBlockEventType.java
index f728a9025..3169ca1fe 100644
--- a/src/main/java/com/plotsquared/bukkit/listeners/PlayerBlockEventType.java
+++ b/src/main/java/com/plotsquared/bukkit/listeners/PlayerBlockEventType.java
@@ -1,16 +1,17 @@
 package com.plotsquared.bukkit.listeners;
 
-public enum PlayerBlockEventType {
+public enum PlayerBlockEventType
+{
     // Non interactive
     EAT,
     READ,
-    
+
     // Right click with monster egg
     SPAWN_MOB,
-    
+
     // Dragon egg
     TELEPORT_OBJECT,
-    
+
     // armor stands
     PLACE_MISC,
     // blocks
@@ -27,7 +28,7 @@ public enum PlayerBlockEventType {
     // paintings / item frames
     BREAK_HANGING,
     BREAK_VEHICLE,
-    
+
     // armor stands
     INTERACT_MISC,
     // blocks
@@ -36,7 +37,7 @@ public enum PlayerBlockEventType {
     INTERACT_VEHICLE,
     // item frame / painting
     INTERACT_HANGING,
-    
+
     // Pressure plate, tripwire etc
     TRIGGER_PHYSICAL,
 }
diff --git a/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents.java b/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents.java
index 2d6504cca..a2c4ce451 100644
--- a/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents.java
+++ b/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents.java
@@ -1,2126 +1,2398 @@
-package com.plotsquared.bukkit.listeners;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-import java.util.UUID;
-import java.util.regex.Pattern;
-
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.Chunk;
-import org.bukkit.Material;
-import org.bukkit.World;
-import org.bukkit.block.Block;
-import org.bukkit.block.BlockFace;
-import org.bukkit.block.BlockState;
-import org.bukkit.command.PluginCommand;
-import org.bukkit.entity.Animals;
-import org.bukkit.entity.Arrow;
-import org.bukkit.entity.Creature;
-import org.bukkit.entity.EnderDragon;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.EntityType;
-import org.bukkit.entity.FallingBlock;
-import org.bukkit.entity.Hanging;
-import org.bukkit.entity.HumanEntity;
-import org.bukkit.entity.LivingEntity;
-import org.bukkit.entity.Monster;
-import org.bukkit.entity.Player;
-import org.bukkit.entity.Projectile;
-import org.bukkit.entity.Tameable;
-import org.bukkit.entity.ThrownPotion;
-import org.bukkit.entity.Vehicle;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.event.block.Action;
-import org.bukkit.event.block.BlockBreakEvent;
-import org.bukkit.event.block.BlockDamageEvent;
-import org.bukkit.event.block.BlockFadeEvent;
-import org.bukkit.event.block.BlockFormEvent;
-import org.bukkit.event.block.BlockFromToEvent;
-import org.bukkit.event.block.BlockGrowEvent;
-import org.bukkit.event.block.BlockIgniteEvent;
-import org.bukkit.event.block.BlockPhysicsEvent;
-import org.bukkit.event.block.BlockPistonExtendEvent;
-import org.bukkit.event.block.BlockPistonRetractEvent;
-import org.bukkit.event.block.BlockPlaceEvent;
-import org.bukkit.event.block.BlockRedstoneEvent;
-import org.bukkit.event.block.BlockSpreadEvent;
-import org.bukkit.event.block.EntityBlockFormEvent;
-import org.bukkit.event.entity.CreatureSpawnEvent;
-import org.bukkit.event.entity.EntityChangeBlockEvent;
-import org.bukkit.event.entity.EntityDamageByEntityEvent;
-import org.bukkit.event.entity.EntityExplodeEvent;
-import org.bukkit.event.entity.PotionSplashEvent;
-import org.bukkit.event.entity.ProjectileHitEvent;
-import org.bukkit.event.hanging.HangingBreakByEntityEvent;
-import org.bukkit.event.hanging.HangingPlaceEvent;
-import org.bukkit.event.inventory.InventoryClickEvent;
-import org.bukkit.event.inventory.InventoryCloseEvent;
-import org.bukkit.event.inventory.InventoryPickupItemEvent;
-import org.bukkit.event.player.AsyncPlayerChatEvent;
-import org.bukkit.event.player.PlayerBucketEmptyEvent;
-import org.bukkit.event.player.PlayerBucketFillEvent;
-import org.bukkit.event.player.PlayerChangedWorldEvent;
-import org.bukkit.event.player.PlayerCommandPreprocessEvent;
-import org.bukkit.event.player.PlayerEggThrowEvent;
-import org.bukkit.event.player.PlayerInteractEntityEvent;
-import org.bukkit.event.player.PlayerInteractEvent;
-import org.bukkit.event.player.PlayerJoinEvent;
-import org.bukkit.event.player.PlayerLoginEvent;
-import org.bukkit.event.player.PlayerLoginEvent.Result;
-import org.bukkit.event.player.PlayerMoveEvent;
-import org.bukkit.event.player.PlayerQuitEvent;
-import org.bukkit.event.player.PlayerTeleportEvent;
-import org.bukkit.event.vehicle.VehicleCreateEvent;
-import org.bukkit.event.vehicle.VehicleDestroyEvent;
-import org.bukkit.event.world.ChunkLoadEvent;
-import org.bukkit.event.world.StructureGrowEvent;
-import org.bukkit.help.HelpTopic;
-import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.projectiles.BlockProjectileSource;
-import org.bukkit.projectiles.ProjectileSource;
-import org.bukkit.util.Vector;
-
-import com.intellectualcrafters.plot.PS;
-import com.intellectualcrafters.plot.config.C;
-import com.intellectualcrafters.plot.config.Settings;
-import com.intellectualcrafters.plot.database.DBFunc;
-import com.intellectualcrafters.plot.flag.Flag;
-import com.intellectualcrafters.plot.flag.FlagManager;
-import com.intellectualcrafters.plot.object.Location;
-import com.intellectualcrafters.plot.object.Plot;
-import com.intellectualcrafters.plot.object.PlotBlock;
-import com.intellectualcrafters.plot.object.PlotHandler;
-import com.intellectualcrafters.plot.object.PlotId;
-import com.intellectualcrafters.plot.object.PlotInventory;
-import com.intellectualcrafters.plot.object.PlotManager;
-import com.intellectualcrafters.plot.object.PlotPlayer;
-import com.intellectualcrafters.plot.object.PlotWorld;
-import com.intellectualcrafters.plot.object.StringWrapper;
-import com.intellectualcrafters.plot.util.ChunkManager;
-import com.intellectualcrafters.plot.util.ClusterManager;
-import com.intellectualcrafters.plot.util.EventUtil;
-import com.intellectualcrafters.plot.util.ExpireManager;
-import com.intellectualcrafters.plot.util.MainUtil;
-import com.intellectualcrafters.plot.util.MathMan;
-import com.intellectualcrafters.plot.util.Permissions;
-import com.intellectualcrafters.plot.util.RegExUtil;
-import com.intellectualcrafters.plot.util.StringMan;
-import com.intellectualcrafters.plot.util.TaskManager;
-import com.intellectualcrafters.plot.util.UUIDHandler;
-import com.plotsquared.bukkit.BukkitMain;
-import com.plotsquared.bukkit.object.BukkitLazyBlock;
-import com.plotsquared.bukkit.object.BukkitPlayer;
-import com.plotsquared.bukkit.util.BukkitUtil;
-import com.plotsquared.listener.WEManager;
-
-/**
- * Player Events involving plots
- *
- * @author Citymonstret
- * @author Empire92
- */
-@SuppressWarnings({"unused","deprecation","unchecked"})
-public class PlayerEvents extends com.plotsquared.listener.PlotListener implements Listener {
-
-    private boolean pistonBlocks = true;
-
-    public static void sendBlockChange(final org.bukkit.Location bloc, final Material type, final byte data) {
-        TaskManager.runTaskLater(new Runnable() {
-            @Override
-            public void run() {
-                String world = bloc.getWorld().getName();
-                int x = bloc.getBlockX();
-                int z = bloc.getBlockZ();
-                int distance = Bukkit.getViewDistance() * 16;
-                for (PlotPlayer player : UUIDHandler.getPlayers().values()) {
-                    Location loc = player.getLocation();
-                    if (loc.getWorld().equals(world)) {
-                        if (16 * (Math.abs(loc.getX() - x) / 16) > distance) {
-                            continue;
-                        }
-                        if (16 * (Math.abs(loc.getZ() - z) / 16) > distance) {
-                            continue;
-                        }
-                        ((BukkitPlayer) player).player.sendBlockChange(bloc, type, data);
-                    }
-                }
-            }
-        }, 3);
-    }
-    
-    @EventHandler
-    public void onRedstoneEvent(BlockRedstoneEvent event) {
-        Block block = event.getBlock();
-        switch (block.getType()) {
-            case REDSTONE_LAMP_OFF:
-            case REDSTONE_WIRE:
-            case REDSTONE_LAMP_ON:
-            case PISTON_BASE:
-            case PISTON_STICKY_BASE:
-            case IRON_DOOR_BLOCK:
-            case LEVER:
-            case WOODEN_DOOR:
-            case FENCE_GATE:
-            case WOOD_BUTTON:
-            case STONE_BUTTON:
-            case IRON_PLATE:
-            case WOOD_PLATE:
-            case STONE_PLATE:
-            case GOLD_PLATE:
-            case SPRUCE_DOOR:
-            case BIRCH_DOOR:
-            case JUNGLE_DOOR:
-            case ACACIA_DOOR:
-            case DARK_OAK_DOOR:
-            case IRON_TRAPDOOR:
-            case SPRUCE_FENCE_GATE:
-            case BIRCH_FENCE_GATE:
-            case JUNGLE_FENCE_GATE:
-            case ACACIA_FENCE_GATE:
-            case DARK_OAK_FENCE_GATE:
-            case POWERED_RAIL: {
-                return;
-            }
-            default: {
-                Location loc = BukkitUtil.getLocation(block.getLocation());
-                if (!PS.get().isPlotWorld(loc.getWorld())) {
-                    return;
-                }
-                Plot plot = MainUtil.getPlot(loc);
-                if (plot == null || !plot.hasOwner()) {
-                    return;
-                }
-                Flag redstone = FlagManager.getPlotFlag(plot, "redstone");
-                if (redstone != null) {
-                    if ((Boolean) redstone.getValue()) {
-                        return;
-                    }
-                    else {
-                        event.setNewCurrent(0);
-                        return;
-                    }
-                }
-                if (Settings.REDSTONE_DISABLER) {
-                    if (UUIDHandler.getPlayer(plot.owner) == null) {
-                        boolean disable = true;
-                        for (UUID trusted : plot.getTrusted()) {
-                            if (UUIDHandler.getPlayer(trusted) != null) {
-                                disable = false;
-                                break;
-                            }
-                        }
-                        if (disable) {
-                            event.setNewCurrent(0);
-                            return;
-                        }
-                    }
-                }
-                if (Settings.REDSTONE_DISABLER_UNOCCUPIED) {
-                    for (PlotPlayer pp : UUIDHandler.getPlayers().values()) {
-                        if (plot.equals(pp.getCurrentPlot())) {
-                            return;
-                        }
-                    }
-                    event.setNewCurrent(0);
-                    return;
-                }
-            }
-        }
-    }
-    
-    @EventHandler(ignoreCancelled=true, priority=EventPriority.HIGHEST)
-    public void onPhysicsEvent(BlockPhysicsEvent event) {
-        switch (event.getChangedTypeId()) {
-            case 149:
-            case 150: {
-                Block block = event.getBlock();
-                Location loc = BukkitUtil.getLocation(block.getLocation());
-                Plot plot = MainUtil.getPlot(loc);
-                if (plot == null) {
-                    return;
-                }
-                if (FlagManager.isPlotFlagFalse(plot, "redstone")) {
-                    event.setCancelled(true);
-                }
-                return;
-            }
-            case 122:
-            case 145:
-            case 12:
-            case 13: {
-                Block block = event.getBlock();
-                Location loc = BukkitUtil.getLocation(block.getLocation());
-                Plot plot = MainUtil.getPlot(loc);
-                if (plot != null && FlagManager.isPlotFlagTrue(plot, "disable-physics")) {
-                    event.setCancelled(true);
-                    return;
-                }
-                return;
-            }
-            default: {
-                break;
-            }
-        }
-    }
-    
-    @EventHandler
-    public void onProjectileHit(ProjectileHitEvent event) {
-        Projectile entity = event.getEntity();
-        Location loc = BukkitUtil.getLocation(entity);
-        if (!PS.get().isPlotWorld(loc.getWorld())) {
-            return;
-        }
-        Plot plot = MainUtil.getPlot(loc);
-        if (!MainUtil.isPlotArea(loc)) {
-            return;
-        }
-        ProjectileSource shooter = entity.getShooter();
-        if (shooter instanceof BlockProjectileSource) {
-            if (plot == null) {
-                entity.remove();
-                return;
-            }
-            Location sLoc = BukkitUtil.getLocation(((BlockProjectileSource) shooter).getBlock().getLocation());
-            Plot sPlot = MainUtil.getPlot(sLoc);
-            if (sPlot == null || !PlotHandler.sameOwners(plot, sPlot)) {
-                entity.remove();
-            }
-        }
-        else if ((shooter instanceof Player)) {
-            PlotPlayer pp = BukkitUtil.getPlayer((Player) shooter);
-            if (plot == null) {
-                if (!Permissions.hasPermission(pp, C.PERMISSION_PROJECTILE_UNOWNED)) {
-                    entity.remove();
-                }
-                return;
-            }
-            if (plot.isAdded(pp.getUUID())) {
-                return;
-            }
-            if (Permissions.hasPermission(pp, C.PERMISSION_PROJECTILE_OTHER)) {
-                return;
-            }
-            entity.remove();
-        }
-    }
-
-    @EventHandler
-    public void PlayerCommand(final PlayerCommandPreprocessEvent event) {
-        final String message = event.getMessage().toLowerCase().replaceAll("/", "").trim();
-        if (message.length() == 0) {
-            return;
-        }
-        String[] split = message.split(" ");
-        PluginCommand cmd = Bukkit.getServer().getPluginCommand(split[0]);
-        if (cmd == null) {
-            if (split[0].equals("plotme") || split[0].equals("ap")) {
-                final Player player = event.getPlayer();
-                if (Settings.USE_PLOTME_ALIAS) {
-                    player.performCommand("plots " + StringMan.join(Arrays.copyOfRange(split, 1, split.length), " "));
-                } else {
-                    MainUtil.sendMessage(BukkitUtil.getPlayer(player), C.NOT_USING_PLOTME);
-                }
-                event.setCancelled(true);
-            }
-        }
-
-        Player player = event.getPlayer();
-        PlotPlayer pp = BukkitUtil.getPlayer(player);
-        Location loc = pp.getLocation();
-        if (!PS.get().isPlotWorld(BukkitUtil.getWorld(player))) {
-            return;
-        }
-
-        final Plot plot = MainUtil.getPlot(BukkitUtil.getLocation(player));
-        if (plot == null) {
-            return;
-        }
-
-        Flag flag;
-        if ((flag = FlagManager.getPlotFlag(plot, "blocked-cmds")) != null && !Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_BLOCKED_CMDS)) {
-            List<String> v = (List<String>) flag.getValue();
-
-            String msg  = event.getMessage().toLowerCase().replaceFirst("/", "");
-
-            String[] parts = msg.split(" ");
-            String c = parts[0];
-            if (parts[0].contains(":")) {
-                c = parts[0].split(":")[1];
-                msg = msg.replace(parts[0].split(":")[0] + ":", "");
-            }
-
-            String l = c;
-
-            List<String> aliases = new ArrayList<>();
-
-            for (HelpTopic cmdLabel : Bukkit.getServer().getHelpMap().getHelpTopics()) {
-                if (c.equals(cmdLabel.getName())) {
-                    break;
-                }
-                PluginCommand p;
-                String label = cmdLabel.getName().replaceFirst("/", "");
-                if (aliases.contains(label)) {
-                    continue;
-                }
-                if ((p = Bukkit.getPluginCommand(label)) != null) {
-                    for (String a : p.getAliases()) {
-                        if (aliases.contains(a))
-                            continue;
-                        aliases.add(a);
-                        a = a.replaceFirst("/", "");
-                        if (!a.equals(label) && a.equals(c)) {
-                            c = label;
-                            break;
-                        }
-                    }
-                }
-            }
-
-            if (!l.equals(c)) {
-                msg = msg.replace(l, c);
-            }
-
-            for (String s : v) {
-                Pattern pattern;
-                if (!RegExUtil.compiledPatterns.containsKey(s)) {
-                    RegExUtil.compiledPatterns.put(s, ((pattern = Pattern.compile(s))));
-                } else {
-                    pattern = RegExUtil.compiledPatterns.get(s);
-                }
-                if (pattern.matcher(msg).matches()) {
-                    MainUtil.sendMessage(pp, C.COMMAND_BLOCKED);
-                    event.setCancelled(true);
-                    return;
-                }
-            }
-        }
-    }
-
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onChunkLoad(final ChunkLoadEvent event) {
-        final String worldname = event.getWorld().getName();
-        final Chunk chunk = event.getChunk();
-        if (MainUtil.worldBorder.containsKey(worldname)) {
-            final int border = MainUtil.getBorder(worldname);
-            final int x = Math.abs(chunk.getX() << 4);
-            final int z = Math.abs(chunk.getZ() << 4);
-            if ((x > border) || (z > border)) {
-                chunk.unload(false, true);
-            }
-        }
-    }
-    
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onConnect(final PlayerLoginEvent event) {
-        Player player = event.getPlayer();
-        String name = player.getName();
-        PlotPlayer pp = BukkitUtil.getPlayer(player);
-        if (name.equals("PlotSquared") || pp.getUUID().equals(DBFunc.everyone)) {
-            event.disallow(Result.KICK_WHITELIST, "This account is reserved");
-            BukkitUtil.removePlayer(pp.getName());
-        }
-    }
-
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onJoin(final PlayerJoinEvent event) {
-        final Player player = event.getPlayer();
-        BukkitUtil.removePlayer(player.getName());
-        if (!player.hasPlayedBefore()) {
-            player.saveData();
-        }
-        final PlotPlayer pp = BukkitUtil.getPlayer(player);
-        
-        // Set last location
-        pp.setMeta("location", BukkitUtil.getLocation(player.getLocation()));
-        
-        final String username = pp.getName();
-        final StringWrapper name = new StringWrapper(username);
-        final UUID uuid = pp.getUUID();
-        UUIDHandler.add(name, uuid);
-        ExpireManager.dates.put(uuid, System.currentTimeMillis());
-        if (BukkitMain.worldEdit != null) {
-            if (pp.getAttribute("worldedit")) {
-                MainUtil.sendMessage(pp, C.WORLDEDIT_BYPASSED);
-            }
-        }
-        if (PS.get().update != null && Permissions.hasPermission(pp, C.PERMISSION_ADMIN)) {
-            TaskManager.runTaskLater(new Runnable() {
-                @Override
-                public void run() {
-                    MainUtil.sendMessage(pp, "&6An update for PlotSquared is available: &7/plot update");
-                }
-            }, 20);
-        }
-        final Location loc = BukkitUtil.getLocation(player.getLocation());
-        final Plot plot = MainUtil.getPlot(loc);
-        if (plot == null) {
-            return;
-        }
-        if (Settings.TELEPORT_ON_LOGIN) {
-            MainUtil.teleportPlayer(pp, pp.getLocation(), plot);
-            MainUtil.sendMessage(pp, C.TELEPORTED_TO_ROAD);
-        }
-        plotEntry(pp, plot);
-    }
-
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void PlayerMove(final PlayerMoveEvent event) {
-        org.bukkit.Location from = event.getFrom();
-        org.bukkit.Location to = event.getTo();
-        int x2;
-        if (MathMan.roundInt(from.getX()) != (x2 = MathMan.roundInt(to.getX()))) {
-            Player player = event.getPlayer();
-            PlotPlayer pp = BukkitUtil.getPlayer(player);
-            
-            // Set last location
-            pp.setMeta("location", BukkitUtil.getLocation(to));
-            
-            String worldname = to.getWorld().getName();
-            PlotWorld plotworld = PS.get().getPlotWorld(worldname);
-            if (plotworld == null) {
-                return;
-            }
-            PlotManager plotManager = PS.get().getPlotManager(worldname);
-            PlotId id = plotManager.getPlotId(plotworld, x2, 0, MathMan.roundInt(to.getZ()));
-            Plot lastPlot = (Plot) pp.getMeta("lastplot");
-            if (id == null) {
-                if (lastPlot != null && !plotExit(pp, lastPlot)) {
-                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_EXIT_DENIED);
-                    if (lastPlot.equals(MainUtil.getPlot(BukkitUtil.getLocation(from)))) {
-                        player.teleport(from);
-                    }
-                    else {
-                        player.teleport(player.getWorld().getSpawnLocation());
-                    }
-                    event.setCancelled(true);
-                    return;
-                }
-            }
-            else if (lastPlot != null && id.equals(lastPlot.id)) {
-                return;
-            }
-            else {
-                Plot plot = MainUtil.getPlot(worldname, id);
-                if (!plotEntry(pp, plot)) {
-                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_ENTRY_DENIED);
-                    if (!plot.equals(MainUtil.getPlot(BukkitUtil.getLocation(from)))) {
-                        player.teleport(from);
-                    }
-                    else {
-                        player.teleport(player.getWorld().getSpawnLocation());
-                    }
-                    event.setCancelled(true);
-                    return;
-                }
-            }
-            Integer border = MainUtil.worldBorder.get(worldname);
-            if (border != null) {
-                if (x2 > border) {
-                    to.setX(border - 4);
-                    player.teleport(event.getTo());
-                    MainUtil.sendMessage(pp, C.BORDER);
-                    return;
-                }
-                else if (x2 < -border) {
-                    to.setX(-border + 4);
-                    player.teleport(event.getTo());
-                    MainUtil.sendMessage(pp, C.BORDER);
-                    return;
-                }
-            }
-            return;
-        }
-        int z2;
-        if (MathMan.roundInt(from.getZ()) != (z2 = MathMan.roundInt(to.getZ())) ) {
-            Player player = event.getPlayer();
-            PlotPlayer pp = BukkitUtil.getPlayer(player);
-            
-            // Set last location
-            pp.setMeta("location", BukkitUtil.getLocation(to));
-            
-            String worldname = to.getWorld().getName();
-            PlotWorld plotworld = PS.get().getPlotWorld(worldname);
-            if (plotworld == null) {
-                return;
-            }
-            PlotManager plotManager = PS.get().getPlotManager(worldname);
-            PlotId id = plotManager.getPlotId(plotworld, x2, 0, z2);
-            Plot lastPlot = (Plot) pp.getMeta("lastplot");
-            if (id == null) {
-                if (lastPlot != null && !plotExit(pp, lastPlot)) {
-                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_EXIT_DENIED);
-                    if (lastPlot.equals(MainUtil.getPlot(BukkitUtil.getLocation(from)))) {
-                        player.teleport(from);
-                    }
-                    else {
-                        player.teleport(player.getWorld().getSpawnLocation());
-                    }
-                    event.setCancelled(true);
-                    return;
-                }
-            }
-            else if (lastPlot != null && id.equals(lastPlot.id)) {
-                return;
-            }
-            else {
-                Plot plot = MainUtil.getPlot(worldname, id);
-                if (!plotEntry(pp, plot)) {
-                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_ENTRY_DENIED);
-                    if (!plot.equals(MainUtil.getPlot(BukkitUtil.getLocation(from)))) {
-                        player.teleport(from);
-                    }
-                    else {
-                        player.teleport(player.getWorld().getSpawnLocation());
-                    }
-                    event.setCancelled(true);
-                    return;
-                }
-            }
-            Integer border = MainUtil.worldBorder.get(worldname);
-            if (border != null) {
-                if (z2 > border) {
-                    to.setZ(border - 4);
-                    player.teleport(event.getTo());
-                    MainUtil.sendMessage(pp, C.BORDER);
-                }
-                else if (z2 < -border) {
-                    to.setZ(-border + 4);
-                    player.teleport(event.getTo());
-                    MainUtil.sendMessage(pp, C.BORDER);
-                }
-            }
-        }
-    }
-
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled=true)
-    public void onChat(final AsyncPlayerChatEvent event) {
-        final Player player = event.getPlayer();
-        final String world = player.getWorld().getName();
-        final PlotWorld plotworld = PS.get().getPlotWorld(world);
-        if (plotworld == null) {
-            return;
-        }
-        final PlotPlayer plr = BukkitUtil.getPlayer(player);
-        if (!plotworld.PLOT_CHAT && !plr.getAttribute("chat")) {
-            return;
-        }
-        final Location loc = BukkitUtil.getLocation(player);
-        final Plot plot = MainUtil.getPlot(loc);
-        if (plot == null) {
-            return;
-        }
-        final String message = event.getMessage();
-        String format = C.PLOT_CHAT_FORMAT.s();
-        final String sender = event.getPlayer().getDisplayName();
-        final PlotId id = plot.id;
-        final Set<Player> recipients = event.getRecipients();
-        recipients.clear();
-        for (final Player p : Bukkit.getOnlinePlayers()) {
-            PlotPlayer pp = BukkitUtil.getPlayer(p);
-            if (pp.getAttribute("chatspy")) {
-                String spy = event.getFormat();
-                spy = String.format(spy, sender, message);
-                pp.sendMessage(spy);
-            }
-            else if (plot.equals(pp.getCurrentPlot())) {
-                recipients.add(p);
-            }
-        }
-        format = format.replaceAll("%plot_id%", id.x + ";" + id.y).replaceAll("%sender%", "%s").replaceAll("%msg%", "%s");
-        format = ChatColor.translateAlternateColorCodes('&', format);
-        event.setFormat(format);
-    }
-
-    @EventHandler(priority = EventPriority.HIGHEST)
-    public void BlockDestroy(final BlockBreakEvent event) {
-        final Player player = event.getPlayer();
-        final String world = player.getWorld().getName();
-        if (!PS.get().isPlotWorld(world)) {
-            return;
-        }
-        final Location loc = BukkitUtil.getLocation(event.getBlock().getLocation());
-        final Plot plot = MainUtil.getPlot(loc);
-        if (plot != null) {
-            if (event.getBlock().getY() == 0) {
-                event.setCancelled(true);
-                return;
-            }
-            final PlotPlayer pp = BukkitUtil.getPlayer(player);
-            if (!plot.hasOwner()) {
-                if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_DESTROY_UNOWNED)) {
-                    return;
-                }
-                MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_DESTROY_UNOWNED);
-                event.setCancelled(true);
-                return;
-            }
-            else if (!plot.isAdded(pp.getUUID())) {
-                final Flag destroy = FlagManager.getPlotFlag(plot, "break");
-                final Block block = event.getBlock();
-                if ((destroy != null) && ((HashSet<PlotBlock>) destroy.getValue()).contains(new PlotBlock((short) block.getTypeId(), block.getData()))) {
-                    return;
-                }
-                if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_DESTROY_OTHER)) {
-                    return;
-                }
-                MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_DESTROY_OTHER);
-                event.setCancelled(true);
-            }
-            else if (Settings.DONE_RESTRICTS_BUILDING && plot.getSettings().flags.containsKey("done")) {
-                if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_OTHER)) {
-                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_OTHER);
-                    event.setCancelled(true);
-                    return;
-                }
-            }
-            return;
-        }
-        final PlotPlayer pp = BukkitUtil.getPlayer(player);
-        if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_DESTROY_ROAD)) {
-            return;
-        }
-        if (MainUtil.isPlotAreaAbs(loc)) {
-            MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_DESTROY_ROAD);
-            event.setCancelled(true);
-        }
-    }
-
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onBigBoom(final EntityExplodeEvent event) {
-        Location loc = BukkitUtil.getLocation(event.getLocation());
-        final String world = loc.getWorld();
-        if (!PS.get().isPlotWorld(world)) {
-            return;
-        }
-        final Plot plot = MainUtil.getPlot(loc);
-        if ((plot != null) && plot.hasOwner()) {
-            if (FlagManager.isPlotFlagTrue(plot, "explosion")) {
-                final Iterator<Block> iter = event.blockList().iterator();
-                while (iter.hasNext()) {
-                    final Block b = iter.next();
-                    if (!plot.equals(MainUtil.getPlot(BukkitUtil.getLocation(b.getLocation())))) {
-                        iter.remove();
-                    }
-                }
-                return;
-            }
-        }
-        if (MainUtil.isPlotArea(loc)) {
-            event.setCancelled(true);
-        } else {
-            final Iterator<Block> iter = event.blockList().iterator();
-            while (iter.hasNext()) {
-                iter.next();
-                if (MainUtil.isPlotArea(loc)) {
-                    iter.remove();
-                }
-            }
-        }
-    }
-
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onWorldChanged(final PlayerChangedWorldEvent event) {
-        Player player = event.getPlayer();
-        final PlotPlayer pp = BukkitUtil.getPlayer(player);
-        
-        // Delete last location
-        BukkitUtil.getPlayer(event.getPlayer()).deleteMeta("location");
-        BukkitUtil.getPlayer(event.getPlayer()).deleteMeta("lastplot");
-        
-        if (BukkitMain.worldEdit != null) {
-            if (!Permissions.hasPermission(pp, C.PERMISSION_WORLDEDIT_BYPASS)) {
-                if (pp.getAttribute("worldedit")) {
-                    pp.removeAttribute("worldedit");
-                }
-            }
-        }
-        if (Settings.PERMISSION_CACHING) {
-            ((BukkitPlayer) pp).hasPerm = new HashSet<>();
-            ((BukkitPlayer) pp).noPerm = new HashSet<>();
-        }
-    }
-
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onPeskyMobsChangeTheWorldLikeWTFEvent(final EntityChangeBlockEvent event) {
-        final String world = event.getBlock().getWorld().getName();
-        if (!PS.get().isPlotWorld(world)) {
-            return;
-        }
-        final Entity e = event.getEntity();
-        if (!(e instanceof Player)) {
-            if (!(e instanceof org.bukkit.entity.FallingBlock)) {
-                event.setCancelled(true);
-            }
-        } else {
-            final Block b = event.getBlock();
-            final Player p = (Player) e;
-            final Location loc = BukkitUtil.getLocation(b.getLocation());
-            Plot plot = MainUtil.getPlot(loc);
-            if (plot == null) {
-                if (MainUtil.isPlotAreaAbs(loc)) {
-                    final PlotPlayer pp = BukkitUtil.getPlayer(p);
-                    if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_ROAD)) {
-                        MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_ROAD);
-                        event.setCancelled(true);
-                    }
-                }
-            } else {
-                if (!plot.hasOwner()) {
-                    final PlotPlayer pp = BukkitUtil.getPlayer(p);
-                    if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_UNOWNED)) {
-                        MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_UNOWNED);
-                        event.setCancelled(true);
-                    }
-                } else {
-                    final PlotPlayer pp = BukkitUtil.getPlayer(p);
-                    if (!plot.isAdded(pp.getUUID())) {
-                        if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_OTHER)) {
-                            if (MainUtil.isPlotArea(loc)) {
-                                MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_OTHER);
-                                event.setCancelled(true);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onEntityBlockForm(final EntityBlockFormEvent e) {
-        final String world = e.getBlock().getWorld().getName();
-        if (!PS.get().isPlotWorld(world)) {
-            return;
-        }
-        if ((!(e.getEntity() instanceof Player))) {
-            if (MainUtil.isPlotArea(BukkitUtil.getLocation(e.getBlock().getLocation()))) {
-                e.setCancelled(true);
-            }
-        }
-    }
-
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onBS(final BlockSpreadEvent e) {
-        final Block b = e.getBlock();
-        final Location loc = BukkitUtil.getLocation(b.getLocation());
-        if (PS.get().isPlotWorld(loc.getWorld())) {
-            if (MainUtil.isPlotRoad(loc)) {
-                e.setCancelled(true);
-            }
-        }
-    }
-
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onBF(final BlockFormEvent e) {
-        final Block b = e.getBlock();
-        final Location loc = BukkitUtil.getLocation(b.getLocation());
-        if (PS.get().isPlotWorld(loc.getWorld())) {
-            if (MainUtil.isPlotRoad(loc)) {
-                e.setCancelled(true);
-            }
-        }
-    }
-
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onBD(final BlockDamageEvent event) {
-        final Player player = event.getPlayer();
-
-        final String world;
-        if (player == null) {
-            final Location loc = BukkitUtil.getLocation(event.getBlock().getLocation());
-            if (PS.get().isPlotWorld(loc.getWorld())) {
-                if (MainUtil.isPlotRoad(loc)) {
-                    event.setCancelled(true);
-                }
-            }
-            world = loc.getWorld();
-        } else {
-            world = player.getWorld().getName();
-        }
-
-        if (!PS.get().isPlotWorld(world)) {
-            return;
-        }
-
-        final Location loc = BukkitUtil.getLocation(event.getBlock().getLocation());
-        final Plot plot = MainUtil.getPlot(loc);
-        if (plot != null) {
-            if (event.getBlock().getY() == 0) {
-                event.setCancelled(true);
-                return;
-            }
-            if (!plot.hasOwner()) {
-                final PlotPlayer pp = BukkitUtil.getPlayer(player);
-                if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_DESTROY_UNOWNED)) {
-                    return;
-                }
-                MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_DESTROY_UNOWNED);
-                event.setCancelled(true);
-                return;
-            }
-            final PlotPlayer pp = BukkitUtil.getPlayer(player);
-            if (!plot.isAdded(pp.getUUID())) {
-                final Flag destroy = FlagManager.getPlotFlag(plot, "break");
-                final Block block = event.getBlock();
-                if ((destroy != null) && ((HashSet<PlotBlock>) destroy.getValue()).contains(new PlotBlock((short) block.getTypeId(), block.getData()))) {
-                    return;
-                }
-                if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_DESTROY_OTHER)) {
-                    return;
-                }
-                MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_DESTROY_OTHER);
-                event.setCancelled(true);
-                return;
-            }
-            return;
-        }
-        final PlotPlayer pp = BukkitUtil.getPlayer(player);
-        if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_DESTROY_ROAD)) {
-            return;
-        }
-        if (MainUtil.isPlotArea(loc)) {
-            MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_DESTROY_ROAD);
-            event.setCancelled(true);
-        }
-    }
-
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onFade(final BlockFadeEvent e) {
-        final Block b = e.getBlock();
-        String world = b.getWorld().getName();
-        PlotWorld plotworld = PS.get().getPlotWorld(world);
-        if (plotworld == null) {
-            return;
-        }
-        PlotManager manager = PS.get().getPlotManager(world);
-        PlotId id = manager.getPlotId(plotworld, b.getX(), b.getY(), b.getZ());
-        if (id == null) {
-            if (plotworld.TYPE == 2) {
-                if (ClusterManager.getClusterAbs(BukkitUtil.getLocation(b.getLocation())) != null) {
-                    return;
-                }
-            }
-            e.setCancelled(true);
-        }
-    }
-
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onChange(final BlockFromToEvent e) {
-        final Block b = e.getToBlock();
-        final Location loc = BukkitUtil.getLocation(b.getLocation());
-        if (PS.get().isPlotWorld(loc.getWorld())) {
-            if (MainUtil.isPlotRoad(loc)) {
-                e.setCancelled(true);
-            }
-            else {
-                Plot plot = MainUtil.getPlot(loc);
-                if (plot != null && FlagManager.isPlotFlagTrue(plot, "disable-physics")) {
-                    e.setCancelled(true);
-                }
-            }
-        }
-    }
-
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onGrow(final BlockGrowEvent e) {
-        final Block b = e.getBlock();
-        final Location loc = BukkitUtil.getLocation(b.getLocation());
-        if (PS.get().isPlotWorld(loc.getWorld())) {
-            if (MainUtil.isPlotRoad(loc)) {
-                e.setCancelled(true);
-            }
-        }
-    }
-
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onBlockPistonExtend(final BlockPistonExtendEvent event) {
-        final Block block = event.getBlock();
-        Location loc = BukkitUtil.getLocation(block.getLocation());
-        String world = loc.getWorld();
-        if (!PS.get().isPlotWorld(world)) {
-            return;
-        }
-        Plot plot = MainUtil.getPlot(loc);
-        BlockFace face = event.getDirection();
-        Vector relative = new Vector(face.getModX(), face.getModY(), face.getModZ());
-        List<Block> blocks = event.getBlocks();
-        for (final Block b : blocks) {
-            Location bloc = BukkitUtil.getLocation(b.getLocation().add(relative));
-            Plot newPlot = MainUtil.getPlot(bloc);
-            if (!MainUtil.equals(plot, newPlot)) {
-                event.setCancelled(true);
-                return;
-            }
-        }
-        if (!Settings.PISTON_FALLING_BLOCK_CHECK) {
-            return;
-        }
-        org.bukkit.Location lastLoc;
-        if (blocks.size() > 0) {
-            lastLoc = blocks.get(blocks.size() - 1).getLocation().add(relative);
-        }
-        else {
-            lastLoc = event.getBlock().getLocation().add(relative);
-        }
-        Entity[] ents = lastLoc.getChunk().getEntities();
-        for (Entity entity : ents) {
-            if (entity instanceof FallingBlock) {
-                org.bukkit.Location eloc = entity.getLocation();
-                if (eloc.distanceSquared(lastLoc) < 2) {
-                    event.setCancelled(true);
-                    return;
-                }
-            }
-        }
-    }
-    
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onBlockPistonRetract(final BlockPistonRetractEvent event) {
-        final Block block = event.getBlock();
-        Location loc = BukkitUtil.getLocation(block.getLocation());
-        String world = loc.getWorld();
-        if (!PS.get().isPlotWorld(world)) {
-            return;
-        }
-        if (block.getType() != Material.PISTON_STICKY_BASE && block.getType() != Material.PISTON_BASE && block.getType() != Material.PISTON_MOVING_PIECE) {
-            return;
-        }
-
-        Plot plot = MainUtil.getPlot(loc);
-        
-        if (pistonBlocks) {
-            try {
-                for (Block pulled : event.getBlocks()) {
-                    Plot other = MainUtil.getPlot(BukkitUtil.getLocation(pulled.getLocation()));
-                    if (!MainUtil.equals(plot, other)) {
-                        event.setCancelled(true);
-                        return;
-                    }
-                }
-            }
-            catch (Throwable e) {
-                pistonBlocks = false;
-            }
-        }
-        if (!pistonBlocks && block.getType() != Material.PISTON_BASE) {
-            BlockFace dir = event.getDirection();
-            Location bloc = BukkitUtil.getLocation(block.getLocation().subtract(dir.getModX() * 2, dir.getModY() * 2, dir.getModZ() * 2));
-            Plot newPlot = MainUtil.getPlot(bloc);
-            if (!MainUtil.equals(plot, newPlot)) {
-                event.setCancelled(true);
-            }
-        }
-    }
-
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onStructureGrow(final StructureGrowEvent e) {
-        if (!PS.get().isPlotWorld(e.getWorld().getName())) {
-            return;
-        }
-        final List<BlockState> blocks = e.getBlocks();
-        if (blocks.size() == 0) {
-            return;
-        }
-        Plot origin = MainUtil.getPlot(BukkitUtil.getLocation(blocks.get(0).getLocation()));
-        BlockState start = blocks.get(0);
-        for (int i = blocks.size() - 1; i >= 0; i--) {
-            final Location loc = BukkitUtil.getLocation(blocks.get(i).getLocation());
-            final Plot plot = MainUtil.getPlot(loc);
-            if (!MainUtil.equals(plot, origin)) {
-                e.getBlocks().remove(i);
-            }
-        }
-    }
-    
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onInteract(final PlayerInteractEvent event) {
-    	Action action = event.getAction();
-        final Block block = event.getClickedBlock();
-        if (block == null) {
-            return;
-        }
-        final Player player = event.getPlayer();
-        final String world = player.getWorld().getName();
-        if (!PS.get().isPlotWorld(world)) {
-            return;
-        }
-        Location loc = BukkitUtil.getLocation(block.getLocation());
-        PlotPlayer pp = BukkitUtil.getPlayer(player);
-        PlayerBlockEventType eventType = null;
-        BukkitLazyBlock lb;
-        switch (action) {
-            case PHYSICAL: {
-                eventType = PlayerBlockEventType.TRIGGER_PHYSICAL;
-                lb = new BukkitLazyBlock(block);
-                break;
-            }
-            case RIGHT_CLICK_BLOCK: {
-                Material blockType = block.getType();
-                int blockId = blockType.getId();
-                switch (blockType) {
-                    case ANVIL:
-                    case ACACIA_DOOR:
-                    case BIRCH_DOOR:
-                    case DARK_OAK_DOOR:
-                    case IRON_DOOR:
-                    case JUNGLE_DOOR:
-                    case SPRUCE_DOOR:
-                    case TRAP_DOOR:
-                    case IRON_TRAPDOOR:
-                    case WOOD_DOOR:
-                    case WOODEN_DOOR:
-                    case TRAPPED_CHEST:
-                    case ENDER_CHEST:
-                    case CHEST:
-                    case ACACIA_FENCE_GATE:
-                    case BIRCH_FENCE_GATE:
-                    case DARK_OAK_FENCE_GATE:
-                    case FENCE_GATE:
-                    case JUNGLE_FENCE_GATE:
-                    case SPRUCE_FENCE_GATE:
-                    case LEVER:
-                    case DIODE:
-                    case DIODE_BLOCK_OFF:
-                    case DIODE_BLOCK_ON:
-                    case COMMAND:
-                    case REDSTONE_COMPARATOR:
-                    case REDSTONE_COMPARATOR_OFF:
-                    case REDSTONE_COMPARATOR_ON:
-                    case REDSTONE_ORE:
-                    case WOOD_BUTTON:
-                    case STONE_BUTTON:
-                    case BEACON:
-                    case BED_BLOCK:
-                    case SIGN:
-                    case WALL_SIGN:
-                    case SIGN_POST:
-                    case ENCHANTMENT_TABLE:
-                    case BREWING_STAND:
-                    case STANDING_BANNER:
-                    case BURNING_FURNACE:
-                    case FURNACE:
-                    case CAKE_BLOCK:
-                    case DISPENSER:
-                    case DROPPER:
-                    case HOPPER:
-                    case NOTE_BLOCK:
-                    case JUKEBOX:
-                    case WORKBENCH: {
-                        eventType = PlayerBlockEventType.INTERACT_BLOCK;
-                        break;
-                    }
-                    case DRAGON_EGG: {
-                        eventType = PlayerBlockEventType.TELEPORT_OBJECT;
-                        break;
-                    }
-                    default: {
-                        break;
-                    }
-                }
-                lb = new BukkitLazyBlock(blockId, block);
-                ItemStack hand = player.getItemInHand();
-                if (eventType != null && !player.isSneaking()) {
-                    break;
-                }
-                if (hand == null || hand.getType() == Material.AIR || hand.getType().isBlock()) {
-                    eventType = PlayerBlockEventType.INTERACT_BLOCK;
-                    lb = new BukkitLazyBlock(block);
-                    break;
-                }
-                // TODO calls both:
-                // redstone ore
-                
-                lb = new BukkitLazyBlock(new PlotBlock((short) hand.getTypeId(), (byte) hand.getDurability()));
-                switch (hand.getType()) {
-                    case MONSTER_EGG:
-                    case MONSTER_EGGS: {
-                        eventType = PlayerBlockEventType.SPAWN_MOB;
-                        break;
-                    }
-                    
-                    case ARMOR_STAND: {
-                        eventType = PlayerBlockEventType.PLACE_MISC;
-                        break;
-                    }
-                    
-                    case WRITTEN_BOOK:
-                    case BOOK_AND_QUILL:
-                    case BOOK: {
-                        eventType = PlayerBlockEventType.READ;
-                        break;
-                    }
-                    
-                    case APPLE:
-                    case BAKED_POTATO:
-                    case MUSHROOM_SOUP:
-                    case BREAD:
-                    case CARROT:
-                    case CARROT_ITEM:
-                    case COOKIE:
-                    case GRILLED_PORK:
-                    case POISONOUS_POTATO:
-                    case MUTTON:
-                    case PORK:
-                    case POTATO:
-                    case POTATO_ITEM:
-                    case POTION:
-                    case PUMPKIN_PIE:
-                    case RABBIT:
-                    case RABBIT_FOOT:
-                    case RABBIT_STEW:
-                    case RAW_BEEF:
-                    case RAW_FISH:
-                    case RAW_CHICKEN: {
-                        eventType = PlayerBlockEventType.EAT;
-                        break;
-                    }
-                    
-                    case MINECART :
-                    case STORAGE_MINECART :
-                    case POWERED_MINECART :
-                    case HOPPER_MINECART :
-                    case EXPLOSIVE_MINECART:
-                    case COMMAND_MINECART:
-                    case BOAT: {
-                        eventType = PlayerBlockEventType.PLACE_VEHICLE;
-                        break;
-                    }
-                    case PAINTING:
-                    case ITEM_FRAME: {
-                        eventType = PlayerBlockEventType.PLACE_HANGING;
-                        break;
-                    }
-                    default: {
-                        eventType = PlayerBlockEventType.INTERACT_BLOCK;
-                        break;
-                    }
-                }
-                break;
-            }
-            case LEFT_CLICK_BLOCK: {
-                eventType = PlayerBlockEventType.BREAK_BLOCK;
-                lb = new BukkitLazyBlock(block);
-                break;
-            }
-            default: {
-                return;
-            }
-        }
-        if (!EventUtil.manager.checkPlayerBlockEvent(pp, eventType, loc, lb, true)) {
-            event.setCancelled(true);
-        }
-    }
-
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void MobSpawn(final CreatureSpawnEvent event) {
-        Entity entity = event.getEntity();
-        if (entity instanceof Player) {
-            return;
-        }
-        final Location loc = BukkitUtil.getLocation(event.getLocation());
-        final String world = loc.getWorld();
-        if (!PS.get().isPlotWorld(world)) {
-            return;
-        }
-        if (!MainUtil.isPlotArea(loc)) {
-            return;
-        }
-        final PlotWorld pW = PS.get().getPlotWorld(world);
-        final CreatureSpawnEvent.SpawnReason reason = event.getSpawnReason();
-        if ((reason == CreatureSpawnEvent.SpawnReason.SPAWNER_EGG || reason == CreatureSpawnEvent.SpawnReason.DISPENSE_EGG) && !pW.SPAWN_EGGS) {
-            event.setCancelled(true);
-            return;
-        } else if ((reason == CreatureSpawnEvent.SpawnReason.BREEDING) && !pW.SPAWN_BREEDING) {
-            event.setCancelled(true);
-            return;
-        } else if ((reason == CreatureSpawnEvent.SpawnReason.CUSTOM) && !pW.SPAWN_CUSTOM && !(event.getEntityType().getTypeId() == 30)) {
-            event.setCancelled(true);
-            return;
-        }
-
-        Plot plot = MainUtil.getPlot(loc);
-        if (checkEntity(entity, plot)) {
-            event.setCancelled(true);
-        }
-    }
-    
-    @EventHandler(ignoreCancelled=true, priority=EventPriority.HIGHEST)
-    public void onEntityFall(EntityChangeBlockEvent event) {
-        if (event.getEntityType() != EntityType.FALLING_BLOCK) {
-            return;
-        }
-        Block block = event.getBlock();
-        World world = block.getWorld();
-        String worldname = world.getName();
-        if (!PS.get().isPlotWorld(worldname)) {
-            return;
-        }
-        Location loc = BukkitUtil.getLocation(block.getLocation());
-        Plot plot = MainUtil.getPlot(loc);
-        if (plot == null) {
-            return;
-        }
-        if (FlagManager.isPlotFlagTrue(plot, "disable-physics")) {
-            event.setCancelled(true);
-        }
-    }
-    
-    public boolean checkEntity(Entity entity, Plot plot) {
-        if (plot != null && plot.owner != null) {
-            Flag entityFlag = FlagManager.getPlotFlag(plot, "entity-cap");
-            int[] mobs = null;
-            if (entityFlag != null) {
-                int cap = ((Integer) entityFlag.getValue());
-                if (cap == 0) {
-                    return true;
-                }
-                mobs = ChunkManager.manager.countEntities(plot);
-                if (mobs[0] >= cap) {
-                    return true;
-                }
-            }
-            if (entity instanceof Creature) {
-                Flag mobFlag = FlagManager.getPlotFlag(plot, "mob-cap");
-                if (mobFlag != null) {
-                    int cap = ((Integer) mobFlag.getValue());
-                    if (cap == 0) {
-                        return true;
-                    }
-                    if (mobs == null) mobs = ChunkManager.manager.countEntities(plot);
-                    if (mobs[3] >= cap) {
-                        return true;
-                    }
-                }
-                if (entity instanceof Animals) {
-                    Flag animalFlag = FlagManager.getPlotFlag(plot, "animal-cap");
-                    if (animalFlag != null) {
-                        int cap = ((Integer) animalFlag.getValue());
-                        if (cap == 0) {
-                            return true;
-                        }
-                        if (mobs == null) mobs = ChunkManager.manager.countEntities(plot);
-                        if (mobs[1] >= cap) {
-                            return true;
-                        }
-                    }
-                }
-                else if (entity instanceof Monster) {
-                    Flag monsterFlag = FlagManager.getPlotFlag(plot, "hostile-cap");
-                    if (monsterFlag != null) {
-                        int cap = ((Integer) monsterFlag.getValue());
-                        if (cap == 0) {
-                            return true;
-                        }
-                        if (mobs == null) mobs = ChunkManager.manager.countEntities(plot);
-                        if (mobs[2] >= cap) {
-                            return true;
-                        }
-                    }
-                }
-            }
-            else if (entity instanceof Vehicle) {
-                Flag vehicleFlag = FlagManager.getPlotFlag(plot, "vehicle-cap");
-                if (vehicleFlag != null) {
-                    int cap = ((Integer) vehicleFlag.getValue());
-                    if (cap == 0) {
-                        return true;
-                    }
-                    if (mobs == null) mobs = ChunkManager.manager.countEntities(plot);
-                    if (mobs[4] >= cap) {
-                        return true;
-                    }
-                }
-            }
-        }
-        return false;
-    }
-
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onBlockIgnite(final BlockIgniteEvent e) {
-        final Player player = e.getPlayer();
-        final Block b = e.getBlock();
-        final Location loc;
-        if (b != null) {
-            loc = BukkitUtil.getLocation(b.getLocation());
-        } else {
-            final Entity ent = e.getIgnitingEntity();
-            if (ent != null) {
-                loc = BukkitUtil.getLocation(ent);
-            } else {
-                if (player != null) {
-                    loc = BukkitUtil.getLocation(player);
-                } else {
-                    return;
-                }
-            }
-        }
-        
-        final String world;
-        if (e.getBlock() != null) {
-            world = e.getBlock().getWorld().getName();
-        } else if (e.getIgnitingEntity() != null) {
-            world = e.getIgnitingEntity().getWorld().getName();
-        } else if (e.getPlayer() != null) {
-            world = e.getPlayer().getWorld().getName();
-        } else {
-            return;
-        }
-        if (!PS.get().isPlotWorld(world)) {
-            return;
-        }
-        if (e.getCause() == BlockIgniteEvent.IgniteCause.LIGHTNING) {
-            e.setCancelled(true);
-            return;
-        }
-        if (player == null) {
-            if (MainUtil.isPlotArea(loc)) {
-                e.setCancelled(true);
-            }
-            return;
-        }
-        final Player p = e.getPlayer();
-        Plot plot = MainUtil.getPlot(loc);
-        if (plot == null) {
-            if (MainUtil.isPlotAreaAbs(loc)) {
-                final PlotPlayer pp = BukkitUtil.getPlayer(p);
-                if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_ROAD)) {
-                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_ROAD);
-                    e.setCancelled(true);
-                }
-            }
-        } else {
-            if (!plot.hasOwner()) {
-                final PlotPlayer pp = BukkitUtil.getPlayer(p);
-                if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_UNOWNED)) {
-                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_UNOWNED);
-                    e.setCancelled(true);
-                }
-            } else {
-                final PlotPlayer pp = BukkitUtil.getPlayer(p);
-                if (!plot.isAdded(pp.getUUID())) {
-                    if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_OTHER)) {
-                        if (MainUtil.isPlotArea(loc)) {
-                            MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_OTHER);
-                            e.setCancelled(true);
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onTeleport(final PlayerTeleportEvent event) {
-        if (event.getTo() == null || event.getFrom() == null) {
-            BukkitUtil.getPlayer(event.getPlayer()).deleteMeta("location");
-            BukkitUtil.getPlayer(event.getPlayer()).deleteMeta("lastplot");
-            return;
-        }
-        final org.bukkit.Location from = event.getFrom();
-        final org.bukkit.Location to = event.getTo();
-        int x2;
-        if (MathMan.roundInt(from.getX()) != (x2 = MathMan.roundInt(to.getX()))) {
-            Player player = event.getPlayer();
-            PlotPlayer pp = BukkitUtil.getPlayer(player);
-            
-            // Set last location
-            pp.setMeta("location", BukkitUtil.getLocation(to));
-            
-            String worldname = to.getWorld().getName();
-            PlotWorld plotworld = PS.get().getPlotWorld(worldname);
-            if (plotworld == null) {
-                return;
-            }
-            PlotManager plotManager = PS.get().getPlotManager(worldname);
-            PlotId id = plotManager.getPlotId(plotworld, x2, 0, MathMan.roundInt(to.getZ()));
-            Plot lastPlot = (Plot) pp.getMeta("lastplot");
-            if (id == null) {
-                if (lastPlot != null && !plotExit(pp, lastPlot)) {
-                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_EXIT_DENIED);
-                    if (lastPlot.equals(MainUtil.getPlot(BukkitUtil.getLocation(from)))) {
-                        player.teleport(from);
-                    }
-                    else {
-                        player.teleport(player.getWorld().getSpawnLocation());
-                    }
-                    event.setCancelled(true);
-                    return;
-                }
-            }
-            else if (lastPlot != null && id.equals(lastPlot.id)) {
-                return;
-            }
-            else {
-                Plot plot = MainUtil.getPlot(worldname, id);
-                if (!plotEntry(pp, plot)) {
-                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_ENTRY_DENIED);
-                    if (!plot.equals(MainUtil.getPlot(BukkitUtil.getLocation(from)))) {
-                        player.teleport(from);
-                    }
-                    else {
-                        player.teleport(player.getWorld().getSpawnLocation());
-                    }
-                    event.setCancelled(true);
-                    return;
-                }
-            }
-            Integer border = MainUtil.worldBorder.get(worldname);
-            if (border != null) {
-                if (x2 > border) {
-                    to.setX(border - 4);
-                    player.teleport(event.getTo());
-                    MainUtil.sendMessage(pp, C.BORDER);
-                    return;
-                }
-                else if (x2 < -border) {
-                    to.setX(-border + 4);
-                    player.teleport(event.getTo());
-                    MainUtil.sendMessage(pp, C.BORDER);
-                    return;
-                }
-            }
-            return;
-        }
-        int z2;
-        if (MathMan.roundInt(from.getZ()) != (z2 = MathMan.roundInt(to.getZ())) ) {
-            Player player = event.getPlayer();
-            PlotPlayer pp = BukkitUtil.getPlayer(player);
-            
-            // Set last location
-            pp.setMeta("location", BukkitUtil.getLocation(to));
-            
-            String worldname = to.getWorld().getName();
-            PlotWorld plotworld = PS.get().getPlotWorld(worldname);
-            if (plotworld == null) {
-                return;
-            }
-            PlotManager plotManager = PS.get().getPlotManager(worldname);
-            PlotId id = plotManager.getPlotId(plotworld, x2, 0, z2);
-            Plot lastPlot = (Plot) pp.getMeta("lastplot");
-            if (id == null) {
-                if (lastPlot != null && !plotExit(pp, lastPlot)) {
-                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_EXIT_DENIED);
-                    if (lastPlot.equals(MainUtil.getPlot(BukkitUtil.getLocation(from)))) {
-                        player.teleport(from);
-                    }
-                    else {
-                        player.teleport(player.getWorld().getSpawnLocation());
-                    }
-                    event.setCancelled(true);
-                    return;
-                }
-            }
-            else if (lastPlot != null && id.equals(lastPlot.id)) {
-                return;
-            }
-            else {
-                Plot plot = MainUtil.getPlot(worldname, id);
-                if (!plotEntry(pp, plot)) {
-                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_ENTRY_DENIED);
-                    if (!plot.equals(MainUtil.getPlot(BukkitUtil.getLocation(from)))) {
-                        player.teleport(from);
-                    }
-                    else {
-                        player.teleport(player.getWorld().getSpawnLocation());
-                    }
-                    event.setCancelled(true);
-                    return;
-                }
-            }
-            Integer border = MainUtil.worldBorder.get(worldname);
-            if (border != null) {
-                if (z2 > border) {
-                    to.setZ(border - 4);
-                    player.teleport(event.getTo());
-                    MainUtil.sendMessage(pp, C.BORDER);
-                }
-                else if (z2 < -border) {
-                    to.setZ(-border + 4);
-                    player.teleport(event.getTo());
-                    MainUtil.sendMessage(pp, C.BORDER);
-                }
-            }
-        }
-    }
-
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onBucketEmpty(final PlayerBucketEmptyEvent e) {
-        final BlockFace bf = e.getBlockFace();
-        final Block b = e.getBlockClicked().getLocation().add(bf.getModX(), bf.getModY(), bf.getModZ()).getBlock();
-        final Location loc = BukkitUtil.getLocation(b.getLocation());
-        if (PS.get().isPlotWorld(loc.getWorld())) {
-            final PlotPlayer pp = BukkitUtil.getPlayer(e.getPlayer());
-            Plot plot = MainUtil.getPlot(loc);
-            if (plot == null) {
-                if (MainUtil.isPlotAreaAbs(loc)) {
-                    if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_ROAD)) {
-                        return;
-                    }
-                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_ROAD);
-                    e.setCancelled(true);
-                }
-            } else {
-                if (!plot.hasOwner()) {
-                    if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_UNOWNED)) {
-                        return;
-                    }
-                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_UNOWNED);
-                    e.setCancelled(true);
-                } else if (!plot.isAdded(pp.getUUID())) {
-                    final Flag use = FlagManager.getPlotFlag(plot, C.FLAG_USE.s());
-                    if ((use != null) && ((HashSet<PlotBlock>) use.getValue()).contains(new PlotBlock((short) e.getBucket().getId(), (byte) 0))) {
-                        return;
-                    }
-                    if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_OTHER)) {
-                        return;
-                    }
-                    if (MainUtil.isPlotArea(loc)) {
-                        MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_OTHER);
-                        e.setCancelled(true);
-                    }
-                }
-            }
-        }
-    }
-
-    @EventHandler(priority = EventPriority.HIGHEST)
-    public void onInventoryClick(final InventoryClickEvent event) {
-        HumanEntity clicker = event.getWhoClicked();
-        if (!(clicker instanceof Player) ) {
-            return;
-        }
-        Player player = (Player) clicker;
-        PlotPlayer pp = BukkitUtil.getPlayer(player);
-        PlotInventory inv = (PlotInventory) pp.getMeta("inventory");
-        if (inv != null && event.getRawSlot() == event.getSlot()) {
-            if (!inv.onClick(event.getSlot())) {
-                event.setCancelled(true);
-                inv.close();
-            }
-        }
-    }
-    
-    @EventHandler(priority = EventPriority.HIGHEST)
-    public void onInventoryClose(final InventoryCloseEvent event) {
-        HumanEntity closer = event.getPlayer();
-        if (!(closer instanceof Player)) {
-            return;
-        }
-        Player player = (Player) closer;
-        BukkitUtil.getPlayer(player).deleteMeta("inventory");
-    }
-    
-    
-    @EventHandler(priority= EventPriority.MONITOR)
-    public void onLeave(final PlayerQuitEvent event) {
-        PlotPlayer pp = BukkitUtil.getPlayer(event.getPlayer());
-        Plot plot = pp.getCurrentPlot();
-        if (plot != null) {
-            plotExit(pp, plot);
-        }
-        ExpireManager.dates.put(pp.getUUID(), System.currentTimeMillis());
-        EventUtil.unregisterPlayer(pp);
-        if (Settings.DELETE_PLOTS_ON_BAN && event.getPlayer().isBanned()) {
-            for (final Plot owned : PS.get().getPlotsInWorld(pp.getName())) {
-                owned.deletePlot(null);
-                PS.debug(String.format("&cPlot &6%s &cwas deleted + cleared due to &6%s&c getting banned", plot.getId(), event.getPlayer().getName()));
-            }
-        }
-        BukkitUtil.removePlayer(pp.getName());
-    }
-
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onBucketFill(final PlayerBucketFillEvent e) {
-        final Block b = e.getBlockClicked();
-        final Location loc = BukkitUtil.getLocation(b.getLocation());
-        if (PS.get().isPlotWorld(loc.getWorld())) {
-            final Player p = e.getPlayer();
-            final PlotPlayer pp = BukkitUtil.getPlayer(p);
-            Plot plot = MainUtil.getPlot(loc);
-            if (plot == null) {
-                if (MainUtil.isPlotAreaAbs(loc)) {
-                    if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_ROAD)) {
-                        return;
-                    }
-                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_ROAD);
-                    e.setCancelled(true);
-                }
-            } else {
-                if (!plot.hasOwner()) {
-                    if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_UNOWNED)) {
-                        return;
-                    }
-                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_UNOWNED);
-                    e.setCancelled(true);
-                } else if (!plot.isAdded(pp.getUUID())) {
-                    final Flag use = FlagManager.getPlotFlag(plot, C.FLAG_USE.s());
-                    final Block block = e.getBlockClicked();
-                    if ((use != null) && ((HashSet<PlotBlock>) use.getValue()).contains(new PlotBlock((short) block.getTypeId(), block.getData()))) {
-                        return;
-                    }
-                    if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_OTHER)) {
-                        return;
-                    }
-                    if (MainUtil.isPlotArea(loc)) {
-                        MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_OTHER);
-                        e.setCancelled(true);
-                    }
-                }
-            }
-        }
-    }
-
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onVehicleCreate(final VehicleCreateEvent event) {
-        Vehicle entity = event.getVehicle();
-        Location loc = BukkitUtil.getLocation(entity);
-        Plot plot = MainUtil.getPlot(loc);
-        if (checkEntity(entity, plot)) {
-            entity.remove();
-        }
-    }
-
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onHangingPlace(final HangingPlaceEvent e) {
-        final Block b = e.getBlock();
-        final Location loc = BukkitUtil.getLocation(b.getLocation());
-        if (PS.get().isPlotWorld(loc.getWorld())) {
-            final Player p = e.getPlayer();
-            final PlotPlayer pp = BukkitUtil.getPlayer(p);
-            Plot plot = MainUtil.getPlot(loc);
-            if (plot == null) {
-                if (MainUtil.isPlotAreaAbs(loc)) {
-                    if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_ROAD)) {
-                        MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_ROAD);
-                        e.setCancelled(true);
-                    }
-                }
-            } else {
-                if (!plot.hasOwner()) {
-                    if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_UNOWNED)) {
-                        MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_UNOWNED);
-                        e.setCancelled(true);
-                    }
-                } else if (!plot.isAdded(pp.getUUID())) {
-                    if (FlagManager.isPlotFlagTrue(plot, C.FLAG_HANGING_PLACE.s())) {
-                        return;
-                    }
-                    if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_OTHER)) {
-                        if (MainUtil.isPlotArea(loc)) {
-                            MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_OTHER);
-                            e.setCancelled(true);
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onHangingBreakByEntity(final HangingBreakByEntityEvent e) {
-        final Entity r = e.getRemover();
-        if (r instanceof Player) {
-            final Player p = (Player) r;
-            final Location l = BukkitUtil.getLocation(e.getEntity());
-            final PlotPlayer pp = BukkitUtil.getPlayer(p);
-            if (PS.get().isPlotWorld(l.getWorld())) {
-                Plot plot = MainUtil.getPlot(l);
-                if (plot == null) {
-                    if (MainUtil.isPlotAreaAbs(l)) {
-                        if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_DESTROY_ROAD)) {
-                            MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_DESTROY_ROAD);
-                            e.setCancelled(true);
-                        }
-                    }
-                } else {
-                    if (!plot.hasOwner()) {
-                        if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_DESTROY_UNOWNED)) {
-                            MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_DESTROY_UNOWNED);
-                            e.setCancelled(true);
-                        }
-                    } else if (!plot.isAdded(pp.getUUID())) {
-                        if (FlagManager.isPlotFlagTrue(plot, C.FLAG_HANGING_BREAK.s())) {
-                            return;
-                        }
-                        if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_DESTROY_OTHER)) {
-                            if (MainUtil.isPlotArea(l)) {
-                                MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_DESTROY_OTHER);
-                                e.setCancelled(true);
-                            }
-                        }
-                    }
-                }
-            }
-        } else if (r instanceof Projectile) {
-            Projectile p = (Projectile) r;
-            if (p.getShooter() instanceof Player) {
-                Player shooter = (Player) p.getShooter();
-                if (PS.get().isPlotWorld(BukkitUtil.getLocation(e.getEntity()).getWorld())) {
-                    PlotPlayer player = BukkitUtil.getPlayer(shooter);
-                    Plot plot = MainUtil.getPlot(BukkitUtil.getLocation(e.getEntity()));
-                    if (plot != null) {
-                        if (!plot.hasOwner()) {
-                            if (!Permissions.hasPermission(player, C.PERMISSION_ADMIN_DESTROY_UNOWNED)) {
-                                MainUtil.sendMessage(player, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_DESTROY_UNOWNED);
-                                e.setCancelled(true);
-                            }
-                        } else if (!plot.isAdded(player.getUUID())) {
-                            if (!FlagManager.isPlotFlagTrue(plot, C.FLAG_HANGING_BREAK.s())){
-                                if (!Permissions.hasPermission(player, C.PERMISSION_ADMIN_DESTROY_OTHER)) {
-                                    if (MainUtil.isPlotArea(BukkitUtil.getLocation(e.getEntity()))) {
-                                        MainUtil.sendMessage(player, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_DESTROY_OTHER);
-                                        e.setCancelled(true);
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        } else {
-            e.setCancelled(true);
-        }
-    }
-
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onPlayerInteractEntity(final PlayerInteractEntityEvent e) {
-        final Location l = BukkitUtil.getLocation(e.getRightClicked().getLocation());
-        if (PS.get().isPlotWorld(l.getWorld())) {
-            final Player p = e.getPlayer();
-            final PlotPlayer pp = BukkitUtil.getPlayer(p);
-            Plot plot = MainUtil.getPlot(l);
-            if (plot == null) {
-                if (!MainUtil.isPlotAreaAbs(l)) {
-                    return;
-                }
-                if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_ROAD)) {
-                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_INTERACT_ROAD);
-                    e.setCancelled(true);
-                }
-            } else {
-                if (!plot.hasOwner()) {
-                    if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_UNOWNED)) {
-                        MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_INTERACT_UNOWNED);
-                        e.setCancelled(true);
-                    }
-                } else if (!plot.isAdded(pp.getUUID())) {
-                    final Entity entity = e.getRightClicked();
-                    if ((entity instanceof Monster) && FlagManager.isPlotFlagTrue(plot, C.FLAG_HOSTILE_INTERACT.s())) {
-                        return;
-                    }
-                    if ((entity instanceof Animals) && FlagManager.isPlotFlagTrue(plot, C.FLAG_ANIMAL_INTERACT.s())) {
-                        return;
-                    }
-                    if ((entity instanceof Tameable) && ((Tameable) entity).isTamed() && FlagManager.isPlotFlagTrue(plot, C.FLAG_TAMED_INTERACT.s())) {
-                        return;
-                    }
-                    if ((entity instanceof Vehicle) && FlagManager.isPlotFlagTrue(plot, C.FLAG_VEHICLE_USE.s())) {
-                        return;
-                    }
-                    if ((entity instanceof Player) && FlagManager.isPlotFlagTrue(plot, C.FLAG_PLAYER_INTERACT.s())) {
-                        return;
-                    }
-                    if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_OTHER)) {
-                        if (MainUtil.isPlotArea(l)) {
-                            MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_INTERACT_OTHER);
-                            e.setCancelled(true);
-                        }
-                    }
-                }
-            }
-        }
-    }
-    
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onVehicleDestroy(final VehicleDestroyEvent e) {
-        final Location l = BukkitUtil.getLocation(e.getVehicle());
-        if (PS.get().isPlotWorld(l.getWorld())) {
-            final Entity d = e.getAttacker();
-            if (d instanceof Player) {
-                final Player p = (Player) d;
-                PS.get().getPlotWorld(l.getWorld());
-                final PlotPlayer pp = BukkitUtil.getPlayer(p);
-                Plot plot = MainUtil.getPlot(l);
-                if (plot == null) {
-                    if (!MainUtil.isPlotAreaAbs(l)) {
-                        return;
-                    }
-                    if (!Permissions.hasPermission(pp, "plots.admin.vehicle.break.road")) {
-                        MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, "plots.admin.vehicle.break.road");
-                        e.setCancelled(true);
-                    }
-                } else {
-                    if (!plot.hasOwner()) {
-                        if (!Permissions.hasPermission(pp, "plots.admin.vehicle.break.unowned")) {
-                            MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, "plots.admin.vehicle.break.unowned");
-                            e.setCancelled(true);
-                            return;
-                        }
-                        return;
-                    }
-                    if (!plot.isAdded(pp.getUUID())) {
-                        if (FlagManager.isPlotFlagTrue(plot, "vehicle-break")) {
-                            return;
-                        }
-                        if (!Permissions.hasPermission(pp, "plots.admin.vehicle.break.other")) {
-                            if (MainUtil.isPlotArea(l)) {
-                                MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, "plots.admin.vehicle.break.other");
-                                e.setCancelled(true);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-    
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onPotionSplash(final PotionSplashEvent event) {
-        ThrownPotion damager = event.getPotion();
-        final Location l = BukkitUtil.getLocation(damager);
-        if (!PS.get().isPlotWorld(l.getWorld())) {
-            return;
-        }
-        for (LivingEntity victim : event.getAffectedEntities()) {
-            if (!entityDamage(l, damager, victim)) {
-                event.setIntensity(victim, 0);
-            }
-        }
-    }
-    
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onEntityDamageByEntityEvent(final EntityDamageByEntityEvent e) {
-        final Entity damager = e.getDamager();
-        final Location l = BukkitUtil.getLocation(damager);
-        if (!PS.get().isPlotWorld(l.getWorld())) {
-            return;
-        }
-        final Entity victim = e.getEntity();
-        if (!entityDamage(l, damager, victim)) {
-            e.setCancelled(true);
-        }
-    }
-    
-    public boolean entityDamage(Location l, Entity damager, Entity victim) {
-        Location dloc = BukkitUtil.getLocation(damager);
-        Location vloc = BukkitUtil.getLocation(victim);
-        
-        Plot dplot = MainUtil.getPlot(dloc);
-        Plot vplot = MainUtil.getPlot(vloc);
-        
-        Plot plot;
-        String stub;
-        if (dplot == null && vplot == null) {
-            if (!MainUtil.isPlotAreaAbs(dloc)) {
-                return true;
-            }
-            plot = null;
-            stub = "road";
-        }
-        else {
-            // Priorize plots for close to seamless pvp zones
-            plot = vplot == null ? dplot : ((dplot == null || !(victim instanceof Player)) ? vplot : (victim.getTicksLived() > damager.getTicksLived() ? dplot : vplot));
-            stub = plot.hasOwner() ? "other" : "unowned";
-        }
-        
-        Player player;
-        if (damager instanceof Player) { // attacker is player
-            player = (Player) damager;
-        }
-        else if (damager instanceof Projectile) {
-            Projectile projectile = (Projectile) damager;
-            ProjectileSource shooter = projectile.getShooter();
-            if (shooter instanceof Player) { // shooter is player
-                player = (Player) shooter;
-            }
-            else { // shooter is not player
-                player = null;
-            }
-        }
-        else { // Attacker is not player
-            player = null;
-        }
-        if (player != null) {
-            PlotPlayer pp = BukkitUtil.getPlayer(player);
-            if (victim instanceof Hanging) { // hanging
-                if (plot != null && ((FlagManager.isPlotFlagTrue(plot, "hanging-break") || plot.isAdded(pp.getUUID())))) {
-                    return true;
-                }
-                if (!Permissions.hasPermission(pp, "plots.admin.break." + stub)) {
-                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, "plots.admin.break." + stub);
-                    return false;
-                }
-            }
-            else if (victim.getEntityId() == 30) {
-                if (plot != null && ((FlagManager.isPlotFlagTrue(plot, "misc-break") || plot.isAdded(pp.getUUID())))) {
-                    return true;
-                }
-                if (!Permissions.hasPermission(pp, "plots.admin.break." + stub)) {
-                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, "plots.admin.break." + stub);
-                    return false;
-                }
-            }
-            else if (victim instanceof Monster || victim instanceof EnderDragon) { // victim is monster
-                if (plot != null && ((FlagManager.isPlotFlagTrue(plot, "hostile-attack") || FlagManager.isPlotFlagTrue(plot, "pve") || plot.isAdded(pp.getUUID())))) {
-                    return true;
-                }
-                if (!Permissions.hasPermission(pp, "plots.admin.pve." + stub)) {
-                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, "plots.admin.pve." + stub);
-                    return false;
-                }
-            }
-            else if (victim instanceof Tameable) { // victim is tameable
-                if (plot != null && ((FlagManager.isPlotFlagTrue(plot, "tamed-attack") || FlagManager.isPlotFlagTrue(plot, "pve") || plot.isAdded(pp.getUUID())))) {
-                    return true;
-                }
-                if (!Permissions.hasPermission(pp, "plots.admin.pve." + stub)) {
-                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, "plots.admin.pve." + stub);
-                    return false;
-                }
-            }
-            else if (victim instanceof Player) {
-                if (plot != null) {
-                    Flag pvp = FlagManager.getPlotFlag(plot, C.FLAG_PVP.s());
-                    if (pvp == null) {
-                        return true;
-                    } else {
-                        if ((Boolean) pvp.getValue()) {
-                            return true;
-                        }
-                        else if (!Permissions.hasPermission(pp, "plots.admin.pve." + stub)) {
-                            MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, "plots.admin.pve." + stub);
-                            return false;
-                        }
-                    }
-                }
-                if (!Permissions.hasPermission(pp, "plots.admin.pvp." + stub)) {
-                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, "plots.admin.pvp." + stub);
-                    return false;
-                }
-            }
-            else if (victim instanceof Creature) { // victim is animal
-                if (plot != null && ((FlagManager.isPlotFlagTrue(plot, "animal-attack") || FlagManager.isPlotFlagTrue(plot, "pve") || plot.isAdded(pp.getUUID())))) {
-                    return true;
-                }
-                if (!Permissions.hasPermission(pp, "plots.admin.pve." + stub)) {
-                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, "plots.admin.pve." + stub);
-                    return false;
-                }
-            }
-            else if (victim instanceof Vehicle) { // Vehicles are managed in vehicle destroy event
-                return true;
-            }
-            else { // victim is something else
-                if (plot != null && ((FlagManager.isPlotFlagTrue(plot, "pve") || plot.isAdded(pp.getUUID())))) {
-                    return true;
-                }
-                if (!Permissions.hasPermission(pp, "plots.admin.pve." + stub)) {
-                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, "plots.admin.pve." + stub);
-                    return false;
-                }
-            }
-            return true;
-        }
-        // player is null
-        if ((damager instanceof Arrow) && (!(victim instanceof Creature))) {
-            return false;
-        }
-        return true;
-    }
-
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onPlayerEggThrow(final PlayerEggThrowEvent e) {
-        final Location l = BukkitUtil.getLocation(e.getEgg().getLocation());
-        if (PS.get().isPlotWorld(l.getWorld())) {
-            final Player p = e.getPlayer();
-            final PlotPlayer pp = BukkitUtil.getPlayer(p);
-            Plot plot = MainUtil.getPlot(l);
-            if (plot == null) {
-                if (!MainUtil.isPlotAreaAbs(l)) {
-                    return;
-                }
-                if (!Permissions.hasPermission(pp, "plots.admin.projectile.road")) {
-                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, "plots.admin.projectile.road");
-                    e.setHatching(false);
-                }
-            } else {
-                if (!plot.hasOwner()) {
-                    if (!Permissions.hasPermission(pp, "plots.admin.projectile.unowned")) {
-                        MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, "plots.admin.projectile.unowned");
-                        e.setHatching(false);
-                    }
-                } else if (!plot.isAdded(pp.getUUID())) {
-                    if (!Permissions.hasPermission(pp, "plots.admin.projectile.other")) {
-                        if (MainUtil.isPlotArea(l)) {
-                            MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, "plots.admin.projectile.other");
-                            e.setHatching(false);
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled=true)
-    public void BlockCreate(final BlockPlaceEvent event) {
-        final Player player = event.getPlayer();
-        final String world = player.getWorld().getName();
-        if (!PS.get().isPlotWorld(world)) {
-            return;
-        }
-        final PlotPlayer pp = BukkitUtil.getPlayer(player);
-        final Location loc = BukkitUtil.getLocation(event.getBlock().getLocation());
-        final Plot plot = MainUtil.getPlot(loc); 
-        if (plot != null) {
-            if (!plot.hasOwner()) {
-                if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_UNOWNED)) {
-                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_UNOWNED);
-                    event.setCancelled(true);
-                    return;
-                }
-            }
-            else if (!plot.isAdded(pp.getUUID())) {
-                final Flag place = FlagManager.getPlotFlag(plot, C.FLAG_PLACE.s());
-                final Block block = event.getBlock();
-                if (((place == null) || !((HashSet<PlotBlock>) place.getValue()).contains(new PlotBlock((short) block.getTypeId(), block.getData()))) && !Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_OTHER)) {
-                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_OTHER);
-                    event.setCancelled(true);
-                    return;
-                }
-            }
-            else if (Settings.DONE_RESTRICTS_BUILDING && plot.getSettings().flags.containsKey("done")) {
-                if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_OTHER)) {
-                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_OTHER);
-                    event.setCancelled(true);
-                    return;
-                }
-            }
-            if (FlagManager.isPlotFlagTrue(plot, C.FLAG_DISABLE_PHYSICS.s())) {
-                Block block = event.getBlockPlaced();
-                if (block.getType().hasGravity()) {
-                    sendBlockChange(block.getLocation(), block.getType(), block.getData());
-                }
-            }
-            PlotWorld pw = PS.get().getPlotWorld(loc.getWorld());
-            if ((loc.getY() > pw.MAX_BUILD_HEIGHT && loc.getY() < pw.MIN_BUILD_HEIGHT) && !Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_HEIGHTLIMIT)) {
-                event.setCancelled(true);
-                MainUtil.sendMessage(pp, C.HEIGHT_LIMIT.s().replace("{limit}", "" + pw.MAX_BUILD_HEIGHT));
-            }
-        }
-        else if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_OTHER)) {
-            if (MainUtil.isPlotAreaAbs(loc)) {
-                MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_ROAD);
-                event.setCancelled(true);
-            }
-        }
-    }
-}
+package com.plotsquared.bukkit.listeners;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+import java.util.UUID;
+import java.util.regex.Pattern;
+
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.Chunk;
+import org.bukkit.Material;
+import org.bukkit.World;
+import org.bukkit.block.Block;
+import org.bukkit.block.BlockFace;
+import org.bukkit.block.BlockState;
+import org.bukkit.command.PluginCommand;
+import org.bukkit.entity.Animals;
+import org.bukkit.entity.Arrow;
+import org.bukkit.entity.Creature;
+import org.bukkit.entity.EnderDragon;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.FallingBlock;
+import org.bukkit.entity.Hanging;
+import org.bukkit.entity.HumanEntity;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Monster;
+import org.bukkit.entity.Player;
+import org.bukkit.entity.Projectile;
+import org.bukkit.entity.Tameable;
+import org.bukkit.entity.ThrownPotion;
+import org.bukkit.entity.Vehicle;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.block.Action;
+import org.bukkit.event.block.BlockBreakEvent;
+import org.bukkit.event.block.BlockDamageEvent;
+import org.bukkit.event.block.BlockFadeEvent;
+import org.bukkit.event.block.BlockFormEvent;
+import org.bukkit.event.block.BlockFromToEvent;
+import org.bukkit.event.block.BlockGrowEvent;
+import org.bukkit.event.block.BlockIgniteEvent;
+import org.bukkit.event.block.BlockPhysicsEvent;
+import org.bukkit.event.block.BlockPistonExtendEvent;
+import org.bukkit.event.block.BlockPistonRetractEvent;
+import org.bukkit.event.block.BlockPlaceEvent;
+import org.bukkit.event.block.BlockRedstoneEvent;
+import org.bukkit.event.block.BlockSpreadEvent;
+import org.bukkit.event.block.EntityBlockFormEvent;
+import org.bukkit.event.entity.CreatureSpawnEvent;
+import org.bukkit.event.entity.EntityChangeBlockEvent;
+import org.bukkit.event.entity.EntityDamageByEntityEvent;
+import org.bukkit.event.entity.EntityExplodeEvent;
+import org.bukkit.event.entity.PotionSplashEvent;
+import org.bukkit.event.entity.ProjectileHitEvent;
+import org.bukkit.event.hanging.HangingBreakByEntityEvent;
+import org.bukkit.event.hanging.HangingPlaceEvent;
+import org.bukkit.event.inventory.InventoryClickEvent;
+import org.bukkit.event.inventory.InventoryCloseEvent;
+import org.bukkit.event.player.AsyncPlayerChatEvent;
+import org.bukkit.event.player.PlayerBucketEmptyEvent;
+import org.bukkit.event.player.PlayerBucketFillEvent;
+import org.bukkit.event.player.PlayerChangedWorldEvent;
+import org.bukkit.event.player.PlayerCommandPreprocessEvent;
+import org.bukkit.event.player.PlayerEggThrowEvent;
+import org.bukkit.event.player.PlayerInteractEntityEvent;
+import org.bukkit.event.player.PlayerInteractEvent;
+import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.event.player.PlayerLoginEvent;
+import org.bukkit.event.player.PlayerLoginEvent.Result;
+import org.bukkit.event.player.PlayerMoveEvent;
+import org.bukkit.event.player.PlayerQuitEvent;
+import org.bukkit.event.player.PlayerTeleportEvent;
+import org.bukkit.event.vehicle.VehicleCreateEvent;
+import org.bukkit.event.vehicle.VehicleDestroyEvent;
+import org.bukkit.event.world.ChunkLoadEvent;
+import org.bukkit.event.world.StructureGrowEvent;
+import org.bukkit.help.HelpTopic;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.projectiles.BlockProjectileSource;
+import org.bukkit.projectiles.ProjectileSource;
+import org.bukkit.util.Vector;
+
+import com.intellectualcrafters.plot.PS;
+import com.intellectualcrafters.plot.config.C;
+import com.intellectualcrafters.plot.config.Settings;
+import com.intellectualcrafters.plot.database.DBFunc;
+import com.intellectualcrafters.plot.flag.Flag;
+import com.intellectualcrafters.plot.flag.FlagManager;
+import com.intellectualcrafters.plot.object.Location;
+import com.intellectualcrafters.plot.object.Plot;
+import com.intellectualcrafters.plot.object.PlotBlock;
+import com.intellectualcrafters.plot.object.PlotHandler;
+import com.intellectualcrafters.plot.object.PlotId;
+import com.intellectualcrafters.plot.object.PlotInventory;
+import com.intellectualcrafters.plot.object.PlotManager;
+import com.intellectualcrafters.plot.object.PlotPlayer;
+import com.intellectualcrafters.plot.object.PlotWorld;
+import com.intellectualcrafters.plot.object.StringWrapper;
+import com.intellectualcrafters.plot.util.ChunkManager;
+import com.intellectualcrafters.plot.util.ClusterManager;
+import com.intellectualcrafters.plot.util.EventUtil;
+import com.intellectualcrafters.plot.util.ExpireManager;
+import com.intellectualcrafters.plot.util.MainUtil;
+import com.intellectualcrafters.plot.util.MathMan;
+import com.intellectualcrafters.plot.util.Permissions;
+import com.intellectualcrafters.plot.util.RegExUtil;
+import com.intellectualcrafters.plot.util.StringMan;
+import com.intellectualcrafters.plot.util.TaskManager;
+import com.intellectualcrafters.plot.util.UUIDHandler;
+import com.plotsquared.bukkit.BukkitMain;
+import com.plotsquared.bukkit.object.BukkitLazyBlock;
+import com.plotsquared.bukkit.object.BukkitPlayer;
+import com.plotsquared.bukkit.util.BukkitUtil;
+
+/**
+ * Player Events involving plots
+ *


+ */
+@SuppressWarnings({ "unused", "deprecation", "unchecked" })
+public class PlayerEvents extends com.plotsquared.listener.PlotListener implements Listener
+{
+
+    private boolean pistonBlocks = true;
+
+    public static void sendBlockChange(final org.bukkit.Location bloc, final Material type, final byte data)
+    {
+        TaskManager.runTaskLater(new Runnable()
+        {
+            @Override
+            public void run()
+            {
+                final String world = bloc.getWorld().getName();
+                final int x = bloc.getBlockX();
+                final int z = bloc.getBlockZ();
+                final int distance = Bukkit.getViewDistance() * 16;
+                for (final PlotPlayer player : UUIDHandler.getPlayers().values())
+                {
+                    final Location loc = player.getLocation();
+                    if (loc.getWorld().equals(world))
+                    {
+                        if ((16 * (Math.abs(loc.getX() - x) / 16)) > distance)
+                        {
+                            continue;
+                        }
+                        if ((16 * (Math.abs(loc.getZ() - z) / 16)) > distance)
+                        {
+                            continue;
+                        }
+                        ((BukkitPlayer) player).player.sendBlockChange(bloc, type, data);
+                    }
+                }
+            }
+        }, 3);
+    }
+
+    @EventHandler
+    public void onRedstoneEvent(final BlockRedstoneEvent event)
+    {
+        final Block block = event.getBlock();
+        switch (block.getType())
+        {
+            case REDSTONE_LAMP_OFF:
+            case REDSTONE_WIRE:
+            case REDSTONE_LAMP_ON:
+            case PISTON_BASE:
+            case PISTON_STICKY_BASE:
+            case IRON_DOOR_BLOCK:
+            case LEVER:
+            case WOODEN_DOOR:
+            case FENCE_GATE:
+            case WOOD_BUTTON:
+            case STONE_BUTTON:
+            case IRON_PLATE:
+            case WOOD_PLATE:
+            case STONE_PLATE:
+            case GOLD_PLATE:
+            case SPRUCE_DOOR:
+            case BIRCH_DOOR:
+            case JUNGLE_DOOR:
+            case ACACIA_DOOR:
+            case DARK_OAK_DOOR:
+            case IRON_TRAPDOOR:
+            case SPRUCE_FENCE_GATE:
+            case BIRCH_FENCE_GATE:
+            case JUNGLE_FENCE_GATE:
+            case ACACIA_FENCE_GATE:
+            case DARK_OAK_FENCE_GATE:
+            case POWERED_RAIL:
+            {
+                return;
+            }
+            default:
+            {
+                final Location loc = BukkitUtil.getLocation(block.getLocation());
+                if (!PS.get().isPlotWorld(loc.getWorld())) { return; }
+                final Plot plot = MainUtil.getPlot(loc);
+                if ((plot == null) || !plot.hasOwner()) { return; }
+                final Flag redstone = FlagManager.getPlotFlag(plot, "redstone");
+                if (redstone != null)
+                {
+                    if ((Boolean) redstone.getValue())
+                    {
+                        return;
+                    }
+                    else
+                    {
+                        event.setNewCurrent(0);
+                        return;
+                    }
+                }
+                if (Settings.REDSTONE_DISABLER)
+                {
+                    if (UUIDHandler.getPlayer(plot.owner) == null)
+                    {
+                        boolean disable = true;
+                        for (final UUID trusted : plot.getTrusted())
+                        {
+                            if (UUIDHandler.getPlayer(trusted) != null)
+                            {
+                                disable = false;
+                                break;
+                            }
+                        }
+                        if (disable)
+                        {
+                            event.setNewCurrent(0);
+                            return;
+                        }
+                    }
+                }
+                if (Settings.REDSTONE_DISABLER_UNOCCUPIED)
+                {
+                    for (final PlotPlayer pp : UUIDHandler.getPlayers().values())
+                    {
+                        if (plot.equals(pp.getCurrentPlot())) { return; }
+                    }
+                    event.setNewCurrent(0);
+                    return;
+                }
+            }
+        }
+    }
+
+    @EventHandler(ignoreCancelled = true, priority = EventPriority.HIGHEST)
+    public void onPhysicsEvent(final BlockPhysicsEvent event)
+    {
+        switch (event.getChangedTypeId())
+        {
+            case 149:
+            case 150:
+            {
+                final Block block = event.getBlock();
+                final Location loc = BukkitUtil.getLocation(block.getLocation());
+                final Plot plot = MainUtil.getPlot(loc);
+                if (plot == null) { return; }
+                if (FlagManager.isPlotFlagFalse(plot, "redstone"))
+                {
+                    event.setCancelled(true);
+                }
+                return;
+            }
+            case 122:
+            case 145:
+            case 12:
+            case 13:
+            {
+                final Block block = event.getBlock();
+                final Location loc = BukkitUtil.getLocation(block.getLocation());
+                final Plot plot = MainUtil.getPlot(loc);
+                if ((plot != null) && FlagManager.isPlotFlagTrue(plot, "disable-physics"))
+                {
+                    event.setCancelled(true);
+                    return;
+                }
+                return;
+            }
+            default:
+            {
+                break;
+            }
+        }
+    }
+
+    @EventHandler
+    public void onProjectileHit(final ProjectileHitEvent event)
+    {
+        final Projectile entity = event.getEntity();
+        final Location loc = BukkitUtil.getLocation(entity);
+        if (!PS.get().isPlotWorld(loc.getWorld())) { return; }
+        final Plot plot = MainUtil.getPlot(loc);
+        if (!MainUtil.isPlotArea(loc)) { return; }
+        final ProjectileSource shooter = entity.getShooter();
+        if (shooter instanceof BlockProjectileSource)
+        {
+            if (plot == null)
+            {
+                entity.remove();
+                return;
+            }
+            final Location sLoc = BukkitUtil.getLocation(((BlockProjectileSource) shooter).getBlock().getLocation());
+            final Plot sPlot = MainUtil.getPlot(sLoc);
+            if ((sPlot == null) || !PlotHandler.sameOwners(plot, sPlot))
+            {
+                entity.remove();
+            }
+        }
+        else if ((shooter instanceof Player))
+        {
+            final PlotPlayer pp = BukkitUtil.getPlayer((Player) shooter);
+            if (plot == null)
+            {
+                if (!Permissions.hasPermission(pp, C.PERMISSION_PROJECTILE_UNOWNED))
+                {
+                    entity.remove();
+                }
+                return;
+            }
+            if (plot.isAdded(pp.getUUID())) { return; }
+            if (Permissions.hasPermission(pp, C.PERMISSION_PROJECTILE_OTHER)) { return; }
+            entity.remove();
+        }
+    }
+
+    @EventHandler
+    public void PlayerCommand(final PlayerCommandPreprocessEvent event)
+    {
+        final String message = event.getMessage().toLowerCase().replaceAll("/", "").trim();
+        if (message.length() == 0) { return; }
+        final String[] split = message.split(" ");
+        final PluginCommand cmd = Bukkit.getServer().getPluginCommand(split[0]);
+        if (cmd == null)
+        {
+            if (split[0].equals("plotme") || split[0].equals("ap"))
+            {
+                final Player player = event.getPlayer();
+                if (Settings.USE_PLOTME_ALIAS)
+                {
+                    player.performCommand("plots " + StringMan.join(Arrays.copyOfRange(split, 1, split.length), " "));
+                }
+                else
+                {
+                    MainUtil.sendMessage(BukkitUtil.getPlayer(player), C.NOT_USING_PLOTME);
+                }
+                event.setCancelled(true);
+            }
+        }
+
+        final Player player = event.getPlayer();
+        final PlotPlayer pp = BukkitUtil.getPlayer(player);
+        pp.getLocation();
+        if (!PS.get().isPlotWorld(BukkitUtil.getWorld(player))) { return; }
+
+        final Plot plot = MainUtil.getPlot(BukkitUtil.getLocation(player));
+        if (plot == null) { return; }
+
+        Flag flag;
+        if (((flag = FlagManager.getPlotFlag(plot, "blocked-cmds")) != null) && !Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_BLOCKED_CMDS))
+        {
+            final List<String> v = (List<String>) flag.getValue();
+
+            String msg = event.getMessage().toLowerCase().replaceFirst("/", "");
+
+            final String[] parts = msg.split(" ");
+            String c = parts[0];
+            if (parts[0].contains(":"))
+            {
+                c = parts[0].split(":")[1];
+                msg = msg.replace(parts[0].split(":")[0] + ":", "");
+            }
+
+            final String l = c;
+
+            final List<String> aliases = new ArrayList<>();
+
+            for (final HelpTopic cmdLabel : Bukkit.getServer().getHelpMap().getHelpTopics())
+            {
+                if (c.equals(cmdLabel.getName()))
+                {
+                    break;
+                }
+                PluginCommand p;
+                final String label = cmdLabel.getName().replaceFirst("/", "");
+                if (aliases.contains(label))
+                {
+                    continue;
+                }
+                if ((p = Bukkit.getPluginCommand(label)) != null)
+                {
+                    for (String a : p.getAliases())
+                    {
+                        if (aliases.contains(a))
+                        {
+                            continue;
+                        }
+                        aliases.add(a);
+                        a = a.replaceFirst("/", "");
+                        if (!a.equals(label) && a.equals(c))
+                        {
+                            c = label;
+                            break;
+                        }
+                    }
+                }
+            }
+
+            if (!l.equals(c))
+            {
+                msg = msg.replace(l, c);
+            }
+
+            for (final String s : v)
+            {
+                Pattern pattern;
+                if (!RegExUtil.compiledPatterns.containsKey(s))
+                {
+                    RegExUtil.compiledPatterns.put(s, ((pattern = Pattern.compile(s))));
+                }
+                else
+                {
+                    pattern = RegExUtil.compiledPatterns.get(s);
+                }
+                if (pattern.matcher(msg).matches())
+                {
+                    MainUtil.sendMessage(pp, C.COMMAND_BLOCKED);
+                    event.setCancelled(true);
+                    return;
+                }
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onChunkLoad(final ChunkLoadEvent event)
+    {
+        final String worldname = event.getWorld().getName();
+        final Chunk chunk = event.getChunk();
+        if (MainUtil.worldBorder.containsKey(worldname))
+        {
+            final int border = MainUtil.getBorder(worldname);
+            final int x = Math.abs(chunk.getX() << 4);
+            final int z = Math.abs(chunk.getZ() << 4);
+            if ((x > border) || (z > border))
+            {
+                chunk.unload(false, true);
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onConnect(final PlayerLoginEvent event)
+    {
+        final Player player = event.getPlayer();
+        final String name = player.getName();
+        final PlotPlayer pp = BukkitUtil.getPlayer(player);
+        if (name.equals("PlotSquared") || pp.getUUID().equals(DBFunc.everyone))
+        {
+            event.disallow(Result.KICK_WHITELIST, "This account is reserved");
+            BukkitUtil.removePlayer(pp.getName());
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onJoin(final PlayerJoinEvent event)
+    {
+        final Player player = event.getPlayer();
+        BukkitUtil.removePlayer(player.getName());
+        if (!player.hasPlayedBefore())
+        {
+            player.saveData();
+        }
+        final PlotPlayer pp = BukkitUtil.getPlayer(player);
+
+        // Set last location
+        pp.setMeta("location", BukkitUtil.getLocation(player.getLocation()));
+
+        final String username = pp.getName();
+        final StringWrapper name = new StringWrapper(username);
+        final UUID uuid = pp.getUUID();
+        UUIDHandler.add(name, uuid);
+        ExpireManager.dates.put(uuid, System.currentTimeMillis());
+        if (BukkitMain.worldEdit != null)
+        {
+            if (pp.getAttribute("worldedit"))
+            {
+                MainUtil.sendMessage(pp, C.WORLDEDIT_BYPASSED);
+            }
+        }
+        if ((PS.get().update != null) && Permissions.hasPermission(pp, C.PERMISSION_ADMIN))
+        {
+            TaskManager.runTaskLater(new Runnable()
+            {
+                @Override
+                public void run()
+                {
+                    MainUtil.sendMessage(pp, "&6An update for PlotSquared is available: &7/plot update");
+                }
+            }, 20);
+        }
+        final Location loc = BukkitUtil.getLocation(player.getLocation());
+        final Plot plot = MainUtil.getPlot(loc);
+        if (plot == null) { return; }
+        if (Settings.TELEPORT_ON_LOGIN)
+        {
+            MainUtil.teleportPlayer(pp, pp.getLocation(), plot);
+            MainUtil.sendMessage(pp, C.TELEPORTED_TO_ROAD);
+        }
+        plotEntry(pp, plot);
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void PlayerMove(final PlayerMoveEvent event)
+    {
+        final org.bukkit.Location from = event.getFrom();
+        final org.bukkit.Location to = event.getTo();
+        int x2;
+        if (MathMan.roundInt(from.getX()) != (x2 = MathMan.roundInt(to.getX())))
+        {
+            final Player player = event.getPlayer();
+            final PlotPlayer pp = BukkitUtil.getPlayer(player);
+
+            // Set last location
+            pp.setMeta("location", BukkitUtil.getLocation(to));
+
+            final String worldname = to.getWorld().getName();
+            final PlotWorld plotworld = PS.get().getPlotWorld(worldname);
+            if (plotworld == null) { return; }
+            final PlotManager plotManager = PS.get().getPlotManager(worldname);
+            final PlotId id = plotManager.getPlotId(plotworld, x2, 0, MathMan.roundInt(to.getZ()));
+            final Plot lastPlot = (Plot) pp.getMeta("lastplot");
+            if (id == null)
+            {
+                if ((lastPlot != null) && !plotExit(pp, lastPlot))
+                {
+                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_EXIT_DENIED);
+                    if (lastPlot.equals(MainUtil.getPlot(BukkitUtil.getLocation(from))))
+                    {
+                        player.teleport(from);
+                    }
+                    else
+                    {
+                        player.teleport(player.getWorld().getSpawnLocation());
+                    }
+                    event.setCancelled(true);
+                    return;
+                }
+            }
+            else if ((lastPlot != null) && id.equals(lastPlot.id))
+            {
+                return;
+            }
+            else
+            {
+                final Plot plot = MainUtil.getPlot(worldname, id);
+                if (!plotEntry(pp, plot))
+                {
+                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_ENTRY_DENIED);
+                    if (!plot.equals(MainUtil.getPlot(BukkitUtil.getLocation(from))))
+                    {
+                        player.teleport(from);
+                    }
+                    else
+                    {
+                        player.teleport(player.getWorld().getSpawnLocation());
+                    }
+                    event.setCancelled(true);
+                    return;
+                }
+            }
+            final Integer border = MainUtil.worldBorder.get(worldname);
+            if (border != null)
+            {
+                if (x2 > border)
+                {
+                    to.setX(border - 4);
+                    player.teleport(event.getTo());
+                    MainUtil.sendMessage(pp, C.BORDER);
+                    return;
+                }
+                else if (x2 < -border)
+                {
+                    to.setX(-border + 4);
+                    player.teleport(event.getTo());
+                    MainUtil.sendMessage(pp, C.BORDER);
+                    return;
+                }
+            }
+            return;
+        }
+        int z2;
+        if (MathMan.roundInt(from.getZ()) != (z2 = MathMan.roundInt(to.getZ())))
+        {
+            final Player player = event.getPlayer();
+            final PlotPlayer pp = BukkitUtil.getPlayer(player);
+
+            // Set last location
+            pp.setMeta("location", BukkitUtil.getLocation(to));
+
+            final String worldname = to.getWorld().getName();
+            final PlotWorld plotworld = PS.get().getPlotWorld(worldname);
+            if (plotworld == null) { return; }
+            final PlotManager plotManager = PS.get().getPlotManager(worldname);
+            final PlotId id = plotManager.getPlotId(plotworld, x2, 0, z2);
+            final Plot lastPlot = (Plot) pp.getMeta("lastplot");
+            if (id == null)
+            {
+                if ((lastPlot != null) && !plotExit(pp, lastPlot))
+                {
+                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_EXIT_DENIED);
+                    if (lastPlot.equals(MainUtil.getPlot(BukkitUtil.getLocation(from))))
+                    {
+                        player.teleport(from);
+                    }
+                    else
+                    {
+                        player.teleport(player.getWorld().getSpawnLocation());
+                    }
+                    event.setCancelled(true);
+                    return;
+                }
+            }
+            else if ((lastPlot != null) && id.equals(lastPlot.id))
+            {
+                return;
+            }
+            else
+            {
+                final Plot plot = MainUtil.getPlot(worldname, id);
+                if (!plotEntry(pp, plot))
+                {
+                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_ENTRY_DENIED);
+                    if (!plot.equals(MainUtil.getPlot(BukkitUtil.getLocation(from))))
+                    {
+                        player.teleport(from);
+                    }
+                    else
+                    {
+                        player.teleport(player.getWorld().getSpawnLocation());
+                    }
+                    event.setCancelled(true);
+                    return;
+                }
+            }
+            final Integer border = MainUtil.worldBorder.get(worldname);
+            if (border != null)
+            {
+                if (z2 > border)
+                {
+                    to.setZ(border - 4);
+                    player.teleport(event.getTo());
+                    MainUtil.sendMessage(pp, C.BORDER);
+                }
+                else if (z2 < -border)
+                {
+                    to.setZ(-border + 4);
+                    player.teleport(event.getTo());
+                    MainUtil.sendMessage(pp, C.BORDER);
+                }
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onChat(final AsyncPlayerChatEvent event)
+    {
+        final Player player = event.getPlayer();
+        final String world = player.getWorld().getName();
+        final PlotWorld plotworld = PS.get().getPlotWorld(world);
+        if (plotworld == null) { return; }
+        final PlotPlayer plr = BukkitUtil.getPlayer(player);
+        if (!plotworld.PLOT_CHAT && !plr.getAttribute("chat")) { return; }
+        final Location loc = BukkitUtil.getLocation(player);
+        final Plot plot = MainUtil.getPlot(loc);
+        if (plot == null) { return; }
+        final String message = event.getMessage();
+        String format = C.PLOT_CHAT_FORMAT.s();
+        final String sender = event.getPlayer().getDisplayName();
+        final PlotId id = plot.id;
+        final Set<Player> recipients = event.getRecipients();
+        recipients.clear();
+        for (final Player p : Bukkit.getOnlinePlayers())
+        {
+            final PlotPlayer pp = BukkitUtil.getPlayer(p);
+            if (pp.getAttribute("chatspy"))
+            {
+                String spy = event.getFormat();
+                spy = String.format(spy, sender, message);
+                pp.sendMessage(spy);
+            }
+            else if (plot.equals(pp.getCurrentPlot()))
+            {
+                recipients.add(p);
+            }
+        }
+        format = format.replaceAll("%plot_id%", id.x + ";" + id.y).replaceAll("%sender%", "%s").replaceAll("%msg%", "%s");
+        format = ChatColor.translateAlternateColorCodes('&', format);
+        event.setFormat(format);
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST)
+    public void BlockDestroy(final BlockBreakEvent event)
+    {
+        final Player player = event.getPlayer();
+        final String world = player.getWorld().getName();
+        if (!PS.get().isPlotWorld(world)) { return; }
+        final Location loc = BukkitUtil.getLocation(event.getBlock().getLocation());
+        final Plot plot = MainUtil.getPlot(loc);
+        if (plot != null)
+        {
+            if (event.getBlock().getY() == 0)
+            {
+                event.setCancelled(true);
+                return;
+            }
+            final PlotPlayer pp = BukkitUtil.getPlayer(player);
+            if (!plot.hasOwner())
+            {
+                if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_DESTROY_UNOWNED)) { return; }
+                MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_DESTROY_UNOWNED);
+                event.setCancelled(true);
+                return;
+            }
+            else if (!plot.isAdded(pp.getUUID()))
+            {
+                final Flag destroy = FlagManager.getPlotFlag(plot, "break");
+                final Block block = event.getBlock();
+                if ((destroy != null) && ((HashSet<PlotBlock>) destroy.getValue()).contains(new PlotBlock((short) block.getTypeId(), block.getData()))) { return; }
+                if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_DESTROY_OTHER)) { return; }
+                MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_DESTROY_OTHER);
+                event.setCancelled(true);
+            }
+            else if (Settings.DONE_RESTRICTS_BUILDING && plot.getSettings().flags.containsKey("done"))
+            {
+                if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_OTHER))
+                {
+                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_OTHER);
+                    event.setCancelled(true);
+                    return;
+                }
+            }
+            return;
+        }
+        final PlotPlayer pp = BukkitUtil.getPlayer(player);
+        if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_DESTROY_ROAD)) { return; }
+        if (MainUtil.isPlotAreaAbs(loc))
+        {
+            MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_DESTROY_ROAD);
+            event.setCancelled(true);
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onBigBoom(final EntityExplodeEvent event)
+    {
+        final Location loc = BukkitUtil.getLocation(event.getLocation());
+        final String world = loc.getWorld();
+        if (!PS.get().isPlotWorld(world)) { return; }
+        final Plot plot = MainUtil.getPlot(loc);
+        if ((plot != null) && plot.hasOwner())
+        {
+            if (FlagManager.isPlotFlagTrue(plot, "explosion"))
+            {
+                final Iterator<Block> iter = event.blockList().iterator();
+                while (iter.hasNext())
+                {
+                    final Block b = iter.next();
+                    if (!plot.equals(MainUtil.getPlot(BukkitUtil.getLocation(b.getLocation()))))
+                    {
+                        iter.remove();
+                    }
+                }
+                return;
+            }
+        }
+        if (MainUtil.isPlotArea(loc))
+        {
+            event.setCancelled(true);
+        }
+        else
+        {
+            final Iterator<Block> iter = event.blockList().iterator();
+            while (iter.hasNext())
+            {
+                iter.next();
+                if (MainUtil.isPlotArea(loc))
+                {
+                    iter.remove();
+                }
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onWorldChanged(final PlayerChangedWorldEvent event)
+    {
+        final Player player = event.getPlayer();
+        final PlotPlayer pp = BukkitUtil.getPlayer(player);
+
+        // Delete last location
+        BukkitUtil.getPlayer(event.getPlayer()).deleteMeta("location");
+        BukkitUtil.getPlayer(event.getPlayer()).deleteMeta("lastplot");
+
+        if (BukkitMain.worldEdit != null)
+        {
+            if (!Permissions.hasPermission(pp, C.PERMISSION_WORLDEDIT_BYPASS))
+            {
+                if (pp.getAttribute("worldedit"))
+                {
+                    pp.removeAttribute("worldedit");
+                }
+            }
+        }
+        if (Settings.PERMISSION_CACHING)
+        {
+            ((BukkitPlayer) pp).hasPerm = new HashSet<>();
+            ((BukkitPlayer) pp).noPerm = new HashSet<>();
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onPeskyMobsChangeTheWorldLikeWTFEvent(final EntityChangeBlockEvent event)
+    {
+        final String world = event.getBlock().getWorld().getName();
+        if (!PS.get().isPlotWorld(world)) { return; }
+        final Entity e = event.getEntity();
+        if (!(e instanceof Player))
+        {
+            if (!(e instanceof org.bukkit.entity.FallingBlock))
+            {
+                event.setCancelled(true);
+            }
+        }
+        else
+        {
+            final Block b = event.getBlock();
+            final Player p = (Player) e;
+            final Location loc = BukkitUtil.getLocation(b.getLocation());
+            final Plot plot = MainUtil.getPlot(loc);
+            if (plot == null)
+            {
+                if (MainUtil.isPlotAreaAbs(loc))
+                {
+                    final PlotPlayer pp = BukkitUtil.getPlayer(p);
+                    if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_ROAD))
+                    {
+                        MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_ROAD);
+                        event.setCancelled(true);
+                    }
+                }
+            }
+            else
+            {
+                if (!plot.hasOwner())
+                {
+                    final PlotPlayer pp = BukkitUtil.getPlayer(p);
+                    if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_UNOWNED))
+                    {
+                        MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_UNOWNED);
+                        event.setCancelled(true);
+                    }
+                }
+                else
+                {
+                    final PlotPlayer pp = BukkitUtil.getPlayer(p);
+                    if (!plot.isAdded(pp.getUUID()))
+                    {
+                        if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_OTHER))
+                        {
+                            if (MainUtil.isPlotArea(loc))
+                            {
+                                MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_OTHER);
+                                event.setCancelled(true);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onEntityBlockForm(final EntityBlockFormEvent e)
+    {
+        final String world = e.getBlock().getWorld().getName();
+        if (!PS.get().isPlotWorld(world)) { return; }
+        if ((!(e.getEntity() instanceof Player)))
+        {
+            if (MainUtil.isPlotArea(BukkitUtil.getLocation(e.getBlock().getLocation())))
+            {
+                e.setCancelled(true);
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onBS(final BlockSpreadEvent e)
+    {
+        final Block b = e.getBlock();
+        final Location loc = BukkitUtil.getLocation(b.getLocation());
+        if (PS.get().isPlotWorld(loc.getWorld()))
+        {
+            if (MainUtil.isPlotRoad(loc))
+            {
+                e.setCancelled(true);
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onBF(final BlockFormEvent e)
+    {
+        final Block b = e.getBlock();
+        final Location loc = BukkitUtil.getLocation(b.getLocation());
+        if (PS.get().isPlotWorld(loc.getWorld()))
+        {
+            if (MainUtil.isPlotRoad(loc))
+            {
+                e.setCancelled(true);
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onBD(final BlockDamageEvent event)
+    {
+        final Player player = event.getPlayer();
+
+        final String world;
+        if (player == null)
+        {
+            final Location loc = BukkitUtil.getLocation(event.getBlock().getLocation());
+            if (PS.get().isPlotWorld(loc.getWorld()))
+            {
+                if (MainUtil.isPlotRoad(loc))
+                {
+                    event.setCancelled(true);
+                }
+            }
+            world = loc.getWorld();
+        }
+        else
+        {
+            world = player.getWorld().getName();
+        }
+
+        if (!PS.get().isPlotWorld(world)) { return; }
+
+        final Location loc = BukkitUtil.getLocation(event.getBlock().getLocation());
+        final Plot plot = MainUtil.getPlot(loc);
+        if (plot != null)
+        {
+            if (event.getBlock().getY() == 0)
+            {
+                event.setCancelled(true);
+                return;
+            }
+            if (!plot.hasOwner())
+            {
+                final PlotPlayer pp = BukkitUtil.getPlayer(player);
+                if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_DESTROY_UNOWNED)) { return; }
+                MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_DESTROY_UNOWNED);
+                event.setCancelled(true);
+                return;
+            }
+            final PlotPlayer pp = BukkitUtil.getPlayer(player);
+            if (!plot.isAdded(pp.getUUID()))
+            {
+                final Flag destroy = FlagManager.getPlotFlag(plot, "break");
+                final Block block = event.getBlock();
+                if ((destroy != null) && ((HashSet<PlotBlock>) destroy.getValue()).contains(new PlotBlock((short) block.getTypeId(), block.getData()))) { return; }
+                if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_DESTROY_OTHER)) { return; }
+                MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_DESTROY_OTHER);
+                event.setCancelled(true);
+                return;
+            }
+            return;
+        }
+        final PlotPlayer pp = BukkitUtil.getPlayer(player);
+        if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_DESTROY_ROAD)) { return; }
+        if (MainUtil.isPlotArea(loc))
+        {
+            MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_DESTROY_ROAD);
+            event.setCancelled(true);
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onFade(final BlockFadeEvent e)
+    {
+        final Block b = e.getBlock();
+        final String world = b.getWorld().getName();
+        final PlotWorld plotworld = PS.get().getPlotWorld(world);
+        if (plotworld == null) { return; }
+        final PlotManager manager = PS.get().getPlotManager(world);
+        final PlotId id = manager.getPlotId(plotworld, b.getX(), b.getY(), b.getZ());
+        if (id == null)
+        {
+            if (plotworld.TYPE == 2)
+            {
+                if (ClusterManager.getClusterAbs(BukkitUtil.getLocation(b.getLocation())) != null) { return; }
+            }
+            e.setCancelled(true);
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onChange(final BlockFromToEvent e)
+    {
+        final Block b = e.getToBlock();
+        final Location loc = BukkitUtil.getLocation(b.getLocation());
+        if (PS.get().isPlotWorld(loc.getWorld()))
+        {
+            if (MainUtil.isPlotRoad(loc))
+            {
+                e.setCancelled(true);
+            }
+            else
+            {
+                final Plot plot = MainUtil.getPlot(loc);
+                if ((plot != null) && FlagManager.isPlotFlagTrue(plot, "disable-physics"))
+                {
+                    e.setCancelled(true);
+                }
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onGrow(final BlockGrowEvent e)
+    {
+        final Block b = e.getBlock();
+        final Location loc = BukkitUtil.getLocation(b.getLocation());
+        if (PS.get().isPlotWorld(loc.getWorld()))
+        {
+            if (MainUtil.isPlotRoad(loc))
+            {
+                e.setCancelled(true);
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onBlockPistonExtend(final BlockPistonExtendEvent event)
+    {
+        final Block block = event.getBlock();
+        final Location loc = BukkitUtil.getLocation(block.getLocation());
+        final String world = loc.getWorld();
+        if (!PS.get().isPlotWorld(world)) { return; }
+        final Plot plot = MainUtil.getPlot(loc);
+        final BlockFace face = event.getDirection();
+        final Vector relative = new Vector(face.getModX(), face.getModY(), face.getModZ());
+        final List<Block> blocks = event.getBlocks();
+        for (final Block b : blocks)
+        {
+            final Location bloc = BukkitUtil.getLocation(b.getLocation().add(relative));
+            final Plot newPlot = MainUtil.getPlot(bloc);
+            if (!MainUtil.equals(plot, newPlot))
+            {
+                event.setCancelled(true);
+                return;
+            }
+        }
+        if (!Settings.PISTON_FALLING_BLOCK_CHECK) { return; }
+        org.bukkit.Location lastLoc;
+        if (blocks.size() > 0)
+        {
+            lastLoc = blocks.get(blocks.size() - 1).getLocation().add(relative);
+        }
+        else
+        {
+            lastLoc = event.getBlock().getLocation().add(relative);
+        }
+        final Entity[] ents = lastLoc.getChunk().getEntities();
+        for (final Entity entity : ents)
+        {
+            if (entity instanceof FallingBlock)
+            {
+                final org.bukkit.Location eloc = entity.getLocation();
+                if (eloc.distanceSquared(lastLoc) < 2)
+                {
+                    event.setCancelled(true);
+                    return;
+                }
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onBlockPistonRetract(final BlockPistonRetractEvent event)
+    {
+        final Block block = event.getBlock();
+        final Location loc = BukkitUtil.getLocation(block.getLocation());
+        final String world = loc.getWorld();
+        if (!PS.get().isPlotWorld(world)) { return; }
+        if ((block.getType() != Material.PISTON_STICKY_BASE) && (block.getType() != Material.PISTON_BASE) && (block.getType() != Material.PISTON_MOVING_PIECE)) { return; }
+
+        final Plot plot = MainUtil.getPlot(loc);
+
+        if (pistonBlocks)
+        {
+            try
+            {
+                for (final Block pulled : event.getBlocks())
+                {
+                    final Plot other = MainUtil.getPlot(BukkitUtil.getLocation(pulled.getLocation()));
+                    if (!MainUtil.equals(plot, other))
+                    {
+                        event.setCancelled(true);
+                        return;
+                    }
+                }
+            }
+            catch (final Throwable e)
+            {
+                pistonBlocks = false;
+            }
+        }
+        if (!pistonBlocks && (block.getType() != Material.PISTON_BASE))
+        {
+            final BlockFace dir = event.getDirection();
+            final Location bloc = BukkitUtil.getLocation(block.getLocation().subtract(dir.getModX() * 2, dir.getModY() * 2, dir.getModZ() * 2));
+            final Plot newPlot = MainUtil.getPlot(bloc);
+            if (!MainUtil.equals(plot, newPlot))
+            {
+                event.setCancelled(true);
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onStructureGrow(final StructureGrowEvent e)
+    {
+        if (!PS.get().isPlotWorld(e.getWorld().getName())) { return; }
+        final List<BlockState> blocks = e.getBlocks();
+        if (blocks.size() == 0) { return; }
+        final Plot origin = MainUtil.getPlot(BukkitUtil.getLocation(blocks.get(0).getLocation()));
+        blocks.get(0);
+        for (int i = blocks.size() - 1; i >= 0; i--)
+        {
+            final Location loc = BukkitUtil.getLocation(blocks.get(i).getLocation());
+            final Plot plot = MainUtil.getPlot(loc);
+            if (!MainUtil.equals(plot, origin))
+            {
+                e.getBlocks().remove(i);
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onInteract(final PlayerInteractEvent event)
+    {
+        final Action action = event.getAction();
+        final Block block = event.getClickedBlock();
+        if (block == null) { return; }
+        final Player player = event.getPlayer();
+        final String world = player.getWorld().getName();
+        if (!PS.get().isPlotWorld(world)) { return; }
+        final Location loc = BukkitUtil.getLocation(block.getLocation());
+        final PlotPlayer pp = BukkitUtil.getPlayer(player);
+        PlayerBlockEventType eventType = null;
+        BukkitLazyBlock lb;
+        switch (action)
+        {
+            case PHYSICAL:
+            {
+                eventType = PlayerBlockEventType.TRIGGER_PHYSICAL;
+                lb = new BukkitLazyBlock(block);
+                break;
+            }
+            case RIGHT_CLICK_BLOCK:
+            {
+                final Material blockType = block.getType();
+                final int blockId = blockType.getId();
+                switch (blockType)
+                {
+                    case ANVIL:
+                    case ACACIA_DOOR:
+                    case BIRCH_DOOR:
+                    case DARK_OAK_DOOR:
+                    case IRON_DOOR:
+                    case JUNGLE_DOOR:
+                    case SPRUCE_DOOR:
+                    case TRAP_DOOR:
+                    case IRON_TRAPDOOR:
+                    case WOOD_DOOR:
+                    case WOODEN_DOOR:
+                    case TRAPPED_CHEST:
+                    case ENDER_CHEST:
+                    case CHEST:
+                    case ACACIA_FENCE_GATE:
+                    case BIRCH_FENCE_GATE:
+                    case DARK_OAK_FENCE_GATE:
+                    case FENCE_GATE:
+                    case JUNGLE_FENCE_GATE:
+                    case SPRUCE_FENCE_GATE:
+                    case LEVER:
+                    case DIODE:
+                    case DIODE_BLOCK_OFF:
+                    case DIODE_BLOCK_ON:
+                    case COMMAND:
+                    case REDSTONE_COMPARATOR:
+                    case REDSTONE_COMPARATOR_OFF:
+                    case REDSTONE_COMPARATOR_ON:
+                    case REDSTONE_ORE:
+                    case WOOD_BUTTON:
+                    case STONE_BUTTON:
+                    case BEACON:
+                    case BED_BLOCK:
+                    case SIGN:
+                    case WALL_SIGN:
+                    case SIGN_POST:
+                    case ENCHANTMENT_TABLE:
+                    case BREWING_STAND:
+                    case STANDING_BANNER:
+                    case BURNING_FURNACE:
+                    case FURNACE:
+                    case CAKE_BLOCK:
+                    case DISPENSER:
+                    case DROPPER:
+                    case HOPPER:
+                    case NOTE_BLOCK:
+                    case JUKEBOX:
+                    case WORKBENCH:
+                    {
+                        eventType = PlayerBlockEventType.INTERACT_BLOCK;
+                        break;
+                    }
+                    case DRAGON_EGG:
+                    {
+                        eventType = PlayerBlockEventType.TELEPORT_OBJECT;
+                        break;
+                    }
+                    default:
+                    {
+                        break;
+                    }
+                }
+                lb = new BukkitLazyBlock(blockId, block);
+                final ItemStack hand = player.getItemInHand();
+                if ((eventType != null) && !player.isSneaking())
+                {
+                    break;
+                }
+                if ((hand == null) || (hand.getType() == Material.AIR) || hand.getType().isBlock())
+                {
+                    eventType = PlayerBlockEventType.INTERACT_BLOCK;
+                    lb = new BukkitLazyBlock(block);
+                    break;
+                }
+                // TODO calls both:
+                // redstone ore
+
+                lb = new BukkitLazyBlock(new PlotBlock((short) hand.getTypeId(), (byte) hand.getDurability()));
+                switch (hand.getType())
+                {
+                    case MONSTER_EGG:
+                    case MONSTER_EGGS:
+                    {
+                        eventType = PlayerBlockEventType.SPAWN_MOB;
+                        break;
+                    }
+
+                    case ARMOR_STAND:
+                    {
+                        eventType = PlayerBlockEventType.PLACE_MISC;
+                        break;
+                    }
+
+                    case WRITTEN_BOOK:
+                    case BOOK_AND_QUILL:
+                    case BOOK:
+                    {
+                        eventType = PlayerBlockEventType.READ;
+                        break;
+                    }
+
+                    case APPLE:
+                    case BAKED_POTATO:
+                    case MUSHROOM_SOUP:
+                    case BREAD:
+                    case CARROT:
+                    case CARROT_ITEM:
+                    case COOKIE:
+                    case GRILLED_PORK:
+                    case POISONOUS_POTATO:
+                    case MUTTON:
+                    case PORK:
+                    case POTATO:
+                    case POTATO_ITEM:
+                    case POTION:
+                    case PUMPKIN_PIE:
+                    case RABBIT:
+                    case RABBIT_FOOT:
+                    case RABBIT_STEW:
+                    case RAW_BEEF:
+                    case RAW_FISH:
+                    case RAW_CHICKEN:
+                    {
+                        eventType = PlayerBlockEventType.EAT;
+                        break;
+                    }
+
+                    case MINECART:
+                    case STORAGE_MINECART:
+                    case POWERED_MINECART:
+                    case HOPPER_MINECART:
+                    case EXPLOSIVE_MINECART:
+                    case COMMAND_MINECART:
+                    case BOAT:
+                    {
+                        eventType = PlayerBlockEventType.PLACE_VEHICLE;
+                        break;
+                    }
+                    case PAINTING:
+                    case ITEM_FRAME:
+                    {
+                        eventType = PlayerBlockEventType.PLACE_HANGING;
+                        break;
+                    }
+                    default:
+                    {
+                        eventType = PlayerBlockEventType.INTERACT_BLOCK;
+                        break;
+                    }
+                }
+                break;
+            }
+            case LEFT_CLICK_BLOCK:
+            {
+                eventType = PlayerBlockEventType.BREAK_BLOCK;
+                lb = new BukkitLazyBlock(block);
+                break;
+            }
+            default:
+            {
+                return;
+            }
+        }
+        if (!EventUtil.manager.checkPlayerBlockEvent(pp, eventType, loc, lb, true))
+        {
+            event.setCancelled(true);
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void MobSpawn(final CreatureSpawnEvent event)
+    {
+        final Entity entity = event.getEntity();
+        if (entity instanceof Player) { return; }
+        final Location loc = BukkitUtil.getLocation(event.getLocation());
+        final String world = loc.getWorld();
+        if (!PS.get().isPlotWorld(world)) { return; }
+        if (!MainUtil.isPlotArea(loc)) { return; }
+        final PlotWorld pW = PS.get().getPlotWorld(world);
+        final CreatureSpawnEvent.SpawnReason reason = event.getSpawnReason();
+        if (((reason == CreatureSpawnEvent.SpawnReason.SPAWNER_EGG) || (reason == CreatureSpawnEvent.SpawnReason.DISPENSE_EGG)) && !pW.SPAWN_EGGS)
+        {
+            event.setCancelled(true);
+            return;
+        }
+        else if ((reason == CreatureSpawnEvent.SpawnReason.BREEDING) && !pW.SPAWN_BREEDING)
+        {
+            event.setCancelled(true);
+            return;
+        }
+        else if ((reason == CreatureSpawnEvent.SpawnReason.CUSTOM) && !pW.SPAWN_CUSTOM && !(event.getEntityType().getTypeId() == 30))
+        {
+            event.setCancelled(true);
+            return;
+        }
+
+        final Plot plot = MainUtil.getPlot(loc);
+        if (checkEntity(entity, plot))
+        {
+            event.setCancelled(true);
+        }
+    }
+
+    @EventHandler(ignoreCancelled = true, priority = EventPriority.HIGHEST)
+    public void onEntityFall(final EntityChangeBlockEvent event)
+    {
+        if (event.getEntityType() != EntityType.FALLING_BLOCK) { return; }
+        final Block block = event.getBlock();
+        final World world = block.getWorld();
+        final String worldname = world.getName();
+        if (!PS.get().isPlotWorld(worldname)) { return; }
+        final Location loc = BukkitUtil.getLocation(block.getLocation());
+        final Plot plot = MainUtil.getPlot(loc);
+        if (plot == null) { return; }
+        if (FlagManager.isPlotFlagTrue(plot, "disable-physics"))
+        {
+            event.setCancelled(true);
+        }
+    }
+
+    public boolean checkEntity(final Entity entity, final Plot plot)
+    {
+        if ((plot != null) && (plot.owner != null))
+        {
+            final Flag entityFlag = FlagManager.getPlotFlag(plot, "entity-cap");
+            int[] mobs = null;
+            if (entityFlag != null)
+            {
+                final int cap = ((Integer) entityFlag.getValue());
+                if (cap == 0) { return true; }
+                mobs = ChunkManager.manager.countEntities(plot);
+                if (mobs[0] >= cap) { return true; }
+            }
+            if (entity instanceof Creature)
+            {
+                final Flag mobFlag = FlagManager.getPlotFlag(plot, "mob-cap");
+                if (mobFlag != null)
+                {
+                    final int cap = ((Integer) mobFlag.getValue());
+                    if (cap == 0) { return true; }
+                    if (mobs == null)
+                    {
+                        mobs = ChunkManager.manager.countEntities(plot);
+                    }
+                    if (mobs[3] >= cap) { return true; }
+                }
+                if (entity instanceof Animals)
+                {
+                    final Flag animalFlag = FlagManager.getPlotFlag(plot, "animal-cap");
+                    if (animalFlag != null)
+                    {
+                        final int cap = ((Integer) animalFlag.getValue());
+                        if (cap == 0) { return true; }
+                        if (mobs == null)
+                        {
+                            mobs = ChunkManager.manager.countEntities(plot);
+                        }
+                        if (mobs[1] >= cap) { return true; }
+                    }
+                }
+                else if (entity instanceof Monster)
+                {
+                    final Flag monsterFlag = FlagManager.getPlotFlag(plot, "hostile-cap");
+                    if (monsterFlag != null)
+                    {
+                        final int cap = ((Integer) monsterFlag.getValue());
+                        if (cap == 0) { return true; }
+                        if (mobs == null)
+                        {
+                            mobs = ChunkManager.manager.countEntities(plot);
+                        }
+                        if (mobs[2] >= cap) { return true; }
+                    }
+                }
+            }
+            else if (entity instanceof Vehicle)
+            {
+                final Flag vehicleFlag = FlagManager.getPlotFlag(plot, "vehicle-cap");
+                if (vehicleFlag != null)
+                {
+                    final int cap = ((Integer) vehicleFlag.getValue());
+                    if (cap == 0) { return true; }
+                    if (mobs == null)
+                    {
+                        mobs = ChunkManager.manager.countEntities(plot);
+                    }
+                    if (mobs[4] >= cap) { return true; }
+                }
+            }
+        }
+        return false;
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onBlockIgnite(final BlockIgniteEvent e)
+    {
+        final Player player = e.getPlayer();
+        final Block b = e.getBlock();
+        final Location loc;
+        if (b != null)
+        {
+            loc = BukkitUtil.getLocation(b.getLocation());
+        }
+        else
+        {
+            final Entity ent = e.getIgnitingEntity();
+            if (ent != null)
+            {
+                loc = BukkitUtil.getLocation(ent);
+            }
+            else
+            {
+                if (player != null)
+                {
+                    loc = BukkitUtil.getLocation(player);
+                }
+                else
+                {
+                    return;
+                }
+            }
+        }
+
+        final String world;
+        if (e.getBlock() != null)
+        {
+            world = e.getBlock().getWorld().getName();
+        }
+        else if (e.getIgnitingEntity() != null)
+        {
+            world = e.getIgnitingEntity().getWorld().getName();
+        }
+        else if (e.getPlayer() != null)
+        {
+            world = e.getPlayer().getWorld().getName();
+        }
+        else
+        {
+            return;
+        }
+        if (!PS.get().isPlotWorld(world)) { return; }
+        if (e.getCause() == BlockIgniteEvent.IgniteCause.LIGHTNING)
+        {
+            e.setCancelled(true);
+            return;
+        }
+        if (player == null)
+        {
+            if (MainUtil.isPlotArea(loc))
+            {
+                e.setCancelled(true);
+            }
+            return;
+        }
+        final Player p = e.getPlayer();
+        final Plot plot = MainUtil.getPlot(loc);
+        if (plot == null)
+        {
+            if (MainUtil.isPlotAreaAbs(loc))
+            {
+                final PlotPlayer pp = BukkitUtil.getPlayer(p);
+                if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_ROAD))
+                {
+                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_ROAD);
+                    e.setCancelled(true);
+                }
+            }
+        }
+        else
+        {
+            if (!plot.hasOwner())
+            {
+                final PlotPlayer pp = BukkitUtil.getPlayer(p);
+                if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_UNOWNED))
+                {
+                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_UNOWNED);
+                    e.setCancelled(true);
+                }
+            }
+            else
+            {
+                final PlotPlayer pp = BukkitUtil.getPlayer(p);
+                if (!plot.isAdded(pp.getUUID()))
+                {
+                    if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_OTHER))
+                    {
+                        if (MainUtil.isPlotArea(loc))
+                        {
+                            MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_OTHER);
+                            e.setCancelled(true);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onTeleport(final PlayerTeleportEvent event)
+    {
+        if ((event.getTo() == null) || (event.getFrom() == null))
+        {
+            BukkitUtil.getPlayer(event.getPlayer()).deleteMeta("location");
+            BukkitUtil.getPlayer(event.getPlayer()).deleteMeta("lastplot");
+            return;
+        }
+        final org.bukkit.Location from = event.getFrom();
+        final org.bukkit.Location to = event.getTo();
+        int x2;
+        if (MathMan.roundInt(from.getX()) != (x2 = MathMan.roundInt(to.getX())))
+        {
+            final Player player = event.getPlayer();
+            final PlotPlayer pp = BukkitUtil.getPlayer(player);
+
+            // Set last location
+            pp.setMeta("location", BukkitUtil.getLocation(to));
+
+            final String worldname = to.getWorld().getName();
+            final PlotWorld plotworld = PS.get().getPlotWorld(worldname);
+            if (plotworld == null) { return; }
+            final PlotManager plotManager = PS.get().getPlotManager(worldname);
+            final PlotId id = plotManager.getPlotId(plotworld, x2, 0, MathMan.roundInt(to.getZ()));
+            final Plot lastPlot = (Plot) pp.getMeta("lastplot");
+            if (id == null)
+            {
+                if ((lastPlot != null) && !plotExit(pp, lastPlot))
+                {
+                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_EXIT_DENIED);
+                    if (lastPlot.equals(MainUtil.getPlot(BukkitUtil.getLocation(from))))
+                    {
+                        player.teleport(from);
+                    }
+                    else
+                    {
+                        player.teleport(player.getWorld().getSpawnLocation());
+                    }
+                    event.setCancelled(true);
+                    return;
+                }
+            }
+            else if ((lastPlot != null) && id.equals(lastPlot.id))
+            {
+                return;
+            }
+            else
+            {
+                final Plot plot = MainUtil.getPlot(worldname, id);
+                if (!plotEntry(pp, plot))
+                {
+                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_ENTRY_DENIED);
+                    if (!plot.equals(MainUtil.getPlot(BukkitUtil.getLocation(from))))
+                    {
+                        player.teleport(from);
+                    }
+                    else
+                    {
+                        player.teleport(player.getWorld().getSpawnLocation());
+                    }
+                    event.setCancelled(true);
+                    return;
+                }
+            }
+            final Integer border = MainUtil.worldBorder.get(worldname);
+            if (border != null)
+            {
+                if (x2 > border)
+                {
+                    to.setX(border - 4);
+                    player.teleport(event.getTo());
+                    MainUtil.sendMessage(pp, C.BORDER);
+                    return;
+                }
+                else if (x2 < -border)
+                {
+                    to.setX(-border + 4);
+                    player.teleport(event.getTo());
+                    MainUtil.sendMessage(pp, C.BORDER);
+                    return;
+                }
+            }
+            return;
+        }
+        int z2;
+        if (MathMan.roundInt(from.getZ()) != (z2 = MathMan.roundInt(to.getZ())))
+        {
+            final Player player = event.getPlayer();
+            final PlotPlayer pp = BukkitUtil.getPlayer(player);
+
+            // Set last location
+            pp.setMeta("location", BukkitUtil.getLocation(to));
+
+            final String worldname = to.getWorld().getName();
+            final PlotWorld plotworld = PS.get().getPlotWorld(worldname);
+            if (plotworld == null) { return; }
+            final PlotManager plotManager = PS.get().getPlotManager(worldname);
+            final PlotId id = plotManager.getPlotId(plotworld, x2, 0, z2);
+            final Plot lastPlot = (Plot) pp.getMeta("lastplot");
+            if (id == null)
+            {
+                if ((lastPlot != null) && !plotExit(pp, lastPlot))
+                {
+                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_EXIT_DENIED);
+                    if (lastPlot.equals(MainUtil.getPlot(BukkitUtil.getLocation(from))))
+                    {
+                        player.teleport(from);
+                    }
+                    else
+                    {
+                        player.teleport(player.getWorld().getSpawnLocation());
+                    }
+                    event.setCancelled(true);
+                    return;
+                }
+            }
+            else if ((lastPlot != null) && id.equals(lastPlot.id))
+            {
+                return;
+            }
+            else
+            {
+                final Plot plot = MainUtil.getPlot(worldname, id);
+                if (!plotEntry(pp, plot))
+                {
+                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_ENTRY_DENIED);
+                    if (!plot.equals(MainUtil.getPlot(BukkitUtil.getLocation(from))))
+                    {
+                        player.teleport(from);
+                    }
+                    else
+                    {
+                        player.teleport(player.getWorld().getSpawnLocation());
+                    }
+                    event.setCancelled(true);
+                    return;
+                }
+            }
+            final Integer border = MainUtil.worldBorder.get(worldname);
+            if (border != null)
+            {
+                if (z2 > border)
+                {
+                    to.setZ(border - 4);
+                    player.teleport(event.getTo());
+                    MainUtil.sendMessage(pp, C.BORDER);
+                }
+                else if (z2 < -border)
+                {
+                    to.setZ(-border + 4);
+                    player.teleport(event.getTo());
+                    MainUtil.sendMessage(pp, C.BORDER);
+                }
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onBucketEmpty(final PlayerBucketEmptyEvent e)
+    {
+        final BlockFace bf = e.getBlockFace();
+        final Block b = e.getBlockClicked().getLocation().add(bf.getModX(), bf.getModY(), bf.getModZ()).getBlock();
+        final Location loc = BukkitUtil.getLocation(b.getLocation());
+        if (PS.get().isPlotWorld(loc.getWorld()))
+        {
+            final PlotPlayer pp = BukkitUtil.getPlayer(e.getPlayer());
+            final Plot plot = MainUtil.getPlot(loc);
+            if (plot == null)
+            {
+                if (MainUtil.isPlotAreaAbs(loc))
+                {
+                    if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_ROAD)) { return; }
+                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_ROAD);
+                    e.setCancelled(true);
+                }
+            }
+            else
+            {
+                if (!plot.hasOwner())
+                {
+                    if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_UNOWNED)) { return; }
+                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_UNOWNED);
+                    e.setCancelled(true);
+                }
+                else if (!plot.isAdded(pp.getUUID()))
+                {
+                    final Flag use = FlagManager.getPlotFlag(plot, C.FLAG_USE.s());
+                    if ((use != null) && ((HashSet<PlotBlock>) use.getValue()).contains(new PlotBlock((short) e.getBucket().getId(), (byte) 0))) { return; }
+                    if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_OTHER)) { return; }
+                    if (MainUtil.isPlotArea(loc))
+                    {
+                        MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_OTHER);
+                        e.setCancelled(true);
+                    }
+                }
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST)
+    public void onInventoryClick(final InventoryClickEvent event)
+    {
+        final HumanEntity clicker = event.getWhoClicked();
+        if (!(clicker instanceof Player)) { return; }
+        final Player player = (Player) clicker;
+        final PlotPlayer pp = BukkitUtil.getPlayer(player);
+        final PlotInventory inv = (PlotInventory) pp.getMeta("inventory");
+        if ((inv != null) && (event.getRawSlot() == event.getSlot()))
+        {
+            if (!inv.onClick(event.getSlot()))
+            {
+                event.setCancelled(true);
+                inv.close();
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST)
+    public void onInventoryClose(final InventoryCloseEvent event)
+    {
+        final HumanEntity closer = event.getPlayer();
+        if (!(closer instanceof Player)) { return; }
+        final Player player = (Player) closer;
+        BukkitUtil.getPlayer(player).deleteMeta("inventory");
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR)
+    public void onLeave(final PlayerQuitEvent event)
+    {
+        final PlotPlayer pp = BukkitUtil.getPlayer(event.getPlayer());
+        final Plot plot = pp.getCurrentPlot();
+        if (plot != null)
+        {
+            plotExit(pp, plot);
+        }
+        ExpireManager.dates.put(pp.getUUID(), System.currentTimeMillis());
+        EventUtil.unregisterPlayer(pp);
+        if (Settings.DELETE_PLOTS_ON_BAN && event.getPlayer().isBanned())
+        {
+            for (final Plot owned : PS.get().getPlotsInWorld(pp.getName()))
+            {
+                owned.deletePlot(null);
+                PS.debug(String.format("&cPlot &6%s &cwas deleted + cleared due to &6%s&c getting banned", plot.getId(), event.getPlayer().getName()));
+            }
+        }
+        BukkitUtil.removePlayer(pp.getName());
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onBucketFill(final PlayerBucketFillEvent e)
+    {
+        final Block b = e.getBlockClicked();
+        final Location loc = BukkitUtil.getLocation(b.getLocation());
+        if (PS.get().isPlotWorld(loc.getWorld()))
+        {
+            final Player p = e.getPlayer();
+            final PlotPlayer pp = BukkitUtil.getPlayer(p);
+            final Plot plot = MainUtil.getPlot(loc);
+            if (plot == null)
+            {
+                if (MainUtil.isPlotAreaAbs(loc))
+                {
+                    if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_ROAD)) { return; }
+                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_ROAD);
+                    e.setCancelled(true);
+                }
+            }
+            else
+            {
+                if (!plot.hasOwner())
+                {
+                    if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_UNOWNED)) { return; }
+                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_UNOWNED);
+                    e.setCancelled(true);
+                }
+                else if (!plot.isAdded(pp.getUUID()))
+                {
+                    final Flag use = FlagManager.getPlotFlag(plot, C.FLAG_USE.s());
+                    final Block block = e.getBlockClicked();
+                    if ((use != null) && ((HashSet<PlotBlock>) use.getValue()).contains(new PlotBlock((short) block.getTypeId(), block.getData()))) { return; }
+                    if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_OTHER)) { return; }
+                    if (MainUtil.isPlotArea(loc))
+                    {
+                        MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_OTHER);
+                        e.setCancelled(true);
+                    }
+                }
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onVehicleCreate(final VehicleCreateEvent event)
+    {
+        final Vehicle entity = event.getVehicle();
+        final Location loc = BukkitUtil.getLocation(entity);
+        final Plot plot = MainUtil.getPlot(loc);
+        if (checkEntity(entity, plot))
+        {
+            entity.remove();
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onHangingPlace(final HangingPlaceEvent e)
+    {
+        final Block b = e.getBlock();
+        final Location loc = BukkitUtil.getLocation(b.getLocation());
+        if (PS.get().isPlotWorld(loc.getWorld()))
+        {
+            final Player p = e.getPlayer();
+            final PlotPlayer pp = BukkitUtil.getPlayer(p);
+            final Plot plot = MainUtil.getPlot(loc);
+            if (plot == null)
+            {
+                if (MainUtil.isPlotAreaAbs(loc))
+                {
+                    if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_ROAD))
+                    {
+                        MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_ROAD);
+                        e.setCancelled(true);
+                    }
+                }
+            }
+            else
+            {
+                if (!plot.hasOwner())
+                {
+                    if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_UNOWNED))
+                    {
+                        MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_UNOWNED);
+                        e.setCancelled(true);
+                    }
+                }
+                else if (!plot.isAdded(pp.getUUID()))
+                {
+                    if (FlagManager.isPlotFlagTrue(plot, C.FLAG_HANGING_PLACE.s())) { return; }
+                    if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_OTHER))
+                    {
+                        if (MainUtil.isPlotArea(loc))
+                        {
+                            MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_OTHER);
+                            e.setCancelled(true);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onHangingBreakByEntity(final HangingBreakByEntityEvent e)
+    {
+        final Entity r = e.getRemover();
+        if (r instanceof Player)
+        {
+            final Player p = (Player) r;
+            final Location l = BukkitUtil.getLocation(e.getEntity());
+            final PlotPlayer pp = BukkitUtil.getPlayer(p);
+            if (PS.get().isPlotWorld(l.getWorld()))
+            {
+                final Plot plot = MainUtil.getPlot(l);
+                if (plot == null)
+                {
+                    if (MainUtil.isPlotAreaAbs(l))
+                    {
+                        if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_DESTROY_ROAD))
+                        {
+                            MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_DESTROY_ROAD);
+                            e.setCancelled(true);
+                        }
+                    }
+                }
+                else
+                {
+                    if (!plot.hasOwner())
+                    {
+                        if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_DESTROY_UNOWNED))
+                        {
+                            MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_DESTROY_UNOWNED);
+                            e.setCancelled(true);
+                        }
+                    }
+                    else if (!plot.isAdded(pp.getUUID()))
+                    {
+                        if (FlagManager.isPlotFlagTrue(plot, C.FLAG_HANGING_BREAK.s())) { return; }
+                        if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_DESTROY_OTHER))
+                        {
+                            if (MainUtil.isPlotArea(l))
+                            {
+                                MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_DESTROY_OTHER);
+                                e.setCancelled(true);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        else if (r instanceof Projectile)
+        {
+            final Projectile p = (Projectile) r;
+            if (p.getShooter() instanceof Player)
+            {
+                final Player shooter = (Player) p.getShooter();
+                if (PS.get().isPlotWorld(BukkitUtil.getLocation(e.getEntity()).getWorld()))
+                {
+                    final PlotPlayer player = BukkitUtil.getPlayer(shooter);
+                    final Plot plot = MainUtil.getPlot(BukkitUtil.getLocation(e.getEntity()));
+                    if (plot != null)
+                    {
+                        if (!plot.hasOwner())
+                        {
+                            if (!Permissions.hasPermission(player, C.PERMISSION_ADMIN_DESTROY_UNOWNED))
+                            {
+                                MainUtil.sendMessage(player, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_DESTROY_UNOWNED);
+                                e.setCancelled(true);
+                            }
+                        }
+                        else if (!plot.isAdded(player.getUUID()))
+                        {
+                            if (!FlagManager.isPlotFlagTrue(plot, C.FLAG_HANGING_BREAK.s()))
+                            {
+                                if (!Permissions.hasPermission(player, C.PERMISSION_ADMIN_DESTROY_OTHER))
+                                {
+                                    if (MainUtil.isPlotArea(BukkitUtil.getLocation(e.getEntity())))
+                                    {
+                                        MainUtil.sendMessage(player, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_DESTROY_OTHER);
+                                        e.setCancelled(true);
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        else
+        {
+            e.setCancelled(true);
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onPlayerInteractEntity(final PlayerInteractEntityEvent e)
+    {
+        final Location l = BukkitUtil.getLocation(e.getRightClicked().getLocation());
+        if (PS.get().isPlotWorld(l.getWorld()))
+        {
+            final Player p = e.getPlayer();
+            final PlotPlayer pp = BukkitUtil.getPlayer(p);
+            final Plot plot = MainUtil.getPlot(l);
+            if (plot == null)
+            {
+                if (!MainUtil.isPlotAreaAbs(l)) { return; }
+                if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_ROAD))
+                {
+                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_INTERACT_ROAD);
+                    e.setCancelled(true);
+                }
+            }
+            else
+            {
+                if (!plot.hasOwner())
+                {
+                    if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_UNOWNED))
+                    {
+                        MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_INTERACT_UNOWNED);
+                        e.setCancelled(true);
+                    }
+                }
+                else if (!plot.isAdded(pp.getUUID()))
+                {
+                    final Entity entity = e.getRightClicked();
+                    if ((entity instanceof Monster) && FlagManager.isPlotFlagTrue(plot, C.FLAG_HOSTILE_INTERACT.s())) { return; }
+                    if ((entity instanceof Animals) && FlagManager.isPlotFlagTrue(plot, C.FLAG_ANIMAL_INTERACT.s())) { return; }
+                    if ((entity instanceof Tameable) && ((Tameable) entity).isTamed() && FlagManager.isPlotFlagTrue(plot, C.FLAG_TAMED_INTERACT.s())) { return; }
+                    if ((entity instanceof Vehicle) && FlagManager.isPlotFlagTrue(plot, C.FLAG_VEHICLE_USE.s())) { return; }
+                    if ((entity instanceof Player) && FlagManager.isPlotFlagTrue(plot, C.FLAG_PLAYER_INTERACT.s())) { return; }
+                    if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_OTHER))
+                    {
+                        if (MainUtil.isPlotArea(l))
+                        {
+                            MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_INTERACT_OTHER);
+                            e.setCancelled(true);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onVehicleDestroy(final VehicleDestroyEvent e)
+    {
+        final Location l = BukkitUtil.getLocation(e.getVehicle());
+        if (PS.get().isPlotWorld(l.getWorld()))
+        {
+            final Entity d = e.getAttacker();
+            if (d instanceof Player)
+            {
+                final Player p = (Player) d;
+                PS.get().getPlotWorld(l.getWorld());
+                final PlotPlayer pp = BukkitUtil.getPlayer(p);
+                final Plot plot = MainUtil.getPlot(l);
+                if (plot == null)
+                {
+                    if (!MainUtil.isPlotAreaAbs(l)) { return; }
+                    if (!Permissions.hasPermission(pp, "plots.admin.vehicle.break.road"))
+                    {
+                        MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, "plots.admin.vehicle.break.road");
+                        e.setCancelled(true);
+                    }
+                }
+                else
+                {
+                    if (!plot.hasOwner())
+                    {
+                        if (!Permissions.hasPermission(pp, "plots.admin.vehicle.break.unowned"))
+                        {
+                            MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, "plots.admin.vehicle.break.unowned");
+                            e.setCancelled(true);
+                            return;
+                        }
+                        return;
+                    }
+                    if (!plot.isAdded(pp.getUUID()))
+                    {
+                        if (FlagManager.isPlotFlagTrue(plot, "vehicle-break")) { return; }
+                        if (!Permissions.hasPermission(pp, "plots.admin.vehicle.break.other"))
+                        {
+                            if (MainUtil.isPlotArea(l))
+                            {
+                                MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, "plots.admin.vehicle.break.other");
+                                e.setCancelled(true);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onPotionSplash(final PotionSplashEvent event)
+    {
+        final ThrownPotion damager = event.getPotion();
+        final Location l = BukkitUtil.getLocation(damager);
+        if (!PS.get().isPlotWorld(l.getWorld())) { return; }
+        for (final LivingEntity victim : event.getAffectedEntities())
+        {
+            if (!entityDamage(l, damager, victim))
+            {
+                event.setIntensity(victim, 0);
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onEntityDamageByEntityEvent(final EntityDamageByEntityEvent e)
+    {
+        final Entity damager = e.getDamager();
+        final Location l = BukkitUtil.getLocation(damager);
+        if (!PS.get().isPlotWorld(l.getWorld())) { return; }
+        final Entity victim = e.getEntity();
+        if (!entityDamage(l, damager, victim))
+        {
+            e.setCancelled(true);
+        }
+    }
+
+    public boolean entityDamage(final Location l, final Entity damager, final Entity victim)
+    {
+        final Location dloc = BukkitUtil.getLocation(damager);
+        final Location vloc = BukkitUtil.getLocation(victim);
+
+        final Plot dplot = MainUtil.getPlot(dloc);
+        final Plot vplot = MainUtil.getPlot(vloc);
+
+        Plot plot;
+        String stub;
+        if ((dplot == null) && (vplot == null))
+        {
+            if (!MainUtil.isPlotAreaAbs(dloc)) { return true; }
+            plot = null;
+            stub = "road";
+        }
+        else
+        {
+            // Priorize plots for close to seamless pvp zones
+            plot = vplot == null ? dplot : (((dplot == null) || !(victim instanceof Player)) ? vplot : (victim.getTicksLived() > damager.getTicksLived() ? dplot : vplot));
+            stub = plot.hasOwner() ? "other" : "unowned";
+        }
+
+        Player player;
+        if (damager instanceof Player)
+        { // attacker is player
+            player = (Player) damager;
+        }
+        else if (damager instanceof Projectile)
+        {
+            final Projectile projectile = (Projectile) damager;
+            final ProjectileSource shooter = projectile.getShooter();
+            if (shooter instanceof Player)
+            { // shooter is player
+                player = (Player) shooter;
+            }
+            else
+            { // shooter is not player
+                player = null;
+            }
+        }
+        else
+        { // Attacker is not player
+            player = null;
+        }
+        if (player != null)
+        {
+            final PlotPlayer pp = BukkitUtil.getPlayer(player);
+            if (victim instanceof Hanging)
+            { // hanging
+                if ((plot != null) && ((FlagManager.isPlotFlagTrue(plot, "hanging-break") || plot.isAdded(pp.getUUID())))) { return true; }
+                if (!Permissions.hasPermission(pp, "plots.admin.break." + stub))
+                {
+                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, "plots.admin.break." + stub);
+                    return false;
+                }
+            }
+            else if (victim.getEntityId() == 30)
+            {
+                if ((plot != null) && ((FlagManager.isPlotFlagTrue(plot, "misc-break") || plot.isAdded(pp.getUUID())))) { return true; }
+                if (!Permissions.hasPermission(pp, "plots.admin.break." + stub))
+                {
+                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, "plots.admin.break." + stub);
+                    return false;
+                }
+            }
+            else if ((victim instanceof Monster) || (victim instanceof EnderDragon))
+            { // victim is monster
+                if ((plot != null) && ((FlagManager.isPlotFlagTrue(plot, "hostile-attack") || FlagManager.isPlotFlagTrue(plot, "pve") || plot.isAdded(pp.getUUID())))) { return true; }
+                if (!Permissions.hasPermission(pp, "plots.admin.pve." + stub))
+                {
+                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, "plots.admin.pve." + stub);
+                    return false;
+                }
+            }
+            else if (victim instanceof Tameable)
+            { // victim is tameable
+                if ((plot != null) && ((FlagManager.isPlotFlagTrue(plot, "tamed-attack") || FlagManager.isPlotFlagTrue(plot, "pve") || plot.isAdded(pp.getUUID())))) { return true; }
+                if (!Permissions.hasPermission(pp, "plots.admin.pve." + stub))
+                {
+                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, "plots.admin.pve." + stub);
+                    return false;
+                }
+            }
+            else if (victim instanceof Player)
+            {
+                if (plot != null)
+                {
+                    final Flag pvp = FlagManager.getPlotFlag(plot, C.FLAG_PVP.s());
+                    if (pvp == null)
+                    {
+                        return true;
+                    }
+                    else
+                    {
+                        if ((Boolean) pvp.getValue())
+                        {
+                            return true;
+                        }
+                        else if (!Permissions.hasPermission(pp, "plots.admin.pve." + stub))
+                        {
+                            MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, "plots.admin.pve." + stub);
+                            return false;
+                        }
+                    }
+                }
+                if (!Permissions.hasPermission(pp, "plots.admin.pvp." + stub))
+                {
+                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, "plots.admin.pvp." + stub);
+                    return false;
+                }
+            }
+            else if (victim instanceof Creature)
+            { // victim is animal
+                if ((plot != null) && ((FlagManager.isPlotFlagTrue(plot, "animal-attack") || FlagManager.isPlotFlagTrue(plot, "pve") || plot.isAdded(pp.getUUID())))) { return true; }
+                if (!Permissions.hasPermission(pp, "plots.admin.pve." + stub))
+                {
+                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, "plots.admin.pve." + stub);
+                    return false;
+                }
+            }
+            else if (victim instanceof Vehicle)
+            { // Vehicles are managed in vehicle destroy event
+                return true;
+            }
+            else
+            { // victim is something else
+                if ((plot != null) && ((FlagManager.isPlotFlagTrue(plot, "pve") || plot.isAdded(pp.getUUID())))) { return true; }
+                if (!Permissions.hasPermission(pp, "plots.admin.pve." + stub))
+                {
+                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, "plots.admin.pve." + stub);
+                    return false;
+                }
+            }
+            return true;
+        }
+        // player is null
+        if ((damager instanceof Arrow) && (!(victim instanceof Creature))) { return false; }
+        return true;
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onPlayerEggThrow(final PlayerEggThrowEvent e)
+    {
+        final Location l = BukkitUtil.getLocation(e.getEgg().getLocation());
+        if (PS.get().isPlotWorld(l.getWorld()))
+        {
+            final Player p = e.getPlayer();
+            final PlotPlayer pp = BukkitUtil.getPlayer(p);
+            final Plot plot = MainUtil.getPlot(l);
+            if (plot == null)
+            {
+                if (!MainUtil.isPlotAreaAbs(l)) { return; }
+                if (!Permissions.hasPermission(pp, "plots.admin.projectile.road"))
+                {
+                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, "plots.admin.projectile.road");
+                    e.setHatching(false);
+                }
+            }
+            else
+            {
+                if (!plot.hasOwner())
+                {
+                    if (!Permissions.hasPermission(pp, "plots.admin.projectile.unowned"))
+                    {
+                        MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, "plots.admin.projectile.unowned");
+                        e.setHatching(false);
+                    }
+                }
+                else if (!plot.isAdded(pp.getUUID()))
+                {
+                    if (!Permissions.hasPermission(pp, "plots.admin.projectile.other"))
+                    {
+                        if (MainUtil.isPlotArea(l))
+                        {
+                            MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, "plots.admin.projectile.other");
+                            e.setHatching(false);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void BlockCreate(final BlockPlaceEvent event)
+    {
+        final Player player = event.getPlayer();
+        final String world = player.getWorld().getName();
+        if (!PS.get().isPlotWorld(world)) { return; }
+        final PlotPlayer pp = BukkitUtil.getPlayer(player);
+        final Location loc = BukkitUtil.getLocation(event.getBlock().getLocation());
+        final Plot plot = MainUtil.getPlot(loc);
+        if (plot != null)
+        {
+            if (!plot.hasOwner())
+            {
+                if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_UNOWNED))
+                {
+                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_UNOWNED);
+                    event.setCancelled(true);
+                    return;
+                }
+            }
+            else if (!plot.isAdded(pp.getUUID()))
+            {
+                final Flag place = FlagManager.getPlotFlag(plot, C.FLAG_PLACE.s());
+                final Block block = event.getBlock();
+                if (((place == null) || !((HashSet<PlotBlock>) place.getValue()).contains(new PlotBlock((short) block.getTypeId(), block.getData())))
+                && !Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_OTHER))
+                {
+                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_OTHER);
+                    event.setCancelled(true);
+                    return;
+                }
+            }
+            else if (Settings.DONE_RESTRICTS_BUILDING && plot.getSettings().flags.containsKey("done"))
+            {
+                if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_OTHER))
+                {
+                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_OTHER);
+                    event.setCancelled(true);
+                    return;
+                }
+            }
+            if (FlagManager.isPlotFlagTrue(plot, C.FLAG_DISABLE_PHYSICS.s()))
+            {
+                final Block block = event.getBlockPlaced();
+                if (block.getType().hasGravity())
+                {
+                    sendBlockChange(block.getLocation(), block.getType(), block.getData());
+                }
+            }
+            final PlotWorld pw = PS.get().getPlotWorld(loc.getWorld());
+            if (((loc.getY() > pw.MAX_BUILD_HEIGHT) && (loc.getY() < pw.MIN_BUILD_HEIGHT)) && !Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_HEIGHTLIMIT))
+            {
+                event.setCancelled(true);
+                MainUtil.sendMessage(pp, C.HEIGHT_LIMIT.s().replace("{limit}", "" + pw.MAX_BUILD_HEIGHT));
+            }
+        }
+        else if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_OTHER))
+        {
+            if (MainUtil.isPlotAreaAbs(loc))
+            {
+                MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_ROAD);
+                event.setCancelled(true);
+            }
+        }
+    }
+}
diff --git a/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents_1_8.java b/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents_1_8.java
index 5d9c4d665..74495bf9a 100644
--- a/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents_1_8.java
+++ b/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents_1_8.java
@@ -30,85 +30,87 @@ import com.intellectualcrafters.plot.util.Permissions;
 import com.plotsquared.bukkit.util.BukkitUtil;
 import com.plotsquared.listener.PlotListener;
 
-public class PlayerEvents_1_8 extends PlotListener implements Listener {
-    
+public class PlayerEvents_1_8 extends PlotListener implements Listener
+{
+
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onInventoryClick(InventoryClickEvent event) {
-        if (!event.isLeftClick() || event.getAction() != InventoryAction.PLACE_ALL || event.isShiftClick()) {
-            return;
-        }
-        HumanEntity entity = event.getWhoClicked();
-        if (!(entity instanceof Player) || !PS.get().isPlotWorld(entity.getWorld().getName())) {
-            return;
-        }
-        Player player = (Player) entity;
-        PlayerInventory inv = player.getInventory();
-        int slot = inv.getHeldItemSlot();
-        if (slot != event.getSlot() || slot > 8 || !event.getEventName().equals("InventoryCreativeEvent")) {
-            return;
-        }
-        ItemStack current = inv.getItemInHand();
-        ItemStack newItem = event.getCursor();
-        ItemMeta newMeta = newItem.getItemMeta();
-        ItemMeta oldMeta = newItem.getItemMeta();
+    public void onInventoryClick(final InventoryClickEvent event)
+    {
+        if (!event.isLeftClick() || (event.getAction() != InventoryAction.PLACE_ALL) || event.isShiftClick()) { return; }
+        final HumanEntity entity = event.getWhoClicked();
+        if (!(entity instanceof Player) || !PS.get().isPlotWorld(entity.getWorld().getName())) { return; }
+        final Player player = (Player) entity;
+        final PlayerInventory inv = player.getInventory();
+        final int slot = inv.getHeldItemSlot();
+        if ((slot != event.getSlot()) || (slot > 8) || !event.getEventName().equals("InventoryCreativeEvent")) { return; }
+        final ItemStack current = inv.getItemInHand();
+        final ItemStack newItem = event.getCursor();
+        final ItemMeta newMeta = newItem.getItemMeta();
+        final ItemMeta oldMeta = newItem.getItemMeta();
         String newLore = "";
-        if (newMeta != null) {
-            List<String> lore = newMeta.getLore();
-            if (lore != null) {
+        if (newMeta != null)
+        {
+            final List<String> lore = newMeta.getLore();
+            if (lore != null)
+            {
                 newLore = lore.toString();
             }
         }
         String oldLore = "";
-        if (oldMeta != null) {
-            List<String> lore = oldMeta.getLore();
-            if (lore != null) {
+        if (oldMeta != null)
+        {
+            final List<String> lore = oldMeta.getLore();
+            if (lore != null)
+            {
                 oldLore = lore.toString();
             }
         }
-        if (!newLore.equals("[(+NBT)]") || (current.equals(newItem) && newLore.equals(oldLore))) {
-            return;
-        }
-        HashSet<Byte> blocks = null;
-        Block block = player.getTargetBlock(blocks, 7);
-        BlockState state = block.getState();
-        if (state == null) {
-            return;
-        }
-        if (state.getType() != newItem.getType()) {
-            return;
-        }
+        if (!newLore.equals("[(+NBT)]") || (current.equals(newItem) && newLore.equals(oldLore))) { return; }
+        final HashSet<Byte> blocks = null;
+        final Block block = player.getTargetBlock(blocks, 7);
+        final BlockState state = block.getState();
+        if (state == null) { return; }
+        if (state.getType() != newItem.getType()) { return; }
         final Location l = BukkitUtil.getLocation(state.getLocation());
-        Plot plot = MainUtil.getPlot(l);
-        PlotPlayer pp = BukkitUtil.getPlayer(player);
+        final Plot plot = MainUtil.getPlot(l);
+        final PlotPlayer pp = BukkitUtil.getPlayer(player);
         boolean cancelled = false;
-        if (plot == null) {
-            if (!MainUtil.isPlotArea(l)) {
-                return;
-            }
-            if (!Permissions.hasPermission(pp, "plots.admin.interact.road")) {
+        if (plot == null)
+        {
+            if (!MainUtil.isPlotArea(l)) { return; }
+            if (!Permissions.hasPermission(pp, "plots.admin.interact.road"))
+            {
                 MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, "plots.admin.interact.road");
                 cancelled = true;
             }
         }
-        else {
-            if (!plot.hasOwner()) {
-                if (!Permissions.hasPermission(pp, "plots.admin.interact.unowned")) {
+        else
+        {
+            if (!plot.hasOwner())
+            {
+                if (!Permissions.hasPermission(pp, "plots.admin.interact.unowned"))
+                {
                     MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, "plots.admin.interact.unowned");
                     cancelled = true;
                 }
             }
-            else {
+            else
+            {
                 final UUID uuid = pp.getUUID();
-                if (!plot.isAdded(uuid)) {
-                    if (!Permissions.hasPermission(pp, "plots.admin.interact.other")) {
+                if (!plot.isAdded(uuid))
+                {
+                    if (!Permissions.hasPermission(pp, "plots.admin.interact.other"))
+                    {
                         MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, "plots.admin.interact.other");
                         cancelled = true;
                     }
                 }
             }
         }
-        if (cancelled) {
-            if (current.getTypeId() == newItem.getTypeId() && current.getDurability() == newItem.getDurability()) {
+        if (cancelled)
+        {
+            if ((current.getTypeId() == newItem.getTypeId()) && (current.getDurability() == newItem.getDurability()))
+            {
                 event.setCursor(new ItemStack(newItem.getTypeId(), newItem.getAmount(), newItem.getDurability()));
                 event.setCancelled(true);
                 return;
@@ -116,40 +118,43 @@ public class PlayerEvents_1_8 extends PlotListener implements Listener {
             event.setCursor(new ItemStack(newItem.getTypeId(), newItem.getAmount(), newItem.getDurability()));
         }
     }
-    
+
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onInteract(final PlayerInteractAtEntityEvent e) {
-        Entity entity = e.getRightClicked();
-        if (!(entity instanceof ArmorStand)) {
-            return;
-        }
+    public void onInteract(final PlayerInteractAtEntityEvent e)
+    {
+        final Entity entity = e.getRightClicked();
+        if (!(entity instanceof ArmorStand)) { return; }
         final Location l = BukkitUtil.getLocation(e.getRightClicked().getLocation());
-        String world = l.getWorld();
-        if (!PS.get().isPlotWorld(world)) {
-            return;
-        }
-        Plot plot = MainUtil.getPlot(l);
-        PlotPlayer pp = BukkitUtil.getPlayer(e.getPlayer());
-        if (plot == null) {
-            if (!MainUtil.isPlotArea(l)) {
-                return;
-            }
-            if (!Permissions.hasPermission(pp, "plots.admin.interact.road")) {
+        final String world = l.getWorld();
+        if (!PS.get().isPlotWorld(world)) { return; }
+        final Plot plot = MainUtil.getPlot(l);
+        final PlotPlayer pp = BukkitUtil.getPlayer(e.getPlayer());
+        if (plot == null)
+        {
+            if (!MainUtil.isPlotArea(l)) { return; }
+            if (!Permissions.hasPermission(pp, "plots.admin.interact.road"))
+            {
                 MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, "plots.admin.interact.road");
                 e.setCancelled(true);
             }
         }
-        else {
-            if (!plot.hasOwner()) {
-                if (!Permissions.hasPermission(pp, "plots.admin.interact.unowned")) {
+        else
+        {
+            if (!plot.hasOwner())
+            {
+                if (!Permissions.hasPermission(pp, "plots.admin.interact.unowned"))
+                {
                     MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, "plots.admin.interact.unowned");
                     e.setCancelled(true);
                 }
             }
-            else {
+            else
+            {
                 final UUID uuid = pp.getUUID();
-                if (!plot.isAdded(uuid)) {
-                    if (!Permissions.hasPermission(pp, "plots.admin.interact.other")) {
+                if (!plot.isAdded(uuid))
+                {
+                    if (!Permissions.hasPermission(pp, "plots.admin.interact.other"))
+                    {
                         MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, "plots.admin.interact.other");
                         e.setCancelled(true);
                     }
diff --git a/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents_1_8_3.java b/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents_1_8_3.java
index 3e19ddf17..dfb8cbed9 100644
--- a/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents_1_8_3.java
+++ b/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents_1_8_3.java
@@ -15,35 +15,44 @@ import com.intellectualcrafters.plot.object.Plot;
 import com.intellectualcrafters.plot.util.MainUtil;
 import com.plotsquared.bukkit.util.BukkitUtil;
 
-public class PlayerEvents_1_8_3 implements Listener {
+public class PlayerEvents_1_8_3 implements Listener
+{
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onBigBoom(final BlockExplodeEvent event) {
-        Block block = event.getBlock();
-        Location loc = BukkitUtil.getLocation(block.getLocation());
+    public void onBigBoom(final BlockExplodeEvent event)
+    {
+        final Block block = event.getBlock();
+        final Location loc = BukkitUtil.getLocation(block.getLocation());
         final String world = loc.getWorld();
-        if (!PS.get().isPlotWorld(world)) {
-            return;
-        }
+        if (!PS.get().isPlotWorld(world)) { return; }
         final Plot plot = MainUtil.getPlot(loc);
-        if ((plot != null) && plot.hasOwner()) {
-            if (FlagManager.isPlotFlagTrue(plot, "explosion")) {
+        if ((plot != null) && plot.hasOwner())
+        {
+            if (FlagManager.isPlotFlagTrue(plot, "explosion"))
+            {
                 final Iterator<Block> iter = event.blockList().iterator();
-                while (iter.hasNext()) {
+                while (iter.hasNext())
+                {
                     final Block b = iter.next();
-                    if (!plot.equals(MainUtil.getPlot(BukkitUtil.getLocation(b.getLocation())))) {
+                    if (!plot.equals(MainUtil.getPlot(BukkitUtil.getLocation(b.getLocation()))))
+                    {
                         iter.remove();
                     }
                 }
                 return;
             }
         }
-        if (MainUtil.isPlotArea(loc)) {
+        if (MainUtil.isPlotArea(loc))
+        {
             event.setCancelled(true);
-        } else {
+        }
+        else
+        {
             final Iterator<Block> iter = event.blockList().iterator();
-            while (iter.hasNext()) {
+            while (iter.hasNext())
+            {
                 iter.next();
-                if (MainUtil.isPlotArea(loc)) {
+                if (MainUtil.isPlotArea(loc))
+                {
                     iter.remove();
                 }
             }
diff --git a/src/main/java/com/plotsquared/bukkit/listeners/PlotPlusListener.java b/src/main/java/com/plotsquared/bukkit/listeners/PlotPlusListener.java
index 25a094216..52643a14e 100644
--- a/src/main/java/com/plotsquared/bukkit/listeners/PlotPlusListener.java
+++ b/src/main/java/com/plotsquared/bukkit/listeners/PlotPlusListener.java
@@ -1,254 +1,267 @@
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// PlotSquared - A plot manager and world generator for the Bukkit API                             /
-// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
-//                                                                                                 /
-// This program is free software; you can redistribute it and/or modify                            /
-// it under the terms of the GNU General Public License as published by                            /
-// the Free Software Foundation; either version 3 of the License, or                               /
-// (at your option) any later version.                                                             /
-//                                                                                                 /
-// This program is distributed in the hope that it will be useful,                                 /
-// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
-// GNU General Public License for more details.                                                    /
-//                                                                                                 /
-// You should have received a copy of the GNU General Public License                               /
-// along with this program; if not, write to the Free Software Foundation,                         /
-// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
-//                                                                                                 /
-// You can contact us via: support@intellectualsites.com                                           /
-////////////////////////////////////////////////////////////////////////////////////////////////////
-package com.plotsquared.bukkit.listeners;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map.Entry;
-import java.util.UUID;
-
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.GameMode;
-import org.bukkit.Material;
-import org.bukkit.entity.EntityType;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.event.block.BlockDamageEvent;
-import org.bukkit.event.entity.EntityDamageEvent;
-import org.bukkit.event.player.PlayerDropItemEvent;
-import org.bukkit.event.player.PlayerPickupItemEvent;
-import org.bukkit.event.player.PlayerQuitEvent;
-import org.bukkit.plugin.java.JavaPlugin;
-
-import com.intellectualcrafters.plot.config.C;
-import com.intellectualcrafters.plot.flag.Flag;
-import com.intellectualcrafters.plot.flag.FlagManager;
-import com.intellectualcrafters.plot.object.Plot;
-import com.intellectualcrafters.plot.object.PlotHandler;
-import com.intellectualcrafters.plot.object.PlotPlayer;
-import com.intellectualcrafters.plot.util.MainUtil;
-import com.intellectualcrafters.plot.util.Permissions;
-import com.intellectualcrafters.plot.util.UUIDHandler;
-import com.plotsquared.bukkit.events.PlayerEnterPlotEvent;
-import com.plotsquared.bukkit.events.PlayerLeavePlotEvent;
-import com.plotsquared.bukkit.util.BukkitUtil;
-import com.plotsquared.listener.PlotListener;
-
-/**
- * Created 2014-10-30 for PlotSquared
- *
- * @author Citymonstret
- */
-@SuppressWarnings({ "deprecation"})
-public class PlotPlusListener extends PlotListener implements Listener {
-    private final static HashMap<String, Interval> feedRunnable = new HashMap<>();
-    private final static HashMap<String, Interval> healRunnable = new HashMap<>();
-
-    public static void startRunnable(final JavaPlugin plugin) {
-        plugin.getServer().getScheduler().scheduleSyncRepeatingTask(plugin, new Runnable() {
-            @Override
-            public void run() {
-                for (Iterator<Entry<String, Interval>> iter = healRunnable.entrySet().iterator(); iter.hasNext();){
-                    Entry<String, Interval> entry = iter.next();
-                    final Interval value = entry.getValue();
-                    ++value.count;
-                    if (value.count == value.interval) {
-                        value.count = 0;
-                        final Player player = Bukkit.getPlayer(entry.getKey());
-                        if (player == null) {
-                            iter.remove();
-                            continue;
-                        }
-                        final double level = player.getHealth();
-                        if (level != value.max) {
-                            player.setHealth(Math.min(level + value.amount, value.max));
-                        }
-                    }
-                }
-                for (Iterator<Entry<String, Interval>> iter = feedRunnable.entrySet().iterator(); iter.hasNext();){
-                    Entry<String, Interval> entry = iter.next();
-                    final Interval value = entry.getValue();
-                    ++value.count;
-                    if (value.count == value.interval) {
-                        value.count = 0;
-                        final Player player = Bukkit.getPlayer(entry.getKey());
-                        if (player == null) {
-                            iter.remove();
-                            continue;
-                        }
-                        final int level = player.getFoodLevel();
-                        if (level != value.max) {
-                            player.setFoodLevel(Math.min(level + value.amount, value.max));
-                        }
-                    }
-                }
-            }
-        }, 0l, 20l);
-    }
-
-    @EventHandler(priority = EventPriority.HIGH)
-    public void onInteract(final BlockDamageEvent event) {
-        final Player player = event.getPlayer();
-        if (player.getGameMode() != GameMode.SURVIVAL) {
-            return;
-        }
-        final Plot plot = MainUtil.getPlot(BukkitUtil.getLocation(player));
-        if (plot == null) {
-            return;
-        }
-        if (FlagManager.isBooleanFlag(plot, "instabreak", false)) {
-            event.getBlock().breakNaturally();
-        }
-    }
-
-    @EventHandler(priority = EventPriority.HIGH)
-    public void onDamage(final EntityDamageEvent event) {
-        if (event.getEntityType() != EntityType.PLAYER) {
-            return;
-        }
-        final Player player = (Player) event.getEntity();
-        final Plot plot = MainUtil.getPlot(BukkitUtil.getLocation(player));
-        if (plot == null) {
-            return;
-        }
-        if (FlagManager.isBooleanFlag(plot, "invincible", false)) {
-            event.setCancelled(true);
-        }
-    }
-
-    @EventHandler
-    public void onItemPickup(final PlayerPickupItemEvent event) {
-        final Player player = event.getPlayer();
-        final PlotPlayer pp = BukkitUtil.getPlayer(player);
-        final Plot plot = MainUtil.getPlot(pp.getLocation());
-        if (plot == null) {
-            return;
-        }
-        final UUID uuid = pp.getUUID();
-        if (plot.isAdded(uuid) && FlagManager.isBooleanFlag(plot, "drop-protection", false)) {
-            event.setCancelled(true);
-        }
-    }
-
-    @EventHandler
-    public void onItemDrop(final PlayerDropItemEvent event) {
-        final Player player = event.getPlayer();
-        final PlotPlayer pp = BukkitUtil.getPlayer(player);
-        final Plot plot = MainUtil.getPlot(pp.getLocation());
-        if (plot == null) {
-            return;
-        }
-        final UUID uuid = pp.getUUID();
-        if (plot.isAdded(uuid) && FlagManager.isBooleanFlag(plot, "item-drop", false)) {
-            event.setCancelled(true);
-        }
-    }
-
-    @EventHandler
-    public void onPlotEnter(final PlayerEnterPlotEvent event) {
-        Player player = event.getPlayer();
-        final Plot plot = event.getPlot();
-        Flag feed = FlagManager.getPlotFlag(plot, "feed");
-        if (feed != null) {
-            Integer[] value = (Integer[]) feed.getValue();
-            feedRunnable.put(player.getName(), new Interval(value[0], value[1], 20));
-        }
-        Flag heal = FlagManager.getPlotFlag(plot, "heal");
-        if (heal != null) {
-            Integer[] value = (Integer[]) heal.getValue();
-            healRunnable.put(player.getName(), new Interval(value[0], value[1], 20));
-        }
-    }
-
-    @EventHandler
-    public void onPlayerQuit(final PlayerQuitEvent event) {
-        final Player player = event.getPlayer();
-        final String name = player.getName();
-        feedRunnable.remove(name);
-        healRunnable.remove(name);
-    }
-
-    @EventHandler
-    public void onPlotLeave(final PlayerLeavePlotEvent event) {
-        final Player leaver = event.getPlayer();
-        final Plot plot = event.getPlot();
-        if (!plot.hasOwner()) {
-            return;
-        }
-        final PlotPlayer pl = BukkitUtil.getPlayer(leaver);
-        String name = leaver.getName();
-        feedRunnable.remove(name);
-        healRunnable.remove(name);
-    }
-
-    public static class Interval {
-        public final int interval;
-        public final int amount;
-        public final int max;
-        public int count = 0;
-
-        public Interval(final int interval, final int amount, final int max) {
-            this.interval = interval;
-            this.amount = amount;
-            this.max = max;
-        }
-    }
-
-    /**
-     * Record Meta Class
-     *
-     * @author Citymonstret
-     */
-    public static class RecordMeta {
-        public final static List<RecordMeta> metaList = new ArrayList<>();
-        static {
-            for (int x = 3; x < 12; x++) {
-                metaList.add(new RecordMeta(x + "", Material.valueOf("RECORD_" + x)));
-            }
-        }
-        private final String name;
-        private final Material material;
-
-        public RecordMeta(final String name, final Material material) {
-            this.name = name;
-            this.material = material;
-        }
-
-        @Override
-        public String toString() {
-            return this.name;
-        }
-
-        @Override
-        public int hashCode() {
-            return this.name.hashCode();
-        }
-
-        public Material getMaterial() {
-            return this.material;
-        }
-    }
-}
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// PlotSquared - A plot manager and world generator for the Bukkit API                             /
+// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
+//                                                                                                 /
+// This program is free software; you can redistribute it and/or modify                            /
+// it under the terms of the GNU General Public License as published by                            /
+// the Free Software Foundation; either version 3 of the License, or                               /
+// (at your option) any later version.                                                             /
+//                                                                                                 /
+// This program is distributed in the hope that it will be useful,                                 /
+// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
+// GNU General Public License for more details.                                                    /
+//                                                                                                 /
+// You should have received a copy of the GNU General Public License                               /
+// along with this program; if not, write to the Free Software Foundation,                         /
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
+//                                                                                                 /
+// You can contact us via: support@intellectualsites.com                                           /
+////////////////////////////////////////////////////////////////////////////////////////////////////
+package com.plotsquared.bukkit.listeners;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map.Entry;
+import java.util.UUID;
+
+import org.bukkit.Bukkit;
+import org.bukkit.GameMode;
+import org.bukkit.Material;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.block.BlockDamageEvent;
+import org.bukkit.event.entity.EntityDamageEvent;
+import org.bukkit.event.player.PlayerDropItemEvent;
+import org.bukkit.event.player.PlayerPickupItemEvent;
+import org.bukkit.event.player.PlayerQuitEvent;
+import org.bukkit.plugin.java.JavaPlugin;
+
+import com.intellectualcrafters.plot.flag.Flag;
+import com.intellectualcrafters.plot.flag.FlagManager;
+import com.intellectualcrafters.plot.object.Plot;
+import com.intellectualcrafters.plot.object.PlotPlayer;
+import com.intellectualcrafters.plot.util.MainUtil;
+import com.plotsquared.bukkit.events.PlayerEnterPlotEvent;
+import com.plotsquared.bukkit.events.PlayerLeavePlotEvent;
+import com.plotsquared.bukkit.util.BukkitUtil;
+import com.plotsquared.listener.PlotListener;
+
+/**
+ * Created 2014-10-30 for PlotSquared
+ *

+ */
+@SuppressWarnings({ "deprecation" })
+public class PlotPlusListener extends PlotListener implements Listener
+{
+    private final static HashMap<String, Interval> feedRunnable = new HashMap<>();
+    private final static HashMap<String, Interval> healRunnable = new HashMap<>();
+
+    public static void startRunnable(final JavaPlugin plugin)
+    {
+        plugin.getServer().getScheduler().scheduleSyncRepeatingTask(plugin, new Runnable()
+        {
+            @Override
+            public void run()
+            {
+                for (final Iterator<Entry<String, Interval>> iter = healRunnable.entrySet().iterator(); iter.hasNext();)
+                {
+                    final Entry<String, Interval> entry = iter.next();
+                    final Interval value = entry.getValue();
+                    ++value.count;
+                    if (value.count == value.interval)
+                    {
+                        value.count = 0;
+                        final Player player = Bukkit.getPlayer(entry.getKey());
+                        if (player == null)
+                        {
+                            iter.remove();
+                            continue;
+                        }
+                        final double level = player.getHealth();
+                        if (level != value.max)
+                        {
+                            player.setHealth(Math.min(level + value.amount, value.max));
+                        }
+                    }
+                }
+                for (final Iterator<Entry<String, Interval>> iter = feedRunnable.entrySet().iterator(); iter.hasNext();)
+                {
+                    final Entry<String, Interval> entry = iter.next();
+                    final Interval value = entry.getValue();
+                    ++value.count;
+                    if (value.count == value.interval)
+                    {
+                        value.count = 0;
+                        final Player player = Bukkit.getPlayer(entry.getKey());
+                        if (player == null)
+                        {
+                            iter.remove();
+                            continue;
+                        }
+                        final int level = player.getFoodLevel();
+                        if (level != value.max)
+                        {
+                            player.setFoodLevel(Math.min(level + value.amount, value.max));
+                        }
+                    }
+                }
+            }
+        }, 0l, 20l);
+    }
+
+    @EventHandler(priority = EventPriority.HIGH)
+    public void onInteract(final BlockDamageEvent event)
+    {
+        final Player player = event.getPlayer();
+        if (player.getGameMode() != GameMode.SURVIVAL) { return; }
+        final Plot plot = MainUtil.getPlot(BukkitUtil.getLocation(player));
+        if (plot == null) { return; }
+        if (FlagManager.isBooleanFlag(plot, "instabreak", false))
+        {
+            event.getBlock().breakNaturally();
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGH)
+    public void onDamage(final EntityDamageEvent event)
+    {
+        if (event.getEntityType() != EntityType.PLAYER) { return; }
+        final Player player = (Player) event.getEntity();
+        final Plot plot = MainUtil.getPlot(BukkitUtil.getLocation(player));
+        if (plot == null) { return; }
+        if (FlagManager.isBooleanFlag(plot, "invincible", false))
+        {
+            event.setCancelled(true);
+        }
+    }
+
+    @EventHandler
+    public void onItemPickup(final PlayerPickupItemEvent event)
+    {
+        final Player player = event.getPlayer();
+        final PlotPlayer pp = BukkitUtil.getPlayer(player);
+        final Plot plot = MainUtil.getPlot(pp.getLocation());
+        if (plot == null) { return; }
+        final UUID uuid = pp.getUUID();
+        if (plot.isAdded(uuid) && FlagManager.isBooleanFlag(plot, "drop-protection", false))
+        {
+            event.setCancelled(true);
+        }
+    }
+
+    @EventHandler
+    public void onItemDrop(final PlayerDropItemEvent event)
+    {
+        final Player player = event.getPlayer();
+        final PlotPlayer pp = BukkitUtil.getPlayer(player);
+        final Plot plot = MainUtil.getPlot(pp.getLocation());
+        if (plot == null) { return; }
+        final UUID uuid = pp.getUUID();
+        if (plot.isAdded(uuid) && FlagManager.isBooleanFlag(plot, "item-drop", false))
+        {
+            event.setCancelled(true);
+        }
+    }
+
+    @EventHandler
+    public void onPlotEnter(final PlayerEnterPlotEvent event)
+    {
+        final Player player = event.getPlayer();
+        final Plot plot = event.getPlot();
+        final Flag feed = FlagManager.getPlotFlag(plot, "feed");
+        if (feed != null)
+        {
+            final Integer[] value = (Integer[]) feed.getValue();
+            feedRunnable.put(player.getName(), new Interval(value[0], value[1], 20));
+        }
+        final Flag heal = FlagManager.getPlotFlag(plot, "heal");
+        if (heal != null)
+        {
+            final Integer[] value = (Integer[]) heal.getValue();
+            healRunnable.put(player.getName(), new Interval(value[0], value[1], 20));
+        }
+    }
+
+    @EventHandler
+    public void onPlayerQuit(final PlayerQuitEvent event)
+    {
+        final Player player = event.getPlayer();
+        final String name = player.getName();
+        feedRunnable.remove(name);
+        healRunnable.remove(name);
+    }
+
+    @EventHandler
+    public void onPlotLeave(final PlayerLeavePlotEvent event)
+    {
+        final Player leaver = event.getPlayer();
+        final Plot plot = event.getPlot();
+        if (!plot.hasOwner()) { return; }
+        BukkitUtil.getPlayer(leaver);
+        final String name = leaver.getName();
+        feedRunnable.remove(name);
+        healRunnable.remove(name);
+    }
+
+    public static class Interval
+    {
+        public final int interval;
+        public final int amount;
+        public final int max;
+        public int count = 0;
+
+        public Interval(final int interval, final int amount, final int max)
+        {
+            this.interval = interval;
+            this.amount = amount;
+            this.max = max;
+        }
+    }
+
+    /**
+     * Record Meta Class
+     *

+     */
+    public static class RecordMeta
+    {
+        public final static List<RecordMeta> metaList = new ArrayList<>();
+        static
+        {
+            for (int x = 3; x < 12; x++)
+            {
+                metaList.add(new RecordMeta(x + "", Material.valueOf("RECORD_" + x)));
+            }
+        }
+        private final String name;
+        private final Material material;
+
+        public RecordMeta(final String name, final Material material)
+        {
+            this.name = name;
+            this.material = material;
+        }
+
+        @Override
+        public String toString()
+        {
+            return name;
+        }
+
+        @Override
+        public int hashCode()
+        {
+            return name.hashCode();
+        }
+
+        public Material getMaterial()
+        {
+            return material;
+        }
+    }
+}
diff --git a/src/main/java/com/plotsquared/bukkit/listeners/TNTListener.java b/src/main/java/com/plotsquared/bukkit/listeners/TNTListener.java
index 9d77a2121..5042d1901 100644
--- a/src/main/java/com/plotsquared/bukkit/listeners/TNTListener.java
+++ b/src/main/java/com/plotsquared/bukkit/listeners/TNTListener.java
@@ -19,104 +19,112 @@ import com.intellectualcrafters.plot.object.Plot;
 import com.intellectualcrafters.plot.util.MainUtil;
 import com.plotsquared.bukkit.util.BukkitUtil;
 
-public class TNTListener implements Listener {
+public class TNTListener implements Listener
+{
     private double lastRadius;
-    
+
     @EventHandler
-    public void onPrime(ExplosionPrimeEvent event) {
+    public void onPrime(final ExplosionPrimeEvent event)
+    {
         lastRadius = event.getRadius() + 1;
     }
+
     @EventHandler
-    public void onExplode(EntityExplodeEvent event) {
-        Entity entity = event.getEntity();
-        if (entity == null) {
-            return;
-        }
-        World world = entity.getWorld();
-        String worldname = world.getName();
-        if (!PS.get().isPlotWorld(worldname)) {
-            return;
-        }
-        Plot plot = MainUtil.getPlot(BukkitUtil.getLocation(entity));
-        if (plot == null) {
-            return;
-        }
-        
-        if (!FlagManager.isPlotFlagTrue(plot, "explosion")) {
-            return;
-        }
-        
-        Location bot = MainUtil.getPlotBottomLoc(plot.world, plot.id);
-        Location top = MainUtil.getPlotTopLoc(plot.world, plot.id);
-        
-        List<Entity> nearby = entity.getNearbyEntities(lastRadius, lastRadius, lastRadius);
-        for (Entity near : nearby) {
-            if (near instanceof TNTPrimed || near.getType() == EntityType.MINECART_TNT) {
-                Vector velocity = near.getVelocity();
-                Location loc = BukkitUtil.getLocation(near);
-                Plot nearPlot = MainUtil.getPlot(loc);
-                if (!plot.equals(nearPlot)) {
+    public void onExplode(final EntityExplodeEvent event)
+    {
+        final Entity entity = event.getEntity();
+        if (entity == null) { return; }
+        final World world = entity.getWorld();
+        final String worldname = world.getName();
+        if (!PS.get().isPlotWorld(worldname)) { return; }
+        final Plot plot = MainUtil.getPlot(BukkitUtil.getLocation(entity));
+        if (plot == null) { return; }
+
+        if (!FlagManager.isPlotFlagTrue(plot, "explosion")) { return; }
+
+        final Location bot = MainUtil.getPlotBottomLoc(plot.world, plot.id);
+        final Location top = MainUtil.getPlotTopLoc(plot.world, plot.id);
+
+        final List<Entity> nearby = entity.getNearbyEntities(lastRadius, lastRadius, lastRadius);
+        for (final Entity near : nearby)
+        {
+            if ((near instanceof TNTPrimed) || (near.getType() == EntityType.MINECART_TNT))
+            {
+                final Vector velocity = near.getVelocity();
+                final Location loc = BukkitUtil.getLocation(near);
+                final Plot nearPlot = MainUtil.getPlot(loc);
+                if (!plot.equals(nearPlot))
+                {
                     near.setVelocity(new Vector(0, 0, 0));
                     continue;
                 }
-                double vx = velocity.getX();
-                double vy = velocity.getX();
-                double vz = velocity.getX();
-                
+                final double vx = velocity.getX();
+                velocity.getX();
+                final double vz = velocity.getX();
+
                 int dx;
                 int dz;
-                
-                if (vx > 0) {
+
+                if (vx > 0)
+                {
                     dx = top.getX() - loc.getX();
                 }
-                else {
+                else
+                {
                     dx = bot.getX() - loc.getX();
                 }
-                if (vz > 0) {
+                if (vz > 0)
+                {
                     dz = top.getZ() - loc.getZ();
                 }
-                else {
+                else
+                {
                     dz = bot.getZ() - loc.getZ();
                 }
-                
-                double s1 = dx / vx;
-                double s2 = dz / vz;
-                Vector v1 = new Vector(dx, 0, vz * s1);
-                Vector v2 = new Vector(vx * s2, 0, dz);
-                
+
+                final double s1 = dx / vx;
+                final double s2 = dz / vz;
+                final Vector v1 = new Vector(dx, 0, vz * s1);
+                final Vector v2 = new Vector(vx * s2, 0, dz);
+
                 Vector shortest;
-                if (v1.length() < v2.length()) {
+                if (v1.length() < v2.length())
+                {
                     shortest = v1;
                 }
-                else {
+                else
+                {
                     shortest = v2;
                 }
-                
-                Location landing = loc.add(shortest.getBlockX() + 1, 0, shortest.getBlockZ() + 1);
-                int ty = MainUtil.getHeighestBlock(worldname, landing.getX(), landing.getZ());
-                int diff = ty - loc.getY();
-                double calcDiff = getY(velocity, Math.sqrt(shortest.getBlockX() * shortest.getBlockX() + shortest.getBlockZ() * shortest.getBlockZ()));
-                if (calcDiff > diff) {
+
+                final Location landing = loc.add(shortest.getBlockX() + 1, 0, shortest.getBlockZ() + 1);
+                final int ty = MainUtil.getHeighestBlock(worldname, landing.getX(), landing.getZ());
+                final int diff = ty - loc.getY();
+                final double calcDiff = getY(velocity, Math.sqrt((shortest.getBlockX() * shortest.getBlockX()) + (shortest.getBlockZ() * shortest.getBlockZ())));
+                if (calcDiff > diff)
+                {
                     near.setVelocity(new Vector(0, 0, 0));
                 }
             }
         }
         event.getEntity().setVelocity(new Vector(0, 0, 0));
     }
-    
-    public double getY(Vector velocity, double x) {
-        
-        double g = 16;
-        double l1 = velocity.length();
-        double l2 = Math.sqrt(velocity.getX() * velocity.getX() + velocity.getZ() * velocity.getZ());
-        
-        double v = l1 * 20;
-        double theta = Math.acos(l2/l1);
-        if (velocity.getY() < 0) {
+
+    public double getY(final Vector velocity, final double x)
+    {
+
+        final double g = 16;
+        final double l1 = velocity.length();
+        final double l2 = Math.sqrt((velocity.getX() * velocity.getX()) + (velocity.getZ() * velocity.getZ()));
+
+        final double v = l1 * 20;
+        double theta = Math.acos(l2 / l1);
+        if (velocity.getY() < 0)
+        {
             theta = -theta;
         }
-        double cos = Math.cos(theta);
-        double yDiff = (x * Math.tan(theta)) - ((g * x * x) / (2 * (v * v * cos * cos)));
+        final double cos = Math.cos(theta);
+        final double yDiff = (x * Math.tan(theta)) - ((g * x * x) / (2 * (v * v * cos * cos)));
         return yDiff;
     }
 }
diff --git a/src/main/java/com/plotsquared/bukkit/listeners/WorldEvents.java b/src/main/java/com/plotsquared/bukkit/listeners/WorldEvents.java
index 9b2f99a0d..aa368b35d 100644
--- a/src/main/java/com/plotsquared/bukkit/listeners/WorldEvents.java
+++ b/src/main/java/com/plotsquared/bukkit/listeners/WorldEvents.java
@@ -11,29 +11,37 @@ import com.intellectualcrafters.plot.PS;
 import com.plotsquared.bukkit.generator.BukkitGeneratorWrapper;
 import com.plotsquared.bukkit.generator.BukkitPlotGenerator;
 
-public class WorldEvents implements Listener {
-    
+public class WorldEvents implements Listener
+{
+
     public static String lastWorld = null;
-    
-    public static String getName(World world) {
-        if (lastWorld != null && !lastWorld.equals("CheckingPlotSquaredGenerator")) {
+
+    public static String getName(final World world)
+    {
+        if ((lastWorld != null) && !lastWorld.equals("CheckingPlotSquaredGenerator"))
+        {
             return lastWorld;
         }
-        else {
+        else
+        {
             return world.getName();
         }
     }
-    
+
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public static void onWorldInit(final WorldInitEvent event) {
+    public static void onWorldInit(final WorldInitEvent event)
+    {
         final World world = event.getWorld();
-        String name = getName(world);
+        final String name = getName(world);
         final ChunkGenerator gen = world.getGenerator();
-        if (gen instanceof BukkitPlotGenerator) {
-            PS.get().loadWorld(name, new BukkitGeneratorWrapper(name, (BukkitPlotGenerator) gen));
+        if (gen instanceof BukkitPlotGenerator)
+        {
+            PS.get().loadWorld(name, new BukkitGeneratorWrapper(name, gen));
         }
-        else {
-            if (PS.get().config.contains("worlds." + name)) {
+        else
+        {
+            if (PS.get().config.contains("worlds." + name))
+            {
                 PS.get().loadWorld(name, new BukkitGeneratorWrapper(name, null));
             }
         }
diff --git a/src/main/java/com/plotsquared/bukkit/listeners/worldedit/WEListener.java b/src/main/java/com/plotsquared/bukkit/listeners/worldedit/WEListener.java
index a893c10ec..982f34ac5 100644
--- a/src/main/java/com/plotsquared/bukkit/listeners/worldedit/WEListener.java
+++ b/src/main/java/com/plotsquared/bukkit/listeners/worldedit/WEListener.java
@@ -3,7 +3,6 @@ package com.plotsquared.bukkit.listeners.worldedit;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
-import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
@@ -25,15 +24,14 @@ import com.intellectualcrafters.plot.util.Permissions;
 import com.intellectualcrafters.plot.util.SetBlockQueue;
 import com.plotsquared.bukkit.BukkitMain;
 import com.plotsquared.bukkit.util.BukkitUtil;
-import com.plotsquared.bukkit.util.SetBlockFast;
 import com.plotsquared.listener.WEManager;
 import com.sk89q.worldedit.BlockVector;
-import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.bukkit.WorldEditPlugin;
 import com.sk89q.worldedit.bukkit.selections.Selection;
- 
-public class WEListener implements Listener {
-    
+
+public class WEListener implements Listener
+{
+
     public final HashSet<String> rad1 = new HashSet<>(Arrays.asList("forestgen", "pumpkins", "drain", "fixwater", "fixlava", "replacenear", "snow", "thaw", "ex", "butcher", "size"));
     public final HashSet<String> rad2 = new HashSet<>(Arrays.asList("fill", "fillr", "removenear", "remove"));
     public final HashSet<String> rad2_1 = new HashSet<>(Arrays.asList("hcyl", "cyl"));
@@ -41,273 +39,356 @@ public class WEListener implements Listener {
     public final HashSet<String> rad2_3 = new HashSet<>(Arrays.asList("brush smooth"));
     public final HashSet<String> rad3_1 = new HashSet<>(Arrays.asList("brush gravity"));
     public final HashSet<String> rad3_2 = new HashSet<>(Arrays.asList("brush sphere", "brush cylinder"));
-    
-    public final HashSet<String> region  = new HashSet<>(Arrays.asList("move", "set", "replace", "overlay", "walls", "outline", "deform", "hollow", "smooth", "naturalize", "paste", "count", "distr", "regen", "copy", "cut", "green", "setbiome"));
+
+    public final HashSet<String> region = new HashSet<>(Arrays.asList("move", "set", "replace", "overlay", "walls", "outline", "deform", "hollow", "smooth", "naturalize", "paste", "count", "distr",
+    "regen", "copy", "cut", "green", "setbiome"));
     public final HashSet<String> regionExtend = new HashSet<>(Arrays.asList("stack"));
     public final HashSet<String> unregioned = new HashSet<>(Arrays.asList("paste", "redo", "undo", "rotate", "flip", "generate", "schematic", "schem"));
-    public final HashSet<String> unsafe1 =  new HashSet<>(Arrays.asList("cs", ".s", "restore", "snapshot", "delchunks", "listchunks"));
+    public final HashSet<String> unsafe1 = new HashSet<>(Arrays.asList("cs", ".s", "restore", "snapshot", "delchunks", "listchunks"));
     public final HashSet<String> restricted = new HashSet<>(Arrays.asList("up"));
     public final HashSet<String> other = new HashSet<>(Arrays.asList("undo", "redo"));
-    
-    public boolean checkCommand(List<String> list, String cmd) {
-        for (String identifier : list) {
-            if (("/" + identifier).equals(cmd) || ("//" + identifier).equals(cmd) || ("/worldedit:/" + identifier).equals(cmd) || ("/worldedit:" + identifier).equals(cmd)) {
-                return true;
-            }
+
+    public boolean checkCommand(final List<String> list, final String cmd)
+    {
+        for (final String identifier : list)
+        {
+            if (("/" + identifier).equals(cmd) || ("//" + identifier).equals(cmd) || ("/worldedit:/" + identifier).equals(cmd) || ("/worldedit:" + identifier).equals(cmd)) { return true; }
         }
         return false;
     }
-    
-    public String reduceCmd(String cmd, boolean single) {
-        if (cmd.startsWith("/worldedit:/")) {
-            return cmd.substring(12);
-        }
-        if (cmd.startsWith("/worldedit:")) {
-            return cmd.substring(11);
-        }
-        if (cmd.startsWith("//")) {
-            return cmd.substring(2);
-        }
-        if (single && cmd.startsWith("/")) {
-            return cmd.substring(1);
-        }
+
+    public String reduceCmd(final String cmd, final boolean single)
+    {
+        if (cmd.startsWith("/worldedit:/")) { return cmd.substring(12); }
+        if (cmd.startsWith("/worldedit:")) { return cmd.substring(11); }
+        if (cmd.startsWith("//")) { return cmd.substring(2); }
+        if (single && cmd.startsWith("/")) { return cmd.substring(1); }
         return cmd;
     }
-    
-    public int getInt(String s) {
-        try {
+
+    public int getInt(final String s)
+    {
+        try
+        {
             int max = 0;
-            String[] split = s.split(",");
-            for (String rad : split) {
-                int val = Integer.parseInt(rad);
-                if (val > max) {
+            final String[] split = s.split(",");
+            for (final String rad : split)
+            {
+                final int val = Integer.parseInt(rad);
+                if (val > max)
+                {
                     max = val;
                 }
             }
             return max;
         }
-        catch (NumberFormatException e) {
+        catch (final NumberFormatException e)
+        {
             return 0;
         }
     }
-    
-    public boolean checkVolume(PlotPlayer player, long volume, long max, Cancellable e) {
-        if (volume > max) {
+
+    public boolean checkVolume(final PlotPlayer player, final long volume, final long max, final Cancellable e)
+    {
+        if (volume > max)
+        {
             MainUtil.sendMessage(player, C.WORLDEDIT_VOLUME.s().replaceAll("%current%", volume + "").replaceAll("%max%", max + ""));
             e.setCancelled(true);
         }
-        if (Permissions.hasPermission(player, "plots.worldedit.bypass")) {
+        if (Permissions.hasPermission(player, "plots.worldedit.bypass"))
+        {
             MainUtil.sendMessage(player, C.WORLDEDIT_BYPASS);
         }
         return true;
     }
-    
-    public boolean checkSelection(Player p, PlotPlayer pp, int modifier, long max, Cancellable e) {
+
+    public boolean checkSelection(final Player p, final PlotPlayer pp, final int modifier, final long max, final Cancellable e)
+    {
         final Selection selection = BukkitMain.worldEdit.getSelection(p);
-        if (selection == null) {
-            return true;
-        }
+        if (selection == null) { return true; }
         final BlockVector pos1 = selection.getNativeMinimumPoint().toBlockVector();
         final BlockVector pos2 = selection.getNativeMaximumPoint().toBlockVector();
-        HashSet<RegionWrapper> mask = WEManager.getMask(pp);
-        RegionWrapper region = new RegionWrapper(pos1.getBlockX(), pos2.getBlockX(), pos1.getBlockZ(), pos2.getBlockZ());
-        if (Settings.REQUIRE_SELECTION) {
+        final HashSet<RegionWrapper> mask = WEManager.getMask(pp);
+        final RegionWrapper region = new RegionWrapper(pos1.getBlockX(), pos2.getBlockX(), pos1.getBlockZ(), pos2.getBlockZ());
+        if (Settings.REQUIRE_SELECTION)
+        {
             String arg = null;
-            if (!WEManager.regionContains(region, mask)) {
+            if (!WEManager.regionContains(region, mask))
+            {
                 arg = "pos1 + pos2";
             }
-            else if (!WEManager.maskContains(mask, pos1.getBlockX(), pos1.getBlockY(), pos1.getBlockZ())) {
+            else if (!WEManager.maskContains(mask, pos1.getBlockX(), pos1.getBlockY(), pos1.getBlockZ()))
+            {
                 arg = "pos1";
             }
-            else if (!WEManager.maskContains(mask, pos2.getBlockX(), pos2.getBlockY(), pos2.getBlockZ())) {
+            else if (!WEManager.maskContains(mask, pos2.getBlockX(), pos2.getBlockY(), pos2.getBlockZ()))
+            {
                 arg = "pos2";
             }
-            if (arg != null) {
+            if (arg != null)
+            {
                 e.setCancelled(true);
                 MainUtil.sendMessage(pp, C.REQUIRE_SELECTION_IN_MASK, arg);
-                if (Permissions.hasPermission(pp, "plots.worldedit.bypass")) {
+                if (Permissions.hasPermission(pp, "plots.worldedit.bypass"))
+                {
                     MainUtil.sendMessage(pp, C.WORLDEDIT_BYPASS);
                 }
                 return true;
             }
-            if (!WEManager.regionContains(region, mask)) {
+            if (!WEManager.regionContains(region, mask))
+            {
                 MainUtil.sendMessage(pp, C.REQUIRE_SELECTION_IN_MASK, "pos1 + pos2");
                 e.setCancelled(true);
-                if (Permissions.hasPermission(pp, "plots.worldedit.bypass")) {
+                if (Permissions.hasPermission(pp, "plots.worldedit.bypass"))
+                {
                     MainUtil.sendMessage(pp, C.WORLDEDIT_BYPASS);
                 }
                 return true;
             }
         }
-        long volume = Math.abs((pos1.getBlockX() - pos2.getBlockX()) * (pos1.getBlockY() - pos2.getBlockY()) * (pos1.getBlockZ() - pos2.getBlockZ())) * modifier;
+        final long volume = Math.abs((pos1.getBlockX() - pos2.getBlockX()) * (pos1.getBlockY() - pos2.getBlockY()) * (pos1.getBlockZ() - pos2.getBlockZ())) * modifier;
         return checkVolume(pp, volume, max, e);
     }
-    
-    private boolean set = false;
-    
-    public boolean delay(final Player player, final String command, boolean delayed) {
-        if (!Settings.QUEUE_COMMANDS || !Settings.EXPERIMENTAL_FAST_ASYNC_WORLDEDIT || set) {
-            return false;
-        }
-        boolean free = SetBlockQueue.addNotify(null);
-        if (free) {
-            if (delayed) {
+
+    private final boolean set = false;
+
+    public boolean delay(final Player player, final String command, final boolean delayed)
+    {
+        if (!Settings.QUEUE_COMMANDS || !Settings.EXPERIMENTAL_FAST_ASYNC_WORLDEDIT || set) { return false; }
+        final boolean free = SetBlockQueue.addNotify(null);
+        if (free)
+        {
+            if (delayed)
+            {
                 MainUtil.sendMessage(BukkitUtil.getPlayer(player), C.WORLDEDIT_RUN, command);
                 Bukkit.getServer().dispatchCommand(player, command.substring(1));
             }
-            else {
+            else
+            {
                 return false;
             }
         }
-        else {
-            if (!delayed) {
+        else
+        {
+            if (!delayed)
+            {
                 MainUtil.sendMessage(BukkitUtil.getPlayer(player), C.WORLDEDIT_DELAYED);
             }
-            SetBlockQueue.addNotify(new Runnable() {
+            SetBlockQueue.addNotify(new Runnable()
+            {
                 @Override
-                public void run() {
+                public void run()
+                {
                     delay(player, command, true);
                 }
             });
         }
         return true;
     }
-    
+
     @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
-    public boolean onPlayerCommand(final PlayerCommandPreprocessEvent e) {
-        WorldEditPlugin worldedit = BukkitMain.worldEdit;
-        if (worldedit == null) {
+    public boolean onPlayerCommand(final PlayerCommandPreprocessEvent e)
+    {
+        final WorldEditPlugin worldedit = BukkitMain.worldEdit;
+        if (worldedit == null)
+        {
             HandlerList.unregisterAll(this);
             return true;
         }
         final Player p = e.getPlayer();
         final PlotPlayer pp = BukkitUtil.getPlayer(p);
-        if (!PS.get().isPlotWorld(p.getWorld().getName())) {
-            return true;
-        }
-        String message = e.getMessage();
-        String cmd = message.toLowerCase();
-        boolean single = true;
-        String[] split = cmd.split(" ");
-        
-        long maxVolume = Settings.WE_MAX_VOLUME;
-        long maxIterations = Settings.WE_MAX_ITERATIONS;
-        if (pp.getAttribute("worldedit")) {
-            return true;
-        }
-        if (split.length >= 2) {
-            String reduced = reduceCmd(split[0], single);
-            String reduced2 = reduceCmd(split[0] + " " + split[1], single);
-            if (rad1.contains(reduced)) {
-                if (delay(p, message, false)) { e.setCancelled(true); return true; }
-                long volume = getInt(split[1]) * 256;
+        if (!PS.get().isPlotWorld(p.getWorld().getName())) { return true; }
+        final String message = e.getMessage();
+        final String cmd = message.toLowerCase();
+        final boolean single = true;
+        final String[] split = cmd.split(" ");
+
+        final long maxVolume = Settings.WE_MAX_VOLUME;
+        final long maxIterations = Settings.WE_MAX_ITERATIONS;
+        if (pp.getAttribute("worldedit")) { return true; }
+        if (split.length >= 2)
+        {
+            final String reduced = reduceCmd(split[0], single);
+            final String reduced2 = reduceCmd(split[0] + " " + split[1], single);
+            if (rad1.contains(reduced))
+            {
+                if (delay(p, message, false))
+                {
+                    e.setCancelled(true);
+                    return true;
+                }
+                final long volume = getInt(split[1]) * 256;
                 return checkVolume(pp, volume, maxVolume, e);
             }
-            if (rad2.contains(reduced)) {
-                if (delay(p, message, false)) { e.setCancelled(true); return true; }
-                if (split.length >= 3) {
-                    long volume = getInt(split[2]) * 256;
+            if (rad2.contains(reduced))
+            {
+                if (delay(p, message, false))
+                {
+                    e.setCancelled(true);
+                    return true;
+                }
+                if (split.length >= 3)
+                {
+                    final long volume = getInt(split[2]) * 256;
                     return checkVolume(pp, volume, maxVolume, e);
                 }
                 return true;
             }
-            if (rad2_1.contains(reduced)) {
-                if (delay(p, message, false)) { e.setCancelled(true); return true; }
-                if (split.length >= 4) {
-                    long volume = getInt(split[2]) * getInt(split[3]);
+            if (rad2_1.contains(reduced))
+            {
+                if (delay(p, message, false))
+                {
+                    e.setCancelled(true);
+                    return true;
+                }
+                if (split.length >= 4)
+                {
+                    final long volume = getInt(split[2]) * getInt(split[3]);
                     return checkVolume(pp, volume, maxVolume, e);
                 }
                 return true;
             }
-            if (rad2_2.contains(reduced)) {
-                if (delay(p, message, false)) { e.setCancelled(true); return true; }
-                if (split.length >= 3) {
-                    long radius = getInt(split[2]);
-                    long volume = radius * radius;
+            if (rad2_2.contains(reduced))
+            {
+                if (delay(p, message, false))
+                {
+                    e.setCancelled(true);
+                    return true;
+                }
+                if (split.length >= 3)
+                {
+                    final long radius = getInt(split[2]);
+                    final long volume = radius * radius;
                     return checkVolume(pp, volume, maxVolume, e);
                 }
                 return true;
             }
-            if (rad2_3.contains(reduced2)) {
-                if (delay(p, message, false)) { e.setCancelled(true); return true; }
-                if (split.length >= 3) {
-                    if (split.length == 4) {
-                        int iterations = getInt(split[3]);
-                        if (iterations > maxIterations) {
+            if (rad2_3.contains(reduced2))
+            {
+                if (delay(p, message, false))
+                {
+                    e.setCancelled(true);
+                    return true;
+                }
+                if (split.length >= 3)
+                {
+                    if (split.length == 4)
+                    {
+                        final int iterations = getInt(split[3]);
+                        if (iterations > maxIterations)
+                        {
                             MainUtil.sendMessage(pp, C.WORLDEDIT_ITERATIONS.s().replaceAll("%current%", iterations + "").replaceAll("%max%", maxIterations + ""));
                             e.setCancelled(true);
-                            if (Permissions.hasPermission(pp, "plots.worldedit.bypass")) {
+                            if (Permissions.hasPermission(pp, "plots.worldedit.bypass"))
+                            {
                                 MainUtil.sendMessage(pp, C.WORLDEDIT_BYPASS);
                             }
                             return true;
                         }
                     }
-                    long radius = getInt(split[2]);
-                    long volume = radius * radius;
+                    final long radius = getInt(split[2]);
+                    final long volume = radius * radius;
                     return checkVolume(pp, volume, maxVolume, e);
                 }
                 return true;
             }
-            if (rad3_1.contains(reduced2)) {
-                if (delay(p, message, false)) { e.setCancelled(true); return true; }
-                if (split.length >= 3) {
+            if (rad3_1.contains(reduced2))
+            {
+                if (delay(p, message, false))
+                {
+                    e.setCancelled(true);
+                    return true;
+                }
+                if (split.length >= 3)
+                {
                     int i = 2;
-                    if (split[i].equalsIgnoreCase("-h")) {
+                    if (split[i].equalsIgnoreCase("-h"))
+                    {
                         i = 3;
                     }
-                    long radius = getInt(split[i]);
-                    long volume = radius * radius;
+                    final long radius = getInt(split[i]);
+                    final long volume = radius * radius;
                     return checkVolume(pp, volume, maxVolume, e);
                 }
                 return true;
             }
-            if (rad3_2.contains(reduced2)) {
-                if (delay(p, message, false)) { e.setCancelled(true); return true; }
-                if (split.length >= 4) {
+            if (rad3_2.contains(reduced2))
+            {
+                if (delay(p, message, false))
+                {
+                    e.setCancelled(true);
+                    return true;
+                }
+                if (split.length >= 4)
+                {
                     int i = 3;
-                    if (split[i].equalsIgnoreCase("-h")) {
+                    if (split[i].equalsIgnoreCase("-h"))
+                    {
                         i = 4;
                     }
-                    long radius = getInt(split[i]);
-                    long volume = radius * radius;
+                    final long radius = getInt(split[i]);
+                    final long volume = radius * radius;
                     return checkVolume(pp, volume, maxVolume, e);
                 }
                 return true;
             }
-            if (regionExtend.contains(reduced)) {
-                if (delay(p, message, false)) { e.setCancelled(true); return true; }
+            if (regionExtend.contains(reduced))
+            {
+                if (delay(p, message, false))
+                {
+                    e.setCancelled(true);
+                    return true;
+                }
                 return checkSelection(p, pp, getInt(split[1]), maxVolume, e);
             }
         }
-        String reduced = reduceCmd(split[0], single);
-        if (Settings.WE_BLACKLIST.contains(reduced)) {
+        final String reduced = reduceCmd(split[0], single);
+        if (Settings.WE_BLACKLIST.contains(reduced))
+        {
             MainUtil.sendMessage(pp, C.WORLDEDIT_UNSAFE);
             e.setCancelled(true);
-            if (Permissions.hasPermission(pp, "plots.worldedit.bypass")) {
+            if (Permissions.hasPermission(pp, "plots.worldedit.bypass"))
+            {
                 MainUtil.sendMessage(pp, C.WORLDEDIT_BYPASS);
             }
         }
-        if (restricted.contains(reduced)) {
-            Plot plot = MainUtil.getPlot(pp.getLocation());
-            if (plot != null && plot.isAdded(pp.getUUID())) {
-                if (delay(p, message, false)) { e.setCancelled(true); return true; }
+        if (restricted.contains(reduced))
+        {
+            final Plot plot = MainUtil.getPlot(pp.getLocation());
+            if ((plot != null) && plot.isAdded(pp.getUUID()))
+            {
+                if (delay(p, message, false))
+                {
+                    e.setCancelled(true);
+                    return true;
+                }
                 return true;
             }
             e.setCancelled(true);
             MainUtil.sendMessage(pp, C.NO_PLOT_PERMS);
-            if (Permissions.hasPermission(pp, "plots.worldedit.bypass")) {
+            if (Permissions.hasPermission(pp, "plots.worldedit.bypass"))
+            {
                 MainUtil.sendMessage(pp, C.WORLDEDIT_BYPASS);
             }
             return true;
         }
-        if (region.contains(reduced)) {
-            if (delay(p, message, false)) { e.setCancelled(true); return true; }
+        if (region.contains(reduced))
+        {
+            if (delay(p, message, false))
+            {
+                e.setCancelled(true);
+                return true;
+            }
             return checkSelection(p, pp, 1, maxVolume, e);
         }
-        if (other.contains(reduced)) {
-            if (delay(p, message, false)) { e.setCancelled(true); return true; }
+        if (other.contains(reduced))
+        {
+            if (delay(p, message, false))
+            {
+                e.setCancelled(true);
+                return true;
+            }
         }
         return true;
     }
 }
- 
diff --git a/src/main/java/com/plotsquared/bukkit/object/BukkitLazyBlock.java b/src/main/java/com/plotsquared/bukkit/object/BukkitLazyBlock.java
index 35023f03c..d81498eb0 100644
--- a/src/main/java/com/plotsquared/bukkit/object/BukkitLazyBlock.java
+++ b/src/main/java/com/plotsquared/bukkit/object/BukkitLazyBlock.java
@@ -5,37 +5,41 @@ import org.bukkit.block.Block;
 import com.intellectualcrafters.plot.object.LazyBlock;
 import com.intellectualcrafters.plot.object.PlotBlock;
 
-public class BukkitLazyBlock extends LazyBlock {
+public class BukkitLazyBlock extends LazyBlock
+{
 
     private int id = -1;
     private Block block;
     private PlotBlock pb;
-    
-    
-    public BukkitLazyBlock(int id, Block block) {
+
+    public BukkitLazyBlock(final int id, final Block block)
+    {
         this.id = id;
         this.block = block;
     }
-    
-    public BukkitLazyBlock(PlotBlock pb) {
-        this.id = pb.id;
+
+    public BukkitLazyBlock(final PlotBlock pb)
+    {
+        id = pb.id;
         this.pb = pb;
     }
-    
-    public BukkitLazyBlock(Block block) {
+
+    public BukkitLazyBlock(final Block block)
+    {
         this.block = block;
     }
-    
+
     @Override
-    public PlotBlock getPlotBlock() {
-        if (pb != null) {
-            return pb;
-        }
-        if (id == -1 ) {
+    public PlotBlock getPlotBlock()
+    {
+        if (pb != null) { return pb; }
+        if (id == -1)
+        {
             id = block.getTypeId();
         }
         byte data;
-        switch(id) {
+        switch (id)
+        {
             case 0:
             case 2:
             case 4:
@@ -127,15 +131,17 @@ public class BukkitLazyBlock extends LazyBlock {
         }
         pb = new PlotBlock((short) id, data);
         return pb;
-        
+
     }
-    
+
     @Override
-    public int getId() {
-        if (id == -1) {
+    public int getId()
+    {
+        if (id == -1)
+        {
             id = block.getTypeId();
         }
         return id;
     }
-    
+
 }
diff --git a/src/main/java/com/plotsquared/bukkit/object/BukkitOfflinePlayer.java b/src/main/java/com/plotsquared/bukkit/object/BukkitOfflinePlayer.java
index c935aec8d..931005470 100644
--- a/src/main/java/com/plotsquared/bukkit/object/BukkitOfflinePlayer.java
+++ b/src/main/java/com/plotsquared/bukkit/object/BukkitOfflinePlayer.java
@@ -6,35 +6,41 @@ import org.bukkit.OfflinePlayer;
 
 import com.intellectualcrafters.plot.object.OfflinePlotPlayer;
 
-public class BukkitOfflinePlayer implements OfflinePlotPlayer {
-    
+public class BukkitOfflinePlayer implements OfflinePlotPlayer
+{
+
     public final OfflinePlayer player;
 
     /**
      * Please do not use this method. Instead use BukkitUtil.getPlayer(Player), as it caches player objects.
      * @param player
      */
-    public BukkitOfflinePlayer(final OfflinePlayer player) {
+    public BukkitOfflinePlayer(final OfflinePlayer player)
+    {
         this.player = player;
     }
-    
+
     @Override
-    public UUID getUUID() {
-        return this.player.getUniqueId();
+    public UUID getUUID()
+    {
+        return player.getUniqueId();
     }
-    
+
     @Override
-    public long getLastPlayed() {
-        return this.player.getLastPlayed();
+    public long getLastPlayed()
+    {
+        return player.getLastPlayed();
     }
-    
+
     @Override
-    public boolean isOnline() {
-        return this.player.isOnline();
+    public boolean isOnline()
+    {
+        return player.isOnline();
     }
-    
+
     @Override
-    public String getName() {
-        return this.player.getName();
+    public String getName()
+    {
+        return player.getName();
     }
 }
diff --git a/src/main/java/com/plotsquared/bukkit/object/BukkitPlayer.java b/src/main/java/com/plotsquared/bukkit/object/BukkitPlayer.java
index 8a9bba232..d7a11080d 100644
--- a/src/main/java/com/plotsquared/bukkit/object/BukkitPlayer.java
+++ b/src/main/java/com/plotsquared/bukkit/object/BukkitPlayer.java
@@ -24,8 +24,9 @@ import com.intellectualcrafters.plot.util.PlotWeather;
 import com.intellectualcrafters.plot.util.UUIDHandler;
 import com.plotsquared.bukkit.util.BukkitUtil;
 
-public class BukkitPlayer extends PlotPlayer {
-    
+public class BukkitPlayer extends PlotPlayer
+{
+
     public final Player player;
     private UUID uuid;
     private String name;
@@ -38,73 +39,85 @@ public class BukkitPlayer extends PlotPlayer {
      * Please do not use this method. Instead use BukkitUtil.getPlayer(Player), as it caches player objects.
      * @param player
      */
-    public BukkitPlayer(final Player player) {
+    public BukkitPlayer(final Player player)
+    {
         this.player = player;
     }
-    
-    public BukkitPlayer(final Player player, boolean offline) {
+
+    public BukkitPlayer(final Player player, final boolean offline)
+    {
         this.player = player;
         this.offline = offline;
     }
-    
-    public long getPreviousLogin() {
-        if (last == 0) {
+
+    @Override
+    public long getPreviousLogin()
+    {
+        if (last == 0)
+        {
             last = player.getLastPlayed();
         }
         return last;
     }
 
     @Override
-    public Location getLocation() {
-        Location loc = super.getLocation();
-        return loc == null ? BukkitUtil.getLocation(this.player) : loc; 
+    public Location getLocation()
+    {
+        final Location loc = super.getLocation();
+        return loc == null ? BukkitUtil.getLocation(player) : loc;
     }
-    
+
     @Override
-    public UUID getUUID() {
-        if (this.uuid == null) {
-            this.uuid = UUIDHandler.getUUID(this);
+    public UUID getUUID()
+    {
+        if (uuid == null)
+        {
+            uuid = UUIDHandler.getUUID(this);
         }
-        return this.uuid;
+        return uuid;
     }
-    
+
     @Override
-    public boolean hasPermission(final String node) {
-        if (Settings.PERMISSION_CACHING) {
-            if (this.noPerm.contains(node)) {
-                return false;
-            }
-            if (this.hasPerm.contains(node)) {
-                return true;
-            }
+    public boolean hasPermission(final String node)
+    {
+        if (Settings.PERMISSION_CACHING)
+        {
+            if (noPerm.contains(node)) { return false; }
+            if (hasPerm.contains(node)) { return true; }
         }
-        if (offline && EconHandler.manager != null) {
-            return EconHandler.manager.hasPermission(getName(), node);
-        }
-        boolean value = this.player.hasPermission(node);
-        if (Settings.PERMISSION_CACHING) {
-            if (value) {
-                this.hasPerm.add(node);
+        if (offline && (EconHandler.manager != null)) { return EconHandler.manager.hasPermission(getName(), node); }
+        final boolean value = player.hasPermission(node);
+        if (Settings.PERMISSION_CACHING)
+        {
+            if (value)
+            {
+                hasPerm.add(node);
             }
-            else {
-                this.noPerm.add(node);
+            else
+            {
+                noPerm.add(node);
             }
         }
         return value;
     }
-    
-    public Permission getPermission(String node) {
-        PluginManager manager = Bukkit.getPluginManager();
+
+    public Permission getPermission(final String node)
+    {
+        final PluginManager manager = Bukkit.getPluginManager();
         Permission perm = manager.getPermission(node);
-        if (perm == null) {
-            String[] nodes = node.split("\\.");
+        if (perm == null)
+        {
+            final String[] nodes = node.split("\\.");
             perm = new Permission(node);
             final StringBuilder n = new StringBuilder();
-            for (int i = 0; i < (nodes.length - 1); i++) {
+            for (int i = 0; i < (nodes.length - 1); i++)
+            {
                 n.append(nodes[i] + ("."));
-                if (!node.equals(n + C.PERMISSION_STAR.s())) {
-                    Permission parent = getPermission(n + C.PERMISSION_STAR.s());
-                    if (parent != null) {
+                if (!node.equals(n + C.PERMISSION_STAR.s()))
+                {
+                    final Permission parent = getPermission(n + C.PERMISSION_STAR.s());
+                    if (parent != null)
+                    {
                         perm.addParent(parent, true);
                     }
                 }
@@ -115,53 +128,61 @@ public class BukkitPlayer extends PlotPlayer {
         perm.recalculatePermissibles();
         return perm;
     }
-    
+
     @Override
-    public void sendMessage(final String message) {
-        this.player.sendMessage(message);
+    public void sendMessage(final String message)
+    {
+        player.sendMessage(message);
     }
-    
+
     @Override
-    public void sendMessage(C c, String... args) {
+    public void sendMessage(final C c, final String... args)
+    {
         MainUtil.sendMessage(this, c, args);
     }
-    
+
     @Override
-    public void teleport(final Location loc) {
-        if (Math.abs(loc.getX()) >= 30000000 || Math.abs(loc.getZ()) >= 30000000) {
-            return;
+    public void teleport(final Location loc)
+    {
+        if ((Math.abs(loc.getX()) >= 30000000) || (Math.abs(loc.getZ()) >= 30000000)) { return; }
+        player.teleport(new org.bukkit.Location(BukkitUtil.getWorld(loc.getWorld()), loc.getX() + 0.5, loc.getY(), loc.getZ() + 0.5, loc.getYaw(), loc.getPitch()), TeleportCause.COMMAND);
+    }
+
+    @Override
+    public String getName()
+    {
+        if (name == null)
+        {
+            name = player.getName();
         }
-            this.player.teleport(new org.bukkit.Location(BukkitUtil.getWorld(loc.getWorld()), loc.getX() + 0.5, loc.getY(), loc.getZ() + 0.5, loc.getYaw(), loc.getPitch()), TeleportCause.COMMAND);
+        return name;
     }
-    
+
     @Override
-    public String getName() {
-        if (this.name == null) {
-            this.name = this.player.getName();
-        }
-        return this.name;
+    public boolean isOnline()
+    {
+        return !offline && player.isOnline();
     }
-    
+
     @Override
-    public boolean isOnline() {
-        return !offline && this.player.isOnline();
-    }
-    
-    @Override
-    public void setCompassTarget(final Location loc) {
-        this.player.setCompassTarget(new org.bukkit.Location(BukkitUtil.getWorld(loc.getWorld()), loc.getX(), loc.getY(), loc.getZ()));
+    public void setCompassTarget(final Location loc)
+    {
+        player.setCompassTarget(new org.bukkit.Location(BukkitUtil.getWorld(loc.getWorld()), loc.getX(), loc.getY(), loc.getZ()));
 
     }
 
     @Override
-    public Location getLocationFull() {
-        return BukkitUtil.getLocationFull(this.player);
+    public Location getLocationFull()
+    {
+        return BukkitUtil.getLocationFull(player);
     }
 
     @Override
-    public void setAttribute(String key) {
+    public void setAttribute(String key)
+    {
         key = "plotsquared_user_attributes." + key;
-        if (EconHandler.manager == null || player.hasPermission("plotsquared_user_attributes.*")) {
+        if ((EconHandler.manager == null) || player.hasPermission("plotsquared_user_attributes.*"))
+        {
             setMeta(key, true);
             return;
         }
@@ -169,14 +190,17 @@ public class BukkitPlayer extends PlotPlayer {
     }
 
     @Override
-    public boolean getAttribute(String key) {
+    public boolean getAttribute(String key)
+    {
         key = "plotsquared_user_attributes." + key;
-        if (EconHandler.manager == null || player.hasPermission("plotsquared_user_attributes.*")) {
-            Object v = getMeta(key);
+        if ((EconHandler.manager == null) || player.hasPermission("plotsquared_user_attributes.*"))
+        {
+            final Object v = getMeta(key);
             return v == null ? false : (Boolean) v;
         }
         Permission perm = Bukkit.getServer().getPluginManager().getPermission(key);
-        if (perm == null) {
+        if (perm == null)
+        {
             perm = new Permission(key, PermissionDefault.FALSE);
             Bukkit.getServer().getPluginManager().addPermission(perm);
             Bukkit.getServer().getPluginManager().recalculatePermissionDefaults(perm);
@@ -185,9 +209,11 @@ public class BukkitPlayer extends PlotPlayer {
     }
 
     @Override
-    public void removeAttribute(String key) {
+    public void removeAttribute(String key)
+    {
         key = "plotsquared_user_attributes." + key;
-        if (EconHandler.manager == null || player.hasPermission("plotsquared_user_attributes.*")) {
+        if ((EconHandler.manager == null) || player.hasPermission("plotsquared_user_attributes.*"))
+        {
             deleteMeta(key);
             return;
         }
@@ -195,24 +221,30 @@ public class BukkitPlayer extends PlotPlayer {
     }
 
     @Override
-    public void loadData() {
-        if (!player.isOnline()) {
+    public void loadData()
+    {
+        if (!player.isOnline())
+        {
             player.loadData();
         }
     }
 
     @Override
-    public void saveData() {
+    public void saveData()
+    {
         player.saveData();
     }
 
     @Override
-    public void setWeather(PlotWeather weather) {
-        switch (weather) {
+    public void setWeather(final PlotWeather weather)
+    {
+        switch (weather)
+        {
             case CLEAR:
                 player.setPlayerWeather(WeatherType.CLEAR);
                 return;
-            case RAIN: {
+            case RAIN:
+            {
                 player.setPlayerWeather(WeatherType.DOWNFALL);
                 return;
             }
@@ -223,8 +255,10 @@ public class BukkitPlayer extends PlotPlayer {
     }
 
     @Override
-    public PlotGamemode getGamemode() {
-        switch (player.getGameMode()) {
+    public PlotGamemode getGamemode()
+    {
+        switch (player.getGameMode())
+        {
             case ADVENTURE:
                 return PlotGamemode.ADVENTURE;
             case CREATIVE:
@@ -238,8 +272,10 @@ public class BukkitPlayer extends PlotPlayer {
     }
 
     @Override
-    public void setGamemode(PlotGamemode gamemode) {
-        switch (gamemode) {
+    public void setGamemode(final PlotGamemode gamemode)
+    {
+        switch (gamemode)
+        {
             case ADVENTURE:
                 player.setGameMode(GameMode.ADVENTURE);
                 return;
@@ -256,22 +292,26 @@ public class BukkitPlayer extends PlotPlayer {
     }
 
     @Override
-    public void setTime(long time) {
+    public void setTime(final long time)
+    {
         player.setPlayerTime(time, false);
     }
 
     @Override
-    public void setFlight(boolean fly) {
+    public void setFlight(final boolean fly)
+    {
         player.setAllowFlight(fly);
     }
 
     @Override
-    public void playMusic(Location loc, int id) {
+    public void playMusic(final Location loc, final int id)
+    {
         player.playEffect(BukkitUtil.getLocation(loc), Effect.RECORD_PLAY, id);
     }
 
     @Override
-    public void kick(String message) {
+    public void kick(final String message)
+    {
         player.kickPlayer(message);
     }
 }
diff --git a/src/main/java/com/plotsquared/bukkit/object/entity/EntityWrapper.java b/src/main/java/com/plotsquared/bukkit/object/entity/EntityWrapper.java
index b6a259824..263f556c6 100644
--- a/src/main/java/com/plotsquared/bukkit/object/entity/EntityWrapper.java
+++ b/src/main/java/com/plotsquared/bukkit/object/entity/EntityWrapper.java
@@ -37,7 +37,8 @@ import com.intellectualcrafters.plot.object.entity.ArmorStandStats;
 import com.intellectualcrafters.plot.object.entity.EntityBaseStats;
 import com.intellectualcrafters.plot.object.entity.HorseStats;
 
-public class EntityWrapper {
+public class EntityWrapper
+{
     public short id;
     public float yaw;
     public float pitch;
@@ -59,43 +60,52 @@ public class EntityWrapper {
     private ArmorStandStats stand;
 
     private int hash;
-    
+
     @Override
-    public boolean equals(Object obj) {
+    public boolean equals(final Object obj)
+    {
         return hash == obj.hashCode();
     }
-    
+
     @Override
-    public int hashCode() {
+    public int hashCode()
+    {
         return hash;
     }
-    
-    public void storeInventory(final InventoryHolder held) {
-        this.inventory = held.getInventory().getContents().clone();
+
+    public void storeInventory(final InventoryHolder held)
+    {
+        inventory = held.getInventory().getContents().clone();
     }
 
-    private void restoreLiving(final LivingEntity entity) {
-        if (this.lived.loot) {
-            entity.setCanPickupItems(this.lived.loot);
+    private void restoreLiving(final LivingEntity entity)
+    {
+        if (lived.loot)
+        {
+            entity.setCanPickupItems(lived.loot);
         }
-        if (this.lived.name != null) {
-            entity.setCustomName(this.lived.name);
-            entity.setCustomNameVisible(this.lived.visible);
+        if (lived.name != null)
+        {
+            entity.setCustomName(lived.name);
+            entity.setCustomNameVisible(lived.visible);
         }
-        if ((this.lived.potions != null) && (this.lived.potions.size() > 0)) {
-            entity.addPotionEffects(this.lived.potions);
+        if ((lived.potions != null) && (lived.potions.size() > 0))
+        {
+            entity.addPotionEffects(lived.potions);
         }
-        entity.setRemainingAir(this.lived.air);
-        entity.setRemoveWhenFarAway(this.lived.persistent);
-        if (this.lived.equipped) {
+        entity.setRemainingAir(lived.air);
+        entity.setRemoveWhenFarAway(lived.persistent);
+        if (lived.equipped)
+        {
             final EntityEquipment equipment = entity.getEquipment();
-            equipment.setItemInHand(this.lived.hands);
-            equipment.setHelmet(this.lived.helmet);
-            equipment.setChestplate(this.lived.chestplate);
-            equipment.setLeggings(this.lived.leggings);
-            equipment.setBoots(this.lived.boots);
+            equipment.setItemInHand(lived.hands);
+            equipment.setHelmet(lived.helmet);
+            equipment.setChestplate(lived.chestplate);
+            equipment.setLeggings(lived.leggings);
+            equipment.setBoots(lived.boots);
         }
-        if (this.lived.leashed) {
+        if (lived.leashed)
+        {
             // TODO leashes
             //            World world = entity.getWorld();
             //            Entity leash = world.spawnEntity(new Location(world, Math.floor(x) + lived.leash_x, Math.floor(y) + lived.leash_y, Math.floor(z) + lived.leash_z), EntityType.LEASH_HITCH);
@@ -103,11 +113,13 @@ public class EntityWrapper {
         }
     }
 
-    private void restoreInventory(final InventoryHolder entity) {
-        entity.getInventory().setContents(this.inventory);
+    private void restoreInventory(final InventoryHolder entity)
+    {
+        entity.getInventory().setContents(inventory);
     }
 
-    public void storeLiving(final LivingEntity lived) {
+    public void storeLiving(final LivingEntity lived)
+    {
         this.lived = new LivingEntityStats();
         this.lived.potions = lived.getActivePotionEffects();
         this.lived.loot = lived.getCanPickupItems();
@@ -117,15 +129,17 @@ public class EntityWrapper {
         this.lived.air = (short) lived.getRemainingAir();
         this.lived.persistent = lived.getRemoveWhenFarAway();
         this.lived.leashed = lived.isLeashed();
-        if (this.lived.leashed) {
+        if (this.lived.leashed)
+        {
             final Location loc = lived.getLeashHolder().getLocation();
-            this.lived.leash_x = (short) (this.x - loc.getBlockX());
-            this.lived.leash_y = (short) (this.y - loc.getBlockY());
-            this.lived.leash_z = (short) (this.z - loc.getBlockZ());
+            this.lived.leash_x = (short) (x - loc.getBlockX());
+            this.lived.leash_y = (short) (y - loc.getBlockY());
+            this.lived.leash_z = (short) (z - loc.getBlockZ());
         }
         final EntityEquipment equipment = lived.getEquipment();
         this.lived.equipped = equipment != null;
-        if (this.lived.equipped) {
+        if (this.lived.equipped)
+        {
             this.lived.hands = equipment.getItemInHand().clone();
             this.lived.boots = equipment.getBoots().clone();
             this.lived.leggings = equipment.getLeggings().clone();
@@ -134,70 +148,78 @@ public class EntityWrapper {
         }
     }
 
-    private void restoreTameable(final Tameable entity) {
-        if (this.tamed.tamed) {
-            if (this.tamed.owner != null) {
+    private void restoreTameable(final Tameable entity)
+    {
+        if (tamed.tamed)
+        {
+            if (tamed.owner != null)
+            {
                 entity.setTamed(true);
-                entity.setOwner(this.tamed.owner);
+                entity.setOwner(tamed.owner);
             }
         }
     }
 
-    private void restoreAgeable(final Ageable entity) {
-        if (!this.aged.adult) {
+    private void restoreAgeable(final Ageable entity)
+    {
+        if (!aged.adult)
+        {
             entity.setBaby();
         }
-        if (this.aged.locked) {
-            entity.setAgeLock(this.aged.locked);
+        if (aged.locked)
+        {
+            entity.setAgeLock(aged.locked);
         }
-        if (this.aged.age > 0) {
-            entity.setAge(this.aged.age);
+        if (aged.age > 0)
+        {
+            entity.setAge(aged.age);
         }
     }
 
-    public void storeAgeable(final Ageable aged) {
+    public void storeAgeable(final Ageable aged)
+    {
         this.aged = new AgeableStats();
         this.aged.age = aged.getAge();
         this.aged.locked = aged.getAgeLock();
         this.aged.adult = aged.isAdult();
     }
 
-    public void storeTameable(final Tameable tamed) {
+    public void storeTameable(final Tameable tamed)
+    {
         this.tamed = new TameableStats();
         this.tamed.owner = tamed.getOwner();
         this.tamed.tamed = tamed.isTamed();
     }
 
     @SuppressWarnings("deprecation")
-    public EntityWrapper(final org.bukkit.entity.Entity entity, final short depth) {
-        this.hash = entity.getEntityId();
+    public EntityWrapper(final org.bukkit.entity.Entity entity, final short depth)
+    {
+        hash = entity.getEntityId();
         this.depth = depth;
         final Location loc = entity.getLocation();
-        this.yaw = loc.getYaw();
-        this.pitch = loc.getPitch();
-        this.x = loc.getX();
-        this.y = loc.getY();
-        this.z = loc.getZ();
-        this.id = entity.getType().getTypeId();
-        if (depth == 0) {
-            return;
-        }
-        this.base = new EntityBaseStats();
+        yaw = loc.getYaw();
+        pitch = loc.getPitch();
+        x = loc.getX();
+        y = loc.getY();
+        z = loc.getZ();
+        id = entity.getType().getTypeId();
+        if (depth == 0) { return; }
+        base = new EntityBaseStats();
         final Entity p = entity.getPassenger();
-        if (p != null) {
-            this.base.passenger = new EntityWrapper(p, depth);
+        if (p != null)
+        {
+            base.passenger = new EntityWrapper(p, depth);
         }
-        this.base.fall = entity.getFallDistance();
-        this.base.fire = (short) entity.getFireTicks();
-        this.base.age = entity.getTicksLived();
+        base.fall = entity.getFallDistance();
+        base.fire = (short) entity.getFireTicks();
+        base.age = entity.getTicksLived();
         final Vector velocity = entity.getVelocity();
-        this.base.v_x = velocity.getX();
-        this.base.v_y = velocity.getY();
-        this.base.v_z = velocity.getZ();
-        if (depth == 1) {
-            return;
-        }
-        switch (entity.getType()) {
+        base.v_x = velocity.getX();
+        base.v_y = velocity.getY();
+        base.v_z = velocity.getZ();
+        if (depth == 1) { return; }
+        switch (entity.getType())
+        {
             case ARROW:
             case BOAT:
             case COMPLEX_PART:
@@ -226,57 +248,66 @@ public class EntityWrapper {
             case THROWN_EXP_BOTTLE:
             case WEATHER:
             case WITHER_SKULL:
-            case UNKNOWN: {
+            case UNKNOWN:
+            {
                 // Do this stuff later
                 return;
             }
-            default: {
+            default:
+            {
                 PS.debug("&cCOULD NOT IDENTIFY ENTITY: " + entity.getType());
                 return;
             }
             // MISC //
-            case DROPPED_ITEM: {
+            case DROPPED_ITEM:
+            {
                 final Item item = (Item) entity;
-                this.stack = item.getItemStack();
+                stack = item.getItemStack();
                 return;
             }
-            case ITEM_FRAME: {
+            case ITEM_FRAME:
+            {
                 final ItemFrame itemframe = (ItemFrame) entity;
-                this.x = Math.floor(this.x);
-                this.y = Math.floor(this.y);
-                this.z = Math.floor(this.z);
-                this.dataByte = getOrdinal(Rotation.values(), itemframe.getRotation());
-                this.stack = itemframe.getItem().clone();
+                x = Math.floor(x);
+                y = Math.floor(y);
+                z = Math.floor(z);
+                dataByte = getOrdinal(Rotation.values(), itemframe.getRotation());
+                stack = itemframe.getItem().clone();
                 return;
             }
-            case PAINTING: {
+            case PAINTING:
+            {
                 final Painting painting = (Painting) entity;
-                this.x = Math.floor(this.x);
-                this.y = Math.floor(this.y);
-                this.z = Math.floor(this.z);
+                x = Math.floor(x);
+                y = Math.floor(y);
+                z = Math.floor(z);
                 final Art a = painting.getArt();
-                this.dataByte = getOrdinal(BlockFace.values(), painting.getFacing());
+                dataByte = getOrdinal(BlockFace.values(), painting.getFacing());
                 final int h = a.getBlockHeight();
-                if ((h % 2) == 0) {
-                    this.y -= 1;
+                if ((h % 2) == 0)
+                {
+                    y -= 1;
                 }
-                this.dataString = a.name();
+                dataString = a.name();
                 return;
             }
             // END MISC //
             // INVENTORY HOLDER //
-            case MINECART_CHEST: {
+            case MINECART_CHEST:
+            {
                 storeInventory((InventoryHolder) entity);
                 return;
             }
-            case MINECART_HOPPER: {
+            case MINECART_HOPPER:
+            {
                 storeInventory((InventoryHolder) entity);
                 return;
             }
             // START LIVING ENTITY //
             // START AGEABLE //
             // START TAMEABLE //
-            case HORSE: {
+            case HORSE:
+            {
                 final Horse horse = (Horse) entity;
                 this.horse = new HorseStats();
                 this.horse.jump = horse.getJumpStrength();
@@ -292,17 +323,19 @@ public class EntityWrapper {
             }
             // END INVENTORY HOLDER //
             case WOLF:
-            case OCELOT: {
+            case OCELOT:
+            {
                 storeTameable((Tameable) entity);
                 storeAgeable((Ageable) entity);
                 storeLiving((LivingEntity) entity);
                 return;
             }
             // END AMEABLE //
-            case SHEEP: {
+            case SHEEP:
+            {
                 final Sheep sheep = (Sheep) entity;
-                this.dataByte = (byte) ((sheep).isSheared() ? 1 : 0);
-                this.dataByte2 = sheep.getColor().getDyeData();
+                dataByte = (byte) ((sheep).isSheared() ? 1 : 0);
+                dataByte2 = sheep.getColor().getDyeData();
                 storeAgeable((Ageable) entity);
                 storeLiving((LivingEntity) entity);
                 return;
@@ -311,78 +344,88 @@ public class EntityWrapper {
             case CHICKEN:
             case COW:
             case MUSHROOM_COW:
-            case PIG: {
+            case PIG:
+            {
                 storeAgeable((Ageable) entity);
                 storeLiving((LivingEntity) entity);
                 return;
             }
             // END AGEABLE //
-            case RABBIT: { // NEW
-                this.dataByte = getOrdinal(Type.values(), ((Rabbit) entity).getRabbitType());
+            case RABBIT:
+            { // NEW
+                dataByte = getOrdinal(Type.values(), ((Rabbit) entity).getRabbitType());
                 storeAgeable((Ageable) entity);
                 storeLiving((LivingEntity) entity);
                 return;
             }
-            case GUARDIAN: { // NEW
-                this.dataByte = (byte) (((Guardian) entity).isElder() ? 1 : 0);
+            case GUARDIAN:
+            { // NEW
+                dataByte = (byte) (((Guardian) entity).isElder() ? 1 : 0);
                 storeLiving((LivingEntity) entity);
                 return;
             }
-            case SKELETON: { // NEW
-                this.dataByte = (byte) ((Skeleton) entity).getSkeletonType().getId();
+            case SKELETON:
+            { // NEW
+                dataByte = (byte) ((Skeleton) entity).getSkeletonType().getId();
                 storeLiving((LivingEntity) entity);
                 return;
             }
-            case ARMOR_STAND: { // NEW
-                // CHECK positions
+            case ARMOR_STAND:
+            { // NEW
+              // CHECK positions
                 final ArmorStand stand = (ArmorStand) entity;
-                this.inventory = new ItemStack[] { stand.getItemInHand().clone(), stand.getHelmet().clone(), stand.getChestplate().clone(), stand.getLeggings().clone(), stand.getBoots().clone() };
+                inventory = new ItemStack[] { stand.getItemInHand().clone(), stand.getHelmet().clone(), stand.getChestplate().clone(), stand.getLeggings().clone(), stand.getBoots().clone() };
                 storeLiving((LivingEntity) entity);
                 this.stand = new ArmorStandStats();
-                
-                EulerAngle head = stand.getHeadPose();
+
+                final EulerAngle head = stand.getHeadPose();
                 this.stand.head[0] = (float) head.getX();
                 this.stand.head[1] = (float) head.getY();
                 this.stand.head[2] = (float) head.getZ();
-                
-                EulerAngle body = stand.getBodyPose();
+
+                final EulerAngle body = stand.getBodyPose();
                 this.stand.body[0] = (float) body.getX();
                 this.stand.body[1] = (float) body.getY();
                 this.stand.body[2] = (float) body.getZ();
-                
-                EulerAngle leftLeg = stand.getLeftLegPose();
+
+                final EulerAngle leftLeg = stand.getLeftLegPose();
                 this.stand.leftLeg[0] = (float) leftLeg.getX();
                 this.stand.leftLeg[1] = (float) leftLeg.getY();
                 this.stand.leftLeg[2] = (float) leftLeg.getZ();
-                
-                EulerAngle rightLeg = stand.getRightLegPose();
+
+                final EulerAngle rightLeg = stand.getRightLegPose();
                 this.stand.rightLeg[0] = (float) rightLeg.getX();
                 this.stand.rightLeg[1] = (float) rightLeg.getY();
                 this.stand.rightLeg[2] = (float) rightLeg.getZ();
-                
-                EulerAngle leftArm = stand.getLeftArmPose();
+
+                final EulerAngle leftArm = stand.getLeftArmPose();
                 this.stand.leftArm[0] = (float) leftArm.getX();
                 this.stand.leftArm[1] = (float) leftArm.getY();
                 this.stand.leftArm[2] = (float) leftArm.getZ();
 
-                EulerAngle rightArm = stand.getRightArmPose();
+                final EulerAngle rightArm = stand.getRightArmPose();
                 this.stand.rightArm[0] = (float) rightArm.getX();
                 this.stand.rightArm[1] = (float) rightArm.getY();
                 this.stand.rightArm[2] = (float) rightArm.getZ();
-                
-                if (stand.hasArms()) {
+
+                if (stand.hasArms())
+                {
                     this.stand.arms = true;
                 }
-                if (!stand.hasBasePlate()) {
+                if (!stand.hasBasePlate())
+                {
                     this.stand.noplate = true;
                 }
-                if (!stand.hasGravity()) {
+                if (!stand.hasGravity())
+                {
                     this.stand.nogravity = true;
                 }
-                if (!stand.isVisible()) {
+                if (!stand.isVisible())
+                {
                     this.stand.invisible = true;
                 }
-                if (stand.isSmall()) {
+                if (stand.isSmall())
+                {
                     this.stand.small = true;
                 }
                 return;
@@ -405,7 +448,8 @@ public class EntityWrapper {
             case CREEPER:
             case BLAZE:
             case SNOWMAN:
-            case IRON_GOLEM: {
+            case IRON_GOLEM:
+            {
                 storeLiving((LivingEntity) entity);
                 return;
             }
@@ -414,28 +458,32 @@ public class EntityWrapper {
     }
 
     @SuppressWarnings("deprecation")
-    public Entity spawn(final World world, final int x_offset, final int z_offset) {
-        final Location loc = new Location(world, this.x + x_offset, this.y, this.z + z_offset);
-        loc.setYaw(this.yaw);
-        loc.setPitch(this.pitch);
-        if (this.id == -1) {
-            return null;
-        }
-        final EntityType type = EntityType.fromId(this.id);
+    public Entity spawn(final World world, final int x_offset, final int z_offset)
+    {
+        final Location loc = new Location(world, x + x_offset, y, z + z_offset);
+        loc.setYaw(yaw);
+        loc.setPitch(pitch);
+        if (id == -1) { return null; }
+        final EntityType type = EntityType.fromId(id);
         Entity entity;
-        switch (type) {
-            case DROPPED_ITEM: {
-                return world.dropItem(loc, this.stack);
+        switch (type)
+        {
+            case DROPPED_ITEM:
+            {
+                return world.dropItem(loc, stack);
             }
             case PLAYER:
-            case LEASH_HITCH: {
+            case LEASH_HITCH:
+            {
                 return null;
             }
-            case ITEM_FRAME: {
+            case ITEM_FRAME:
+            {
                 entity = world.spawn(loc, ItemFrame.class);
                 break;
             }
-            case PAINTING: {
+            case PAINTING:
+            {
                 entity = world.spawn(loc, Painting.class);
                 break;
             }
@@ -443,23 +491,32 @@ public class EntityWrapper {
                 entity = world.spawnEntity(loc, type);
                 break;
         }
-        if (this.depth == 0) {
-            return entity;
-        }
-        if (this.base.passenger != null) {
-            try {
-                entity.setPassenger(this.base.passenger.spawn(world, x_offset, z_offset));
-            } catch (final Exception e) {
+        if (depth == 0) { return entity; }
+        if (base.passenger != null)
+        {
+            try
+            {
+                entity.setPassenger(base.passenger.spawn(world, x_offset, z_offset));
             }
+            catch (final Exception e)
+            {}
         }
-        if (this.base.fall != 0) entity.setFallDistance(this.base.fall);
-        if (this.base.fire != 0) entity.setFireTicks(this.base.fire);
-        if (this.base.age != 0) entity.setTicksLived(this.base.age);
-        entity.setVelocity(new Vector(this.base.v_x, this.base.v_y, this.base.v_z));
-        if (this.depth == 1) {
-            return entity;
+        if (base.fall != 0)
+        {
+            entity.setFallDistance(base.fall);
         }
-        switch (entity.getType()) {
+        if (base.fire != 0)
+        {
+            entity.setFireTicks(base.fire);
+        }
+        if (base.age != 0)
+        {
+            entity.setTicksLived(base.age);
+        }
+        entity.setVelocity(new Vector(base.v_x, base.v_y, base.v_z));
+        if (depth == 1) { return entity; }
+        switch (entity.getType())
+        {
             case ARROW:
             case BOAT:
             case COMPLEX_PART:
@@ -488,41 +545,48 @@ public class EntityWrapper {
             case WEATHER:
             case WITHER_SKULL:
             case MINECART_FURNACE:
-            case UNKNOWN: {
+            case UNKNOWN:
+            {
                 // Do this stuff later
                 return entity;
             }
-            default: {
+            default:
+            {
                 PS.debug("&cCOULD NOT IDENTIFY ENTITY: " + entity.getType());
                 return entity;
             }
             // MISC //
-            case ITEM_FRAME: {
+            case ITEM_FRAME:
+            {
                 final ItemFrame itemframe = (ItemFrame) entity;
-                itemframe.setRotation(Rotation.values()[this.dataByte]);
-                itemframe.setItem(this.stack);
+                itemframe.setRotation(Rotation.values()[dataByte]);
+                itemframe.setItem(stack);
                 return entity;
             }
-            case PAINTING: {
+            case PAINTING:
+            {
                 final Painting painting = (Painting) entity;
-                painting.setFacingDirection(BlockFace.values()[this.dataByte], true);
-                painting.setArt(Art.getByName(this.dataString), true);
+                painting.setFacingDirection(BlockFace.values()[dataByte], true);
+                painting.setArt(Art.getByName(dataString), true);
                 return entity;
             }
             // END MISC //
             // INVENTORY HOLDER //
-            case MINECART_CHEST: {
+            case MINECART_CHEST:
+            {
                 restoreInventory((InventoryHolder) entity);
                 return entity;
             }
-            case MINECART_HOPPER: {
+            case MINECART_HOPPER:
+            {
                 restoreInventory((InventoryHolder) entity);
                 return entity;
             }
             // START LIVING ENTITY //
             // START AGEABLE //
             // START TAMEABLE //
-            case HORSE: {
+            case HORSE:
+            {
                 final Horse horse = (Horse) entity;
                 horse.setJumpStrength(this.horse.jump);
                 horse.setCarryingChest(this.horse.chest);
@@ -537,20 +601,24 @@ public class EntityWrapper {
             }
             // END INVENTORY HOLDER //
             case WOLF:
-            case OCELOT: {
+            case OCELOT:
+            {
                 restoreTameable((Tameable) entity);
                 restoreAgeable((Ageable) entity);
                 restoreLiving((LivingEntity) entity);
                 return entity;
             }
             // END AMEABLE //
-            case SHEEP: {
+            case SHEEP:
+            {
                 final Sheep sheep = (Sheep) entity;
-                if (this.dataByte == 1) {
+                if (dataByte == 1)
+                {
                     sheep.setSheared(true);
                 }
-                if (this.dataByte2 != 0) {
-                    sheep.setColor(DyeColor.getByDyeData(this.dataByte2));
+                if (dataByte2 != 0)
+                {
+                    sheep.setColor(DyeColor.getByDyeData(dataByte2));
                 }
                 restoreAgeable((Ageable) entity);
                 restoreLiving((LivingEntity) entity);
@@ -560,89 +628,113 @@ public class EntityWrapper {
             case CHICKEN:
             case COW:
             case MUSHROOM_COW:
-            case PIG: {
+            case PIG:
+            {
                 restoreAgeable((Ageable) entity);
                 restoreLiving((LivingEntity) entity);
                 return entity;
             }
             // END AGEABLE //
-            case RABBIT: { // NEW
-                if (this.dataByte != 0) {
-                    ((Rabbit) entity).setRabbitType(Type.values()[this.dataByte]);
+            case RABBIT:
+            { // NEW
+                if (dataByte != 0)
+                {
+                    ((Rabbit) entity).setRabbitType(Type.values()[dataByte]);
                 }
                 restoreAgeable((Ageable) entity);
                 restoreLiving((LivingEntity) entity);
                 return entity;
             }
-            case GUARDIAN: { // NEW
-                if (this.dataByte != 0) {
+            case GUARDIAN:
+            { // NEW
+                if (dataByte != 0)
+                {
                     ((Guardian) entity).setElder(true);
                 }
                 restoreLiving((LivingEntity) entity);
                 return entity;
             }
-            case SKELETON: { // NEW
-                if (this.dataByte != 0) {
-                    ((Skeleton) entity).setSkeletonType(SkeletonType.values()[this.dataByte]);
+            case SKELETON:
+            { // NEW
+                if (dataByte != 0)
+                {
+                    ((Skeleton) entity).setSkeletonType(SkeletonType.values()[dataByte]);
                 }
                 storeLiving((LivingEntity) entity);
                 return entity;
             }
-            case ARMOR_STAND: { // NEW
-                // CHECK positions
+            case ARMOR_STAND:
+            { // NEW
+              // CHECK positions
                 final ArmorStand stand = (ArmorStand) entity;
-                if (this.inventory[0] != null) {
-                    stand.setItemInHand(this.inventory[0]);
+                if (inventory[0] != null)
+                {
+                    stand.setItemInHand(inventory[0]);
                 }
-                if (this.inventory[1] != null) {
-                    stand.setHelmet(this.inventory[1]);
+                if (inventory[1] != null)
+                {
+                    stand.setHelmet(inventory[1]);
                 }
-                if (this.inventory[2] != null) {
-                    stand.setChestplate(this.inventory[2]);
+                if (inventory[2] != null)
+                {
+                    stand.setChestplate(inventory[2]);
                 }
-                if (this.inventory[3] != null) {
-                    stand.setLeggings(this.inventory[3]);
+                if (inventory[3] != null)
+                {
+                    stand.setLeggings(inventory[3]);
                 }
-                if (this.inventory[4] != null) {
-                    stand.setBoots(this.inventory[4]);
+                if (inventory[4] != null)
+                {
+                    stand.setBoots(inventory[4]);
                 }
-                if (this.stand.head[0] != 0 || this.stand.head[1] != 0 || this.stand.head[2] != 0) {
-                    EulerAngle pose = new EulerAngle(this.stand.head[0], this.stand.head[1], this.stand.head[2]);
+                if ((this.stand.head[0] != 0) || (this.stand.head[1] != 0) || (this.stand.head[2] != 0))
+                {
+                    final EulerAngle pose = new EulerAngle(this.stand.head[0], this.stand.head[1], this.stand.head[2]);
                     stand.setHeadPose(pose);
                 }
-                if (this.stand.body[0] != 0 || this.stand.body[1] != 0 || this.stand.body[2] != 0) {
-                    EulerAngle pose = new EulerAngle(this.stand.body[0], this.stand.body[1], this.stand.body[2]);
+                if ((this.stand.body[0] != 0) || (this.stand.body[1] != 0) || (this.stand.body[2] != 0))
+                {
+                    final EulerAngle pose = new EulerAngle(this.stand.body[0], this.stand.body[1], this.stand.body[2]);
                     stand.setBodyPose(pose);
                 }
-                if (this.stand.leftLeg[0] != 0 || this.stand.leftLeg[1] != 0 || this.stand.leftLeg[2] != 0) {
-                    EulerAngle pose = new EulerAngle(this.stand.leftLeg[0], this.stand.leftLeg[1], this.stand.leftLeg[2]);
+                if ((this.stand.leftLeg[0] != 0) || (this.stand.leftLeg[1] != 0) || (this.stand.leftLeg[2] != 0))
+                {
+                    final EulerAngle pose = new EulerAngle(this.stand.leftLeg[0], this.stand.leftLeg[1], this.stand.leftLeg[2]);
                     stand.setLeftLegPose(pose);
                 }
-                if (this.stand.rightLeg[0] != 0 || this.stand.rightLeg[1] != 0 || this.stand.rightLeg[2] != 0) {
-                    EulerAngle pose = new EulerAngle(this.stand.rightLeg[0], this.stand.rightLeg[1], this.stand.rightLeg[2]);
+                if ((this.stand.rightLeg[0] != 0) || (this.stand.rightLeg[1] != 0) || (this.stand.rightLeg[2] != 0))
+                {
+                    final EulerAngle pose = new EulerAngle(this.stand.rightLeg[0], this.stand.rightLeg[1], this.stand.rightLeg[2]);
                     stand.setRightLegPose(pose);
                 }
-                if (this.stand.leftArm[0] != 0 || this.stand.leftArm[1] != 0 || this.stand.leftArm[2] != 0) {
-                    EulerAngle pose = new EulerAngle(this.stand.leftArm[0], this.stand.leftArm[1], this.stand.leftArm[2]);
+                if ((this.stand.leftArm[0] != 0) || (this.stand.leftArm[1] != 0) || (this.stand.leftArm[2] != 0))
+                {
+                    final EulerAngle pose = new EulerAngle(this.stand.leftArm[0], this.stand.leftArm[1], this.stand.leftArm[2]);
                     stand.setLeftArmPose(pose);
                 }
-                if (this.stand.rightArm[0] != 0 || this.stand.rightArm[1] != 0 || this.stand.rightArm[2] != 0) {
-                    EulerAngle pose = new EulerAngle(this.stand.rightArm[0], this.stand.rightArm[1], this.stand.rightArm[2]);
+                if ((this.stand.rightArm[0] != 0) || (this.stand.rightArm[1] != 0) || (this.stand.rightArm[2] != 0))
+                {
+                    final EulerAngle pose = new EulerAngle(this.stand.rightArm[0], this.stand.rightArm[1], this.stand.rightArm[2]);
                     stand.setRightArmPose(pose);
                 }
-                if (this.stand.invisible) {
+                if (this.stand.invisible)
+                {
                     stand.setVisible(false);
                 }
-                if (this.stand.arms) {
+                if (this.stand.arms)
+                {
                     stand.setArms(true);
                 }
-                if (this.stand.nogravity) {
+                if (this.stand.nogravity)
+                {
                     stand.setGravity(false);
                 }
-                if (this.stand.noplate) {
+                if (this.stand.noplate)
+                {
                     stand.setBasePlate(false);
                 }
-                if (this.stand.small) {
+                if (this.stand.small)
+                {
                     stand.setSmall(true);
                 }
                 restoreLiving((LivingEntity) entity);
@@ -666,7 +758,8 @@ public class EntityWrapper {
             case CREEPER:
             case BLAZE:
             case SNOWMAN:
-            case IRON_GOLEM: {
+            case IRON_GOLEM:
+            {
                 restoreLiving((LivingEntity) entity);
                 return entity;
             }
@@ -674,11 +767,11 @@ public class EntityWrapper {
         }
     }
 
-    private byte getOrdinal(final Object[] list, final Object value) {
-        for (byte i = 0; i < list.length; i++) {
-            if (list[i].equals(value)) {
-                return i;
-            }
+    private byte getOrdinal(final Object[] list, final Object value)
+    {
+        for (byte i = 0; i < list.length; i++)
+        {
+            if (list[i].equals(value)) { return i; }
         }
         return 0;
     }
diff --git a/src/main/java/com/plotsquared/bukkit/object/entity/LivingEntityStats.java b/src/main/java/com/plotsquared/bukkit/object/entity/LivingEntityStats.java
index 42ceea6ee..5474c78d8 100644
--- a/src/main/java/com/plotsquared/bukkit/object/entity/LivingEntityStats.java
+++ b/src/main/java/com/plotsquared/bukkit/object/entity/LivingEntityStats.java
@@ -5,7 +5,8 @@ import java.util.Collection;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.potion.PotionEffect;
 
-public class LivingEntityStats {
+public class LivingEntityStats
+{
     public boolean loot;
     public String name;
     public boolean visible;
diff --git a/src/main/java/com/plotsquared/bukkit/object/entity/TameableStats.java b/src/main/java/com/plotsquared/bukkit/object/entity/TameableStats.java
index dae91b121..316b19f8a 100644
--- a/src/main/java/com/plotsquared/bukkit/object/entity/TameableStats.java
+++ b/src/main/java/com/plotsquared/bukkit/object/entity/TameableStats.java
@@ -2,7 +2,8 @@ package com.plotsquared.bukkit.object.entity;
 
 import org.bukkit.entity.AnimalTamer;
 
-public class TameableStats {
+public class TameableStats
+{
     public AnimalTamer owner;
     public boolean tamed;
 }
diff --git a/src/main/java/com/plotsquared/bukkit/titles/DefaultTitle.java b/src/main/java/com/plotsquared/bukkit/titles/DefaultTitle.java
index 4c7e7820f..4cd985878 100644
--- a/src/main/java/com/plotsquared/bukkit/titles/DefaultTitle.java
+++ b/src/main/java/com/plotsquared/bukkit/titles/DefaultTitle.java
@@ -4,13 +4,18 @@ import com.intellectualcrafters.plot.object.PlotPlayer;
 import com.intellectualcrafters.plot.util.AbstractTitle;
 import com.plotsquared.bukkit.object.BukkitPlayer;
 
-public class DefaultTitle extends AbstractTitle {
+public class DefaultTitle extends AbstractTitle
+{
     @Override
-    public void sendTitle(final PlotPlayer player, final String head, final String sub, int in, int delay, int out) {
-        try {
+    public void sendTitle(final PlotPlayer player, final String head, final String sub, final int in, final int delay, final int out)
+    {
+        try
+        {
             final DefaultTitleManager title = new DefaultTitleManager(head, sub, in, delay, out);
             title.send(((BukkitPlayer) player).player);
-        } catch (final Throwable e) {
+        }
+        catch (final Throwable e)
+        {
             AbstractTitle.TITLE_CLASS = new DefaultTitle_183();
             AbstractTitle.TITLE_CLASS.sendTitle(player, head, sub, in, delay, out);
         }
diff --git a/src/main/java/com/plotsquared/bukkit/titles/DefaultTitleManager.java b/src/main/java/com/plotsquared/bukkit/titles/DefaultTitleManager.java
index 4ccd2e29d..9e1be1852 100644
--- a/src/main/java/com/plotsquared/bukkit/titles/DefaultTitleManager.java
+++ b/src/main/java/com/plotsquared/bukkit/titles/DefaultTitleManager.java
@@ -17,7 +17,8 @@ import org.bukkit.entity.Player;
  * @author Maxim Van de Wynckel
  *
  */
-public class DefaultTitleManager {
+public class DefaultTitleManager
+{
     /* Title packet */
     private Class<?> packetTitle;
     /* Title packet actions ENUM */
@@ -45,7 +46,8 @@ public class DefaultTitleManager {
      *            Title
      * @throws ClassNotFoundException
      */
-    public DefaultTitleManager(final String title) throws ClassNotFoundException {
+    public DefaultTitleManager(final String title) throws ClassNotFoundException
+    {
         this.title = title;
         loadClasses();
     }
@@ -59,7 +61,8 @@ public class DefaultTitleManager {
      *            Subtitle text
      * @throws ClassNotFoundException
      */
-    public DefaultTitleManager(final String title, final String subtitle) throws ClassNotFoundException {
+    public DefaultTitleManager(final String title, final String subtitle) throws ClassNotFoundException
+    {
         this.title = title;
         this.subtitle = subtitle;
         loadClasses();
@@ -72,16 +75,17 @@ public class DefaultTitleManager {
      *            Title
      * @throws ClassNotFoundException
      */
-    public DefaultTitleManager(final DefaultTitleManager title) throws ClassNotFoundException {
+    public DefaultTitleManager(final DefaultTitleManager title) throws ClassNotFoundException
+    {
         // Copy title
         this.title = title.title;
-        this.subtitle = title.subtitle;
-        this.titleColor = title.titleColor;
-        this.subtitleColor = title.subtitleColor;
-        this.fadeInTime = title.fadeInTime;
-        this.fadeOutTime = title.fadeOutTime;
-        this.stayTime = title.stayTime;
-        this.ticks = title.ticks;
+        subtitle = title.subtitle;
+        titleColor = title.titleColor;
+        subtitleColor = title.subtitleColor;
+        fadeInTime = title.fadeInTime;
+        fadeOutTime = title.fadeOutTime;
+        stayTime = title.stayTime;
+        ticks = title.ticks;
         loadClasses();
     }
 
@@ -100,7 +104,8 @@ public class DefaultTitleManager {
      *            Fade out time
      * @throws ClassNotFoundException
      */
-    public DefaultTitleManager(final String title, final String subtitle, final int fadeInTime, final int stayTime, final int fadeOutTime) throws ClassNotFoundException {
+    public DefaultTitleManager(final String title, final String subtitle, final int fadeInTime, final int stayTime, final int fadeOutTime) throws ClassNotFoundException
+    {
         this.title = title;
         this.subtitle = subtitle;
         this.fadeInTime = fadeInTime;
@@ -113,11 +118,12 @@ public class DefaultTitleManager {
      * Load spigot and NMS classes
      * @throws ClassNotFoundException
      */
-    private void loadClasses() throws ClassNotFoundException {
-        this.packetTitle = getNMSClass("PacketPlayOutTitle");
-        this.packetActions = getNMSClass("EnumTitleAction");
-        this.chatBaseComponent = getNMSClass("IChatBaseComponent");
-        this.nmsChatSerializer = getNMSClass("ChatSerializer");
+    private void loadClasses() throws ClassNotFoundException
+    {
+        packetTitle = getNMSClass("PacketPlayOutTitle");
+        packetActions = getNMSClass("EnumTitleAction");
+        chatBaseComponent = getNMSClass("IChatBaseComponent");
+        nmsChatSerializer = getNMSClass("ChatSerializer");
     }
 
     /**
@@ -126,7 +132,8 @@ public class DefaultTitleManager {
      * @param title
      *            Title
      */
-    public void setTitle(final String title) {
+    public void setTitle(final String title)
+    {
         this.title = title;
     }
 
@@ -135,8 +142,9 @@ public class DefaultTitleManager {
      *
      * @return Title text
      */
-    public String getTitle() {
-        return this.title;
+    public String getTitle()
+    {
+        return title;
     }
 
     /**
@@ -145,7 +153,8 @@ public class DefaultTitleManager {
      * @param subtitle
      *            Subtitle text
      */
-    public void setSubtitle(final String subtitle) {
+    public void setSubtitle(final String subtitle)
+    {
         this.subtitle = subtitle;
     }
 
@@ -154,8 +163,9 @@ public class DefaultTitleManager {
      *
      * @return Subtitle text
      */
-    public String getSubtitle() {
-        return this.subtitle;
+    public String getSubtitle()
+    {
+        return subtitle;
     }
 
     /**
@@ -164,8 +174,9 @@ public class DefaultTitleManager {
      * @param color
      *            Chat color
      */
-    public void setTitleColor(final ChatColor color) {
-        this.titleColor = color;
+    public void setTitleColor(final ChatColor color)
+    {
+        titleColor = color;
     }
 
     /**
@@ -174,8 +185,9 @@ public class DefaultTitleManager {
      * @param color
      *            Chat color
      */
-    public void setSubtitleColor(final ChatColor color) {
-        this.subtitleColor = color;
+    public void setSubtitleColor(final ChatColor color)
+    {
+        subtitleColor = color;
     }
 
     /**
@@ -184,8 +196,9 @@ public class DefaultTitleManager {
      * @param time
      *            Time
      */
-    public void setFadeInTime(final int time) {
-        this.fadeInTime = time;
+    public void setFadeInTime(final int time)
+    {
+        fadeInTime = time;
     }
 
     /**
@@ -194,8 +207,9 @@ public class DefaultTitleManager {
      * @param time
      *            Time
      */
-    public void setFadeOutTime(final int time) {
-        this.fadeOutTime = time;
+    public void setFadeOutTime(final int time)
+    {
+        fadeOutTime = time;
     }
 
     /**
@@ -204,22 +218,25 @@ public class DefaultTitleManager {
      * @param time
      *            Time
      */
-    public void setStayTime(final int time) {
-        this.stayTime = time;
+    public void setStayTime(final int time)
+    {
+        stayTime = time;
     }
 
     /**
      * Set timings to ticks
      */
-    public void setTimingsToTicks() {
-        this.ticks = true;
+    public void setTimingsToTicks()
+    {
+        ticks = true;
     }
 
     /**
      * Set timings to seconds
      */
-    public void setTimingsToSeconds() {
-        this.ticks = false;
+    public void setTimingsToSeconds()
+    {
+        ticks = false;
     }
 
     /**
@@ -231,28 +248,35 @@ public class DefaultTitleManager {
      * @throws IllegalArgumentException
      * @throws IllegalAccessException
      */
-    public void send(final Player player) throws Exception {
-        if (this.packetTitle != null) {
+    public void send(final Player player) throws Exception
+    {
+        if (packetTitle != null)
+        {
             // First reset previous settings
             resetTitle(player);
             // Send timings first
             final Object handle = getHandle(player);
             final Object connection = getField(handle.getClass(), "playerConnection").get(handle);
-            final Object[] actions = this.packetActions.getEnumConstants();
+            final Object[] actions = packetActions.getEnumConstants();
             final Method sendPacket = getMethod(connection.getClass(), "sendPacket");
-            Object packet = this.packetTitle.getConstructor(this.packetActions, this.chatBaseComponent, Integer.TYPE, Integer.TYPE, Integer.TYPE).newInstance(actions[2], null, this.fadeInTime * (this.ticks ? 1 : 20), this.stayTime * (this.ticks ? 1 : 20), this.fadeOutTime * (this.ticks ? 1 : 20));
+            Object packet = packetTitle.getConstructor(packetActions, chatBaseComponent, Integer.TYPE, Integer.TYPE, Integer.TYPE).newInstance(actions[2], null,
+            fadeInTime * (ticks ? 1 : 20), stayTime * (ticks ? 1 : 20), fadeOutTime * (ticks ? 1 : 20));
             // Send if set
-            if ((this.fadeInTime != -1) && (this.fadeOutTime != -1) && (this.stayTime != -1)) {
+            if ((fadeInTime != -1) && (fadeOutTime != -1) && (stayTime != -1))
+            {
                 sendPacket.invoke(connection, packet);
             }
             // Send title
-            Object serialized = getMethod(this.nmsChatSerializer, "a", String.class).invoke(null, "{text:\"" + ChatColor.translateAlternateColorCodes('&', this.title) + "\",color:" + this.titleColor.name().toLowerCase() + "}");
-            packet = this.packetTitle.getConstructor(this.packetActions, this.chatBaseComponent).newInstance(actions[0], serialized);
+            Object serialized = getMethod(nmsChatSerializer, "a", String.class).invoke(null,
+            "{text:\"" + ChatColor.translateAlternateColorCodes('&', title) + "\",color:" + titleColor.name().toLowerCase() + "}");
+            packet = packetTitle.getConstructor(packetActions, chatBaseComponent).newInstance(actions[0], serialized);
             sendPacket.invoke(connection, packet);
-            if (this.subtitle != "") {
+            if (subtitle != "")
+            {
                 // Send subtitle if present
-                serialized = getMethod(this.nmsChatSerializer, "a", String.class).invoke(null, "{text:\"" + ChatColor.translateAlternateColorCodes('&', this.subtitle) + "\",color:" + this.subtitleColor.name().toLowerCase() + "}");
-                packet = this.packetTitle.getConstructor(this.packetActions, this.chatBaseComponent).newInstance(actions[1], serialized);
+                serialized = getMethod(nmsChatSerializer, "a", String.class).invoke(null,
+                "{text:\"" + ChatColor.translateAlternateColorCodes('&', subtitle) + "\",color:" + subtitleColor.name().toLowerCase() + "}");
+                packet = packetTitle.getConstructor(packetActions, chatBaseComponent).newInstance(actions[1], serialized);
                 sendPacket.invoke(connection, packet);
             }
         }
@@ -262,8 +286,10 @@ public class DefaultTitleManager {
      * Broadcast the title to all players
      * @throws Exception
      */
-    public void broadcast() throws Exception {
-        for (final Player p : Bukkit.getOnlinePlayers()) {
+    public void broadcast() throws Exception
+    {
+        for (final Player p : Bukkit.getOnlinePlayers())
+        {
             send(p);
         }
     }
@@ -273,17 +299,18 @@ public class DefaultTitleManager {
      *
      * @param player
      *            Player
-     * @throws IllegalAccessException 
-     * @throws IllegalArgumentException 
+     * @throws IllegalAccessException
+     * @throws IllegalArgumentException
      */
-    public void clearTitle(final Player player) throws Exception {
-            // Send timings first
-            final Object handle = getHandle(player);
-            final Object connection = getField(handle.getClass(), "playerConnection").get(handle);
-            final Object[] actions = this.packetActions.getEnumConstants();
-            final Method sendPacket = getMethod(connection.getClass(), "sendPacket");
-            final Object packet = this.packetTitle.getConstructor(this.packetActions, this.chatBaseComponent).newInstance(actions[3], null);
-            sendPacket.invoke(connection, packet);
+    public void clearTitle(final Player player) throws Exception
+    {
+        // Send timings first
+        final Object handle = getHandle(player);
+        final Object connection = getField(handle.getClass(), "playerConnection").get(handle);
+        final Object[] actions = packetActions.getEnumConstants();
+        final Method sendPacket = getMethod(connection.getClass(), "sendPacket");
+        final Object packet = packetTitle.getConstructor(packetActions, chatBaseComponent).newInstance(actions[3], null);
+        sendPacket.invoke(connection, packet);
     }
 
     /**
@@ -292,88 +319,103 @@ public class DefaultTitleManager {
      * @param player
      *            Player
      */
-    public void resetTitle(final Player player) throws Exception {
-            // Send timings first
+    public void resetTitle(final Player player) throws Exception
+    {
+        // Send timings first
         final Object handle = getHandle(player);
         final Object connection = getField(handle.getClass(), "playerConnection").get(handle);
-        final Object[] actions = this.packetActions.getEnumConstants();
+        final Object[] actions = packetActions.getEnumConstants();
         final Method sendPacket = getMethod(connection.getClass(), "sendPacket");
-        final Object packet = this.packetTitle.getConstructor(this.packetActions, this.chatBaseComponent).newInstance(actions[4], null);
+        final Object packet = packetTitle.getConstructor(packetActions, chatBaseComponent).newInstance(actions[4], null);
         sendPacket.invoke(connection, packet);
     }
 
-    private Class<?> getPrimitiveType(final Class<?> clazz) {
+    private Class<?> getPrimitiveType(final Class<?> clazz)
+    {
         return CORRESPONDING_TYPES.containsKey(clazz) ? CORRESPONDING_TYPES.get(clazz) : clazz;
     }
 
-    private Class<?>[] toPrimitiveTypeArray(final Class<?>[] classes) {
+    private Class<?>[] toPrimitiveTypeArray(final Class<?>[] classes)
+    {
         final int a = classes != null ? classes.length : 0;
         final Class<?>[] types = new Class<?>[a];
-        for (int i = 0; i < a; i++) {
+        for (int i = 0; i < a; i++)
+        {
             types[i] = getPrimitiveType(classes[i]);
         }
         return types;
     }
 
-    private static boolean equalsTypeArray(final Class<?>[] a, final Class<?>[] o) {
-        if (a.length != o.length) {
-            return false;
-        }
-        for (int i = 0; i < a.length; i++) {
-            if (!a[i].equals(o[i]) && !a[i].isAssignableFrom(o[i])) {
-                return false;
-            }
+    private static boolean equalsTypeArray(final Class<?>[] a, final Class<?>[] o)
+    {
+        if (a.length != o.length) { return false; }
+        for (int i = 0; i < a.length; i++)
+        {
+            if (!a[i].equals(o[i]) && !a[i].isAssignableFrom(o[i])) { return false; }
         }
         return true;
     }
 
-    private Object getHandle(final Object obj) {
-        try {
+    private Object getHandle(final Object obj)
+    {
+        try
+        {
             return getMethod("getHandle", obj.getClass()).invoke(obj);
-        } catch (final Exception e) {
+        }
+        catch (final Exception e)
+        {
             e.printStackTrace();
             return null;
         }
     }
 
-    private Method getMethod(final String name, final Class<?> clazz, final Class<?>... paramTypes) {
+    private Method getMethod(final String name, final Class<?> clazz, final Class<?>... paramTypes)
+    {
         final Class<?>[] t = toPrimitiveTypeArray(paramTypes);
-        for (final Method m : clazz.getMethods()) {
+        for (final Method m : clazz.getMethods())
+        {
             final Class<?>[] types = toPrimitiveTypeArray(m.getParameterTypes());
-            if (m.getName().equals(name) && equalsTypeArray(types, t)) {
-                return m;
-            }
+            if (m.getName().equals(name) && equalsTypeArray(types, t)) { return m; }
         }
         return null;
     }
 
-    private String getVersion() {
+    private String getVersion()
+    {
         final String name = Bukkit.getServer().getClass().getPackage().getName();
         final String version = name.substring(name.lastIndexOf('.') + 1) + ".";
         return version;
     }
 
-    private Class<?> getNMSClass(final String className) throws ClassNotFoundException {
+    private Class<?> getNMSClass(final String className) throws ClassNotFoundException
+    {
         final String fullName = "net.minecraft.server." + getVersion() + className;
         Class<?> clazz = null;
         clazz = Class.forName(fullName);
         return clazz;
     }
 
-    private Field getField(final Class<?> clazz, final String name) {
-        try {
+    private Field getField(final Class<?> clazz, final String name)
+    {
+        try
+        {
             final Field field = clazz.getDeclaredField(name);
             field.setAccessible(true);
             return field;
-        } catch (final Exception e) {
+        }
+        catch (final Exception e)
+        {
             e.printStackTrace();
             return null;
         }
     }
 
-    private Method getMethod(final Class<?> clazz, final String name, final Class<?>... args) {
-        for (final Method m : clazz.getMethods()) {
-            if (m.getName().equals(name) && ((args.length == 0) || ClassListEqual(args, m.getParameterTypes()))) {
+    private Method getMethod(final Class<?> clazz, final String name, final Class<?>... args)
+    {
+        for (final Method m : clazz.getMethods())
+        {
+            if (m.getName().equals(name) && ((args.length == 0) || ClassListEqual(args, m.getParameterTypes())))
+            {
                 m.setAccessible(true);
                 return m;
             }
@@ -381,13 +423,14 @@ public class DefaultTitleManager {
         return null;
     }
 
-    private boolean ClassListEqual(final Class<?>[] l1, final Class<?>[] l2) {
+    private boolean ClassListEqual(final Class<?>[] l1, final Class<?>[] l2)
+    {
         boolean equal = true;
-        if (l1.length != l2.length) {
-            return false;
-        }
-        for (int i = 0; i < l1.length; i++) {
-            if (l1[i] != l2[i]) {
+        if (l1.length != l2.length) { return false; }
+        for (int i = 0; i < l1.length; i++)
+        {
+            if (l1[i] != l2[i])
+            {
                 equal = false;
                 break;
             }
diff --git a/src/main/java/com/plotsquared/bukkit/titles/DefaultTitleManager_183.java b/src/main/java/com/plotsquared/bukkit/titles/DefaultTitleManager_183.java
index ee8847551..92693c9c3 100644
--- a/src/main/java/com/plotsquared/bukkit/titles/DefaultTitleManager_183.java
+++ b/src/main/java/com/plotsquared/bukkit/titles/DefaultTitleManager_183.java
@@ -17,7 +17,8 @@ import org.bukkit.entity.Player;
  * @author Maxim Van de Wynckel
  *
  */
-public class DefaultTitleManager_183 {
+public class DefaultTitleManager_183
+{
     /* Title packet */
     private Class<?> packetTitle;
     /* Title packet actions ENUM */
@@ -45,7 +46,8 @@ public class DefaultTitleManager_183 {
      *            Title
      * @throws ClassNotFoundException
      */
-    public DefaultTitleManager_183(final String title) throws ClassNotFoundException {
+    public DefaultTitleManager_183(final String title) throws ClassNotFoundException
+    {
         this.title = title;
         loadClasses();
     }
@@ -59,7 +61,8 @@ public class DefaultTitleManager_183 {
      *            Subtitle text
      * @throws ClassNotFoundException
      */
-    public DefaultTitleManager_183(final String title, final String subtitle) throws ClassNotFoundException {
+    public DefaultTitleManager_183(final String title, final String subtitle) throws ClassNotFoundException
+    {
         this.title = title;
         this.subtitle = subtitle;
         loadClasses();
@@ -72,16 +75,17 @@ public class DefaultTitleManager_183 {
      *            Title
      * @throws ClassNotFoundException
      */
-    public DefaultTitleManager_183(final DefaultTitleManager_183 title) throws ClassNotFoundException {
+    public DefaultTitleManager_183(final DefaultTitleManager_183 title) throws ClassNotFoundException
+    {
         // Copy title
         this.title = title.title;
-        this.subtitle = title.subtitle;
-        this.titleColor = title.titleColor;
-        this.subtitleColor = title.subtitleColor;
-        this.fadeInTime = title.fadeInTime;
-        this.fadeOutTime = title.fadeOutTime;
-        this.stayTime = title.stayTime;
-        this.ticks = title.ticks;
+        subtitle = title.subtitle;
+        titleColor = title.titleColor;
+        subtitleColor = title.subtitleColor;
+        fadeInTime = title.fadeInTime;
+        fadeOutTime = title.fadeOutTime;
+        stayTime = title.stayTime;
+        ticks = title.ticks;
         loadClasses();
     }
 
@@ -100,7 +104,8 @@ public class DefaultTitleManager_183 {
      *            Fade out time
      * @throws ClassNotFoundException
      */
-    public DefaultTitleManager_183(final String title, final String subtitle, final int fadeInTime, final int stayTime, final int fadeOutTime) throws ClassNotFoundException {
+    public DefaultTitleManager_183(final String title, final String subtitle, final int fadeInTime, final int stayTime, final int fadeOutTime) throws ClassNotFoundException
+    {
         this.title = title;
         this.subtitle = subtitle;
         this.fadeInTime = fadeInTime;
@@ -113,12 +118,13 @@ public class DefaultTitleManager_183 {
      * Load spigot and NMS classes
      * @throws ClassNotFoundException
      */
-    private void loadClasses() throws ClassNotFoundException {
-        this.packetTitle = getNMSClass("PacketPlayOutTitle");
-        this.chatBaseComponent = getNMSClass("IChatBaseComponent");
-        this.packetActions = getNMSClass("PacketPlayOutTitle$EnumTitleAction");
-        this.nmsChatSerializer = getNMSClass("IChatBaseComponent$ChatSerializer");
-        
+    private void loadClasses() throws ClassNotFoundException
+    {
+        packetTitle = getNMSClass("PacketPlayOutTitle");
+        chatBaseComponent = getNMSClass("IChatBaseComponent");
+        packetActions = getNMSClass("PacketPlayOutTitle$EnumTitleAction");
+        nmsChatSerializer = getNMSClass("IChatBaseComponent$ChatSerializer");
+
     }
 
     /**
@@ -127,7 +133,8 @@ public class DefaultTitleManager_183 {
      * @param title
      *            Title
      */
-    public void setTitle(final String title) {
+    public void setTitle(final String title)
+    {
         this.title = title;
     }
 
@@ -136,8 +143,9 @@ public class DefaultTitleManager_183 {
      *
      * @return Title text
      */
-    public String getTitle() {
-        return this.title;
+    public String getTitle()
+    {
+        return title;
     }
 
     /**
@@ -146,7 +154,8 @@ public class DefaultTitleManager_183 {
      * @param subtitle
      *            Subtitle text
      */
-    public void setSubtitle(final String subtitle) {
+    public void setSubtitle(final String subtitle)
+    {
         this.subtitle = subtitle;
     }
 
@@ -155,8 +164,9 @@ public class DefaultTitleManager_183 {
      *
      * @return Subtitle text
      */
-    public String getSubtitle() {
-        return this.subtitle;
+    public String getSubtitle()
+    {
+        return subtitle;
     }
 
     /**
@@ -165,8 +175,9 @@ public class DefaultTitleManager_183 {
      * @param color
      *            Chat color
      */
-    public void setTitleColor(final ChatColor color) {
-        this.titleColor = color;
+    public void setTitleColor(final ChatColor color)
+    {
+        titleColor = color;
     }
 
     /**
@@ -175,8 +186,9 @@ public class DefaultTitleManager_183 {
      * @param color
      *            Chat color
      */
-    public void setSubtitleColor(final ChatColor color) {
-        this.subtitleColor = color;
+    public void setSubtitleColor(final ChatColor color)
+    {
+        subtitleColor = color;
     }
 
     /**
@@ -185,8 +197,9 @@ public class DefaultTitleManager_183 {
      * @param time
      *            Time
      */
-    public void setFadeInTime(final int time) {
-        this.fadeInTime = time;
+    public void setFadeInTime(final int time)
+    {
+        fadeInTime = time;
     }
 
     /**
@@ -195,8 +208,9 @@ public class DefaultTitleManager_183 {
      * @param time
      *            Time
      */
-    public void setFadeOutTime(final int time) {
-        this.fadeOutTime = time;
+    public void setFadeOutTime(final int time)
+    {
+        fadeOutTime = time;
     }
 
     /**
@@ -205,22 +219,25 @@ public class DefaultTitleManager_183 {
      * @param time
      *            Time
      */
-    public void setStayTime(final int time) {
-        this.stayTime = time;
+    public void setStayTime(final int time)
+    {
+        stayTime = time;
     }
 
     /**
      * Set timings to ticks
      */
-    public void setTimingsToTicks() {
-        this.ticks = true;
+    public void setTimingsToTicks()
+    {
+        ticks = true;
     }
 
     /**
      * Set timings to seconds
      */
-    public void setTimingsToSeconds() {
-        this.ticks = false;
+    public void setTimingsToSeconds()
+    {
+        ticks = false;
     }
 
     /**
@@ -232,28 +249,35 @@ public class DefaultTitleManager_183 {
      * @throws IllegalArgumentException
      * @throws IllegalAccessException
      */
-    public void send(final Player player) throws Exception {
-        if (this.packetTitle != null) {
+    public void send(final Player player) throws Exception
+    {
+        if (packetTitle != null)
+        {
             // First reset previous settings
             resetTitle(player);
             // Send timings first
             final Object handle = getHandle(player);
             final Object connection = getField(handle.getClass(), "playerConnection").get(handle);
-            final Object[] actions = this.packetActions.getEnumConstants();
+            final Object[] actions = packetActions.getEnumConstants();
             final Method sendPacket = getMethod(connection.getClass(), "sendPacket");
-            Object packet = this.packetTitle.getConstructor(this.packetActions, this.chatBaseComponent, Integer.TYPE, Integer.TYPE, Integer.TYPE).newInstance(actions[2], null, this.fadeInTime * (this.ticks ? 1 : 20), this.stayTime * (this.ticks ? 1 : 20), this.fadeOutTime * (this.ticks ? 1 : 20));
+            Object packet = packetTitle.getConstructor(packetActions, chatBaseComponent, Integer.TYPE, Integer.TYPE, Integer.TYPE).newInstance(actions[2], null,
+            fadeInTime * (ticks ? 1 : 20), stayTime * (ticks ? 1 : 20), fadeOutTime * (ticks ? 1 : 20));
             // Send if set
-            if ((this.fadeInTime != -1) && (this.fadeOutTime != -1) && (this.stayTime != -1)) {
+            if ((fadeInTime != -1) && (fadeOutTime != -1) && (stayTime != -1))
+            {
                 sendPacket.invoke(connection, packet);
             }
             // Send title
-            Object serialized = getMethod(this.nmsChatSerializer, "a", String.class).invoke(null, "{text:\"" + ChatColor.translateAlternateColorCodes('&', this.title) + "\",color:" + this.titleColor.name().toLowerCase() + "}");
-            packet = this.packetTitle.getConstructor(this.packetActions, this.chatBaseComponent).newInstance(actions[0], serialized);
+            Object serialized = getMethod(nmsChatSerializer, "a", String.class).invoke(null,
+            "{text:\"" + ChatColor.translateAlternateColorCodes('&', title) + "\",color:" + titleColor.name().toLowerCase() + "}");
+            packet = packetTitle.getConstructor(packetActions, chatBaseComponent).newInstance(actions[0], serialized);
             sendPacket.invoke(connection, packet);
-            if (this.subtitle != "") {
+            if (subtitle != "")
+            {
                 // Send subtitle if present
-                serialized = getMethod(this.nmsChatSerializer, "a", String.class).invoke(null, "{text:\"" + ChatColor.translateAlternateColorCodes('&', this.subtitle) + "\",color:" + this.subtitleColor.name().toLowerCase() + "}");
-                packet = this.packetTitle.getConstructor(this.packetActions, this.chatBaseComponent).newInstance(actions[1], serialized);
+                serialized = getMethod(nmsChatSerializer, "a", String.class).invoke(null,
+                "{text:\"" + ChatColor.translateAlternateColorCodes('&', subtitle) + "\",color:" + subtitleColor.name().toLowerCase() + "}");
+                packet = packetTitle.getConstructor(packetActions, chatBaseComponent).newInstance(actions[1], serialized);
                 sendPacket.invoke(connection, packet);
             }
         }
@@ -263,8 +287,10 @@ public class DefaultTitleManager_183 {
      * Broadcast the title to all players
      * @throws Exception
      */
-    public void broadcast() throws Exception {
-        for (final Player p : Bukkit.getOnlinePlayers()) {
+    public void broadcast() throws Exception
+    {
+        for (final Player p : Bukkit.getOnlinePlayers())
+        {
             send(p);
         }
     }
@@ -274,17 +300,18 @@ public class DefaultTitleManager_183 {
      *
      * @param player
      *            Player
-     * @throws IllegalAccessException 
-     * @throws IllegalArgumentException 
+     * @throws IllegalAccessException
+     * @throws IllegalArgumentException
      */
-    public void clearTitle(final Player player) throws Exception {
-            // Send timings first
-            final Object handle = getHandle(player);
-            final Object connection = getField(handle.getClass(), "playerConnection").get(handle);
-            final Object[] actions = this.packetActions.getEnumConstants();
-            final Method sendPacket = getMethod(connection.getClass(), "sendPacket");
-            final Object packet = this.packetTitle.getConstructor(this.packetActions, this.chatBaseComponent).newInstance(actions[3], null);
-            sendPacket.invoke(connection, packet);
+    public void clearTitle(final Player player) throws Exception
+    {
+        // Send timings first
+        final Object handle = getHandle(player);
+        final Object connection = getField(handle.getClass(), "playerConnection").get(handle);
+        final Object[] actions = packetActions.getEnumConstants();
+        final Method sendPacket = getMethod(connection.getClass(), "sendPacket");
+        final Object packet = packetTitle.getConstructor(packetActions, chatBaseComponent).newInstance(actions[3], null);
+        sendPacket.invoke(connection, packet);
     }
 
     /**
@@ -292,95 +319,110 @@ public class DefaultTitleManager_183 {
      *
      * @param player
      *            Player
-     * @throws SecurityException 
-     * @throws NoSuchMethodException 
-     * @throws InvocationTargetException 
-     * @throws IllegalArgumentException 
-     * @throws IllegalAccessException 
-     * @throws InstantiationException 
+     * @throws SecurityException
+     * @throws NoSuchMethodException
+     * @throws InvocationTargetException
+     * @throws IllegalArgumentException
+     * @throws IllegalAccessException
+     * @throws InstantiationException
      */
-    public void resetTitle(final Player player) throws Exception {
+    public void resetTitle(final Player player) throws Exception
+    {
         // Send timings first
         final Object handle = getHandle(player);
         final Object connection = getField(handle.getClass(), "playerConnection").get(handle);
-        final Object[] actions = this.packetActions.getEnumConstants();
+        final Object[] actions = packetActions.getEnumConstants();
         final Method sendPacket = getMethod(connection.getClass(), "sendPacket");
-        final Object packet = this.packetTitle.getConstructor(this.packetActions, this.chatBaseComponent).newInstance(actions[4], null);
+        final Object packet = packetTitle.getConstructor(packetActions, chatBaseComponent).newInstance(actions[4], null);
         sendPacket.invoke(connection, packet);
     }
 
-    private Class<?> getPrimitiveType(final Class<?> clazz) {
+    private Class<?> getPrimitiveType(final Class<?> clazz)
+    {
         return CORRESPONDING_TYPES.containsKey(clazz) ? CORRESPONDING_TYPES.get(clazz) : clazz;
     }
 
-    private Class<?>[] toPrimitiveTypeArray(final Class<?>[] classes) {
+    private Class<?>[] toPrimitiveTypeArray(final Class<?>[] classes)
+    {
         final int a = classes != null ? classes.length : 0;
         final Class<?>[] types = new Class<?>[a];
-        for (int i = 0; i < a; i++) {
+        for (int i = 0; i < a; i++)
+        {
             types[i] = getPrimitiveType(classes[i]);
         }
         return types;
     }
 
-    private static boolean equalsTypeArray(final Class<?>[] a, final Class<?>[] o) {
-        if (a.length != o.length) {
-            return false;
-        }
-        for (int i = 0; i < a.length; i++) {
-            if (!a[i].equals(o[i]) && !a[i].isAssignableFrom(o[i])) {
-                return false;
-            }
+    private static boolean equalsTypeArray(final Class<?>[] a, final Class<?>[] o)
+    {
+        if (a.length != o.length) { return false; }
+        for (int i = 0; i < a.length; i++)
+        {
+            if (!a[i].equals(o[i]) && !a[i].isAssignableFrom(o[i])) { return false; }
         }
         return true;
     }
 
-    private Object getHandle(final Object obj) {
-        try {
+    private Object getHandle(final Object obj)
+    {
+        try
+        {
             return getMethod("getHandle", obj.getClass()).invoke(obj);
-        } catch (final Exception e) {
+        }
+        catch (final Exception e)
+        {
             e.printStackTrace();
             return null;
         }
     }
 
-    private Method getMethod(final String name, final Class<?> clazz, final Class<?>... paramTypes) {
+    private Method getMethod(final String name, final Class<?> clazz, final Class<?>... paramTypes)
+    {
         final Class<?>[] t = toPrimitiveTypeArray(paramTypes);
-        for (final Method m : clazz.getMethods()) {
+        for (final Method m : clazz.getMethods())
+        {
             final Class<?>[] types = toPrimitiveTypeArray(m.getParameterTypes());
-            if (m.getName().equals(name) && equalsTypeArray(types, t)) {
-                return m;
-            }
+            if (m.getName().equals(name) && equalsTypeArray(types, t)) { return m; }
         }
         return null;
     }
 
-    private String getVersion() {
+    private String getVersion()
+    {
         final String name = Bukkit.getServer().getClass().getPackage().getName();
         final String version = name.substring(name.lastIndexOf('.') + 1) + ".";
         return version;
     }
 
-    private Class<?> getNMSClass(final String className) throws ClassNotFoundException {
+    private Class<?> getNMSClass(final String className) throws ClassNotFoundException
+    {
         final String fullName = "net.minecraft.server." + getVersion() + className;
         Class<?> clazz = null;
         clazz = Class.forName(fullName);
         return clazz;
     }
 
-    private Field getField(final Class<?> clazz, final String name) {
-        try {
+    private Field getField(final Class<?> clazz, final String name)
+    {
+        try
+        {
             final Field field = clazz.getDeclaredField(name);
             field.setAccessible(true);
             return field;
-        } catch (final Exception e) {
+        }
+        catch (final Exception e)
+        {
             e.printStackTrace();
             return null;
         }
     }
 
-    private Method getMethod(final Class<?> clazz, final String name, final Class<?>... args) {
-        for (final Method m : clazz.getMethods()) {
-            if (m.getName().equals(name) && ((args.length == 0) || ClassListEqual(args, m.getParameterTypes()))) {
+    private Method getMethod(final Class<?> clazz, final String name, final Class<?>... args)
+    {
+        for (final Method m : clazz.getMethods())
+        {
+            if (m.getName().equals(name) && ((args.length == 0) || ClassListEqual(args, m.getParameterTypes())))
+            {
                 m.setAccessible(true);
                 return m;
             }
@@ -388,13 +430,14 @@ public class DefaultTitleManager_183 {
         return null;
     }
 
-    private boolean ClassListEqual(final Class<?>[] l1, final Class<?>[] l2) {
+    private boolean ClassListEqual(final Class<?>[] l1, final Class<?>[] l2)
+    {
         boolean equal = true;
-        if (l1.length != l2.length) {
-            return false;
-        }
-        for (int i = 0; i < l1.length; i++) {
-            if (l1[i] != l2[i]) {
+        if (l1.length != l2.length) { return false; }
+        for (int i = 0; i < l1.length; i++)
+        {
+            if (l1[i] != l2[i])
+            {
                 equal = false;
                 break;
             }
diff --git a/src/main/java/com/plotsquared/bukkit/titles/DefaultTitle_183.java b/src/main/java/com/plotsquared/bukkit/titles/DefaultTitle_183.java
index 718b9d886..7f962613e 100644
--- a/src/main/java/com/plotsquared/bukkit/titles/DefaultTitle_183.java
+++ b/src/main/java/com/plotsquared/bukkit/titles/DefaultTitle_183.java
@@ -4,13 +4,18 @@ import com.intellectualcrafters.plot.object.PlotPlayer;
 import com.intellectualcrafters.plot.util.AbstractTitle;
 import com.plotsquared.bukkit.object.BukkitPlayer;
 
-public class DefaultTitle_183 extends AbstractTitle {
+public class DefaultTitle_183 extends AbstractTitle
+{
     @Override
-    public void sendTitle(final PlotPlayer player, final String head, final String sub, int in, int delay, int out) {
-        try {
+    public void sendTitle(final PlotPlayer player, final String head, final String sub, final int in, final int delay, final int out)
+    {
+        try
+        {
             final DefaultTitleManager_183 title = new DefaultTitleManager_183(head, sub, in, delay, out);
             title.send(((BukkitPlayer) player).player);
-        } catch (final Throwable e) {
+        }
+        catch (final Throwable e)
+        {
             AbstractTitle.TITLE_CLASS = new HackTitle();
             AbstractTitle.TITLE_CLASS.sendTitle(player, head, sub, in, delay, out);
         }
diff --git a/src/main/java/com/plotsquared/bukkit/titles/HackTitle.java b/src/main/java/com/plotsquared/bukkit/titles/HackTitle.java
index dc765e23c..32024036e 100644
--- a/src/main/java/com/plotsquared/bukkit/titles/HackTitle.java
+++ b/src/main/java/com/plotsquared/bukkit/titles/HackTitle.java
@@ -6,13 +6,18 @@ import com.intellectualcrafters.plot.object.PlotPlayer;
 import com.intellectualcrafters.plot.util.AbstractTitle;
 import com.plotsquared.bukkit.object.BukkitPlayer;
 
-public class HackTitle extends AbstractTitle {
+public class HackTitle extends AbstractTitle
+{
     @Override
-    public void sendTitle(final PlotPlayer player, final String head, final String sub, int in, int delay, int out) {
-        try {
+    public void sendTitle(final PlotPlayer player, final String head, final String sub, final int in, final int delay, final int out)
+    {
+        try
+        {
             final HackTitleManager title = new HackTitleManager(head, sub, in, delay, out);
             title.send(((BukkitPlayer) player).player);
-        } catch (final Throwable e) {
+        }
+        catch (final Throwable e)
+        {
             PS.debug("&cYour server version does not support titles!");
             Settings.TITLES = false;
             AbstractTitle.TITLE_CLASS = null;
diff --git a/src/main/java/com/plotsquared/bukkit/titles/HackTitleManager.java b/src/main/java/com/plotsquared/bukkit/titles/HackTitleManager.java
index b218280de..b6b15fd77 100644
--- a/src/main/java/com/plotsquared/bukkit/titles/HackTitleManager.java
+++ b/src/main/java/com/plotsquared/bukkit/titles/HackTitleManager.java
@@ -15,7 +15,8 @@ import org.bukkit.entity.Player;
  * @version 1.0.4
  * @author Maxim Van de Wynckel
  */
-public class HackTitleManager {
+public class HackTitleManager
+{
     /* Title packet */
     private Class<?> packetTitle;
     /* Title packet actions ENUM */
@@ -42,7 +43,8 @@ public class HackTitleManager {
      *            Title
      * @throws ClassNotFoundException
      */
-    public HackTitleManager(final String title) throws ClassNotFoundException {
+    public HackTitleManager(final String title) throws ClassNotFoundException
+    {
         this.title = title;
         loadClasses();
     }
@@ -56,7 +58,8 @@ public class HackTitleManager {
      *            Subtitle text
      * @throws ClassNotFoundException
      */
-    public HackTitleManager(final String title, final String subtitle) throws ClassNotFoundException {
+    public HackTitleManager(final String title, final String subtitle) throws ClassNotFoundException
+    {
         this.title = title;
         this.subtitle = subtitle;
         loadClasses();
@@ -69,16 +72,17 @@ public class HackTitleManager {
      *            Title
      * @throws ClassNotFoundException
      */
-    public HackTitleManager(final HackTitleManager title) throws ClassNotFoundException {
+    public HackTitleManager(final HackTitleManager title) throws ClassNotFoundException
+    {
         // Copy title
         this.title = title.title;
-        this.subtitle = title.subtitle;
-        this.titleColor = title.titleColor;
-        this.subtitleColor = title.subtitleColor;
-        this.fadeInTime = title.fadeInTime;
-        this.fadeOutTime = title.fadeOutTime;
-        this.stayTime = title.stayTime;
-        this.ticks = title.ticks;
+        subtitle = title.subtitle;
+        titleColor = title.titleColor;
+        subtitleColor = title.subtitleColor;
+        fadeInTime = title.fadeInTime;
+        fadeOutTime = title.fadeOutTime;
+        stayTime = title.stayTime;
+        ticks = title.ticks;
         loadClasses();
     }
 
@@ -97,7 +101,8 @@ public class HackTitleManager {
      *            Fade out time
      * @throws ClassNotFoundException
      */
-    public HackTitleManager(final String title, final String subtitle, final int fadeInTime, final int stayTime, final int fadeOutTime) throws ClassNotFoundException {
+    public HackTitleManager(final String title, final String subtitle, final int fadeInTime, final int stayTime, final int fadeOutTime) throws ClassNotFoundException
+    {
         this.title = title;
         this.subtitle = subtitle;
         this.fadeInTime = fadeInTime;
@@ -110,10 +115,11 @@ public class HackTitleManager {
      * Load spigot and NMS classes
      * @throws ClassNotFoundException
      */
-    private void loadClasses() throws ClassNotFoundException {
-        this.packetTitle = getClass("org.spigotmc.ProtocolInjector$PacketTitle");
-        this.packetActions = getClass("org.spigotmc.ProtocolInjector$PacketTitle$Action");
-        this.nmsChatSerializer = getNMSClass("ChatSerializer");
+    private void loadClasses() throws ClassNotFoundException
+    {
+        packetTitle = getClass("org.spigotmc.ProtocolInjector$PacketTitle");
+        packetActions = getClass("org.spigotmc.ProtocolInjector$PacketTitle$Action");
+        nmsChatSerializer = getNMSClass("ChatSerializer");
     }
 
     /**
@@ -122,7 +128,8 @@ public class HackTitleManager {
      * @param title
      *            Title
      */
-    public void setTitle(final String title) {
+    public void setTitle(final String title)
+    {
         this.title = title;
     }
 
@@ -131,8 +138,9 @@ public class HackTitleManager {
      *
      * @return Title text
      */
-    public String getTitle() {
-        return this.title;
+    public String getTitle()
+    {
+        return title;
     }
 
     /**
@@ -141,7 +149,8 @@ public class HackTitleManager {
      * @param subtitle
      *            Subtitle text
      */
-    public void setSubtitle(final String subtitle) {
+    public void setSubtitle(final String subtitle)
+    {
         this.subtitle = subtitle;
     }
 
@@ -150,8 +159,9 @@ public class HackTitleManager {
      *
      * @return Subtitle text
      */
-    public String getSubtitle() {
-        return this.subtitle;
+    public String getSubtitle()
+    {
+        return subtitle;
     }
 
     /**
@@ -160,8 +170,9 @@ public class HackTitleManager {
      * @param color
      *            Chat color
      */
-    public void setTitleColor(final ChatColor color) {
-        this.titleColor = color;
+    public void setTitleColor(final ChatColor color)
+    {
+        titleColor = color;
     }
 
     /**
@@ -170,8 +181,9 @@ public class HackTitleManager {
      * @param color
      *            Chat color
      */
-    public void setSubtitleColor(final ChatColor color) {
-        this.subtitleColor = color;
+    public void setSubtitleColor(final ChatColor color)
+    {
+        subtitleColor = color;
     }
 
     /**
@@ -180,8 +192,9 @@ public class HackTitleManager {
      * @param time
      *            Time
      */
-    public void setFadeInTime(final int time) {
-        this.fadeInTime = time;
+    public void setFadeInTime(final int time)
+    {
+        fadeInTime = time;
     }
 
     /**
@@ -190,8 +203,9 @@ public class HackTitleManager {
      * @param time
      *            Time
      */
-    public void setFadeOutTime(final int time) {
-        this.fadeOutTime = time;
+    public void setFadeOutTime(final int time)
+    {
+        fadeOutTime = time;
     }
 
     /**
@@ -200,22 +214,25 @@ public class HackTitleManager {
      * @param time
      *            Time
      */
-    public void setStayTime(final int time) {
-        this.stayTime = time;
+    public void setStayTime(final int time)
+    {
+        stayTime = time;
     }
 
     /**
      * Set timings to ticks
      */
-    public void setTimingsToTicks() {
-        this.ticks = true;
+    public void setTimingsToTicks()
+    {
+        ticks = true;
     }
 
     /**
      * Set timings to seconds
      */
-    public void setTimingsToSeconds() {
-        this.ticks = false;
+    public void setTimingsToSeconds()
+    {
+        ticks = false;
     }
 
     /**
@@ -224,28 +241,35 @@ public class HackTitleManager {
      * @param player
      *            Player
      */
-    public void send(final Player player) throws Exception {
-        if ((getProtocolVersion(player) >= 47) && isSpigot() && (this.packetTitle != null)) {
+    public void send(final Player player) throws Exception
+    {
+        if ((getProtocolVersion(player) >= 47) && isSpigot() && (packetTitle != null))
+        {
             // First reset previous settings
             resetTitle(player);
             // Send timings first
             final Object handle = getHandle(player);
             final Object connection = getField(handle.getClass(), "playerConnection").get(handle);
-            final Object[] actions = this.packetActions.getEnumConstants();
+            final Object[] actions = packetActions.getEnumConstants();
             final Method sendPacket = getMethod(connection.getClass(), "sendPacket");
-            Object packet = this.packetTitle.getConstructor(this.packetActions, Integer.TYPE, Integer.TYPE, Integer.TYPE).newInstance(actions[2], this.fadeInTime * (this.ticks ? 1 : 20), this.stayTime * (this.ticks ? 1 : 20), this.fadeOutTime * (this.ticks ? 1 : 20));
+            Object packet = packetTitle.getConstructor(packetActions, Integer.TYPE, Integer.TYPE, Integer.TYPE).newInstance(actions[2], fadeInTime * (ticks ? 1 : 20),
+            stayTime * (ticks ? 1 : 20), fadeOutTime * (ticks ? 1 : 20));
             // Send if set
-            if ((this.fadeInTime != -1) && (this.fadeOutTime != -1) && (this.stayTime != -1)) {
+            if ((fadeInTime != -1) && (fadeOutTime != -1) && (stayTime != -1))
+            {
                 sendPacket.invoke(connection, packet);
             }
             // Send title
-            Object serialized = getMethod(this.nmsChatSerializer, "a", String.class).invoke(null, "{text:\"" + ChatColor.translateAlternateColorCodes('&', this.title) + "\",color:" + this.titleColor.name().toLowerCase() + "}");
-            packet = this.packetTitle.getConstructor(this.packetActions, getNMSClass("IChatBaseComponent")).newInstance(actions[0], serialized);
+            Object serialized = getMethod(nmsChatSerializer, "a", String.class).invoke(null,
+            "{text:\"" + ChatColor.translateAlternateColorCodes('&', title) + "\",color:" + titleColor.name().toLowerCase() + "}");
+            packet = packetTitle.getConstructor(packetActions, getNMSClass("IChatBaseComponent")).newInstance(actions[0], serialized);
             sendPacket.invoke(connection, packet);
-            if (this.subtitle != "") {
+            if (subtitle != "")
+            {
                 // Send subtitle if present
-                serialized = getMethod(this.nmsChatSerializer, "a", String.class).invoke(null, "{text:\"" + ChatColor.translateAlternateColorCodes('&', this.subtitle) + "\",color:" + this.subtitleColor.name().toLowerCase() + "}");
-                packet = this.packetTitle.getConstructor(this.packetActions, getNMSClass("IChatBaseComponent")).newInstance(actions[1], serialized);
+                serialized = getMethod(nmsChatSerializer, "a", String.class).invoke(null,
+                "{text:\"" + ChatColor.translateAlternateColorCodes('&', subtitle) + "\",color:" + subtitleColor.name().toLowerCase() + "}");
+                packet = packetTitle.getConstructor(packetActions, getNMSClass("IChatBaseComponent")).newInstance(actions[1], serialized);
                 sendPacket.invoke(connection, packet);
             }
         }
@@ -254,8 +278,10 @@ public class HackTitleManager {
     /**
      * Broadcast the title to all players
      */
-    public void broadcast() throws Exception {
-        for (final Player p : Bukkit.getOnlinePlayers()) {
+    public void broadcast() throws Exception
+    {
+        for (final Player p : Bukkit.getOnlinePlayers())
+        {
             send(p);
         }
     }
@@ -265,16 +291,18 @@ public class HackTitleManager {
      *
      * @param player
      *            Player
-     * @throws Exception 
+     * @throws Exception
      */
-    public void clearTitle(final Player player) throws Exception {
-        if ((getProtocolVersion(player) >= 47) && isSpigot()) {
+    public void clearTitle(final Player player) throws Exception
+    {
+        if ((getProtocolVersion(player) >= 47) && isSpigot())
+        {
             // Send timings first
             final Object handle = getHandle(player);
             final Object connection = getField(handle.getClass(), "playerConnection").get(handle);
-            final Object[] actions = this.packetActions.getEnumConstants();
+            final Object[] actions = packetActions.getEnumConstants();
             final Method sendPacket = getMethod(connection.getClass(), "sendPacket");
-            final Object packet = this.packetTitle.getConstructor(this.packetActions).newInstance(actions[3]);
+            final Object packet = packetTitle.getConstructor(packetActions).newInstance(actions[3]);
             sendPacket.invoke(connection, packet);
         }
     }
@@ -284,16 +312,18 @@ public class HackTitleManager {
      *
      * @param player
      *            Player
-     * @throws Exception 
+     * @throws Exception
      */
-    public void resetTitle(final Player player) throws Exception {
-        if ((getProtocolVersion(player) >= 47) && isSpigot()) {
+    public void resetTitle(final Player player) throws Exception
+    {
+        if ((getProtocolVersion(player) >= 47) && isSpigot())
+        {
             // Send timings first
             final Object handle = getHandle(player);
             final Object connection = getField(handle.getClass(), "playerConnection").get(handle);
-            final Object[] actions = this.packetActions.getEnumConstants();
+            final Object[] actions = packetActions.getEnumConstants();
             final Method sendPacket = getMethod(connection.getClass(), "sendPacket");
-            final Object packet = this.packetTitle.getConstructor(this.packetActions).newInstance(actions[4]);
+            final Object packet = packetTitle.getConstructor(packetActions).newInstance(actions[4]);
             sendPacket.invoke(connection, packet);
         }
     }
@@ -304,13 +334,14 @@ public class HackTitleManager {
      * @param player
      *            Player
      * @return Protocol version
-     * @throws Exception 
+     * @throws Exception
      */
-    private int getProtocolVersion(final Player player) throws Exception {
+    private int getProtocolVersion(final Player player) throws Exception
+    {
         final Object handle = getHandle(player);
         final Object connection = getField(handle.getClass(), "playerConnection").get(handle);
         final Object networkManager = getValue("networkManager", connection);
-        Integer version = (Integer) getMethod("getVersion", networkManager.getClass()).invoke(networkManager);
+        final Integer version = (Integer) getMethod("getVersion", networkManager.getClass()).invoke(networkManager);
         return version;
     }
 
@@ -319,7 +350,8 @@ public class HackTitleManager {
      *
      * @return Spigot
      */
-    private boolean isSpigot() {
+    private boolean isSpigot()
+    {
         return Bukkit.getVersion().contains("Spigot");
     }
 
@@ -330,96 +362,115 @@ public class HackTitleManager {
      *            Namespace url
      * @return Class
      */
-    private Class<?> getClass(final String namespace) {
-        try {
+    private Class<?> getClass(final String namespace)
+    {
+        try
+        {
             return Class.forName(namespace);
-        } catch (final Exception e) {
         }
+        catch (final Exception e)
+        {}
         return null;
     }
 
-    private Field getField(final String name, final Class<?> clazz) throws Exception {
+    private Field getField(final String name, final Class<?> clazz) throws Exception
+    {
         return clazz.getDeclaredField(name);
     }
 
-    private Object getValue(final String name, final Object obj) throws Exception {
+    private Object getValue(final String name, final Object obj) throws Exception
+    {
         final Field f = getField(name, obj.getClass());
         f.setAccessible(true);
         return f.get(obj);
     }
 
-    private Class<?> getPrimitiveType(final Class<?> clazz) {
+    private Class<?> getPrimitiveType(final Class<?> clazz)
+    {
         return CORRESPONDING_TYPES.containsKey(clazz) ? CORRESPONDING_TYPES.get(clazz) : clazz;
     }
 
-    private Class<?>[] toPrimitiveTypeArray(final Class<?>[] classes) {
+    private Class<?>[] toPrimitiveTypeArray(final Class<?>[] classes)
+    {
         final int a = classes != null ? classes.length : 0;
         final Class<?>[] types = new Class<?>[a];
-        for (int i = 0; i < a; i++) {
+        for (int i = 0; i < a; i++)
+        {
             types[i] = getPrimitiveType(classes[i]);
         }
         return types;
     }
 
-    private static boolean equalsTypeArray(final Class<?>[] a, final Class<?>[] o) {
-        if (a.length != o.length) {
-            return false;
-        }
-        for (int i = 0; i < a.length; i++) {
-            if (!a[i].equals(o[i]) && !a[i].isAssignableFrom(o[i])) {
-                return false;
-            }
+    private static boolean equalsTypeArray(final Class<?>[] a, final Class<?>[] o)
+    {
+        if (a.length != o.length) { return false; }
+        for (int i = 0; i < a.length; i++)
+        {
+            if (!a[i].equals(o[i]) && !a[i].isAssignableFrom(o[i])) { return false; }
         }
         return true;
     }
 
-    private Object getHandle(final Object obj) {
-        try {
+    private Object getHandle(final Object obj)
+    {
+        try
+        {
             return getMethod("getHandle", obj.getClass()).invoke(obj);
-        } catch (final Exception e) {
+        }
+        catch (final Exception e)
+        {
             e.printStackTrace();
             return null;
         }
     }
 
-    private Method getMethod(final String name, final Class<?> clazz, final Class<?>... paramTypes) {
+    private Method getMethod(final String name, final Class<?> clazz, final Class<?>... paramTypes)
+    {
         final Class<?>[] t = toPrimitiveTypeArray(paramTypes);
-        for (final Method m : clazz.getMethods()) {
+        for (final Method m : clazz.getMethods())
+        {
             final Class<?>[] types = toPrimitiveTypeArray(m.getParameterTypes());
-            if (m.getName().equals(name) && equalsTypeArray(types, t)) {
-                return m;
-            }
+            if (m.getName().equals(name) && equalsTypeArray(types, t)) { return m; }
         }
         return null;
     }
 
-    private String getVersion() {
+    private String getVersion()
+    {
         final String name = Bukkit.getServer().getClass().getPackage().getName();
         final String version = name.substring(name.lastIndexOf('.') + 1) + ".";
         return version;
     }
 
-    private Class<?> getNMSClass(final String className) throws ClassNotFoundException {
+    private Class<?> getNMSClass(final String className) throws ClassNotFoundException
+    {
         final String fullName = "net.minecraft.server." + getVersion() + className;
         Class<?> clazz = null;
         clazz = Class.forName(fullName);
         return clazz;
     }
 
-    private Field getField(final Class<?> clazz, final String name) {
-        try {
+    private Field getField(final Class<?> clazz, final String name)
+    {
+        try
+        {
             final Field field = clazz.getDeclaredField(name);
             field.setAccessible(true);
             return field;
-        } catch (final Exception e) {
+        }
+        catch (final Exception e)
+        {
             e.printStackTrace();
             return null;
         }
     }
 
-    private Method getMethod(final Class<?> clazz, final String name, final Class<?>... args) {
-        for (final Method m : clazz.getMethods()) {
-            if (m.getName().equals(name) && ((args.length == 0) || ClassListEqual(args, m.getParameterTypes()))) {
+    private Method getMethod(final Class<?> clazz, final String name, final Class<?>... args)
+    {
+        for (final Method m : clazz.getMethods())
+        {
+            if (m.getName().equals(name) && ((args.length == 0) || ClassListEqual(args, m.getParameterTypes())))
+            {
                 m.setAccessible(true);
                 return m;
             }
@@ -427,13 +478,14 @@ public class HackTitleManager {
         return null;
     }
 
-    private boolean ClassListEqual(final Class<?>[] l1, final Class<?>[] l2) {
+    private boolean ClassListEqual(final Class<?>[] l1, final Class<?>[] l2)
+    {
         boolean equal = true;
-        if (l1.length != l2.length) {
-            return false;
-        }
-        for (int i = 0; i < l1.length; i++) {
-            if (l1[i] != l2[i]) {
+        if (l1.length != l2.length) { return false; }
+        for (int i = 0; i < l1.length; i++)
+        {
+            if (l1[i] != l2[i])
+            {
                 equal = false;
                 break;
             }
diff --git a/src/main/java/com/plotsquared/bukkit/util/BukkitChatManager.java b/src/main/java/com/plotsquared/bukkit/util/BukkitChatManager.java
index f117423aa..ad13ccda9 100644
--- a/src/main/java/com/plotsquared/bukkit/util/BukkitChatManager.java
+++ b/src/main/java/com/plotsquared/bukkit/util/BukkitChatManager.java
@@ -13,50 +13,61 @@ import com.intellectualcrafters.plot.util.ChatManager;
 import com.plotsquared.bukkit.chat.FancyMessage;
 import com.plotsquared.bukkit.object.BukkitPlayer;
 
-public class BukkitChatManager extends ChatManager<FancyMessage> {
-    
+public class BukkitChatManager extends ChatManager<FancyMessage>
+{
+
     @Override
-    public FancyMessage builder() {
+    public FancyMessage builder()
+    {
         return new FancyMessage("");
     }
-    
+
     @Override
-    public void color(PlotMessage m, String color) {
+    public void color(final PlotMessage m, final String color)
+    {
         m.$(this).color(ChatColor.getByChar(C.color(color).substring(1)));
     }
-    
+
     @Override
-    public void tooltip(PlotMessage m, PlotMessage... tooltips) {
-        List<FancyMessage> lines = new ArrayList<>();
-        for (PlotMessage tooltip : tooltips) {
+    public void tooltip(final PlotMessage m, final PlotMessage... tooltips)
+    {
+        final List<FancyMessage> lines = new ArrayList<>();
+        for (final PlotMessage tooltip : tooltips)
+        {
             lines.add(tooltip.$(this));
         }
         m.$(this).formattedTooltip(lines);
     }
-    
+
     @Override
-    public void command(PlotMessage m, String command) {
+    public void command(final PlotMessage m, final String command)
+    {
         m.$(this).command(command);
     }
-    
+
     @Override
-    public void text(PlotMessage m, String text) {
+    public void text(final PlotMessage m, final String text)
+    {
         m.$(this).then(ChatColor.stripColor(text));
     }
-    
+
     @Override
-    public void send(PlotMessage m, PlotPlayer player) {
-        if (ConsolePlayer.isConsole(player)) {
+    public void send(final PlotMessage m, final PlotPlayer player)
+    {
+        if (ConsolePlayer.isConsole(player))
+        {
             player.sendMessage(m.$(this).toOldMessageFormat());
         }
-        else {
+        else
+        {
             m.$(this).send(((BukkitPlayer) player).player);
         }
     }
-    
+
     @Override
-    public void suggest(PlotMessage m, String command) {
+    public void suggest(final PlotMessage m, final String command)
+    {
         m.$(this).suggest(command);
     }
-    
+
 }
diff --git a/src/main/java/com/plotsquared/bukkit/util/BukkitChunkManager.java b/src/main/java/com/plotsquared/bukkit/util/BukkitChunkManager.java
index 314d282cc..e58f968bc 100644
--- a/src/main/java/com/plotsquared/bukkit/util/BukkitChunkManager.java
+++ b/src/main/java/com/plotsquared/bukkit/util/BukkitChunkManager.java
@@ -65,32 +65,38 @@ import com.intellectualcrafters.plot.util.TaskManager;
 import com.plotsquared.bukkit.generator.AugmentedPopulator;
 import com.plotsquared.bukkit.object.entity.EntityWrapper;
 
-public class BukkitChunkManager extends ChunkManager {
+public class BukkitChunkManager extends ChunkManager
+{
     @Override
-    public ArrayList<ChunkLoc> getChunkChunks(final String world) {
+    public ArrayList<ChunkLoc> getChunkChunks(final String world)
+    {
         final String directory = Bukkit.getWorldContainer() + File.separator + world + File.separator + "region";
         final File folder = new File(directory);
         final File[] regionFiles = folder.listFiles();
         final ArrayList<ChunkLoc> chunks = new ArrayList<>();
-        if (regionFiles == null) {
-            throw new RuntimeException("Could not find worlds folder.");
-        }
-        for (final File file : regionFiles) {
+        if (regionFiles == null) { throw new RuntimeException("Could not find worlds folder."); }
+        for (final File file : regionFiles)
+        {
             final String name = file.getName();
-            if (name.endsWith("mca")) {
+            if (name.endsWith("mca"))
+            {
                 final String[] split = name.split("\\.");
-                try {
+                try
+                {
                     final int x = Integer.parseInt(split[1]);
                     final int z = Integer.parseInt(split[2]);
                     final ChunkLoc loc = new ChunkLoc(x, z);
                     chunks.add(loc);
-                } catch (final Exception e) {
                 }
+                catch (final Exception e)
+                {}
             }
         }
-        for (final Chunk chunk : Bukkit.getWorld(world).getLoadedChunks()) {
+        for (final Chunk chunk : Bukkit.getWorld(world).getLoadedChunks())
+        {
             final ChunkLoc loc = new ChunkLoc(chunk.getX() >> 5, chunk.getZ() >> 5);
-            if (!chunks.contains(loc)) {
+            if (!chunks.contains(loc))
+            {
                 chunks.add(loc);
             }
         }
@@ -98,18 +104,23 @@ public class BukkitChunkManager extends ChunkManager {
     }
 
     @Override
-    public void regenerateChunk(String world, ChunkLoc loc) {
-        World worldObj = Bukkit.getWorld(world);
-//        Chunk chunk = worldObj.getChunkAt(loc.x, loc.z);
+    public void regenerateChunk(final String world, final ChunkLoc loc)
+    {
+        final World worldObj = Bukkit.getWorld(world);
+        //        Chunk chunk = worldObj.getChunkAt(loc.x, loc.z);
         worldObj.regenerateChunk(loc.x, loc.z);
-        if (BlockUpdateUtil.setBlockManager != null) {
+        if (BlockUpdateUtil.setBlockManager != null)
+        {
             BlockUpdateUtil.setBlockManager.update(world, Arrays.asList(loc));
         }
-        for (final Player player : worldObj.getPlayers()) {
-            org.bukkit.Location locObj = player.getLocation();
-            if (locObj.getBlockX() >> 4 == loc.x && locObj.getBlockZ() >> 4 == loc.z && !locObj.getBlock().isEmpty()) {
+        for (final Player player : worldObj.getPlayers())
+        {
+            final org.bukkit.Location locObj = player.getLocation();
+            if (((locObj.getBlockX() >> 4) == loc.x) && ((locObj.getBlockZ() >> 4) == loc.z) && !locObj.getBlock().isEmpty())
+            {
                 final Plot plot = MainUtil.getPlot(BukkitUtil.getLocation(locObj));
-                if (plot != null) {
+                if (plot != null)
+                {
                     final PlotPlayer pp = BukkitUtil.getPlayer(player);
                     pp.teleport(MainUtil.getDefaultHome(plot));
                 }
@@ -118,33 +129,45 @@ public class BukkitChunkManager extends ChunkManager {
     }
 
     @Override
-    public void deleteRegionFile(final String world, final ChunkLoc loc) {
-        TaskManager.runTaskAsync(new Runnable() {
+    public void deleteRegionFile(final String world, final ChunkLoc loc)
+    {
+        TaskManager.runTaskAsync(new Runnable()
+        {
             @Override
-            public void run() {
+            public void run()
+            {
                 final String directory = world + File.separator + "region" + File.separator + "r." + loc.x + "." + loc.z + ".mca";
                 final File file = new File(directory);
                 PS.debug("&6 - Deleting region: " + file.getName() + " (approx 1024 chunks)");
-                if (file.exists()) {
+                if (file.exists())
+                {
                     file.delete();
                 }
-                try {
+                try
+                {
                     Thread.sleep(100);
-                } catch (InterruptedException e) {}
+                }
+                catch (final InterruptedException e)
+                {}
             }
         });
     }
 
     @Override
-    public void deleteRegionFiles(final String world, final List<ChunkLoc> chunks) {
-        TaskManager.runTaskAsync(new Runnable() {
+    public void deleteRegionFiles(final String world, final List<ChunkLoc> chunks)
+    {
+        TaskManager.runTaskAsync(new Runnable()
+        {
             @Override
-            public void run() {
-                for (ChunkLoc loc : chunks) {
+            public void run()
+            {
+                for (final ChunkLoc loc : chunks)
+                {
                     final String directory = world + File.separator + "region" + File.separator + "r." + loc.x + "." + loc.z + ".mca";
                     final File file = new File(directory);
                     PS.debug("&6 - Deleting file: " + file.getName() + " (max 1024 chunks)");
-                    if (file.exists()) {
+                    if (file.exists())
+                    {
                         file.delete();
                     }
                 }
@@ -153,7 +176,8 @@ public class BukkitChunkManager extends ChunkManager {
     }
 
     @Override
-    public Plot hasPlot(final String world, final ChunkLoc chunk) {
+    public Plot hasPlot(final String world, final ChunkLoc chunk)
+    {
         final int x1 = chunk.x << 4;
         final int z1 = chunk.z << 4;
         final int x2 = x1 + 15;
@@ -161,14 +185,10 @@ public class BukkitChunkManager extends ChunkManager {
         final Location bot = new Location(world, x1, 0, z1);
         Plot plot;
         plot = MainUtil.getPlot(bot);
-        if ((plot != null) && (plot.owner != null)) {
-            return plot;
-        }
+        if ((plot != null) && (plot.owner != null)) { return plot; }
         final Location top = new Location(world, x2, 0, z2);
         plot = MainUtil.getPlot(top);
-        if ((plot != null) && (plot.owner != null)) {
-            return plot;
-        }
+        if ((plot != null) && (plot.owner != null)) { return plot; }
         return null;
     }
 
@@ -195,10 +215,11 @@ public class BukkitChunkManager extends ChunkManager {
      * Copy a region to a new location (in the same world)
      */
     @Override
-    public boolean copyRegion(final Location pos1, final Location pos2, final Location newPos, final Runnable whenDone) {
+    public boolean copyRegion(final Location pos1, final Location pos2, final Location newPos, final Runnable whenDone)
+    {
         final int relX = newPos.getX() - pos1.getX();
         final int relZ = newPos.getZ() - pos1.getZ();
-        
+
         final int relCX = relX >> 4;
         final int relCZ = relZ >> 4;
 
@@ -206,32 +227,37 @@ public class BukkitChunkManager extends ChunkManager {
         final World oldWorld = Bukkit.getWorld(pos1.getWorld());
         final World newWorld = Bukkit.getWorld(newPos.getWorld());
         final ArrayList<Chunk> chunks = new ArrayList<>();
-        
+
         initMaps();
-        
-        ChunkManager.chunkTask(pos1, pos2, new RunnableVal<int[]>() {
+
+        ChunkManager.chunkTask(pos1, pos2, new RunnableVal<int[]>()
+        {
             @Override
-            public void run() {
-                int bx = value[2];
-                int bz = value[3];
-                
-                int tx = value[4];
-                int tz = value[5];
+            public void run()
+            {
+                final int bx = value[2];
+                final int bz = value[3];
+
+                final int tx = value[4];
+                final int tz = value[5];
                 // Load chunks
-                ChunkLoc loc1 = new ChunkLoc(value[0], value[1]);
-                ChunkLoc loc2 = new ChunkLoc(loc1.x + relCX, loc1.z + relCZ);
-                Chunk c1 = oldWorld.getChunkAt(loc1.x, loc1.z);
-                Chunk c2 = oldWorld.getChunkAt(loc2.x, loc2.z);
+                final ChunkLoc loc1 = new ChunkLoc(value[0], value[1]);
+                final ChunkLoc loc2 = new ChunkLoc(loc1.x + relCX, loc1.z + relCZ);
+                final Chunk c1 = oldWorld.getChunkAt(loc1.x, loc1.z);
+                final Chunk c2 = oldWorld.getChunkAt(loc2.x, loc2.z);
                 c1.load(true);
                 c2.load(true);
                 chunks.add(c2);
                 // entities
                 saveEntitiesIn(c1, region);
                 // copy chunk
-                for (int x = bx; x <= tx; x++) {
-                    for (int z = bz; z <= tz; z++) {
+                for (int x = bx; x <= tx; x++)
+                {
+                    for (int z = bz; z <= tz; z++)
+                    {
                         saveBlocks(oldWorld, 255, x, z);
-                        for (int y = 1; y < 256; y++) {
+                        for (int y = 1; y < 256; y++)
+                        {
                             final Block block = oldWorld.getBlockAt(x, y, z);
                             final int id = block.getTypeId();
                             final byte data = block.getData();
@@ -244,38 +270,46 @@ public class BukkitChunkManager extends ChunkManager {
                 restoreEntities(newWorld, relX, relZ);
                 BukkitSetBlockManager.setBlockManager.update(chunks);
             }
-        }, new Runnable() {
+        }, new Runnable()
+        {
             @Override
-            public void run() {
+            public void run()
+            {
                 // TODO whenDone
                 TaskManager.runTask(whenDone);
             }
         }, 5);
         return true;
     }
-    
-    public void saveRegion(World world, int x1, int x2, int z1, int z2) {
-        if (z1 > z2) {
-            int tmp = z1;
+
+    public void saveRegion(final World world, int x1, int x2, int z1, int z2)
+    {
+        if (z1 > z2)
+        {
+            final int tmp = z1;
             z1 = z2;
             z2 = tmp;
         }
-        if (x1 > x2) {
-            int tmp = x1;
+        if (x1 > x2)
+        {
+            final int tmp = x1;
             x1 = x2;
             x2 = tmp;
         }
-        for (int x = x1; x <= x2; x++) {
-            for (int z = z1; z <= z2; z++) {
+        for (int x = x1; x <= x2; x++)
+        {
+            for (int z = z1; z <= z2; z++)
+            {
                 saveBlocks(world, 255, x, z);
             }
         }
     }
 
     @Override
-    public boolean regenerateRegion(final Location pos1, final Location pos2, final Runnable whenDone) {
+    public boolean regenerateRegion(final Location pos1, final Location pos2, final Runnable whenDone)
+    {
         final String world = pos1.getWorld();
-        PlotWorld plotworld = PS.get().getPlotWorld(world);
+        final PlotWorld plotworld = PS.get().getPlotWorld(world);
         final int p1x = pos1.getX();
         final int p1z = pos1.getZ();
         final int p2x = pos2.getX();
@@ -284,28 +318,34 @@ public class BukkitChunkManager extends ChunkManager {
         final int bcz = p1z >> 4;
         final int tcx = p2x >> 4;
         final int tcz = p2z >> 4;
-        
-        final boolean canRegen = (plotworld.TYPE != 0 && plotworld.TERRAIN == 0);
-        
+
+        final boolean canRegen = ((plotworld.TYPE != 0) && (plotworld.TERRAIN == 0));
+
         final ArrayList<ChunkLoc> chunks = new ArrayList<ChunkLoc>();
-        
-        for (int x = bcx; x <= tcx; x++) {
-            for (int z = bcz; z <= tcz; z++) {
+
+        for (int x = bcx; x <= tcx; x++)
+        {
+            for (int z = bcz; z <= tcz; z++)
+            {
                 chunks.add(new ChunkLoc(x, z));
             }
         }
 
         AugmentedPopulator augpop = null;
         final World worldObj = Bukkit.getWorld(world);
-        List<BlockPopulator> populators = worldObj.getPopulators();
-        for (BlockPopulator populator : populators) {
-            if (populator instanceof AugmentedPopulator) {
-                AugmentedPopulator current = ((AugmentedPopulator) populator);
-                if (current.cluster == null) {
+        final List<BlockPopulator> populators = worldObj.getPopulators();
+        for (final BlockPopulator populator : populators)
+        {
+            if (populator instanceof AugmentedPopulator)
+            {
+                final AugmentedPopulator current = ((AugmentedPopulator) populator);
+                if (current.cluster == null)
+                {
                     augpop = current;
                     break;
                 }
-                else if (ClusterManager.contains(current.cluster, pos1)) {
+                else if (ClusterManager.contains(current.cluster, pos1))
+                {
                     augpop = current;
                     break;
                 }
@@ -313,29 +353,36 @@ public class BukkitChunkManager extends ChunkManager {
         }
         final Random r = new Random(System.currentTimeMillis());
         final AugmentedPopulator ap = augpop;
-        TaskManager.runTask(new Runnable() {
+        TaskManager.runTask(new Runnable()
+        {
             @Override
-            public void run() {
-                long start = System.currentTimeMillis();
-                while (chunks.size() > 0 && System.currentTimeMillis() - start < 5) {
-                    ChunkLoc chunk = chunks.remove(0);
-                    int x = chunk.x;
-                    int z = chunk.z;
-                    int xxb = x << 4;
-                    int zzb = z << 4;
-                    int xxt = xxb + 15;
-                    int zzt = zzb + 15;
+            public void run()
+            {
+                final long start = System.currentTimeMillis();
+                while ((chunks.size() > 0) && ((System.currentTimeMillis() - start) < 5))
+                {
+                    final ChunkLoc chunk = chunks.remove(0);
+                    final int x = chunk.x;
+                    final int z = chunk.z;
+                    final int xxb = x << 4;
+                    final int zzb = z << 4;
+                    final int xxt = xxb + 15;
+                    final int zzt = zzb + 15;
                     CURRENT_PLOT_CLEAR = null;
-                    Chunk chunkObj = worldObj.getChunkAt(x, z);
-                    if (!chunkObj.load(false)) {
+                    final Chunk chunkObj = worldObj.getChunkAt(x, z);
+                    if (!chunkObj.load(false))
+                    {
                         continue;
                     }
                     CURRENT_PLOT_CLEAR = new RegionWrapper(pos1.getX(), pos2.getX(), pos1.getZ(), pos2.getZ());
-                    if (xxb >= p1x && xxt <= p2x && zzb >= p1z && zzt <= p2z) {
-                        if (canRegen && ap != null) {
+                    if ((xxb >= p1x) && (xxt <= p2x) && (zzb >= p1z) && (zzt <= p2z))
+                    {
+                        if (canRegen && (ap != null))
+                        {
                             ap.populate(worldObj, r, chunkObj);
                         }
-                        else {
+                        else
+                        {
                             regenerateChunk(world, chunk);
                         }
                         continue;
@@ -344,80 +391,100 @@ public class BukkitChunkManager extends ChunkManager {
                     boolean checkX2 = false;
                     boolean checkZ1 = false;
                     boolean checkZ2 = false;
-                    
+
                     int xxb2;
                     int zzb2;
                     int xxt2;
                     int zzt2;
-                    
-                    if (x == bcx) {
+
+                    if (x == bcx)
+                    {
                         xxb2 = p1x - 1;
                         checkX1 = true;
                     }
-                    else {
-                        xxb2 = xxb; 
+                    else
+                    {
+                        xxb2 = xxb;
                     }
-                    if (x == tcx) {
+                    if (x == tcx)
+                    {
                         xxt2 = p2x + 1;
                         checkX2 = true;
                     }
-                    else {
+                    else
+                    {
                         xxt2 = xxt;
                     }
-                    if (z == bcz) {
+                    if (z == bcz)
+                    {
                         zzb2 = p1z - 1;
                         checkZ1 = true;
                     }
-                    else {
+                    else
+                    {
                         zzb2 = zzb;
                     }
-                    if (z == tcz) {
+                    if (z == tcz)
+                    {
                         zzt2 = p2z + 1;
                         checkZ2 = true;
                     }
-                    else {
+                    else
+                    {
                         zzt2 = zzt;
                     }
                     initMaps();
-                    if (checkX1) {
-                        saveRegion(worldObj, xxb , xxb2, zzb2, zzt2); //
+                    if (checkX1)
+                    {
+                        saveRegion(worldObj, xxb, xxb2, zzb2, zzt2); //
                     }
-                    if (checkX2) {
-                        saveRegion(worldObj, xxt2 , xxt, zzb2, zzt2); //
+                    if (checkX2)
+                    {
+                        saveRegion(worldObj, xxt2, xxt, zzb2, zzt2); //
                     }
-                    if (checkZ1) {
-                        saveRegion(worldObj, xxb2 , xxt2, zzb, zzb2); //
+                    if (checkZ1)
+                    {
+                        saveRegion(worldObj, xxb2, xxt2, zzb, zzb2); //
                     }
-                    if (checkZ2) {
-                        saveRegion(worldObj, xxb2 , xxt2, zzt2, zzt); // 
+                    if (checkZ2)
+                    {
+                        saveRegion(worldObj, xxb2, xxt2, zzt2, zzt); //
                     }
-                    if (checkX1 && checkZ1) {
-                        saveRegion(worldObj, xxb , xxb2, zzb, zzb2); // 
+                    if (checkX1 && checkZ1)
+                    {
+                        saveRegion(worldObj, xxb, xxb2, zzb, zzb2); //
                     }
-                    if (checkX2 && checkZ1) {
-                        saveRegion(worldObj, xxt2 , xxt, zzb, zzb2); // ?
+                    if (checkX2 && checkZ1)
+                    {
+                        saveRegion(worldObj, xxt2, xxt, zzb, zzb2); // ?
                     }
-                    if (checkX1 && checkZ2) {
-                        saveRegion(worldObj, xxb , xxb2, zzt2, zzt); // ?
+                    if (checkX1 && checkZ2)
+                    {
+                        saveRegion(worldObj, xxb, xxb2, zzt2, zzt); // ?
                     }
-                    if (checkX2 && checkZ2) {
-                        saveRegion(worldObj, xxt2 , xxt, zzt2, zzt); // 
+                    if (checkX2 && checkZ2)
+                    {
+                        saveRegion(worldObj, xxt2, xxt, zzt2, zzt); //
                     }
                     saveEntitiesOut(chunkObj, CURRENT_PLOT_CLEAR);
-                    if (canRegen && ap != null) {
+                    if (canRegen && (ap != null))
+                    {
                         ap.populate(worldObj, r, chunkObj);
                     }
-                    else {
+                    else
+                    {
                         regenerateChunk(world, chunk);
                     }
                     restoreBlocks(worldObj, 0, 0);
                     restoreEntities(worldObj, 0, 0);
                 }
                 CURRENT_PLOT_CLEAR = null;
-                if (chunks.size() != 0) {
+                if (chunks.size() != 0)
+                {
                     TaskManager.runTaskLater(this, 1);
                 }
-                else {
+                else
+                {
                     TaskManager.runTaskLater(whenDone, 1);
                 }
             }
@@ -425,7 +492,8 @@ public class BukkitChunkManager extends ChunkManager {
         return true;
     }
 
-    public static void initMaps() {
+    public static void initMaps()
+    {
         GENERATE_BLOCKS = new HashMap<>();
         GENERATE_DATA = new HashMap<>();
         chestContents = new HashMap<>();
@@ -448,19 +516,24 @@ public class BukkitChunkManager extends ChunkManager {
         entities = new HashSet<>();
     }
 
-    public static boolean isIn(final RegionWrapper region, final int x, final int z) {
+    public static boolean isIn(final RegionWrapper region, final int x, final int z)
+    {
         return ((x >= region.minX) && (x <= region.maxX) && (z >= region.minZ) && (z <= region.maxZ));
     }
 
-    public static void saveEntitiesOut(final Chunk chunk, final RegionWrapper region) {
-        for (final Entity entity : chunk.getEntities()) {
+    public static void saveEntitiesOut(final Chunk chunk, final RegionWrapper region)
+    {
+        for (final Entity entity : chunk.getEntities())
+        {
             final Location loc = BukkitUtil.getLocation(entity);
             final int x = loc.getX();
             final int z = loc.getZ();
-            if (isIn(region, x, z)) {
+            if (isIn(region, x, z))
+            {
                 continue;
             }
-            if (entity.getVehicle() != null) {
+            if (entity.getVehicle() != null)
+            {
                 continue;
             }
             final EntityWrapper wrap = new EntityWrapper(entity, (short) 2);
@@ -468,38 +541,50 @@ public class BukkitChunkManager extends ChunkManager {
         }
     }
 
-    public static void saveEntitiesIn(final Chunk chunk, final RegionWrapper region) {
+    public static void saveEntitiesIn(final Chunk chunk, final RegionWrapper region)
+    {
         saveEntitiesIn(chunk, region, 0, 0, false);
     }
 
-    public static void saveEntitiesIn(final Chunk chunk, final RegionWrapper region, final int offset_x, final int offset_z, final boolean delete) {
-        for (final Entity entity : chunk.getEntities()) {
+    public static void saveEntitiesIn(final Chunk chunk, final RegionWrapper region, final int offset_x, final int offset_z, final boolean delete)
+    {
+        for (final Entity entity : chunk.getEntities())
+        {
             final Location loc = BukkitUtil.getLocation(entity);
             final int x = loc.getX();
             final int z = loc.getZ();
-            if (!isIn(region, x, z)) {
+            if (!isIn(region, x, z))
+            {
                 continue;
             }
-            if (entity.getVehicle() != null) {
+            if (entity.getVehicle() != null)
+            {
                 continue;
             }
             final EntityWrapper wrap = new EntityWrapper(entity, (short) 2);
             wrap.x += offset_x;
             wrap.z += offset_z;
             entities.add(wrap);
-            if (delete) {
-                if (!(entity instanceof Player)) {
+            if (delete)
+            {
+                if (!(entity instanceof Player))
+                {
                     entity.remove();
                 }
             }
         }
     }
 
-    public static void restoreEntities(final World world, final int x_offset, final int z_offset) {
-        for (final EntityWrapper entity : entities) {
-            try {
+    public static void restoreEntities(final World world, final int x_offset, final int z_offset)
+    {
+        for (final EntityWrapper entity : entities)
+        {
+            try
+            {
                 entity.spawn(world, x_offset, z_offset);
-            } catch (final Exception e) {
+            }
+            catch (final Exception e)
+            {
                 PS.debug("Failed to restore entity (e): " + entity.x + "," + entity.y + "," + entity.z + " : " + entity.id + " : " + EntityType.fromId(entity.id));
                 e.printStackTrace();
             }
@@ -507,273 +592,398 @@ public class BukkitChunkManager extends ChunkManager {
         entities.clear();
     }
 
-    public static void restoreBlocks(final World world, final int x_offset, final int z_offset) {
-        for (final BlockLoc loc : chestContents.keySet()) {
-            try {
+    public static void restoreBlocks(final World world, final int x_offset, final int z_offset)
+    {
+        for (final BlockLoc loc : chestContents.keySet())
+        {
+            try
+            {
                 final Block block = world.getBlockAt(loc.x + x_offset, loc.y, loc.z + z_offset);
                 final BlockState state = block.getState();
-                if (state instanceof Chest) {
+                if (state instanceof Chest)
+                {
                     final Chest chest = (Chest) state;
                     chest.getInventory().setContents(chestContents.get(loc));
                     state.update(true);
-                } else {
+                }
+                else
+                {
                     PS.debug("&c[WARN] Plot clear failed to regenerate chest: " + (loc.x + x_offset) + "," + (loc.y) + "," + (loc.z + z_offset));
                 }
-            } catch (final Exception e) {
+            }
+            catch (final Exception e)
+            {
                 PS.debug("&c[WARN] Plot clear failed to regenerate chest (e): " + (loc.x + x_offset) + "," + (loc.y) + "," + (loc.z + z_offset));
             }
         }
-        for (final BlockLoc loc : signContents.keySet()) {
-            try {
+        for (final BlockLoc loc : signContents.keySet())
+        {
+            try
+            {
                 final Block block = world.getBlockAt(loc.x + x_offset, loc.y, loc.z + z_offset);
                 final BlockState state = block.getState();
-                if (state instanceof Sign) {
+                if (state instanceof Sign)
+                {
                     final Sign sign = (Sign) state;
                     int i = 0;
-                    for (final String line : signContents.get(loc)) {
+                    for (final String line : signContents.get(loc))
+                    {
                         sign.setLine(i, line);
                         i++;
                     }
                     state.update(true);
-                } else {
+                }
+                else
+                {
                     PS.debug("&c[WARN] Plot clear failed to regenerate sign: " + (loc.x + x_offset) + "," + (loc.y) + "," + (loc.z + z_offset));
                 }
-            } catch (final Exception e) {
+            }
+            catch (final Exception e)
+            {
                 PS.debug("&c[WARN] Plot clear failed to regenerate sign: " + (loc.x + x_offset) + "," + (loc.y) + "," + (loc.z + z_offset));
             }
         }
-        for (final BlockLoc loc : dispenserContents.keySet()) {
-            try {
+        for (final BlockLoc loc : dispenserContents.keySet())
+        {
+            try
+            {
                 final Block block = world.getBlockAt(loc.x + x_offset, loc.y, loc.z + z_offset);
                 final BlockState state = block.getState();
-                if (state instanceof Dispenser) {
+                if (state instanceof Dispenser)
+                {
                     ((Dispenser) (state)).getInventory().setContents(dispenserContents.get(loc));
                     state.update(true);
-                } else {
+                }
+                else
+                {
                     PS.debug("&c[WARN] Plot clear failed to regenerate dispenser: " + (loc.x + x_offset) + "," + (loc.y) + "," + (loc.z + z_offset));
                 }
-            } catch (final Exception e) {
+            }
+            catch (final Exception e)
+            {
                 PS.debug("&c[WARN] Plot clear failed to regenerate dispenser (e): " + (loc.x + x_offset) + "," + (loc.y) + "," + (loc.z + z_offset));
             }
         }
-        for (final BlockLoc loc : dropperContents.keySet()) {
-            try {
+        for (final BlockLoc loc : dropperContents.keySet())
+        {
+            try
+            {
                 final Block block = world.getBlockAt(loc.x + x_offset, loc.y, loc.z + z_offset);
                 final BlockState state = block.getState();
-                if (state instanceof Dropper) {
+                if (state instanceof Dropper)
+                {
                     ((Dropper) (state)).getInventory().setContents(dropperContents.get(loc));
                     state.update(true);
-                } else {
+                }
+                else
+                {
                     PS.debug("&c[WARN] Plot clear failed to regenerate dispenser: " + (loc.x + x_offset) + "," + (loc.y) + "," + (loc.z + z_offset));
                 }
-            } catch (final Exception e) {
+            }
+            catch (final Exception e)
+            {
                 PS.debug("&c[WARN] Plot clear failed to regenerate dispenser (e): " + (loc.x + x_offset) + "," + (loc.y) + "," + (loc.z + z_offset));
             }
         }
-        for (final BlockLoc loc : beaconContents.keySet()) {
-            try {
+        for (final BlockLoc loc : beaconContents.keySet())
+        {
+            try
+            {
                 final Block block = world.getBlockAt(loc.x + x_offset, loc.y, loc.z + z_offset);
                 final BlockState state = block.getState();
-                if (state instanceof Beacon) {
+                if (state instanceof Beacon)
+                {
                     ((Beacon) (state)).getInventory().setContents(beaconContents.get(loc));
                     state.update(true);
-                } else {
+                }
+                else
+                {
                     PS.debug("&c[WARN] Plot clear failed to regenerate beacon: " + (loc.x + x_offset) + "," + (loc.y) + "," + (loc.z + z_offset));
                 }
-            } catch (final Exception e) {
+            }
+            catch (final Exception e)
+            {
                 PS.debug("&c[WARN] Plot clear failed to regenerate beacon (e): " + (loc.x + x_offset) + "," + (loc.y) + "," + (loc.z + z_offset));
             }
         }
-        for (final BlockLoc loc : jukeDisc.keySet()) {
-            try {
+        for (final BlockLoc loc : jukeDisc.keySet())
+        {
+            try
+            {
                 final Block block = world.getBlockAt(loc.x + x_offset, loc.y, loc.z + z_offset);
                 final BlockState state = block.getState();
-                if (state instanceof Jukebox) {
+                if (state instanceof Jukebox)
+                {
                     ((Jukebox) (state)).setPlaying(Material.getMaterial(jukeDisc.get(loc)));
                     state.update(true);
-                } else {
+                }
+                else
+                {
                     PS.debug("&c[WARN] Plot clear failed to restore jukebox: " + (loc.x + x_offset) + "," + (loc.y) + "," + (loc.z + z_offset));
                 }
-            } catch (final Exception e) {
+            }
+            catch (final Exception e)
+            {
                 PS.debug("&c[WARN] Plot clear failed to regenerate jukebox (e): " + (loc.x + x_offset) + "," + (loc.y) + "," + (loc.z + z_offset));
             }
         }
-        for (final BlockLoc loc : skullData.keySet()) {
-            try {
+        for (final BlockLoc loc : skullData.keySet())
+        {
+            try
+            {
                 final Block block = world.getBlockAt(loc.x + x_offset, loc.y, loc.z + z_offset);
                 final BlockState state = block.getState();
-                if (state instanceof Skull) {
+                if (state instanceof Skull)
+                {
                     final Object[] data = skullData.get(loc);
-                    if (data[0] != null) {
+                    if (data[0] != null)
+                    {
                         ((Skull) (state)).setOwner((String) data[0]);
                     }
-                    if (((Integer) data[1]) != 0) {
+                    if (((Integer) data[1]) != 0)
+                    {
                         ((Skull) (state)).setRotation(BlockFace.values()[(int) data[1]]);
                     }
-                    if (((Integer) data[2]) != 0) {
+                    if (((Integer) data[2]) != 0)
+                    {
                         ((Skull) (state)).setSkullType(SkullType.values()[(int) data[2]]);
                     }
                     state.update(true);
-                } else {
+                }
+                else
+                {
                     PS.debug("&c[WARN] Plot clear failed to restore skull: " + (loc.x + x_offset) + "," + (loc.y) + "," + (loc.z + z_offset));
                 }
-            } catch (final Exception e) {
+            }
+            catch (final Exception e)
+            {
                 PS.debug("&c[WARN] Plot clear failed to regenerate skull (e): " + (loc.x + x_offset) + "," + (loc.y) + "," + (loc.z + z_offset));
             }
         }
-        for (final BlockLoc loc : hopperContents.keySet()) {
-            try {
+        for (final BlockLoc loc : hopperContents.keySet())
+        {
+            try
+            {
                 final Block block = world.getBlockAt(loc.x + x_offset, loc.y, loc.z + z_offset);
                 final BlockState state = block.getState();
-                if (state instanceof Hopper) {
+                if (state instanceof Hopper)
+                {
                     ((Hopper) (state)).getInventory().setContents(hopperContents.get(loc));
                     state.update(true);
-                } else {
+                }
+                else
+                {
                     PS.debug("&c[WARN] Plot clear failed to regenerate hopper: " + (loc.x + x_offset) + "," + (loc.y) + "," + (loc.z + z_offset));
                 }
-            } catch (final Exception e) {
+            }
+            catch (final Exception e)
+            {
                 PS.debug("&c[WARN] Plot clear failed to regenerate hopper (e): " + (loc.x + x_offset) + "," + (loc.y) + "," + (loc.z + z_offset));
             }
         }
-        for (final BlockLoc loc : noteBlockContents.keySet()) {
-            try {
+        for (final BlockLoc loc : noteBlockContents.keySet())
+        {
+            try
+            {
                 final Block block = world.getBlockAt(loc.x + x_offset, loc.y, loc.z + z_offset);
                 final BlockState state = block.getState();
-                if (state instanceof NoteBlock) {
+                if (state instanceof NoteBlock)
+                {
                     ((NoteBlock) (state)).setNote(noteBlockContents.get(loc));
                     state.update(true);
-                } else {
+                }
+                else
+                {
                     PS.debug("&c[WARN] Plot clear failed to regenerate note block: " + (loc.x + x_offset) + "," + (loc.y) + "," + (loc.z + z_offset));
                 }
-            } catch (final Exception e) {
+            }
+            catch (final Exception e)
+            {
                 PS.debug("&c[WARN] Plot clear failed to regenerate note block (e): " + (loc.x + x_offset) + "," + (loc.y) + "," + (loc.z + z_offset));
             }
         }
-        for (final BlockLoc loc : brewTime.keySet()) {
-            try {
+        for (final BlockLoc loc : brewTime.keySet())
+        {
+            try
+            {
                 final Block block = world.getBlockAt(loc.x + x_offset, loc.y, loc.z + z_offset);
                 final BlockState state = block.getState();
-                if (state instanceof BrewingStand) {
+                if (state instanceof BrewingStand)
+                {
                     ((BrewingStand) (state)).setBrewingTime(brewTime.get(loc));
-                } else {
+                }
+                else
+                {
                     PS.debug("&c[WARN] Plot clear failed to restore brewing stand cooking: " + (loc.x + x_offset) + "," + (loc.y) + "," + (loc.z + z_offset));
                 }
-            } catch (final Exception e) {
+            }
+            catch (final Exception e)
+            {
                 PS.debug("&c[WARN] Plot clear failed to restore brewing stand cooking (e): " + (loc.x + x_offset) + "," + (loc.y) + "," + (loc.z + z_offset));
             }
         }
-        for (final BlockLoc loc : spawnerData.keySet()) {
-            try {
+        for (final BlockLoc loc : spawnerData.keySet())
+        {
+            try
+            {
                 final Block block = world.getBlockAt(loc.x + x_offset, loc.y, loc.z + z_offset);
                 final BlockState state = block.getState();
-                if (state instanceof CreatureSpawner) {
+                if (state instanceof CreatureSpawner)
+                {
                     ((CreatureSpawner) (state)).setCreatureTypeId(spawnerData.get(loc));
                     state.update(true);
-                } else {
+                }
+                else
+                {
                     PS.debug("&c[WARN] Plot clear failed to restore spawner type: " + (loc.x + x_offset) + "," + (loc.y) + "," + (loc.z + z_offset));
                 }
-            } catch (final Exception e) {
+            }
+            catch (final Exception e)
+            {
                 PS.debug("&c[WARN] Plot clear failed to restore spawner type (e): " + (loc.x + x_offset) + "," + (loc.y) + "," + (loc.z + z_offset));
             }
         }
-        for (final BlockLoc loc : cmdData.keySet()) {
-            try {
+        for (final BlockLoc loc : cmdData.keySet())
+        {
+            try
+            {
                 final Block block = world.getBlockAt(loc.x + x_offset, loc.y, loc.z + z_offset);
                 final BlockState state = block.getState();
-                if (state instanceof CommandBlock) {
+                if (state instanceof CommandBlock)
+                {
                     ((CommandBlock) (state)).setCommand(cmdData.get(loc));
                     state.update(true);
-                } else {
+                }
+                else
+                {
                     PS.debug("&c[WARN] Plot clear failed to restore command block: " + (loc.x + x_offset) + "," + (loc.y) + "," + (loc.z + z_offset));
                 }
-            } catch (final Exception e) {
+            }
+            catch (final Exception e)
+            {
                 PS.debug("&c[WARN] Plot clear failed to restore command block (e): " + (loc.x + x_offset) + "," + (loc.y) + "," + (loc.z + z_offset));
             }
         }
-        for (final BlockLoc loc : brewingStandContents.keySet()) {
-            try {
+        for (final BlockLoc loc : brewingStandContents.keySet())
+        {
+            try
+            {
                 final Block block = world.getBlockAt(loc.x + x_offset, loc.y, loc.z + z_offset);
                 final BlockState state = block.getState();
-                if (state instanceof BrewingStand) {
+                if (state instanceof BrewingStand)
+                {
                     ((BrewingStand) (state)).getInventory().setContents(brewingStandContents.get(loc));
                     state.update(true);
-                } else {
+                }
+                else
+                {
                     PS.debug("&c[WARN] Plot clear failed to regenerate brewing stand: " + (loc.x + x_offset) + "," + (loc.y) + "," + (loc.z + z_offset));
                 }
-            } catch (final Exception e) {
+            }
+            catch (final Exception e)
+            {
                 PS.debug("&c[WARN] Plot clear failed to regenerate brewing stand (e): " + (loc.x + x_offset) + "," + (loc.y) + "," + (loc.z + z_offset));
             }
         }
-        for (final BlockLoc loc : furnaceTime.keySet()) {
-            try {
+        for (final BlockLoc loc : furnaceTime.keySet())
+        {
+            try
+            {
                 final Block block = world.getBlockAt(loc.x + x_offset, loc.y, loc.z + z_offset);
                 final BlockState state = block.getState();
-                if (state instanceof Furnace) {
+                if (state instanceof Furnace)
+                {
                     final Short[] time = furnaceTime.get(loc);
                     ((Furnace) (state)).setBurnTime(time[0]);
                     ((Furnace) (state)).setCookTime(time[1]);
-                } else {
+                }
+                else
+                {
                     PS.debug("&c[WARN] Plot clear failed to restore furnace cooking: " + (loc.x + x_offset) + "," + (loc.y) + "," + (loc.z + z_offset));
                 }
-            } catch (final Exception e) {
+            }
+            catch (final Exception e)
+            {
                 PS.debug("&c[WARN] Plot clear failed to restore furnace cooking (e): " + (loc.x + x_offset) + "," + (loc.y) + "," + (loc.z + z_offset));
             }
         }
-        for (final BlockLoc loc : furnaceContents.keySet()) {
-            try {
+        for (final BlockLoc loc : furnaceContents.keySet())
+        {
+            try
+            {
                 final Block block = world.getBlockAt(loc.x + x_offset, loc.y, loc.z + z_offset);
                 final BlockState state = block.getState();
-                if (state instanceof Furnace) {
+                if (state instanceof Furnace)
+                {
                     ((Furnace) (state)).getInventory().setContents(furnaceContents.get(loc));
                     state.update(true);
-                } else {
+                }
+                else
+                {
                     PS.debug("&c[WARN] Plot clear failed to regenerate furnace: " + (loc.x + x_offset) + "," + (loc.y) + "," + (loc.z + z_offset));
                 }
-            } catch (final Exception e) {
+            }
+            catch (final Exception e)
+            {
                 PS.debug("&c[WARN] Plot clear failed to regenerate furnace (e): " + (loc.x + x_offset) + "," + (loc.y) + "," + (loc.z + z_offset));
             }
         }
-        for (final BlockLoc loc : bannerBase.keySet()) {
-            try {
+        for (final BlockLoc loc : bannerBase.keySet())
+        {
+            try
+            {
                 final Block block = world.getBlockAt(loc.x + x_offset, loc.y, loc.z + z_offset);
                 final BlockState state = block.getState();
-                if (state instanceof Banner) {
+                if (state instanceof Banner)
+                {
                     final Banner banner = (Banner) state;
                     final byte base = bannerBase.get(loc);
                     final ArrayList<Byte[]> colors = bannerColors.get(loc);
                     banner.setBaseColor(DyeColor.values()[base]);
-                    for (final Byte[] color : colors) {
+                    for (final Byte[] color : colors)
+                    {
                         banner.addPattern(new Pattern(DyeColor.getByDyeData(color[1]), PatternType.values()[color[0]]));
                     }
                     state.update(true);
-                } else {
+                }
+                else
+                {
                     PS.debug("&c[WARN] Plot clear failed to regenerate banner: " + (loc.x + x_offset) + "," + (loc.y) + "," + (loc.z + z_offset));
                 }
-            } catch (final Exception e) {
+            }
+            catch (final Exception e)
+            {
                 PS.debug("&c[WARN] Plot clear failed to regenerate banner (e): " + (loc.x + x_offset) + "," + (loc.y) + "," + (loc.z + z_offset));
             }
         }
     }
 
-    public static void saveBlocks(final World world, final int maxY, final int x, final int z) {
+    public static void saveBlocks(final World world, final int maxY, final int x, final int z)
+    {
         saveBlocks(world, maxY, x, z, 0, 0);
     }
 
-    public static void saveBlocks(final World world, final int maxY, final int x, final int z, final int offset_x, final int offset_z) {
+    public static void saveBlocks(final World world, final int maxY, final int x, final int z, final int offset_x, final int offset_z)
+    {
         final HashMap<Short, Short> ids = new HashMap<>();
         final HashMap<Short, Byte> datas = new HashMap<>();
-        for (short y = 0; y < maxY; y++) {
+        for (short y = 0; y < maxY; y++)
+        {
             final Block block = world.getBlockAt(x, y, z);
             final short id = (short) block.getTypeId();
-            if (id != 0) {
+            if (id != 0)
+            {
                 ids.put(y, id);
                 final byte data = block.getData();
-                if (data != 0) {
+                if (data != 0)
+                {
                     datas.put(y, data);
                 }
                 BlockLoc bl;
-                try {
-                    switch (id) {
+                try
+                {
+                    switch (id)
+                    {
                         case 54:
                             bl = new BlockLoc(x + offset_x, y, z + offset_z);
                             final InventoryHolder chest = (InventoryHolder) block.getState();
@@ -784,7 +994,8 @@ public class BukkitChunkManager extends ChunkManager {
                             bl = new BlockLoc(x + offset_x, y, z + offset_z);
                             final CreatureSpawner spawner = (CreatureSpawner) block.getState();
                             final String type = spawner.getCreatureTypeId();
-                            if ((type != null) && (type.length() != 0)) {
+                            if ((type != null) && (type.length() != 0))
+                            {
                                 spawnerData.put(bl, type);
                             }
                             break;
@@ -792,7 +1003,8 @@ public class BukkitChunkManager extends ChunkManager {
                             bl = new BlockLoc(x + offset_x, y, z + offset_z);
                             final CommandBlock cmd = (CommandBlock) block.getState();
                             final String string = cmd.getCommand();
-                            if ((string != null) && (string.length() > 0)) {
+                            if ((string != null) && (string.length() > 0))
+                            {
                                 cmdData.put(bl, string);
                             }
                             break;
@@ -812,7 +1024,8 @@ public class BukkitChunkManager extends ChunkManager {
                             final short cook = furnace.getCookTime();
                             final ItemStack[] invFur = furnace.getInventory().getContents().clone();
                             furnaceContents.put(bl, invFur);
-                            if (cook != 0) {
+                            if (cook != 0)
+                            {
                                 furnaceTime.put(bl, new Short[] { burn, cook });
                             }
                             break;
@@ -832,7 +1045,8 @@ public class BukkitChunkManager extends ChunkManager {
                             bl = new BlockLoc(x + offset_x, y, z + offset_z);
                             final BrewingStand brewingStand = (BrewingStand) block.getState();
                             final short time = (short) brewingStand.getBrewingTime();
-                            if (time > 0) {
+                            if (time > 0)
+                            {
                                 brewTime.put(bl, time);
                             }
                             final ItemStack[] invBre = brewingStand.getInventory().getContents().clone();
@@ -854,7 +1068,8 @@ public class BukkitChunkManager extends ChunkManager {
                             bl = new BlockLoc(x + offset_x, y, z + offset_z);
                             final Jukebox jukebox = (Jukebox) block.getState();
                             final Material playing = jukebox.getPlaying();
-                            if (playing != null) {
+                            if (playing != null)
+                            {
                                 jukeDisc.put(bl, (short) playing.getId());
                             }
                             break;
@@ -879,7 +1094,8 @@ public class BukkitChunkManager extends ChunkManager {
                             final Banner banner = (Banner) block.getState();
                             final byte base = getOrdinal(DyeColor.values(), banner.getBaseColor());
                             final ArrayList<Byte[]> types = new ArrayList<>();
-                            for (final Pattern pattern : banner.getPatterns()) {
+                            for (final Pattern pattern : banner.getPatterns())
+                            {
                                 types.add(new Byte[] { getOrdinal(PatternType.values(), pattern.getPattern()), pattern.getColor().getDyeData() });
                             }
                             bannerBase.put(bl, base);
@@ -887,7 +1103,8 @@ public class BukkitChunkManager extends ChunkManager {
                             break;
                     }
                 }
-                catch (Exception e) {
+                catch (final Exception e)
+                {
                     PS.debug("------------ FAILED TO DO SOMETHING --------");
                     e.printStackTrace();
                     PS.debug("------------ but we caught it ^ --------");
@@ -899,41 +1116,49 @@ public class BukkitChunkManager extends ChunkManager {
         GENERATE_DATA.put(loc, datas);
     }
 
-    private static byte getOrdinal(final Object[] list, final Object value) {
-        for (byte i = 0; i < list.length; i++) {
-            if (list[i].equals(value)) {
-                return i;
-            }
+    private static byte getOrdinal(final Object[] list, final Object value)
+    {
+        for (byte i = 0; i < list.length; i++)
+        {
+            if (list[i].equals(value)) { return i; }
         }
         return 0;
     }
 
     @Override
-    public void clearAllEntities(final Location pos1, final Location pos2) {
+    public void clearAllEntities(final Location pos1, final Location pos2)
+    {
         final String world = pos1.getWorld();
         final List<Entity> entities = BukkitUtil.getEntities(world);
         final int bx = pos1.getX();
         final int bz = pos1.getZ();
         final int tx = pos2.getX();
         final int tz = pos2.getZ();
-        for (final Entity entity : entities) {
-            if (entity instanceof Player) {
-                org.bukkit.Location loc = entity.getLocation();
-                if (loc.getX() >= bx && loc.getX() <= tx && loc.getZ() >= bz && loc.getZ() <= tz) {
+        for (final Entity entity : entities)
+        {
+            if (entity instanceof Player)
+            {
+                final org.bukkit.Location loc = entity.getLocation();
+                if ((loc.getX() >= bx) && (loc.getX() <= tx) && (loc.getZ() >= bz) && (loc.getZ() <= tz))
+                {
                     final Player player = (Player) entity;
                     final PlotPlayer pp = BukkitUtil.getPlayer(player);
-                    Plot plot = pp.getCurrentPlot();
-                    if (plot != null) {
+                    final Plot plot = pp.getCurrentPlot();
+                    if (plot != null)
+                    {
                         final Location plotHome = MainUtil.getDefaultHome(plot);
-                        if (pp.getLocation().getY() <= plotHome.getY()) {
+                        if (pp.getLocation().getY() <= plotHome.getY())
+                        {
                             pp.teleport(plotHome);
                         }
                     }
                 }
             }
-            else {
-                org.bukkit.Location loc = entity.getLocation();
-                if (loc.getX() >= bx && loc.getX() <= tx && loc.getZ() >= bz && loc.getZ() <= tz) {
+            else
+            {
+                final org.bukkit.Location loc = entity.getLocation();
+                if ((loc.getX() >= bx) && (loc.getX() <= tx) && (loc.getZ() >= bz) && (loc.getZ() <= tz))
+                {
                     entity.remove();
                 }
             }
@@ -941,16 +1166,19 @@ public class BukkitChunkManager extends ChunkManager {
     }
 
     @Override
-    public boolean loadChunk(final String world, final ChunkLoc loc, boolean force) {
+    public boolean loadChunk(final String world, final ChunkLoc loc, final boolean force)
+    {
         return BukkitUtil.getWorld(world).getChunkAt(loc.x, loc.z).load(force);
     }
 
     @Override
-    public boolean unloadChunk(final String world, final ChunkLoc loc, boolean save, boolean safe) {
+    public boolean unloadChunk(final String world, final ChunkLoc loc, final boolean save, final boolean safe)
+    {
         return BukkitUtil.getWorld(world).unloadChunk(loc.x, loc.z, save, safe);
     }
 
-    public static void swapChunk(final World world, final Chunk pos1, final Chunk pos2, final RegionWrapper r1, final RegionWrapper r2) {
+    public static void swapChunk(final World world, final Chunk pos1, final Chunk pos2, final RegionWrapper r1, final RegionWrapper r2)
+    {
         initMaps();
         final int relX = (r2.minX - r1.minX);
         final int relZ = (r2.minZ - r1.minZ);
@@ -963,10 +1191,13 @@ public class BukkitChunkManager extends ChunkManager {
 
         final int maxY = world.getMaxHeight();
 
-        for (int x = Math.max(r1.minX, sx); x <= Math.min(r1.maxX, sx + 15); x++) {
-            for (int z = Math.max(r1.minZ, sz); z <= Math.min(r1.maxZ, sz + 15); z++) {
+        for (int x = Math.max(r1.minX, sx); x <= Math.min(r1.maxX, sx + 15); x++)
+        {
+            for (int z = Math.max(r1.minZ, sz); z <= Math.min(r1.maxZ, sz + 15); z++)
+            {
                 saveBlocks(world, maxY, sx, sz, relX, relZ);
-                for (int y = 0; y < maxY; y++) {
+                for (int y = 0; y < maxY; y++)
+                {
                     final Block block1 = world.getBlockAt(x, y, z);
                     final int id1 = block1.getTypeId();
                     final byte data1 = block1.getData();
@@ -975,22 +1206,32 @@ public class BukkitChunkManager extends ChunkManager {
                     final Block block2 = world.getBlockAt(xx, y, zz);
                     final int id2 = block2.getTypeId();
                     final byte data2 = block2.getData();
-                    if (id1 == 0) {
-                        if (id2 != 0) {
+                    if (id1 == 0)
+                    {
+                        if (id2 != 0)
+                        {
                             BukkitSetBlockManager.setBlockManager.set(world, x, y, z, id2, data2);
                             BukkitSetBlockManager.setBlockManager.set(world, xx, y, zz, 0, (byte) 0);
                         }
-                    } else if (id2 == 0) {
-                        if (id1 != 0) {
+                    }
+                    else if (id2 == 0)
+                    {
+                        if (id1 != 0)
+                        {
                             BukkitSetBlockManager.setBlockManager.set(world, xx, y, zz, id1, data1);
                             BukkitSetBlockManager.setBlockManager.set(world, x, y, z, 0, (byte) 0);
                         }
-                    } else if (id1 == id2) {
-                        if (data1 != data2) {
+                    }
+                    else if (id1 == id2)
+                    {
+                        if (data1 != data2)
+                        {
                             block1.setData(data2);
                             block2.setData(data1);
                         }
-                    } else {
+                    }
+                    else
+                    {
                         BukkitSetBlockManager.setBlockManager.set(world, x, y, z, id2, data2);
                         BukkitSetBlockManager.setBlockManager.set(world, xx, y, zz, id1, data1);
                     }
@@ -1003,7 +1244,8 @@ public class BukkitChunkManager extends ChunkManager {
     }
 
     @Override
-    public void swap(final String worldname, final PlotId pos1, final PlotId pos2) {
+    public void swap(final String worldname, final PlotId pos1, final PlotId pos2)
+    {
         final Location bot1 = MainUtil.getPlotBottomLoc(worldname, pos1).add(1, 0, 1);
         final Location top1 = MainUtil.getPlotTopLoc(worldname, pos1);
 
@@ -1011,17 +1253,18 @@ public class BukkitChunkManager extends ChunkManager {
         final Location top2 = MainUtil.getPlotTopLoc(worldname, pos2);
         swap(worldname, bot1, top1, bot2, top2);
 
-        Plot plot1 = MainUtil.getPlot(worldname, pos1);
-        Plot plot2 = MainUtil.getPlot(worldname, pos2);
-        
+        final Plot plot1 = MainUtil.getPlot(worldname, pos1);
+        final Plot plot2 = MainUtil.getPlot(worldname, pos2);
+
         // TODO clear all entities
-        
+
         clearAllEntities(plot1.getBottom(), plot1.getTop());
         clearAllEntities(plot2.getBottom(), plot2.getTop());
     }
 
     @Override
-    public void swap(final String worldname, final Location bot1, final Location top1, final Location bot2, final Location top2) {
+    public void swap(final String worldname, final Location bot1, final Location top1, final Location bot2, final Location top2)
+    {
         final RegionWrapper region1 = new RegionWrapper(bot1.getX(), top1.getX(), bot1.getZ(), top1.getZ());
         final RegionWrapper region2 = new RegionWrapper(bot2.getX(), top2.getX(), bot2.getZ(), top2.getZ());
         final World world = Bukkit.getWorld(bot1.getWorld());
@@ -1029,8 +1272,10 @@ public class BukkitChunkManager extends ChunkManager {
         final int relX = bot2.getX() - bot1.getX();
         final int relZ = bot2.getZ() - bot1.getZ();
 
-        for (int x = bot1.getX() >> 4; x <= (top1.getX() >> 4); x++) {
-            for (int z = bot1.getZ() >> 4; z <= (top1.getZ() >> 4); z++) {
+        for (int x = bot1.getX() >> 4; x <= (top1.getX() >> 4); x++)
+        {
+            for (int z = bot1.getZ() >> 4; z <= (top1.getZ() >> 4); z++)
+            {
                 final Chunk chunk1 = world.getChunkAt(x, z);
                 final Chunk chunk2 = world.getChunkAt(x + (relX >> 4), z + (relZ >> 4));
                 swapChunk(world, chunk1, chunk2, region1, region2);
@@ -1040,101 +1285,132 @@ public class BukkitChunkManager extends ChunkManager {
     }
 
     @Override
-    public int[] countEntities(final Plot plot) {
+    public int[] countEntities(final Plot plot)
+    {
         final int[] count = new int[5];
         final World world = BukkitUtil.getWorld(plot.world);
 
         final Location bot = MainUtil.getPlotBottomLoc(plot.world, plot.id).add(1, 0, 1);
         final Location top = MainUtil.getPlotTopLoc(plot.world, plot.id);
         final int bx = bot.getX() >> 4;
-                            final int bz = bot.getZ() >> 4;
+        final int bz = bot.getZ() >> 4;
 
-                        final int tx = top.getX() >> 4;
-                        final int tz = top.getZ() >> 4;
+        final int tx = top.getX() >> 4;
+        final int tz = top.getZ() >> 4;
 
-            final int size = (tx - bx) << 4;
+        final int size = (tx - bx) << 4;
 
-            final HashSet<Chunk> chunks = new HashSet<>();
-            for (int X = bx; X <= tx; X++) {
-                for (int Z = bz; Z <= tz; Z++) {
-                    chunks.add(world.getChunkAt(X, Z));
-                }
+        final HashSet<Chunk> chunks = new HashSet<>();
+        for (int X = bx; X <= tx; X++)
+        {
+            for (int Z = bz; Z <= tz; Z++)
+            {
+                chunks.add(world.getChunkAt(X, Z));
             }
+        }
 
-            boolean doWhole = false;
-            List<Entity> entities = null;
-            if (size > 200) {
-                entities = world.getEntities();
-                if (entities.size() < (16 + ((size * size) / 64))) {
-                    doWhole = true;
-                }
+        boolean doWhole = false;
+        List<Entity> entities = null;
+        if (size > 200)
+        {
+            entities = world.getEntities();
+            if (entities.size() < (16 + ((size * size) / 64)))
+            {
+                doWhole = true;
             }
+        }
 
-            if (doWhole) {
-                for (final Entity entity : entities) {
-                    if (!((entity instanceof Creature) || (entity instanceof Vehicle))) {
-                        continue;
-                    }
-                    final org.bukkit.Location loc = entity.getLocation();
-                    final Chunk chunk = loc.getChunk();
-                    if (chunks.contains(chunk)) {
-                        final int X = chunk.getX();
-                        final int Z = chunk.getX();
-                        if ((X > bx) && (X < tx) && (Z > bz) && (Z < tz)) {
-                            count(count, entity);
-                        } else {
-                            final PlotId id = MainUtil.getPlotId(BukkitUtil.getLocation(loc));
-                            if (plot.id.equals(id)) {
-                                count(count, entity);
-                            }
-                        }
-                    }
+        if (doWhole)
+        {
+            for (final Entity entity : entities)
+            {
+                if (!((entity instanceof Creature) || (entity instanceof Vehicle)))
+                {
+                    continue;
                 }
-            } else {
-                for (final Chunk chunk : chunks) {
+                final org.bukkit.Location loc = entity.getLocation();
+                final Chunk chunk = loc.getChunk();
+                if (chunks.contains(chunk))
+                {
                     final int X = chunk.getX();
                     final int Z = chunk.getX();
-                    final Entity[] ents = chunk.getEntities();
-                    for (final Entity entity : ents) {
-                        if (!((entity instanceof Creature) || (entity instanceof Vehicle))) {
-                            continue;
-                        }
-                        if ((X == bx) || (X == tx) || (Z == bz) || (Z == tz)) {
-                            final PlotId id = MainUtil.getPlotId(BukkitUtil.getLocation(entity));
-                            if (plot.id.equals(id)) {
-                                count(count, entity);
-                            }
-                        } else {
+                    if ((X > bx) && (X < tx) && (Z > bz) && (Z < tz))
+                    {
+                        count(count, entity);
+                    }
+                    else
+                    {
+                        final PlotId id = MainUtil.getPlotId(BukkitUtil.getLocation(loc));
+                        if (plot.id.equals(id))
+                        {
                             count(count, entity);
                         }
                     }
                 }
             }
-            return count;
+        }
+        else
+        {
+            for (final Chunk chunk : chunks)
+            {
+                final int X = chunk.getX();
+                final int Z = chunk.getX();
+                final Entity[] ents = chunk.getEntities();
+                for (final Entity entity : ents)
+                {
+                    if (!((entity instanceof Creature) || (entity instanceof Vehicle)))
+                    {
+                        continue;
+                    }
+                    if ((X == bx) || (X == tx) || (Z == bz) || (Z == tz))
+                    {
+                        final PlotId id = MainUtil.getPlotId(BukkitUtil.getLocation(entity));
+                        if (plot.id.equals(id))
+                        {
+                            count(count, entity);
+                        }
+                    }
+                    else
+                    {
+                        count(count, entity);
+                    }
+                }
+            }
+        }
+        return count;
     }
 
-    private void count(final int[] count, final Entity entity) {
+    private void count(final int[] count, final Entity entity)
+    {
         count[0]++;
-        if (entity instanceof Creature) {
+        if (entity instanceof Creature)
+        {
             count[3]++;
-            if (entity instanceof Animals) {
+            if (entity instanceof Animals)
+            {
                 count[1]++;
-            } else {
+            }
+            else
+            {
                 count[2]++;
             }
-        } else {
+        }
+        else
+        {
             count[4]++;
         }
     }
 
     @Override
-    public void setChunk(final ChunkWrapper loc, final PlotBlock[][] blocks) {
+    public void setChunk(final ChunkWrapper loc, final PlotBlock[][] blocks)
+    {
         CURRENT_PLOT_CLEAR = new RegionWrapper(0, 0, 0, 0);
         final World world = Bukkit.getWorld(loc.world);
         final Chunk chunk = world.getChunkAt(loc.x, loc.z);
         final int cx = chunk.getX();
         final int cz = chunk.getZ();
-        if (!chunk.isLoaded()) {
+        if (!chunk.isLoaded())
+        {
             chunk.load(true);
         }
         initMaps();
@@ -1142,21 +1418,28 @@ public class BukkitChunkManager extends ChunkManager {
         final int absZ = cz << 4;
         final boolean save = false;
 
-        for (int x = 0; x < 16; x++) {
-            for (int z = 0; z < 16; z++) {
+        for (int x = 0; x < 16; x++)
+        {
+            for (int z = 0; z < 16; z++)
+            {
                 saveBlocks(world, 255, absX + x, absZ + z);
                 final PlotLoc pl = new PlotLoc(absX + x, absZ + z);
                 final HashMap<Short, Short> ids = GENERATE_BLOCKS.get(pl);
                 final HashMap<Short, Short> datas = GENERATE_BLOCKS.get(pl);
-                for (int i = 0; i < blocks.length; i++) {
-                    if (blocks[i] != null) {
+                for (int i = 0; i < blocks.length; i++)
+                {
+                    if (blocks[i] != null)
+                    {
                         final short y0 = (short) (i << 4);
-                        for (short y = y0; y < (y0 + 16); y++) {
+                        for (short y = y0; y < (y0 + 16); y++)
+                        {
                             final int j = ((y & 0xF) << 8) | (z << 4) | x;
                             final PlotBlock block = blocks[i][j];
-                            if (block != null) {
+                            if (block != null)
+                            {
                                 ids.put(y, block.id);
-                                if (block.data != 0) {
+                                if (block.data != 0)
+                                {
                                     datas.put(y, block.id);
                                 }
                             }
@@ -1165,12 +1448,14 @@ public class BukkitChunkManager extends ChunkManager {
                 }
             }
         }
-        if (save) {
+        if (save)
+        {
             saveEntitiesOut(chunk, CURRENT_PLOT_CLEAR);
         }
-        ChunkLoc chunkLoc = new ChunkLoc(chunk.getX(), chunk.getZ());
+        final ChunkLoc chunkLoc = new ChunkLoc(chunk.getX(), chunk.getZ());
         regenerateChunk(world.getName(), chunkLoc);
-        if (save) {
+        if (save)
+        {
             restoreBlocks(world, 0, 0);
             restoreEntities(world, 0, 0);
         }
diff --git a/src/main/java/com/plotsquared/bukkit/util/BukkitCommand.java b/src/main/java/com/plotsquared/bukkit/util/BukkitCommand.java
index 43c374c38..18e4a6c13 100644
--- a/src/main/java/com/plotsquared/bukkit/util/BukkitCommand.java
+++ b/src/main/java/com/plotsquared/bukkit/util/BukkitCommand.java
@@ -1,85 +1,85 @@
-package com.plotsquared.bukkit.util;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.command.TabCompleter;
-import org.bukkit.entity.Player;
-
-import com.intellectualcrafters.plot.commands.DebugUUID;
-import com.intellectualcrafters.plot.commands.MainCommand;
-import com.intellectualcrafters.plot.object.ConsolePlayer;
-import com.intellectualcrafters.plot.object.PlotPlayer;
-import com.intellectualcrafters.plot.util.Permissions;
-import com.intellectualcrafters.plot.util.StringComparison;
-import com.plotsquared.general.commands.Command;
-
-/**
- * Created 2015-02-20 for PlotSquared
- *
- * @author Citymonstret
- */
-public class BukkitCommand implements CommandExecutor, TabCompleter {
-    
-    public BukkitCommand() {
-        MainCommand.getInstance().addCommand(new DebugUUID());
-    }
-    
-    @Override
-    public boolean onCommand(final CommandSender commandSender, final org.bukkit.command.Command command, final String commandLabel, final String[] args) {
-        if (commandSender instanceof Player) {
-            return MainCommand.onCommand(BukkitUtil.getPlayer((Player) commandSender), commandLabel, args);
-        }
-        return MainCommand.onCommand(ConsolePlayer.getConsole(), commandLabel, args);
-    }
-
-    @Override
-    public List<String> onTabComplete(final CommandSender commandSender, final org.bukkit.command.Command command, final String s, final String[] strings) {
-        if (!(commandSender instanceof Player)) {
-            return null;
-        }
-        final PlotPlayer player = BukkitUtil.getPlayer((Player) commandSender);
-        if (strings.length < 1) {
-            if ((strings.length == 0) || "plots".startsWith(s)) {
-                return Collections.singletonList("plots");
-            }
-        }
-        if (strings.length > 1) {
-            return null;
-        }
-        if (!command.getLabel().equalsIgnoreCase("plots")) {
-            return null;
-        }
-        final Set<String> tabOptions = new HashSet<>();
-        ArrayList<Command<PlotPlayer>> commands = MainCommand.getInstance().getCommands();
-        String best = new StringComparison(strings[0], commands).getBestMatch();
-        tabOptions.add(best);
-        final String arg = strings[0].toLowerCase();
-        for (final Command<PlotPlayer> cmd : MainCommand.getInstance().getCommands()) {
-            String label = cmd.getCommand();
-            if (!label.equalsIgnoreCase(best)) {
-                if (label.startsWith(arg)) {
-                    if (Permissions.hasPermission(player, cmd.getPermission())) {
-                        tabOptions.add(cmd.getCommand());
-                    } else if (cmd.getAliases().size() > 0) {
-                        for (String alias : cmd.getAliases()) {
-                            if (alias.startsWith(arg)) {
-                                tabOptions.add(label);
-                                break;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        if (tabOptions.size() > 0) {
-            return new ArrayList<>(tabOptions);
-        }
-        return null;
-    }
-}
+package com.plotsquared.bukkit.util;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabCompleter;
+import org.bukkit.entity.Player;
+
+import com.intellectualcrafters.plot.commands.DebugUUID;
+import com.intellectualcrafters.plot.commands.MainCommand;
+import com.intellectualcrafters.plot.object.ConsolePlayer;
+import com.intellectualcrafters.plot.object.PlotPlayer;
+import com.intellectualcrafters.plot.util.Permissions;
+import com.intellectualcrafters.plot.util.StringComparison;
+import com.plotsquared.general.commands.Command;
+
+/**
+ * Created 2015-02-20 for PlotSquared
+ *

+ */
+public class BukkitCommand implements CommandExecutor, TabCompleter
+{
+
+    public BukkitCommand()
+    {
+        MainCommand.getInstance().addCommand(new DebugUUID());
+    }
+
+    @Override
+    public boolean onCommand(final CommandSender commandSender, final org.bukkit.command.Command command, final String commandLabel, final String[] args)
+    {
+        if (commandSender instanceof Player) { return MainCommand.onCommand(BukkitUtil.getPlayer((Player) commandSender), commandLabel, args); }
+        return MainCommand.onCommand(ConsolePlayer.getConsole(), commandLabel, args);
+    }
+
+    @Override
+    public List<String> onTabComplete(final CommandSender commandSender, final org.bukkit.command.Command command, final String s, final String[] strings)
+    {
+        if (!(commandSender instanceof Player)) { return null; }
+        final PlotPlayer player = BukkitUtil.getPlayer((Player) commandSender);
+        if (strings.length < 1)
+        {
+            if ((strings.length == 0) || "plots".startsWith(s)) { return Collections.singletonList("plots"); }
+        }
+        if (strings.length > 1) { return null; }
+        if (!command.getLabel().equalsIgnoreCase("plots")) { return null; }
+        final Set<String> tabOptions = new HashSet<>();
+        final ArrayList<Command<PlotPlayer>> commands = MainCommand.getInstance().getCommands();
+        final String best = new StringComparison(strings[0], commands).getBestMatch();
+        tabOptions.add(best);
+        final String arg = strings[0].toLowerCase();
+        for (final Command<PlotPlayer> cmd : MainCommand.getInstance().getCommands())
+        {
+            final String label = cmd.getCommand();
+            if (!label.equalsIgnoreCase(best))
+            {
+                if (label.startsWith(arg))
+                {
+                    if (Permissions.hasPermission(player, cmd.getPermission()))
+                    {
+                        tabOptions.add(cmd.getCommand());
+                    }
+                    else if (cmd.getAliases().size() > 0)
+                    {
+                        for (final String alias : cmd.getAliases())
+                        {
+                            if (alias.startsWith(arg))
+                            {
+                                tabOptions.add(label);
+                                break;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        if (tabOptions.size() > 0) { return new ArrayList<>(tabOptions); }
+        return null;
+    }
+}
diff --git a/src/main/java/com/plotsquared/bukkit/util/BukkitEconHandler.java b/src/main/java/com/plotsquared/bukkit/util/BukkitEconHandler.java
index a74fb27e5..2cc3c70f2 100644
--- a/src/main/java/com/plotsquared/bukkit/util/BukkitEconHandler.java
+++ b/src/main/java/com/plotsquared/bukkit/util/BukkitEconHandler.java
@@ -4,7 +4,6 @@ import net.milkbowl.vault.economy.Economy;
 import net.milkbowl.vault.permission.Permission;
 
 import org.bukkit.Bukkit;
-import org.bukkit.World;
 import org.bukkit.plugin.RegisteredServiceProvider;
 
 import com.intellectualcrafters.plot.object.OfflinePlotPlayer;
@@ -12,33 +11,39 @@ import com.intellectualcrafters.plot.object.PlotPlayer;
 import com.intellectualcrafters.plot.util.EconHandler;
 import com.plotsquared.bukkit.object.BukkitOfflinePlayer;
 
-public class BukkitEconHandler extends EconHandler {
-    
+public class BukkitEconHandler extends EconHandler
+{
+
     private Economy econ;
     private Permission perms;
-    
-    public Economy getEconomy() {
+
+    public Economy getEconomy()
+    {
         init();
         return econ;
     }
-    
-    public Permission getPermissions() {
+
+    public Permission getPermissions()
+    {
         init();
         return perms;
     }
-    
-    public boolean init() {
-        if (econ == null || perms == null) {
+
+    public boolean init()
+    {
+        if ((econ == null) || (perms == null))
+        {
             setupPermissions();
             setupEconomy();
         }
-        return econ != null && perms != null;
+        return (econ != null) && (perms != null);
     }
-    
+
     private boolean setupPermissions()
     {
-        RegisteredServiceProvider<Permission> permissionProvider = Bukkit.getServer().getServicesManager().getRegistration(net.milkbowl.vault.permission.Permission.class);
-        if (permissionProvider != null) {
+        final RegisteredServiceProvider<Permission> permissionProvider = Bukkit.getServer().getServicesManager().getRegistration(net.milkbowl.vault.permission.Permission.class);
+        if (permissionProvider != null)
+        {
             perms = permissionProvider.getProvider();
         }
         return (perms != null);
@@ -46,49 +51,56 @@ public class BukkitEconHandler extends EconHandler {
 
     private boolean setupEconomy()
     {
-        RegisteredServiceProvider<Economy> economyProvider = Bukkit.getServer().getServicesManager().getRegistration(net.milkbowl.vault.economy.Economy.class);
-        if (economyProvider != null) {
+        final RegisteredServiceProvider<Economy> economyProvider = Bukkit.getServer().getServicesManager().getRegistration(net.milkbowl.vault.economy.Economy.class);
+        if (economyProvider != null)
+        {
             econ = economyProvider.getProvider();
         }
         return (econ != null);
     }
 
     @Override
-    public double getMoney(PlotPlayer player) {
-        double bal = super.getMoney(player);
-        if (Double.isNaN(bal)) {
-            return econ.getBalance(player.getName());
-        }
+    public double getMoney(final PlotPlayer player)
+    {
+        final double bal = super.getMoney(player);
+        if (Double.isNaN(bal)) { return econ.getBalance(player.getName()); }
         return bal;
     }
 
     @Override
-    public void withdrawMoney(PlotPlayer player, double amount) {
+    public void withdrawMoney(final PlotPlayer player, final double amount)
+    {
         econ.withdrawPlayer(player.getName(), amount);
     }
 
     @Override
-    public void depositMoney(PlotPlayer player, double amount) {
+    public void depositMoney(final PlotPlayer player, final double amount)
+    {
         econ.depositPlayer(player.getName(), amount);
     }
 
     @Override
-    public void depositMoney(OfflinePlotPlayer player, double amount) {
+    public void depositMoney(final OfflinePlotPlayer player, final double amount)
+    {
         econ.depositPlayer(((BukkitOfflinePlayer) player).player, amount);
     }
 
     @Override
-    public void setPermission(String world, String player, String perm, boolean value) {
-        if (value) {
+    public void setPermission(final String world, final String player, final String perm, final boolean value)
+    {
+        if (value)
+        {
             perms.playerAdd(world, player, perm);
         }
-        else {
+        else
+        {
             perms.playerRemove(world, player, perm);
         }
     }
 
     @Override
-    public boolean hasPermission(String world, String player, String perm) {
+    public boolean hasPermission(final String world, final String player, final String perm)
+    {
         return perms.playerHas(world, Bukkit.getOfflinePlayer(player), perm);
     }
 }
diff --git a/src/main/java/com/plotsquared/bukkit/util/BukkitEventUtil.java b/src/main/java/com/plotsquared/bukkit/util/BukkitEventUtil.java
index 54a05fe47..7a9f0e35f 100644
--- a/src/main/java/com/plotsquared/bukkit/util/BukkitEventUtil.java
+++ b/src/main/java/com/plotsquared/bukkit/util/BukkitEventUtil.java
@@ -33,98 +33,112 @@ import com.plotsquared.bukkit.events.PlotRateEvent;
 import com.plotsquared.bukkit.events.PlotUnlinkEvent;
 import com.plotsquared.bukkit.object.BukkitPlayer;
 
-public class BukkitEventUtil extends EventUtil {
+public class BukkitEventUtil extends EventUtil
+{
 
-    public Player getPlayer(PlotPlayer player) {
-        if (player instanceof BukkitPlayer) {
-            return ((BukkitPlayer) player).player;
-        }
+    public Player getPlayer(final PlotPlayer player)
+    {
+        if (player instanceof BukkitPlayer) { return ((BukkitPlayer) player).player; }
         return null;
     }
-    
-    public boolean callEvent(Event event) {
+
+    public boolean callEvent(final Event event)
+    {
         Bukkit.getServer().getPluginManager().callEvent(event);
-        if (event instanceof Cancellable) {
-            return !((Cancellable) event).isCancelled();
-        }
+        if (event instanceof Cancellable) { return !((Cancellable) event).isCancelled(); }
         return true;
     }
-    
+
     @Override
-    public boolean callClaim(PlotPlayer player, Plot plot, boolean auto) {
+    public boolean callClaim(final PlotPlayer player, final Plot plot, final boolean auto)
+    {
         return callEvent(new PlayerClaimPlotEvent(getPlayer(player), plot, auto));
     }
 
     @Override
-    public boolean callTeleport(PlotPlayer player, Location from, Plot plot) {
+    public boolean callTeleport(final PlotPlayer player, final Location from, final Plot plot)
+    {
         return callEvent(new PlayerTeleportToPlotEvent(getPlayer(player), from, plot));
     }
 
     @Override
-    public boolean callClear(String world, PlotId id) {
+    public boolean callClear(final String world, final PlotId id)
+    {
         return callEvent(new PlotClearEvent(world, id));
     }
 
     @Override
-    public void callDelete(String world, PlotId id) {
+    public void callDelete(final String world, final PlotId id)
+    {
         callEvent(new PlotDeleteEvent(world, id));
     }
 
     @Override
-    public boolean callFlagAdd(Flag flag, Plot plot) {
+    public boolean callFlagAdd(final Flag flag, final Plot plot)
+    {
         return callEvent(new PlotFlagAddEvent(flag, plot));
     }
 
     @Override
-    public boolean callFlagRemove(Flag flag, Plot plot) {
+    public boolean callFlagRemove(final Flag flag, final Plot plot)
+    {
         return callEvent(new PlotFlagRemoveEvent(flag, plot));
     }
 
     @Override
-    public boolean callMerge(String world, Plot plot, ArrayList<PlotId> plots) {
+    public boolean callMerge(final String world, final Plot plot, final ArrayList<PlotId> plots)
+    {
         return callEvent(new PlotMergeEvent(BukkitUtil.getWorld(world), plot, plots));
     }
 
     @Override
-    public boolean callUnlink(String world, ArrayList<PlotId> plots) {
+    public boolean callUnlink(final String world, final ArrayList<PlotId> plots)
+    {
         return callEvent(new PlotUnlinkEvent(BukkitUtil.getWorld(world), plots));
     }
 
     @Override
-    public void callEntry(PlotPlayer player, Plot plot) {
+    public void callEntry(final PlotPlayer player, final Plot plot)
+    {
         callEvent(new PlayerEnterPlotEvent(getPlayer(player), plot));
     }
 
     @Override
-    public void callLeave(PlotPlayer player, Plot plot) {
+    public void callLeave(final PlotPlayer player, final Plot plot)
+    {
         callEvent(new PlayerLeavePlotEvent(getPlayer(player), plot));
     }
 
     @Override
-    public void callDenied(PlotPlayer initiator, Plot plot, UUID player, boolean added) {
+    public void callDenied(final PlotPlayer initiator, final Plot plot, final UUID player, final boolean added)
+    {
         callEvent(new PlayerPlotDeniedEvent(getPlayer(initiator), plot, player, added));
     }
 
     @Override
-    public void callTrusted(PlotPlayer initiator, Plot plot, UUID player, boolean added) {
+    public void callTrusted(final PlotPlayer initiator, final Plot plot, final UUID player, final boolean added)
+    {
         callEvent(new PlayerPlotHelperEvent(getPlayer(initiator), plot, player, added));
     }
 
     @Override
-    public void callMember(PlotPlayer initiator, Plot plot, UUID player, boolean added) {
+    public void callMember(final PlotPlayer initiator, final Plot plot, final UUID player, final boolean added)
+    {
         callEvent(new PlayerPlotTrustedEvent(getPlayer(initiator), plot, player, added));
     }
 
     @Override
-    public boolean callFlagRemove(Flag flag, PlotCluster cluster) {
+    public boolean callFlagRemove(final Flag flag, final PlotCluster cluster)
+    {
         return callEvent(new ClusterFlagRemoveEvent(flag, cluster));
     }
 
     @Override
-    public Rating callRating(PlotPlayer player, Plot plot, Rating rating) {
-        PlotRateEvent event = new PlotRateEvent(player, rating, plot);
+    public Rating callRating(final PlotPlayer player, final Plot plot, final Rating rating)
+    {
+        final PlotRateEvent event = new PlotRateEvent(player, rating, plot);
         Bukkit.getServer().getPluginManager().callEvent(event);
         return event.getRating();
     }
-    
+
 }
diff --git a/src/main/java/com/plotsquared/bukkit/util/BukkitHybridUtils.java b/src/main/java/com/plotsquared/bukkit/util/BukkitHybridUtils.java
index b805f22d0..67666f586 100644
--- a/src/main/java/com/plotsquared/bukkit/util/BukkitHybridUtils.java
+++ b/src/main/java/com/plotsquared/bukkit/util/BukkitHybridUtils.java
@@ -15,11 +15,9 @@ import org.bukkit.generator.ChunkGenerator.BiomeGrid;
 import org.bukkit.material.Directional;
 import org.bukkit.material.MaterialData;
 
-import com.intellectualcrafters.plot.PS;
 import com.intellectualcrafters.plot.flag.Flag;
 import com.intellectualcrafters.plot.flag.FlagManager;
 import com.intellectualcrafters.plot.generator.HybridUtils;
-import com.intellectualcrafters.plot.object.ChunkLoc;
 import com.intellectualcrafters.plot.object.Location;
 import com.intellectualcrafters.plot.object.Plot;
 import com.intellectualcrafters.plot.object.PlotAnalysis;
@@ -30,10 +28,12 @@ import com.intellectualcrafters.plot.util.MainUtil;
 import com.intellectualcrafters.plot.util.MathMan;
 import com.intellectualcrafters.plot.util.TaskManager;
 
-public class BukkitHybridUtils extends HybridUtils {
+public class BukkitHybridUtils extends HybridUtils
+{
 
     @Override
-    public void analyzePlot(final Plot plot, final RunnableVal<PlotAnalysis> whenDone) {
+    public void analyzePlot(final Plot plot, final RunnableVal<PlotAnalysis> whenDone)
+    {
         // int diff, int variety, int verticies, int rotation, int height_sd
         /*
          * diff: compare to base by looping through all blocks
@@ -46,15 +46,28 @@ public class BukkitHybridUtils extends HybridUtils {
          *  - recheck each block
          *
          */
-        TaskManager.runTaskAsync(new Runnable() {
+        TaskManager.runTaskAsync(new Runnable()
+        {
             @Override
-            public void run() {
+            public void run()
+            {
                 final World world = Bukkit.getWorld(plot.world);
                 final ChunkGenerator gen = world.getGenerator();
                 if (gen == null) {
-                    return;
+                return;
                 }
-                final BiomeGrid base = new BiomeGrid() { @Override public void setBiome(int a, int b, Biome c) {} @Override public Biome getBiome(int a, int b) {return null;}};
+                final BiomeGrid base = new BiomeGrid()
+                {
+                    @Override
+                    public void setBiome(final int a, final int b, final Biome c)
+                    {}
+
+                    @Override
+                    public Biome getBiome(final int a, final int b)
+                    {
+                        return null;
+                    }
+                };
                 final Location bot = MainUtil.getPlotBottomLoc(plot.world, plot.id).add(1, 0, 1);
                 final Location top = MainUtil.getPlotTopLoc(plot.world, plot.id);
                 final int bx = bot.getX();
@@ -67,92 +80,143 @@ public class BukkitHybridUtils extends HybridUtils {
                 final int ctz = tz >> 4;
                 final Random r = new Random();
                 MainUtil.initCache();
-                final int width = tx - bx + 1;
-                final int length = tz - bz + 1;
-        
+                final int width = (tx - bx) + 1;
+                final int length = (tz - bz) + 1;
+
                 System.gc();
                 System.gc();
                 final short[][][] oldblocks = new short[256][width][length];
                 final short[][][] newblocks = new short[256][width][length];
-        
-                final Runnable run = new Runnable() {
+
+                final Runnable run = new Runnable()
+                {
                     @Override
-                    public void run() {
-                        ChunkManager.chunkTask(bot, top, new RunnableVal<int[]>() {
+                    public void run()
+                    {
+                        ChunkManager.chunkTask(bot, top, new RunnableVal<int[]>()
+                        {
                             @Override
-                            public void run() {
+                            public void run()
+                            {
                                 // TODO [chunkx, chunkz, pos1x, pos1z, pos2x, pos2z, isedge]
-                                int X = value[0];
-                                int Z = value[1];
-                                short[][] result = gen.generateExtBlockSections(world, r, X, Z, base);
-                                int xb = ((X) << 4) - bx;
-                                int zb = ((Z) << 4) - bz;
-                                for (int i = 0; i < result.length; i++) {
-                                    if (result[i] == null) {
-                                        for (int j = 0; j < 4096; j++) {
-                                            int x = MainUtil.x_loc[i][j] + xb;
-                                            if (x < 0 || x >= width) continue;
-                                            int z = MainUtil.z_loc[i][j] + zb;
-                                            if (z < 0 || z >= length) continue;
-                                            int y = MainUtil.y_loc[i][j];
+                                final int X = value[0];
+                                final int Z = value[1];
+                                final short[][] result = gen.generateExtBlockSections(world, r, X, Z, base);
+                                final int xb = ((X) << 4) - bx;
+                                final int zb = ((Z) << 4) - bz;
+                                for (int i = 0; i < result.length; i++)
+                                {
+                                    if (result[i] == null)
+                                    {
+                                        for (int j = 0; j < 4096; j++)
+                                        {
+                                            final int x = MainUtil.x_loc[i][j] + xb;
+                                            if ((x < 0) || (x >= width))
+                                            {
+                                                continue;
+                                            }
+                                            final int z = MainUtil.z_loc[i][j] + zb;
+                                            if ((z < 0) || (z >= length))
+                                            {
+                                                continue;
+                                            }
+                                            final int y = MainUtil.y_loc[i][j];
                                             oldblocks[y][x][z] = 0;
                                         }
                                         continue;
                                     }
-                                    for (int j = 0; j < result[i].length; j++) {
-                                        int x = MainUtil.x_loc[i][j] + xb;
-                                        if (x < 0 || x >= width) continue;
-                                        int z = MainUtil.z_loc[i][j] + zb;
-                                        if (z < 0 || z >= length) continue;
-                                        int y = MainUtil.y_loc[i][j];
+                                    for (int j = 0; j < result[i].length; j++)
+                                    {
+                                        final int x = MainUtil.x_loc[i][j] + xb;
+                                        if ((x < 0) || (x >= width))
+                                        {
+                                            continue;
+                                        }
+                                        final int z = MainUtil.z_loc[i][j] + zb;
+                                        if ((z < 0) || (z >= length))
+                                        {
+                                            continue;
+                                        }
+                                        final int y = MainUtil.y_loc[i][j];
                                         oldblocks[y][x][z] = result[i][j];
                                     }
                                 }
-                                
+
                             }
-                        }, new Runnable() {
+                        }, new Runnable()
+                        {
                             @Override
-                            public void run() {
-                                TaskManager.runTaskAsync(new Runnable() {
+                            public void run()
+                            {
+                                TaskManager.runTaskAsync(new Runnable()
+                                {
                                     @Override
-                                    public void run() {
-                                        int size = width * length;
-                                        int[] changes = new int[size];
-                                        int[] faces = new int[size];
-                                        int[] data = new int[size];
-                                        int[] air = new int[size];
-                                        int[] variety = new int[size];
+                                    public void run()
+                                    {
+                                        final int size = width * length;
+                                        final int[] changes = new int[size];
+                                        final int[] faces = new int[size];
+                                        final int[] data = new int[size];
+                                        final int[] air = new int[size];
+                                        final int[] variety = new int[size];
                                         int i = 0;
-                                        for (int x = 0; x < width;x++) {
-                                            for (int z = 0; z < length;z++) {
-                                                HashSet<Short> types = new HashSet<>();
-                                                for (int y = 0; y < 256; y++) {
-                                                    short old = oldblocks[y][x][z];
-                                                    short now = newblocks[y][x][z];
-                                                    if (old != now) {
+                                        for (int x = 0; x < width; x++)
+                                        {
+                                            for (int z = 0; z < length; z++)
+                                            {
+                                                final HashSet<Short> types = new HashSet<>();
+                                                for (int y = 0; y < 256; y++)
+                                                {
+                                                    final short old = oldblocks[y][x][z];
+                                                    final short now = newblocks[y][x][z];
+                                                    if (old != now)
+                                                    {
                                                         changes[i]++;
                                                     }
-                                                    if (now == 0) {
+                                                    if (now == 0)
+                                                    {
                                                         air[i]++;
                                                     }
-                                                    else {
+                                                    else
+                                                    {
                                                         // check verticies
                                                         // modifications_adjacent
-                                                        if (x > 0 && z > 0 && y > 0 && x < width - 1 && z < length - 1 && y < 255) {
-                                                            if (newblocks[y - 1][x][z] == 0) faces[i]++;
-                                                            if (newblocks[y][x - 1][z] == 0) faces[i]++;
-                                                            if (newblocks[y][x][z - 1] == 0) faces[i]++;
-                                                            if (newblocks[y + 1][x][z] == 0) faces[i]++;
-                                                            if (newblocks[y][x + 1][z] == 0) faces[i]++;
-                                                            if (newblocks[y][x][z + 1] == 0) faces[i]++;
+                                                        if ((x > 0) && (z > 0) && (y > 0) && (x < (width - 1)) && (z < (length - 1)) && (y < 255))
+                                                        {
+                                                            if (newblocks[y - 1][x][z] == 0)
+                                                            {
+                                                                faces[i]++;
+                                                            }
+                                                            if (newblocks[y][x - 1][z] == 0)
+                                                            {
+                                                                faces[i]++;
+                                                            }
+                                                            if (newblocks[y][x][z - 1] == 0)
+                                                            {
+                                                                faces[i]++;
+                                                            }
+                                                            if (newblocks[y + 1][x][z] == 0)
+                                                            {
+                                                                faces[i]++;
+                                                            }
+                                                            if (newblocks[y][x + 1][z] == 0)
+                                                            {
+                                                                faces[i]++;
+                                                            }
+                                                            if (newblocks[y][x][z + 1] == 0)
+                                                            {
+                                                                faces[i]++;
+                                                            }
                                                         }
-        
-                                                        Material material = Material.getMaterial(now);
-                                                        Class<? extends MaterialData> md = material.getData();
-                                                        if (md.equals(Directional.class)) {
+
+                                                        final Material material = Material.getMaterial(now);
+                                                        final Class<? extends MaterialData> md = material.getData();
+                                                        if (md.equals(Directional.class))
+                                                        {
                                                             data[i] += 8;
                                                         }
-                                                        else if (!md.equals(MaterialData.class)) {
+                                                        else if (!md.equals(MaterialData.class))
+                                                        {
                                                             data[i]++;
                                                         }
                                                         types.add(now);
@@ -164,34 +228,34 @@ public class BukkitHybridUtils extends HybridUtils {
                                         }
                                         // analyze plot
                                         // put in analysis obj
-        
+
                                         // run whenDone
-                                        PlotAnalysis analysis = new PlotAnalysis();
+                                        final PlotAnalysis analysis = new PlotAnalysis();
                                         analysis.changes = (int) (MathMan.getMean(changes) * 100);
                                         analysis.faces = (int) (MathMan.getMean(faces) * 100);
                                         analysis.data = (int) (MathMan.getMean(data) * 100);
                                         analysis.air = (int) (MathMan.getMean(air) * 100);
                                         analysis.variety = (int) (MathMan.getMean(variety) * 100);
-                                        
+
                                         analysis.changes_sd = (int) (MathMan.getSD(changes, analysis.changes));
                                         analysis.faces_sd = (int) (MathMan.getSD(faces, analysis.faces));
                                         analysis.data_sd = (int) (MathMan.getSD(data, analysis.data));
                                         analysis.air_sd = (int) (MathMan.getSD(air, analysis.air));
                                         analysis.variety_sd = (int) (MathMan.getSD(variety, analysis.variety));
-                                        
-                                        List<Integer> result = new ArrayList<>();
+
+                                        final List<Integer> result = new ArrayList<>();
                                         result.add(analysis.changes);
                                         result.add(analysis.faces);
                                         result.add(analysis.data);
                                         result.add(analysis.air);
                                         result.add(analysis.variety);
-                                        
+
                                         result.add(analysis.changes_sd);
                                         result.add(analysis.faces_sd);
                                         result.add(analysis.data_sd);
                                         result.add(analysis.air_sd);
                                         result.add(analysis.variety_sd);
-                                        Flag flag = new Flag(FlagManager.getFlag("analysis"), result);
+                                        final Flag flag = new Flag(FlagManager.getFlag("analysis"), result);
                                         FlagManager.addPlotFlag(plot, flag);
                                         System.gc();
                                         System.gc();
@@ -201,53 +265,84 @@ public class BukkitHybridUtils extends HybridUtils {
                                 });
                             }
                         }, 5);
-                        
+
                     }
                 };
                 System.gc();
                 MainUtil.initCache();
-                ChunkManager.chunkTask(bot, top, new RunnableVal<int[]>() {
-        
+                ChunkManager.chunkTask(bot, top, new RunnableVal<int[]>()
+                {
+
                     @Override
-                    public void run() {
-                        int X = value[0];
-                        int Z = value[1];
+                    public void run()
+                    {
+                        final int X = value[0];
+                        final int Z = value[1];
                         world.loadChunk(X, Z);
                         int minX;
                         int minZ;
                         int maxX;
                         int maxZ;
-                        if (X == cbx) minX = bx & 15;
-                        else minX = 0;
-                        if (Z == cbz) minZ = bz & 15;
-                        else minZ = 0;
-                        if (X == ctx) maxX = tx & 15;
-                        else maxX = 16;
-                        if (Z == ctz) maxZ = tz & 15;
-                        else maxZ = 16;
-                        
-                        int cbx = X << 4;
-                        int cbz = Z << 4;
-                        
-                        int xb = (cbx) - bx;
-                        int zb = (cbz) - bz;
-                        for (int x = minX; x <= maxX; x++) {
-                            int xx = cbx + x;
-                            for (int z = minZ; z <= maxZ; z++) {
-                                int zz = cbz + z;
-                                for (int y = 0; y < 256; y++) {
-                                    Block block = world.getBlockAt(xx, y, zz);
-                                    int xr = xb + x;
-                                    int zr = zb + z;
+                        if (X == cbx)
+                        {
+                            minX = bx & 15;
+                        }
+                        else
+                        {
+                            minX = 0;
+                        }
+                        if (Z == cbz)
+                        {
+                            minZ = bz & 15;
+                        }
+                        else
+                        {
+                            minZ = 0;
+                        }
+                        if (X == ctx)
+                        {
+                            maxX = tx & 15;
+                        }
+                        else
+                        {
+                            maxX = 16;
+                        }
+                        if (Z == ctz)
+                        {
+                            maxZ = tz & 15;
+                        }
+                        else
+                        {
+                            maxZ = 16;
+                        }
+
+                        final int cbx = X << 4;
+                        final int cbz = Z << 4;
+
+                        final int xb = (cbx) - bx;
+                        final int zb = (cbz) - bz;
+                        for (int x = minX; x <= maxX; x++)
+                        {
+                            final int xx = cbx + x;
+                            for (int z = minZ; z <= maxZ; z++)
+                            {
+                                final int zz = cbz + z;
+                                for (int y = 0; y < 256; y++)
+                                {
+                                    final Block block = world.getBlockAt(xx, y, zz);
+                                    final int xr = xb + x;
+                                    final int zr = zb + z;
                                     newblocks[y][xr][zr] = (short) block.getTypeId();
                                 }
                             }
                         }
                         world.unloadChunkRequest(X, Z, true);
                     }
-                }, new Runnable() {
+                }, new Runnable()
+                {
                     @Override
-                    public void run() {
+                    public void run()
+                    {
                         TaskManager.runTaskAsync(run);
                     }
                 }, 5);
@@ -256,22 +351,29 @@ public class BukkitHybridUtils extends HybridUtils {
     }
 
     @Override
-    public int checkModified(final String worldname, final int x1, final int x2, final int y1, final int y2, final int z1, final int z2, final PlotBlock[] blocks) {
+    public int checkModified(final String worldname, final int x1, final int x2, final int y1, final int y2, final int z1, final int z2, final PlotBlock[] blocks)
+    {
         final World world = BukkitUtil.getWorld(worldname);
         int count = 0;
-        for (int y = y1; y <= y2; y++) {
-            for (int x = x1; x <= x2; x++) {
-                for (int z = z1; z <= z2; z++) {
+        for (int y = y1; y <= y2; y++)
+        {
+            for (int x = x1; x <= x2; x++)
+            {
+                for (int z = z1; z <= z2; z++)
+                {
                     final Block block = world.getBlockAt(x, y, z);
                     final int id = block.getTypeId();
                     boolean same = false;
-                    for (final PlotBlock p : blocks) {
-                        if (id == p.id) {
+                    for (final PlotBlock p : blocks)
+                    {
+                        if (id == p.id)
+                        {
                             same = true;
                             break;
                         }
                     }
-                    if (!same) {
+                    if (!same)
+                    {
                         count++;
                     }
                 }
@@ -281,16 +383,22 @@ public class BukkitHybridUtils extends HybridUtils {
     }
 
     @Override
-    public int get_ey(final String worldname, final int sx, final int ex, final int sz, final int ez, final int sy) {
+    public int get_ey(final String worldname, final int sx, final int ex, final int sz, final int ez, final int sy)
+    {
         final World world = BukkitUtil.getWorld(worldname);
         final int maxY = world.getMaxHeight();
         int ey = sy;
-        for (int x = sx; x <= ex; x++) {
-            for (int z = sz; z <= ez; z++) {
-                for (int y = sy; y < maxY; y++) {
-                    if (y > ey) {
+        for (int x = sx; x <= ex; x++)
+        {
+            for (int z = sz; z <= ez; z++)
+            {
+                for (int y = sy; y < maxY; y++)
+                {
+                    if (y > ey)
+                    {
                         final Block block = world.getBlockAt(x, y, z);
-                        if (block.getTypeId() != 0) {
+                        if (block.getTypeId() != 0)
+                        {
                             ey = y;
                         }
                     }
diff --git a/src/main/java/com/plotsquared/bukkit/util/BukkitInventoryUtil.java b/src/main/java/com/plotsquared/bukkit/util/BukkitInventoryUtil.java
index 35f94d52d..44ff6412b 100644
--- a/src/main/java/com/plotsquared/bukkit/util/BukkitInventoryUtil.java
+++ b/src/main/java/com/plotsquared/bukkit/util/BukkitInventoryUtil.java
@@ -18,16 +18,20 @@ import com.intellectualcrafters.plot.object.PlotPlayer;
 import com.intellectualcrafters.plot.util.InventoryUtil;
 import com.plotsquared.bukkit.object.BukkitPlayer;
 
-public class BukkitInventoryUtil extends InventoryUtil {
+public class BukkitInventoryUtil extends InventoryUtil
+{
 
     @Override
-    public void open(PlotInventory inv) {
-        BukkitPlayer bp = ((BukkitPlayer) inv.player); 
-        Inventory inventory = Bukkit.createInventory(null, inv.size * 9, inv.getTitle());
-        PlotItemStack[] items = inv.getItems();
-        for (int i = 0; i < inv.size * 9; i++) {
-            PlotItemStack item = items[i];
-            if (item != null) {
+    public void open(final PlotInventory inv)
+    {
+        final BukkitPlayer bp = ((BukkitPlayer) inv.player);
+        final Inventory inventory = Bukkit.createInventory(null, inv.size * 9, inv.getTitle());
+        final PlotItemStack[] items = inv.getItems();
+        for (int i = 0; i < (inv.size * 9); i++)
+        {
+            final PlotItemStack item = items[i];
+            if (item != null)
+            {
                 inventory.setItem(i, getItem(item));
             }
         }
@@ -36,92 +40,97 @@ public class BukkitInventoryUtil extends InventoryUtil {
     }
 
     @Override
-    public void close(PlotInventory inv) {
-        if (!inv.isOpen()) {
-            return;
-        }
+    public void close(final PlotInventory inv)
+    {
+        if (!inv.isOpen()) { return; }
         inv.player.deleteMeta("inventory");
-        BukkitPlayer bp = ((BukkitPlayer) inv.player);
+        final BukkitPlayer bp = ((BukkitPlayer) inv.player);
         bp.player.closeInventory();
     }
 
     @Override
-    public void setItem(PlotInventory inv, int index, PlotItemStack item) {
-        BukkitPlayer bp = ((BukkitPlayer) inv.player);
-        InventoryView opened = bp.player.getOpenInventory();
-        if (!inv.isOpen()) {
-            return;
-        }
+    public void setItem(final PlotInventory inv, final int index, final PlotItemStack item)
+    {
+        final BukkitPlayer bp = ((BukkitPlayer) inv.player);
+        final InventoryView opened = bp.player.getOpenInventory();
+        if (!inv.isOpen()) { return; }
         opened.setItem(index, getItem(item));
         bp.player.updateInventory();
     }
-    
-    public PlotItemStack getItem(ItemStack item ) {
-        if (item == null) {
-            return null;
-        }
-        int id = item.getTypeId();
-        short data = item.getDurability();
-        int amount = item.getAmount();
+
+    public PlotItemStack getItem(final ItemStack item)
+    {
+        if (item == null) { return null; }
+        final int id = item.getTypeId();
+        final short data = item.getDurability();
+        final int amount = item.getAmount();
         String name = null;
         String[] lore = null;
-        if (item.hasItemMeta()) {
-            ItemMeta meta = item.getItemMeta();
-            if (meta.hasDisplayName()) {
+        if (item.hasItemMeta())
+        {
+            final ItemMeta meta = item.getItemMeta();
+            if (meta.hasDisplayName())
+            {
                 name = meta.getDisplayName();
             }
-            if (meta.hasLore()) {
-                List<String> itemLore = meta.getLore();
+            if (meta.hasLore())
+            {
+                final List<String> itemLore = meta.getLore();
                 lore = itemLore.toArray(new String[itemLore.size()]);
             }
         }
         return new PlotItemStack(id, data, amount, name, lore);
     }
-    
-    public static ItemStack getItem(PlotItemStack item) {
-        if (item == null) {
-            return null;
-        }
-        ItemStack stack = new ItemStack(item.id, item.amount, item.data);
+
+    public static ItemStack getItem(final PlotItemStack item)
+    {
+        if (item == null) { return null; }
+        final ItemStack stack = new ItemStack(item.id, item.amount, item.data);
         ItemMeta meta = null;
-        if (item.name != null) {
+        if (item.name != null)
+        {
             meta = stack.getItemMeta();
             meta.setDisplayName(ChatColor.translateAlternateColorCodes('&', item.name));
         }
-        if (item.lore != null) {
-            if (meta == null) {
+        if (item.lore != null)
+        {
+            if (meta == null)
+            {
                 meta = stack.getItemMeta();
             }
-            List<String> lore = new ArrayList<>();
-            for (String entry : item.lore) {
+            final List<String> lore = new ArrayList<>();
+            for (final String entry : item.lore)
+            {
                 lore.add(ChatColor.translateAlternateColorCodes('&', entry));
             }
             meta.setLore(lore);
         }
-        if (meta != null) {
+        if (meta != null)
+        {
             stack.setItemMeta(meta);
         }
         return stack;
     }
 
     @Override
-    public PlotItemStack[] getItems(PlotPlayer player) {
-        BukkitPlayer bp = ((BukkitPlayer) player);
-        PlayerInventory inv = bp.player.getInventory();
-        PlotItemStack[] items = new PlotItemStack[36];
-        for (int i = 0; i < 36; i++) {
+    public PlotItemStack[] getItems(final PlotPlayer player)
+    {
+        final BukkitPlayer bp = ((BukkitPlayer) player);
+        final PlayerInventory inv = bp.player.getInventory();
+        final PlotItemStack[] items = new PlotItemStack[36];
+        for (int i = 0; i < 36; i++)
+        {
             items[i] = getItem(inv.getItem(i));
         }
         return items;
     }
 
     @Override
-    public boolean isOpen(PlotInventory inv) {
-        if (!inv.isOpen()) {
-            return false;
-        }
-        BukkitPlayer bp = ((BukkitPlayer) inv.player);
-        InventoryView opened = bp.player.getOpenInventory();
-        return (inv.isOpen() && opened.getType() == InventoryType.CRAFTING && opened.getTitle() == null);
+    public boolean isOpen(final PlotInventory inv)
+    {
+        if (!inv.isOpen()) { return false; }
+        final BukkitPlayer bp = ((BukkitPlayer) inv.player);
+        final InventoryView opened = bp.player.getOpenInventory();
+        return (inv.isOpen() && (opened.getType() == InventoryType.CRAFTING) && (opened.getTitle() == null));
     }
 }
diff --git a/src/main/java/com/plotsquared/bukkit/util/BukkitPlainChatManager.java b/src/main/java/com/plotsquared/bukkit/util/BukkitPlainChatManager.java
index 0a57a6622..522eb2b2d 100644
--- a/src/main/java/com/plotsquared/bukkit/util/BukkitPlainChatManager.java
+++ b/src/main/java/com/plotsquared/bukkit/util/BukkitPlainChatManager.java
@@ -5,48 +5,53 @@ import java.util.List;
 
 import org.bukkit.ChatColor;
 
-import com.intellectualcrafters.plot.config.C;
-import com.intellectualcrafters.plot.object.ConsolePlayer;
 import com.intellectualcrafters.plot.object.PlotMessage;
 import com.intellectualcrafters.plot.object.PlotPlayer;
 import com.intellectualcrafters.plot.util.ChatManager;
-import com.plotsquared.bukkit.chat.FancyMessage;
-import com.plotsquared.bukkit.object.BukkitPlayer;
 
-public class BukkitPlainChatManager extends ChatManager<List<StringBuilder>> {
-    
+public class BukkitPlainChatManager extends ChatManager<List<StringBuilder>>
+{
+
     @Override
-    public List<StringBuilder> builder() {
+    public List<StringBuilder> builder()
+    {
         return new ArrayList<StringBuilder>();
     }
-    
+
     @Override
-    public void color(PlotMessage m, String color) {
-        List<StringBuilder> parts = m.$(this);
+    public void color(final PlotMessage m, final String color)
+    {
+        final List<StringBuilder> parts = m.$(this);
         parts.get(parts.size() - 1).insert(0, color);
     }
-    
+
     @Override
-    public void tooltip(PlotMessage m, PlotMessage... tooltips) {}
-    
+    public void tooltip(final PlotMessage m, final PlotMessage... tooltips)
+    {}
+
     @Override
-    public void command(PlotMessage m, String command) {}
-    
+    public void command(final PlotMessage m, final String command)
+    {}
+
     @Override
-    public void text(PlotMessage m, String text) {
+    public void text(final PlotMessage m, final String text)
+    {
         m.$(this).add(new StringBuilder(ChatColor.stripColor(text)));
     }
-    
+
     @Override
-    public void send(PlotMessage m, PlotPlayer player) {
-        StringBuilder built = new StringBuilder();
-        for (StringBuilder sb : m.$(this)) {
+    public void send(final PlotMessage m, final PlotPlayer player)
+    {
+        final StringBuilder built = new StringBuilder();
+        for (final StringBuilder sb : m.$(this))
+        {
             built.append(sb);
         }
         player.sendMessage(built.toString());
     }
-    
+
     @Override
-    public void suggest(PlotMessage m, String command) {}
-    
+    public void suggest(final PlotMessage m, final String command)
+    {}
+
 }
diff --git a/src/main/java/com/plotsquared/bukkit/util/BukkitPlayerFunctions.java b/src/main/java/com/plotsquared/bukkit/util/BukkitPlayerFunctions.java
index 165e83e09..8ade6a59b 100644
--- a/src/main/java/com/plotsquared/bukkit/util/BukkitPlayerFunctions.java
+++ b/src/main/java/com/plotsquared/bukkit/util/BukkitPlayerFunctions.java
@@ -37,7 +37,8 @@ import com.intellectualcrafters.plot.util.UUIDHandler;
 /**
  * Functions involving players, plots and locations.
  */
-public class BukkitPlayerFunctions {
+public class BukkitPlayerFunctions
+{
 
     /*
      * =========== NOTICE ================
@@ -51,29 +52,31 @@ public class BukkitPlayerFunctions {
      * @param plot
      * @param isDelete
      */
-    public static void clear(final Player player, final String world, final Plot plot, final boolean isDelete) {
+    public static void clear(final Player player, final String world, final Plot plot, final boolean isDelete)
+    {
         final long start = System.currentTimeMillis();
-        final Runnable whenDone = new Runnable() {
+        final Runnable whenDone = new Runnable()
+        {
             @Override
-            public void run() {
-                if ((player != null) && player.isOnline()) {
+            public void run()
+            {
+                if ((player != null) && player.isOnline())
+                {
                     MainUtil.sendMessage(BukkitUtil.getPlayer(player), C.CLEARING_DONE, "" + (System.currentTimeMillis() - start));
                 }
             }
         };
-        if (!MainUtil.clearAsPlayer(plot, isDelete, whenDone)) {
+        if (!MainUtil.clearAsPlayer(plot, isDelete, whenDone))
+        {
             MainUtil.sendMessage(null, C.WAIT_FOR_TIMER);
         }
     }
 
-    public static String getPlayerName(final UUID uuid) {
-        if (uuid == null) {
-            return "unknown";
-        }
+    public static String getPlayerName(final UUID uuid)
+    {
+        if (uuid == null) { return "unknown"; }
         final String name = UUIDHandler.getName(uuid);
-        if (name == null) {
-            return "unknown";
-        }
+        if (name == null) { return "unknown"; }
         return name;
     }
 
@@ -82,22 +85,28 @@ public class BukkitPlayerFunctions {
      *
      * @return boolean
      */
-    public static boolean isInPlot(final Player player) {
+    public static boolean isInPlot(final Player player)
+    {
         return getCurrentPlot(player) != null;
     }
 
-    public static ArrayList<PlotId> getMaxPlotSelectionIds(final String world, PlotId pos1, PlotId pos2) {
+    public static ArrayList<PlotId> getMaxPlotSelectionIds(final String world, PlotId pos1, PlotId pos2)
+    {
         final Plot plot1 = PS.get().getPlot(world, pos1);
         final Plot plot2 = PS.get().getPlot(world, pos2);
-        if (plot1 != null) {
+        if (plot1 != null)
+        {
             pos1 = MainUtil.getBottomPlot(plot1).id;
         }
-        if (plot2 != null) {
+        if (plot2 != null)
+        {
             pos2 = MainUtil.getTopPlot(plot2).id;
         }
         final ArrayList<PlotId> myplots = new ArrayList<>();
-        for (int x = pos1.x; x <= pos2.x; x++) {
-            for (int y = pos1.y; y <= pos2.y; y++) {
+        for (int x = pos1.x; x <= pos2.x; x++)
+        {
+            for (int y = pos1.y; y <= pos2.y; y++)
+            {
                 myplots.add(new PlotId(x, y));
             }
         }
@@ -111,15 +120,12 @@ public class BukkitPlayerFunctions {
      *
      * @return boolean
      */
-    public static Plot getCurrentPlot(final Player player) {
-        if (!PS.get().isPlotWorld(player.getWorld().getName())) {
-            return null;
-        }
+    public static Plot getCurrentPlot(final Player player)
+    {
+        if (!PS.get().isPlotWorld(player.getWorld().getName())) { return null; }
         final PlotId id = MainUtil.getPlotId(BukkitUtil.getLocation(player));
         final String world = player.getWorld().getName();
-        if (id == null) {
-            return null;
-        }
+        if (id == null) { return null; }
         return MainUtil.getPlot(world, id);
     }
 
@@ -130,11 +136,10 @@ public class BukkitPlayerFunctions {
      *
      * @return boolean
      */
-    public static Set<Plot> getPlayerPlots(final String world, final Player plr) {
+    public static Set<Plot> getPlayerPlots(final String world, final Player plr)
+    {
         final Set<Plot> p = PS.get().getPlots(world, plr.getName());
-        if (p == null) {
-            return new HashSet<>();
-        }
+        if (p == null) { return new HashSet<>(); }
         return p;
     }
 }
diff --git a/src/main/java/com/plotsquared/bukkit/util/BukkitSchematicHandler.java b/src/main/java/com/plotsquared/bukkit/util/BukkitSchematicHandler.java
index 62f32ae2b..635ca8d05 100644
--- a/src/main/java/com/plotsquared/bukkit/util/BukkitSchematicHandler.java
+++ b/src/main/java/com/plotsquared/bukkit/util/BukkitSchematicHandler.java
@@ -1,321 +1,348 @@
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// PlotSquared - A plot manager and world generator for the Bukkit API                             /
-// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
-//                                                                                                 /
-// This program is free software; you can redistribute it and/or modify                            /
-// it under the terms of the GNU General Public License as published by                            /
-// the Free Software Foundation; either version 3 of the License, or                               /
-// (at your option) any later version.                                                             /
-//                                                                                                 /
-// This program is distributed in the hope that it will be useful,                                 /
-// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
-// GNU General Public License for more details.                                                    /
-//                                                                                                 /
-// You should have received a copy of the GNU General Public License                               /
-// along with this program; if not, write to the Free Software Foundation,                         /
-// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
-//                                                                                                 /
-// You can contact us via: support@intellectualsites.com                                           /
-////////////////////////////////////////////////////////////////////////////////////////////////////
-package com.plotsquared.bukkit.util;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import org.bukkit.Bukkit;
-import org.bukkit.Chunk;
-import org.bukkit.World;
-import org.bukkit.block.Block;
-import org.bukkit.block.BlockState;
-
-import com.intellectualcrafters.jnbt.ByteArrayTag;
-import com.intellectualcrafters.jnbt.CompoundTag;
-import com.intellectualcrafters.jnbt.IntTag;
-import com.intellectualcrafters.jnbt.ListTag;
-import com.intellectualcrafters.jnbt.ShortTag;
-import com.intellectualcrafters.jnbt.StringTag;
-import com.intellectualcrafters.jnbt.Tag;
-import com.intellectualcrafters.plot.object.ChunkLoc;
-import com.intellectualcrafters.plot.object.Location;
-import com.intellectualcrafters.plot.object.RunnableVal;
-import com.intellectualcrafters.plot.util.SchematicHandler;
-import com.intellectualcrafters.plot.util.TaskManager;
-import com.plotsquared.object.schematic.StateWrapper;
-
-/**
- * Schematic Handler
- *
- * @author Citymonstret
- * @author Empire92
- */
-public class BukkitSchematicHandler extends SchematicHandler {
-
-    @Override
-    public void getCompoundTag(final String world, final Location pos1, final Location pos2, final RunnableVal<CompoundTag> whenDone) {
-
-        // async
-        TaskManager.runTaskAsync(new Runnable() {
-
-            @Override
-            public void run() {
-                // Main positions
-                final int p1x = pos1.getX();
-                final int p1z = pos1.getZ();
-                final int p2x = pos2.getX();
-                final int p2z = pos2.getZ();
-                final int bcx = p1x >> 4;
-                final int bcz = p1z >> 4;
-                final int tcx = p2x >> 4;
-                final int tcz = p2z >> 4;
-                final int sy = pos1.getY();
-                final int ey = pos2.getY();
-
-                final int width = (pos2.getX() - pos1.getX()) + 1;
-                final int height = (pos2.getY() - pos1.getY()) + 1;
-                final int length = (pos2.getZ() - pos1.getZ()) + 1;
-
-                // Main Schematic tag
-                final HashMap<String, Tag> schematic = new HashMap<>();
-
-                schematic.put("Width", new ShortTag("Width", (short) width));
-                schematic.put("Length", new ShortTag("Length", (short) length));
-                schematic.put("Height", new ShortTag("Height", (short) height));
-                schematic.put("Materials", new StringTag("Materials", "Alpha"));
-                schematic.put("WEOriginX", new IntTag("WEOriginX", 0));
-                schematic.put("WEOriginY", new IntTag("WEOriginY", 0));
-                schematic.put("WEOriginZ", new IntTag("WEOriginZ", 0));
-                schematic.put("WEOffsetX", new IntTag("WEOffsetX", 0));
-                schematic.put("WEOffsetY", new IntTag("WEOffsetY", 0));
-                schematic.put("WEOffsetZ", new IntTag("WEOffsetZ", 0));
-
-                // Arrays of data types
-                final List<Tag> tileEntities = new ArrayList<Tag>();
-                final byte[] blocks = new byte[width * height * length];
-                final byte[] blockData = new byte[width * height * length];
-
-                // Generate list of chunks
-                final ArrayList<ChunkLoc> chunks = new ArrayList<ChunkLoc>();
-                for (int x = bcx; x <= tcx; x++) {
-                    for (int z = bcz; z <= tcz; z++) {
-                        chunks.add(new ChunkLoc(x, z));
-                    }
-                }
-
-                final World worldObj = Bukkit.getWorld(world);
-                // Main thread
-                TaskManager.runTask(new Runnable() {
-                    @Override
-                    public void run() {
-                        long start = System.currentTimeMillis();
-                        while (chunks.size() > 0 && System.currentTimeMillis() - start < 20) {
-                            // save schematics
-                            ChunkLoc chunk = chunks.remove(0);
-
-                            Chunk bc = worldObj.getChunkAt(chunk.x, chunk.z);
-                            if (!bc.load(false)) {
-                                continue;
-                            }
-
-                            int X = chunk.x;
-                            int Z = chunk.z;
-                            int xxb = X << 4;
-                            int zzb = Z << 4;
-                            int xxt = xxb + 15;
-                            int zzt = zzb + 15;
-
-                            if (X == bcx) {
-                                xxb = p1x;
-                            }
-                            if (X == tcx) {
-                                xxt = p2x;
-                            }
-                            if (Z == bcz) {
-                                zzb = p1z;
-                            }
-                            if (Z == tcz) {
-                                zzt = p2z;
-                            }
-                            for (int y = sy; y <= Math.min(255, ey); y++) {
-                                int ry = y - sy;
-                                int i1 = (ry * width * length);
-                                for (int z = zzb; z <= zzt; z++) {
-                                    int rz = z - p1z;
-                                    int i2 = i1 + (rz * width);
-                                    for (int x = xxb; x <= xxt; x++) {
-                                        int rx = x - p1x;
-                                        final int index = i2 + rx;
-                                        Block block = worldObj.getBlockAt(x, y, z);
-                                        int id = block.getTypeId();
-                                        switch (id) {
-                                            case 0:
-                                            case 2:
-                                            case 4:
-                                            case 13:
-                                            case 14:
-                                            case 15:
-                                            case 20:
-                                            case 21:
-                                            case 22:
-                                            case 24:
-                                            case 30:
-                                            case 32:
-                                            case 37:
-                                            case 39:
-                                            case 40:
-                                            case 41:
-                                            case 42:
-                                            case 45:
-                                            case 46:
-                                            case 47:
-                                            case 48:
-                                            case 49:
-                                            case 50:
-                                            case 51:
-                                            case 55:
-                                            case 56:
-                                            case 57:
-                                            case 58:
-                                            case 60:
-                                            case 7:
-                                            case 8:
-                                            case 9:
-                                            case 10:
-                                            case 11:
-                                            case 73:
-                                            case 74:
-                                            case 75:
-                                            case 76:
-                                            case 78:
-                                            case 79:
-                                            case 80:
-                                            case 81:
-                                            case 82:
-                                            case 83:
-                                            case 85:
-                                            case 87:
-                                            case 88:
-                                            case 101:
-                                            case 102:
-                                            case 103:
-                                            case 110:
-                                            case 112:
-                                            case 113:
-                                            case 121:
-                                            case 122:
-                                            case 129:
-                                            case 133:
-                                            case 165:
-                                            case 166:
-                                            case 169:
-                                            case 170:
-                                            case 172:
-                                            case 173:
-                                            case 174:
-                                            case 181:
-                                            case 182:
-                                            case 188:
-                                            case 189:
-                                            case 190:
-                                            case 191:
-                                            case 192: {
-                                                break;
-                                            }
-                                            case 54:
-                                            case 130:
-                                            case 142:
-                                            case 27:
-                                            case 137:
-                                            case 52:
-                                            case 154:
-                                            case 84:
-                                            case 25:
-                                            case 144:
-                                            case 138:
-                                            case 176:
-                                            case 177:
-                                            case 63:
-                                            case 68:
-                                            case 323:
-                                            case 117:
-                                            case 116:
-                                            case 28:
-                                            case 66:
-                                            case 157:
-                                            case 61:
-                                            case 62:
-                                            case 140:
-                                            case 146:
-                                            case 149:
-                                            case 150:
-                                            case 158:
-                                            case 23:
-                                            case 123:
-                                            case 124:
-                                            case 29:
-                                            case 33:
-                                            case 151:
-                                            case 178: {
-                                                // TODO implement fully
-                                                BlockState state = block.getState();
-                                                if (state != null) {
-                                                    StateWrapper wrapper = new StateWrapper(state);
-                                                    CompoundTag rawTag = wrapper.getTag();
-                                                    if (rawTag != null) {
-                                                        Map<String, Tag> values = new HashMap<String, Tag>();
-                                                        for (Entry<String, Tag> entry : rawTag.getValue().entrySet()) {
-                                                            values.put(entry.getKey(), entry.getValue());
-                                                        }
-                                                        values.put("id", new StringTag("id", wrapper.getId()));
-                                                        values.put("x", new IntTag("x", x));
-                                                        values.put("y", new IntTag("y", y));
-                                                        values.put("z", new IntTag("z", z));
-                                                        CompoundTag tileEntityTag = new CompoundTag(values);
-                                                        tileEntities.add(tileEntityTag);
-                                                    }
-                                                }
-                                            }
-                                            default: {
-                                                blockData[index] = block.getData();
-                                            }
-                                        }
-                                        // For optimization reasons, we are not supporting custom data types
-                                        // Especially since the most likely reason beyond  this range is modded servers in which the blocks have NBT
-//                                        if (id > 255) {
-//                                            if (addBlocks == null) {
-//                                                addBlocks = new byte[(blocks.length >> 1) + 1];
-//                                            }
-//                                            addBlocks[index >> 1] = (byte) (((index & 1) == 0) ? (addBlocks[index >> 1] & 0xF0) | ((id >> 8) & 0xF) : (addBlocks[index >> 1] & 0xF) | (((id >> 8) & 0xF) << 4));
-//                                        }
-                                        blocks[index] = (byte) id;
-                                    }
-                                }
-                            }
-
-                        }
-                        if (chunks.size() != 0) {
-                            TaskManager.runTaskLater(this, 1);
-                        } else {
-                            TaskManager.runTaskAsync(new Runnable() {
-                                @Override
-                                public void run() {
-                                    schematic.put("Blocks", new ByteArrayTag("Blocks", blocks));
-                                    schematic.put("Data", new ByteArrayTag("Data", blockData));
-                                    schematic.put("Entities", new ListTag("Entities", CompoundTag.class, new ArrayList<Tag>()));
-                                    schematic.put("TileEntities", new ListTag("TileEntities", CompoundTag.class, tileEntities));
-                                    whenDone.value = new CompoundTag("Schematic", schematic);
-                                    TaskManager.runTask(whenDone);
-                                    System.gc();
-                                    System.gc();
-                                }
-                            });
-                        }
-                    }
-                });
-            }
-        });
-    }
-}
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// PlotSquared - A plot manager and world generator for the Bukkit API                             /
+// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
+//                                                                                                 /
+// This program is free software; you can redistribute it and/or modify                            /
+// it under the terms of the GNU General Public License as published by                            /
+// the Free Software Foundation; either version 3 of the License, or                               /
+// (at your option) any later version.                                                             /
+//                                                                                                 /
+// This program is distributed in the hope that it will be useful,                                 /
+// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
+// GNU General Public License for more details.                                                    /
+//                                                                                                 /
+// You should have received a copy of the GNU General Public License                               /
+// along with this program; if not, write to the Free Software Foundation,                         /
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
+//                                                                                                 /
+// You can contact us via: support@intellectualsites.com                                           /
+////////////////////////////////////////////////////////////////////////////////////////////////////
+package com.plotsquared.bukkit.util;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.bukkit.Bukkit;
+import org.bukkit.Chunk;
+import org.bukkit.World;
+import org.bukkit.block.Block;
+import org.bukkit.block.BlockState;
+
+import com.intellectualcrafters.jnbt.ByteArrayTag;
+import com.intellectualcrafters.jnbt.CompoundTag;
+import com.intellectualcrafters.jnbt.IntTag;
+import com.intellectualcrafters.jnbt.ListTag;
+import com.intellectualcrafters.jnbt.ShortTag;
+import com.intellectualcrafters.jnbt.StringTag;
+import com.intellectualcrafters.jnbt.Tag;
+import com.intellectualcrafters.plot.object.ChunkLoc;
+import com.intellectualcrafters.plot.object.Location;
+import com.intellectualcrafters.plot.object.RunnableVal;
+import com.intellectualcrafters.plot.util.SchematicHandler;
+import com.intellectualcrafters.plot.util.TaskManager;
+import com.plotsquared.object.schematic.StateWrapper;
+
+/**
+ * Schematic Handler
+ *


+ */
+public class BukkitSchematicHandler extends SchematicHandler
+{
+
+    @Override
+    public void getCompoundTag(final String world, final Location pos1, final Location pos2, final RunnableVal<CompoundTag> whenDone)
+    {
+
+        // async
+        TaskManager.runTaskAsync(new Runnable()
+        {
+
+            @Override
+            public void run()
+            {
+                // Main positions
+                final int p1x = pos1.getX();
+                final int p1z = pos1.getZ();
+                final int p2x = pos2.getX();
+                final int p2z = pos2.getZ();
+                final int bcx = p1x >> 4;
+                final int bcz = p1z >> 4;
+                final int tcx = p2x >> 4;
+                final int tcz = p2z >> 4;
+                final int sy = pos1.getY();
+                final int ey = pos2.getY();
+
+                final int width = (pos2.getX() - pos1.getX()) + 1;
+                final int height = (pos2.getY() - pos1.getY()) + 1;
+                final int length = (pos2.getZ() - pos1.getZ()) + 1;
+
+                // Main Schematic tag
+                final HashMap<String, Tag> schematic = new HashMap<>();
+
+                schematic.put("Width", new ShortTag("Width", (short) width));
+                schematic.put("Length", new ShortTag("Length", (short) length));
+                schematic.put("Height", new ShortTag("Height", (short) height));
+                schematic.put("Materials", new StringTag("Materials", "Alpha"));
+                schematic.put("WEOriginX", new IntTag("WEOriginX", 0));
+                schematic.put("WEOriginY", new IntTag("WEOriginY", 0));
+                schematic.put("WEOriginZ", new IntTag("WEOriginZ", 0));
+                schematic.put("WEOffsetX", new IntTag("WEOffsetX", 0));
+                schematic.put("WEOffsetY", new IntTag("WEOffsetY", 0));
+                schematic.put("WEOffsetZ", new IntTag("WEOffsetZ", 0));
+
+                // Arrays of data types
+                final List<Tag> tileEntities = new ArrayList<Tag>();
+                final byte[] blocks = new byte[width * height * length];
+                final byte[] blockData = new byte[width * height * length];
+
+                // Generate list of chunks
+                final ArrayList<ChunkLoc> chunks = new ArrayList<ChunkLoc>();
+                for (int x = bcx; x <= tcx; x++)
+                {
+                    for (int z = bcz; z <= tcz; z++)
+                    {
+                        chunks.add(new ChunkLoc(x, z));
+                    }
+                }
+
+                final World worldObj = Bukkit.getWorld(world);
+                // Main thread
+                TaskManager.runTask(new Runnable()
+                {
+                    @Override
+                    public void run()
+                    {
+                        final long start = System.currentTimeMillis();
+                        while ((chunks.size() > 0) && ((System.currentTimeMillis() - start) < 20))
+                        {
+                            // save schematics
+                            final ChunkLoc chunk = chunks.remove(0);
+
+                            final Chunk bc = worldObj.getChunkAt(chunk.x, chunk.z);
+                            if (!bc.load(false))
+                            {
+                                continue;
+                            }
+
+                            final int X = chunk.x;
+                            final int Z = chunk.z;
+                            int xxb = X << 4;
+                            int zzb = Z << 4;
+                            int xxt = xxb + 15;
+                            int zzt = zzb + 15;
+
+                            if (X == bcx)
+                            {
+                                xxb = p1x;
+                            }
+                            if (X == tcx)
+                            {
+                                xxt = p2x;
+                            }
+                            if (Z == bcz)
+                            {
+                                zzb = p1z;
+                            }
+                            if (Z == tcz)
+                            {
+                                zzt = p2z;
+                            }
+                            for (int y = sy; y <= Math.min(255, ey); y++)
+                            {
+                                final int ry = y - sy;
+                                final int i1 = (ry * width * length);
+                                for (int z = zzb; z <= zzt; z++)
+                                {
+                                    final int rz = z - p1z;
+                                    final int i2 = i1 + (rz * width);
+                                    for (int x = xxb; x <= xxt; x++)
+                                    {
+                                        final int rx = x - p1x;
+                                        final int index = i2 + rx;
+                                        final Block block = worldObj.getBlockAt(x, y, z);
+                                        final int id = block.getTypeId();
+                                        switch (id)
+                                        {
+                                            case 0:
+                                            case 2:
+                                            case 4:
+                                            case 13:
+                                            case 14:
+                                            case 15:
+                                            case 20:
+                                            case 21:
+                                            case 22:
+                                            case 24:
+                                            case 30:
+                                            case 32:
+                                            case 37:
+                                            case 39:
+                                            case 40:
+                                            case 41:
+                                            case 42:
+                                            case 45:
+                                            case 46:
+                                            case 47:
+                                            case 48:
+                                            case 49:
+                                            case 50:
+                                            case 51:
+                                            case 55:
+                                            case 56:
+                                            case 57:
+                                            case 58:
+                                            case 60:
+                                            case 7:
+                                            case 8:
+                                            case 9:
+                                            case 10:
+                                            case 11:
+                                            case 73:
+                                            case 74:
+                                            case 75:
+                                            case 76:
+                                            case 78:
+                                            case 79:
+                                            case 80:
+                                            case 81:
+                                            case 82:
+                                            case 83:
+                                            case 85:
+                                            case 87:
+                                            case 88:
+                                            case 101:
+                                            case 102:
+                                            case 103:
+                                            case 110:
+                                            case 112:
+                                            case 113:
+                                            case 121:
+                                            case 122:
+                                            case 129:
+                                            case 133:
+                                            case 165:
+                                            case 166:
+                                            case 169:
+                                            case 170:
+                                            case 172:
+                                            case 173:
+                                            case 174:
+                                            case 181:
+                                            case 182:
+                                            case 188:
+                                            case 189:
+                                            case 190:
+                                            case 191:
+                                            case 192:
+                                            {
+                                                break;
+                                            }
+                                            case 54:
+                                            case 130:
+                                            case 142:
+                                            case 27:
+                                            case 137:
+                                            case 52:
+                                            case 154:
+                                            case 84:
+                                            case 25:
+                                            case 144:
+                                            case 138:
+                                            case 176:
+                                            case 177:
+                                            case 63:
+                                            case 68:
+                                            case 323:
+                                            case 117:
+                                            case 116:
+                                            case 28:
+                                            case 66:
+                                            case 157:
+                                            case 61:
+                                            case 62:
+                                            case 140:
+                                            case 146:
+                                            case 149:
+                                            case 150:
+                                            case 158:
+                                            case 23:
+                                            case 123:
+                                            case 124:
+                                            case 29:
+                                            case 33:
+                                            case 151:
+                                            case 178:
+                                            {
+                                                // TODO implement fully
+                                                final BlockState state = block.getState();
+                                                if (state != null)
+                                                {
+                                                    final StateWrapper wrapper = new StateWrapper(state);
+                                                    final CompoundTag rawTag = wrapper.getTag();
+                                                    if (rawTag != null)
+                                                    {
+                                                        final Map<String, Tag> values = new HashMap<String, Tag>();
+                                                        for (final Entry<String, Tag> entry : rawTag.getValue().entrySet())
+                                                        {
+                                                            values.put(entry.getKey(), entry.getValue());
+                                                        }
+                                                        values.put("id", new StringTag("id", wrapper.getId()));
+                                                        values.put("x", new IntTag("x", x));
+                                                        values.put("y", new IntTag("y", y));
+                                                        values.put("z", new IntTag("z", z));
+                                                        final CompoundTag tileEntityTag = new CompoundTag(values);
+                                                        tileEntities.add(tileEntityTag);
+                                                    }
+                                                }
+                                            }
+                                            default:
+                                            {
+                                                blockData[index] = block.getData();
+                                            }
+                                        }
+                                        // For optimization reasons, we are not supporting custom data types
+                                        // Especially since the most likely reason beyond  this range is modded servers in which the blocks have NBT
+                                        //                                        if (id > 255) {
+                                        //                                            if (addBlocks == null) {
+                                        //                                                addBlocks = new byte[(blocks.length >> 1) + 1];
+                                        //                                            }
+                                        //                                            addBlocks[index >> 1] = (byte) (((index & 1) == 0) ? (addBlocks[index >> 1] & 0xF0) | ((id >> 8) & 0xF) : (addBlocks[index >> 1] & 0xF) | (((id >> 8) & 0xF) << 4));
+                                        //                                        }
+                                        blocks[index] = (byte) id;
+                                    }
+                                }
+                            }
+
+                        }
+                        if (chunks.size() != 0)
+                        {
+                            TaskManager.runTaskLater(this, 1);
+                        }
+                        else
+                        {
+                            TaskManager.runTaskAsync(new Runnable()
+                            {
+                                @Override
+                                public void run()
+                                {
+                                    schematic.put("Blocks", new ByteArrayTag("Blocks", blocks));
+                                    schematic.put("Data", new ByteArrayTag("Data", blockData));
+                                    schematic.put("Entities", new ListTag("Entities", CompoundTag.class, new ArrayList<Tag>()));
+                                    schematic.put("TileEntities", new ListTag("TileEntities", CompoundTag.class, tileEntities));
+                                    whenDone.value = new CompoundTag("Schematic", schematic);
+                                    TaskManager.runTask(whenDone);
+                                    System.gc();
+                                    System.gc();
+                                }
+                            });
+                        }
+                    }
+                });
+            }
+        });
+    }
+}
diff --git a/src/main/java/com/plotsquared/bukkit/util/BukkitSetBlockManager.java b/src/main/java/com/plotsquared/bukkit/util/BukkitSetBlockManager.java
index b4346d127..66c625af4 100644
--- a/src/main/java/com/plotsquared/bukkit/util/BukkitSetBlockManager.java
+++ b/src/main/java/com/plotsquared/bukkit/util/BukkitSetBlockManager.java
@@ -9,18 +9,21 @@ import org.bukkit.World;
 import com.intellectualcrafters.plot.object.ChunkLoc;
 import com.intellectualcrafters.plot.util.BlockUpdateUtil;
 
-public abstract class BukkitSetBlockManager extends BlockUpdateUtil {
+public abstract class BukkitSetBlockManager extends BlockUpdateUtil
+{
     public static BukkitSetBlockManager setBlockManager = null;
 
     public abstract void set(final org.bukkit.World world, final int x, final int y, final int z, final int blockId, final byte data);
 
-    public abstract void update(Collection<Chunk> list);
+    public abstract void update(final Collection<Chunk> list);
 
     @Override
-    public void update(final String worldname, final Collection<ChunkLoc> chunkLocs) {
+    public void update(final String worldname, final Collection<ChunkLoc> chunkLocs)
+    {
         final World world = BukkitUtil.getWorld(worldname);
         final ArrayList<Chunk> chunks = new ArrayList<Chunk>();
-        for (final ChunkLoc loc : chunkLocs) {
+        for (final ChunkLoc loc : chunkLocs)
+        {
             chunks.add(world.getChunkAt(loc.x, loc.z));
         }
         setBlockManager.update(chunks);
diff --git a/src/main/java/com/plotsquared/bukkit/util/BukkitSetupUtils.java b/src/main/java/com/plotsquared/bukkit/util/BukkitSetupUtils.java
index 22c0fc5d3..6cd593765 100644
--- a/src/main/java/com/plotsquared/bukkit/util/BukkitSetupUtils.java
+++ b/src/main/java/com/plotsquared/bukkit/util/BukkitSetupUtils.java
@@ -23,126 +23,136 @@ import com.plotsquared.bukkit.generator.AugmentedPopulator;
 import com.plotsquared.bukkit.generator.BukkitGeneratorWrapper;
 import com.plotsquared.bukkit.generator.BukkitPlotGenerator;
 
-public class BukkitSetupUtils extends SetupUtils {
-    
+public class BukkitSetupUtils extends SetupUtils
+{
+
     @Override
-    public void updateGenerators() {
-        if (SetupUtils.generators.size() > 0) {
-            return;
-        }
+    public void updateGenerators()
+    {
+        if (SetupUtils.generators.size() > 0) { return; }
         final String testWorld = "CheckingPlotSquaredGenerator";
-        for (final Plugin plugin : Bukkit.getPluginManager().getPlugins()) {
-            if (plugin.isEnabled()) {
+        for (final Plugin plugin : Bukkit.getPluginManager().getPlugins())
+        {
+            if (plugin.isEnabled())
+            {
                 final ChunkGenerator generator = plugin.getDefaultWorldGenerator(testWorld, "");
-                if (generator != null) {
+                if (generator != null)
+                {
                     PS.get().removePlotWorld(testWorld);
                     final String name = plugin.getDescription().getName();
-                            SetupUtils.generators.put(name, new BukkitGeneratorWrapper("CheckingPlotSquaredGenerator", generator));
+                    SetupUtils.generators.put(name, new BukkitGeneratorWrapper("CheckingPlotSquaredGenerator", generator));
                 }
             }
         }
     }
-    
+
     @Override
-    public String setupWorld(final SetupObject object) {
+    public String setupWorld(final SetupObject object)
+    {
         SetupUtils.manager.updateGenerators();
         final ConfigurationNode[] steps = object.step;
         final String world = object.world;
-        for (final ConfigurationNode step : steps) {
+        for (final ConfigurationNode step : steps)
+        {
             PS.get().config.set("worlds." + world + "." + step.getConstant(), step.getValue());
         }
-        if (object.type != 0) {
+        if (object.type != 0)
+        {
             PS.get().config.set("worlds." + world + "." + "generator.type", object.type);
             PS.get().config.set("worlds." + world + "." + "generator.terrain", object.terrain);
             PS.get().config.set("worlds." + world + "." + "generator.plugin", object.plotManager);
-            if (object.setupGenerator != null && !object.setupGenerator.equals(object.plotManager)) {
+            if ((object.setupGenerator != null) && !object.setupGenerator.equals(object.plotManager))
+            {
                 PS.get().config.set("worlds." + world + "." + "generator.init", object.setupGenerator);
             }
-            PlotGenerator<ChunkGenerator> gen = (PlotGenerator<ChunkGenerator>) generators.get(object.setupGenerator);
-            if (gen != null && gen.generator instanceof BukkitPlotGenerator) {
+            final PlotGenerator<ChunkGenerator> gen = (PlotGenerator<ChunkGenerator>) generators.get(object.setupGenerator);
+            if ((gen != null) && (gen.generator instanceof BukkitPlotGenerator))
+            {
                 object.setupGenerator = null;
             }
         }
-        try {
+        try
+        {
             PS.get().config.save(PS.get().configFile);
-        } catch (final IOException e) {
+        }
+        catch (final IOException e)
+        {
             e.printStackTrace();
         }
-        if (object.setupGenerator != null) {
-            if ((Bukkit.getPluginManager().getPlugin("Multiverse-Core") != null) && Bukkit.getPluginManager().getPlugin("Multiverse-Core").isEnabled()) {
+        if (object.setupGenerator != null)
+        {
+            if ((Bukkit.getPluginManager().getPlugin("Multiverse-Core") != null) && Bukkit.getPluginManager().getPlugin("Multiverse-Core").isEnabled())
+            {
                 Bukkit.getServer().dispatchCommand(Bukkit.getServer().getConsoleSender(), "mv create " + world + " normal -g " + object.setupGenerator);
                 setGenerator(world, object.setupGenerator);
-                if (Bukkit.getWorld(world) != null) {
-                    return world;
-                }
+                if (Bukkit.getWorld(world) != null) { return world; }
             }
-            if ((Bukkit.getPluginManager().getPlugin("MultiWorld") != null) && Bukkit.getPluginManager().getPlugin("MultiWorld").isEnabled()) {
+            if ((Bukkit.getPluginManager().getPlugin("MultiWorld") != null) && Bukkit.getPluginManager().getPlugin("MultiWorld").isEnabled())
+            {
                 Bukkit.getServer().dispatchCommand(Bukkit.getServer().getConsoleSender(), "mw create " + world + " plugin:" + object.setupGenerator);
                 setGenerator(world, object.setupGenerator);
-                if (Bukkit.getWorld(world) != null) {
-                    return world;
-                }
+                if (Bukkit.getWorld(world) != null) { return world; }
             }
             final WorldCreator wc = new WorldCreator(object.world);
             wc.generator(object.setupGenerator);
             wc.environment(Environment.NORMAL);
             Bukkit.createWorld(wc);
             setGenerator(world, object.setupGenerator);
-        } else {
-            if ((Bukkit.getPluginManager().getPlugin("Multiverse-Core") != null) && Bukkit.getPluginManager().getPlugin("Multiverse-Core").isEnabled()) {
+        }
+        else
+        {
+            if ((Bukkit.getPluginManager().getPlugin("Multiverse-Core") != null) && Bukkit.getPluginManager().getPlugin("Multiverse-Core").isEnabled())
+            {
                 Bukkit.getServer().dispatchCommand(Bukkit.getServer().getConsoleSender(), "mv create " + world + " normal");
-                if (Bukkit.getWorld(world) != null) {
-                    return world;
-                }
+                if (Bukkit.getWorld(world) != null) { return world; }
             }
-            if ((Bukkit.getPluginManager().getPlugin("MultiWorld") != null) && Bukkit.getPluginManager().getPlugin("MultiWorld").isEnabled()) {
+            if ((Bukkit.getPluginManager().getPlugin("MultiWorld") != null) && Bukkit.getPluginManager().getPlugin("MultiWorld").isEnabled())
+            {
                 Bukkit.getServer().dispatchCommand(Bukkit.getServer().getConsoleSender(), "mw create " + world);
-                if (Bukkit.getWorld(world) != null) {
-                    return world;
-                }
+                if (Bukkit.getWorld(world) != null) { return world; }
             }
             Bukkit.createWorld(new WorldCreator(object.world).environment(World.Environment.NORMAL));
         }
         return object.world;
     }
-    
-    public void setGenerator(String world, String generator) {
-        if (Bukkit.getWorlds().size() == 0 || !Bukkit.getWorlds().get(0).getName().equals(world)) {
-            return;
-        }
-        File file = new File("bukkit.yml").getAbsoluteFile();
-        YamlConfiguration yml = YamlConfiguration.loadConfiguration(file);
+
+    public void setGenerator(final String world, final String generator)
+    {
+        if ((Bukkit.getWorlds().size() == 0) || !Bukkit.getWorlds().get(0).getName().equals(world)) { return; }
+        final File file = new File("bukkit.yml").getAbsoluteFile();
+        final YamlConfiguration yml = YamlConfiguration.loadConfiguration(file);
         yml.set("worlds." + world + ".generator", generator);
-        try {
+        try
+        {
             yml.save(file);
-        } catch (IOException e) {
+        }
+        catch (final IOException e)
+        {
             e.printStackTrace();
         }
     }
 
     @Override
-    public String getGenerator(PlotWorld plotworld) {
-        if (SetupUtils.generators.size() == 0) {
+    public String getGenerator(final PlotWorld plotworld)
+    {
+        if (SetupUtils.generators.size() == 0)
+        {
             updateGenerators();
         }
-        World world = Bukkit.getWorld(plotworld.worldname);
-        if (world == null) {
-            return null;
-        }
-        ChunkGenerator generator = world.getGenerator();
-        if (!(generator instanceof BukkitPlotGenerator)) {
-            return null;
-        }
-        for (Entry<String, PlotGenerator<?>> entry : generators.entrySet()) {
-            if (entry.getValue().generator.getClass().getName().equals(generator.getClass().getName())) {
-                return entry.getKey();
-            }
+        final World world = Bukkit.getWorld(plotworld.worldname);
+        if (world == null) { return null; }
+        final ChunkGenerator generator = world.getGenerator();
+        if (!(generator instanceof BukkitPlotGenerator)) { return null; }
+        for (final Entry<String, PlotGenerator<?>> entry : generators.entrySet())
+        {
+            if (entry.getValue().generator.getClass().getName().equals(generator.getClass().getName())) { return entry.getKey(); }
         }
         return null;
     }
 
     @Override
-    public void removePopulator(String world, PlotCluster cluster) {
+    public void removePopulator(final String world, final PlotCluster cluster)
+    {
         AugmentedPopulator.removePopulator(world, cluster);
     }
 }
diff --git a/src/main/java/com/plotsquared/bukkit/util/BukkitTaskManager.java b/src/main/java/com/plotsquared/bukkit/util/BukkitTaskManager.java
index a7812275c..55a5fac93 100644
--- a/src/main/java/com/plotsquared/bukkit/util/BukkitTaskManager.java
+++ b/src/main/java/com/plotsquared/bukkit/util/BukkitTaskManager.java
@@ -5,40 +5,49 @@ import org.bukkit.Bukkit;
 import com.intellectualcrafters.plot.util.TaskManager;
 import com.plotsquared.bukkit.BukkitMain;
 
-public class BukkitTaskManager extends TaskManager {
+public class BukkitTaskManager extends TaskManager
+{
     @Override
-    public int taskRepeat(final Runnable r, final int interval) {
+    public int taskRepeat(final Runnable r, final int interval)
+    {
         return BukkitMain.THIS.getServer().getScheduler().scheduleSyncRepeatingTask(BukkitMain.THIS, r, interval, interval);
     }
-    
+
     @Override
-    public int taskRepeatAsync(final Runnable r, final int interval) {
+    public int taskRepeatAsync(final Runnable r, final int interval)
+    {
         return BukkitMain.THIS.getServer().getScheduler().scheduleAsyncRepeatingTask(BukkitMain.THIS, r, interval, interval);
     }
 
     @Override
-    public void taskAsync(final Runnable r) {
+    public void taskAsync(final Runnable r)
+    {
         BukkitMain.THIS.getServer().getScheduler().runTaskAsynchronously(BukkitMain.THIS, r).getTaskId();
     }
 
     @Override
-    public void task(final Runnable r) {
+    public void task(final Runnable r)
+    {
         BukkitMain.THIS.getServer().getScheduler().runTask(BukkitMain.THIS, r).getTaskId();
     }
 
     @Override
-    public void taskLater(final Runnable r, final int delay) {
+    public void taskLater(final Runnable r, final int delay)
+    {
         BukkitMain.THIS.getServer().getScheduler().runTaskLater(BukkitMain.THIS, r, delay).getTaskId();
     }
 
     @Override
-    public void taskLaterAsync(final Runnable r, final int delay) {
+    public void taskLaterAsync(final Runnable r, final int delay)
+    {
         BukkitMain.THIS.getServer().getScheduler().runTaskLaterAsynchronously(BukkitMain.THIS, r, delay);
     }
-    
+
     @Override
-    public void cancelTask(final int task) {
-        if (task != -1) {
+    public void cancelTask(final int task)
+    {
+        if (task != -1)
+        {
             Bukkit.getScheduler().cancelTask(task);
         }
     }
diff --git a/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java b/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java
index d2c1fdf58..69acc0faf 100644
--- a/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java
+++ b/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java
@@ -1,7 +1,6 @@
 package com.plotsquared.bukkit.util;
 
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.List;
 
 import org.bukkit.Bukkit;
@@ -35,189 +34,204 @@ import com.intellectualcrafters.plot.util.StringMan;
 import com.intellectualcrafters.plot.util.UUIDHandler;
 import com.plotsquared.bukkit.object.BukkitPlayer;
 
-public class BukkitUtil extends BlockManager {
+public class BukkitUtil extends BlockManager
+{
     private static String lastString = null;
     private static World lastWorld = null;
 
     private static Player lastPlayer = null;
     private static PlotPlayer lastPlotPlayer = null;
 
-    public static void removePlayer(final String plr) {
+    public static void removePlayer(final String plr)
+    {
         lastPlayer = null;
         lastPlotPlayer = null;
         UUIDHandler.getPlayers().remove(plr);
     }
-    
-      // These weren't being used, but they might be useful later, so I'm just commenting them out
-//    private static int getMaxHeight(final String world) {
-//        return getWorld(world).getMaxHeight();
-//    }
-//
-//    private static void unloadChunkAt(String worldname, int X, int Z, boolean save, boolean safe) {
-//        final World world = getWorld(worldname);
-//        world.unloadChunk(X, Z, save, safe);
-//    }
-//    
-//    private static void loadChunkAt(final String worldname, int X, int Z, boolean force) {
-//        final World world = getWorld(worldname);
-//        world.loadChunk(X, Z, force);
-//    }
-//    
-//    private static Chunk getChunkAt(final String worldname, final int x, final int z) {
-//        final World world = getWorld(worldname);
-//        return world.getChunkAt(x, z);
-//    }
-//    
-//    private static void teleportPlayer(final Player player, final Location loc) {
-//        final org.bukkit.Location bukkitLoc = new org.bukkit.Location(getWorld(loc.getWorld()), loc.getX(), loc.getY(), loc.getZ());
-//        player.teleport(bukkitLoc);
-//    }
-//    
-//    private static void setBiome(final String worldname, final int pos1_x, final int pos1_z, final int pos2_x, final int pos2_z, final String biome) {
-//        final Biome b = Biome.valueOf(biome.toUpperCase());
-//        final World world = getWorld(worldname);
-//        for (int x = pos1_x; x <= pos2_x; x++) {
-//            for (int z = pos1_z; z <= pos2_z; z++) {
-//                if (world.getBiome(x, z) == b) {
-//                    continue;
-//                }
-//                world.setBiome(x, z, b);
-//            }
-//        }
-//    }
-//    
-//    private static void refreshChunk(final String name, final int x, final int z) {
-//        World world = getWorld(name);
-//        world.refreshChunk(x, z);
-//        world.loadChunk(x, z);
-//    }
-//
-//    private static void regenerateChunk(final String world, final int x, final int z) {
-//        World worldObj = getWorld(world);
-//        Chunk chunk = worldObj.getChunkAt(x, z);
-//        if (chunk.isLoaded() || chunk.load(false)) {
-//            ChunkManager.manager.regenerateChunk(world, new ChunkLoc(x, z));
-//        }
-//    }
-//    
-//    private static Location getLocationFull(final org.bukkit.Location loc) {
-//        final String world = loc.getWorld().getName();
-//        return new Location(world, loc.getBlockX(), loc.getBlockY(), loc.getBlockZ(), loc.getYaw(), loc.getPitch());
-//    }
-//    
-//    private static int getViewDistance() {
-//        return Bukkit.getViewDistance();
-//    }
+
+    // These weren't being used, but they might be useful later, so I'm just commenting them out
+    //    private static int getMaxHeight(final String world) {
+    //        return getWorld(world).getMaxHeight();
+    //    }
+    //
+    //    private static void unloadChunkAt(String worldname, int X, int Z, boolean save, boolean safe) {
+    //        final World world = getWorld(worldname);
+    //        world.unloadChunk(X, Z, save, safe);
+    //    }
+    //
+    //    private static void loadChunkAt(final String worldname, int X, int Z, boolean force) {
+    //        final World world = getWorld(worldname);
+    //        world.loadChunk(X, Z, force);
+    //    }
+    //
+    //    private static Chunk getChunkAt(final String worldname, final int x, final int z) {
+    //        final World world = getWorld(worldname);
+    //        return world.getChunkAt(x, z);
+    //    }
+    //
+    //    private static void teleportPlayer(final Player player, final Location loc) {
+    //        final org.bukkit.Location bukkitLoc = new org.bukkit.Location(getWorld(loc.getWorld()), loc.getX(), loc.getY(), loc.getZ());
+    //        player.teleport(bukkitLoc);
+    //    }
+    //
+    //    private static void setBiome(final String worldname, final int pos1_x, final int pos1_z, final int pos2_x, final int pos2_z, final String biome) {
+    //        final Biome b = Biome.valueOf(biome.toUpperCase());
+    //        final World world = getWorld(worldname);
+    //        for (int x = pos1_x; x <= pos2_x; x++) {
+    //            for (int z = pos1_z; z <= pos2_z; z++) {
+    //                if (world.getBiome(x, z) == b) {
+    //                    continue;
+    //                }
+    //                world.setBiome(x, z, b);
+    //            }
+    //        }
+    //    }
+    //
+    //    private static void refreshChunk(final String name, final int x, final int z) {
+    //        World world = getWorld(name);
+    //        world.refreshChunk(x, z);
+    //        world.loadChunk(x, z);
+    //    }
+    //
+    //    private static void regenerateChunk(final String world, final int x, final int z) {
+    //        World worldObj = getWorld(world);
+    //        Chunk chunk = worldObj.getChunkAt(x, z);
+    //        if (chunk.isLoaded() || chunk.load(false)) {
+    //            ChunkManager.manager.regenerateChunk(world, new ChunkLoc(x, z));
+    //        }
+    //    }
+    //
+    //    private static Location getLocationFull(final org.bukkit.Location loc) {
+    //        final String world = loc.getWorld().getName();
+    //        return new Location(world, loc.getBlockX(), loc.getBlockY(), loc.getBlockZ(), loc.getYaw(), loc.getPitch());
+    //    }
+    //
+    //    private static int getViewDistance() {
+    //        return Bukkit.getViewDistance();
+    //    }
 
     ////////////////////////////////////////////////////////////////////////
     /////////////////// USED BY EVENT SYSTEM AND SUCH //////////////////////
     ////////////////////////////////////////////////////////////////////////
-    public static PlotPlayer getPlayer(final OfflinePlayer op) {
-        if (op.isOnline()) {
-            return getPlayer(op.getPlayer());
-        }
-        Player player = OfflinePlayerUtil.loadPlayer(op);
+    public static PlotPlayer getPlayer(final OfflinePlayer op)
+    {
+        if (op.isOnline()) { return getPlayer(op.getPlayer()); }
+        final Player player = OfflinePlayerUtil.loadPlayer(op);
         player.loadData();
         return new BukkitPlayer(player, true);
     }
-    
-    public static PlotPlayer getPlayer(final Player player) {
-        if (player == lastPlayer) {
-            return lastPlotPlayer;
-        }
-        String name = player.getName();
-        PlotPlayer pp = UUIDHandler.getPlayers().get(name);
-        if (pp != null) {
-            return pp;
-        }
+
+    public static PlotPlayer getPlayer(final Player player)
+    {
+        if (player == lastPlayer) { return lastPlotPlayer; }
+        final String name = player.getName();
+        final PlotPlayer pp = UUIDHandler.getPlayers().get(name);
+        if (pp != null) { return pp; }
         lastPlotPlayer = new BukkitPlayer(player);
         UUIDHandler.getPlayers().put(name, lastPlotPlayer);
         lastPlayer = player;
         return lastPlotPlayer;
     }
 
-    public static Location getLocation(final org.bukkit.Location loc) {
+    public static Location getLocation(final org.bukkit.Location loc)
+    {
         return new Location(loc.getWorld().getName(), MathMan.roundInt(loc.getX()), MathMan.roundInt(loc.getY()), MathMan.roundInt(loc.getZ()));
     }
-    
-    public static org.bukkit.Location getLocation(final Location loc) {
+
+    public static org.bukkit.Location getLocation(final Location loc)
+    {
         return new org.bukkit.Location(getWorld(loc.getWorld()), loc.getX(), loc.getY(), loc.getZ());
     }
 
-    public static World getWorld(final String string) {
-        if (StringMan.isEqual(string, lastString)) {
-            if (lastWorld != null) {
-                return lastWorld;
-            }
+    public static World getWorld(final String string)
+    {
+        if (StringMan.isEqual(string, lastString))
+        {
+            if (lastWorld != null) { return lastWorld; }
         }
-        World world = Bukkit.getWorld(string);
+        final World world = Bukkit.getWorld(string);
         lastString = string;
         lastWorld = world;
         return world;
     }
 
-    public static String getWorld(final Entity entity) {
+    public static String getWorld(final Entity entity)
+    {
         return entity.getWorld().getName();
     }
 
-    public static List<Entity> getEntities(final String worldname) {
+    public static List<Entity> getEntities(final String worldname)
+    {
         return getWorld(worldname).getEntities();
     }
-    
-    public static Location getLocation(final Entity entity) {
+
+    public static Location getLocation(final Entity entity)
+    {
         final org.bukkit.Location loc = entity.getLocation();
         final String world = loc.getWorld().getName();
         return new Location(world, loc.getBlockX(), loc.getBlockY(), loc.getBlockZ());
     }
-    
-    public static Location getLocationFull(final Entity entity) {
-        org.bukkit.Location loc = entity.getLocation();
+
+    public static Location getLocationFull(final Entity entity)
+    {
+        final org.bukkit.Location loc = entity.getLocation();
         return new Location(loc.getWorld().getName(), MathMan.roundInt(loc.getX()), MathMan.roundInt(loc.getY()), MathMan.roundInt(loc.getZ()), loc.getYaw(), loc.getPitch());
     }
+
     ////////////////////////////////////////////////////////////////////////
 
-    
     ////////////////////////////////////////////////////////////////////////
     ////////////////////// CLASS ONLY METHODS //////////////////////////////
     ////////////////////////////////////////////////////////////////////////
-    private static void setBlock(final World world, final int x, final int y, final int z, final int id, final byte data) {
-        try {
+    private static void setBlock(final World world, final int x, final int y, final int z, final int id, final byte data)
+    {
+        try
+        {
             BukkitSetBlockManager.setBlockManager.set(world, x, y, z, id, data);
-        } catch (final Throwable e) {
+        }
+        catch (final Throwable e)
+        {
             BukkitSetBlockManager.setBlockManager = new SetBlockSlow();
             BukkitSetBlockManager.setBlockManager.set(world, x, y, z, id, data);
         }
     }
-    
+
     ////////////////////////////////////////////////////////////////////////
 
     @Override
-    public boolean isWorld(final String world) {
+    public boolean isWorld(final String world)
+    {
         return getWorld(world) != null;
     }
-    
+
     @Override
-    public String getBiome(String world, int x, int z) {
+    public String getBiome(final String world, final int x, final int z)
+    {
         return getWorld(world).getBiome(x, z).name();
     }
 
     @Override
-    public void functionSetBlocks(final String worldname, final int[] x, final int[] y, final int[] z, final int[] id, final byte[] data) {
+    public void functionSetBlocks(final String worldname, final int[] x, final int[] y, final int[] z, final int[] id, final byte[] data)
+    {
         final World world = getWorld(worldname);
-        for (int i = 0; i < x.length; i++) {
+        for (int i = 0; i < x.length; i++)
+        {
             BukkitUtil.setBlock(world, x[i], y[i], z[i], id[i], data[i]);
         }
     }
 
     @Override
-    public void functionSetSign(final String worldname, final int x, final int y, final int z, final String[] lines) {
+    public void functionSetSign(final String worldname, final int x, final int y, final int z, final String[] lines)
+    {
         final World world = getWorld(worldname);
         final Block block = world.getBlockAt(x, y, z);
         block.setType(Material.AIR);
         block.setTypeIdAndData(Material.WALL_SIGN.getId(), (byte) 2, false);
         final BlockState blockstate = block.getState();
-        if ((blockstate instanceof Sign)) {
-            for (int i = 0; i < lines.length; i++) {
+        if ((blockstate instanceof Sign))
+        {
+            for (int i = 0; i < lines.length; i++)
+            {
                 ((Sign) blockstate).setLine(i, lines[i]);
             }
             ((Sign) blockstate).update(true);
@@ -225,107 +239,129 @@ public class BukkitUtil extends BlockManager {
     }
 
     @Override
-    public void functionSetBiomes(final String worldname, final int[] x, final int[] z, final String biomeStr) {
+    public void functionSetBiomes(final String worldname, final int[] x, final int[] z, final String biomeStr)
+    {
         final World world = getWorld(worldname);
         final Biome biome = Biome.valueOf(biomeStr.toUpperCase());
-        for (int i = 0; i < x.length; i++) {
+        for (int i = 0; i < x.length; i++)
+        {
             world.setBiome(x[i], z[i], biome);
         }
     }
-    
+
     @Override
-    public void functionSetBlock(final String worldname, final int x, final int y, final int z, final int id, final byte data) {
+    public void functionSetBlock(final String worldname, final int x, final int y, final int z, final int id, final byte data)
+    {
         BukkitUtil.setBlock(getWorld(worldname), x, y, z, id, data);
     }
-    
+
     @Override
-    public String[] getSign(final Location loc) {
+    public String[] getSign(final Location loc)
+    {
         final Block block = getWorld(loc.getWorld()).getBlockAt(loc.getX(), loc.getY(), loc.getZ());
-        if (block != null) {
-            if (block.getState() instanceof Sign) {
+        if (block != null)
+        {
+            if (block.getState() instanceof Sign)
+            {
                 final Sign sign = (Sign) block.getState();
                 return sign.getLines();
             }
         }
         return null;
     }
-    
+
     @Override
-    public Location getSpawn(final String world) {
+    public Location getSpawn(final String world)
+    {
         final org.bukkit.Location temp = getWorld(world).getSpawnLocation();
         return new Location(world, temp.getBlockX(), temp.getBlockY(), temp.getBlockZ(), temp.getYaw(), temp.getPitch());
     }
-    
+
     @Override
-    public int getHeighestBlock(String world, int x, int z) {
+    public int getHeighestBlock(final String world, final int x, final int z)
+    {
         return getWorld(world).getHighestBlockAt(x, z).getY();
     }
-    
+
     @Override
-    public int getBiomeFromString(final String biomeStr) {
-        try {
+    public int getBiomeFromString(final String biomeStr)
+    {
+        try
+        {
             final Biome biome = Biome.valueOf(biomeStr.toUpperCase());
-            if (biome == null) {
-                return -1;
-            }
+            if (biome == null) { return -1; }
             return Arrays.asList(Biome.values()).indexOf(biome);
         }
-        catch (IllegalArgumentException e) {
+        catch (final IllegalArgumentException e)
+        {
             return -1;
         }
     }
-    
+
     @Override
-    public String[] getBiomeList() {
+    public String[] getBiomeList()
+    {
         final Biome[] biomes = Biome.values();
         final String[] list = new String[biomes.length];
-        for (int i = 0; i < biomes.length; i++) {
+        for (int i = 0; i < biomes.length; i++)
+        {
             list[i] = biomes[i].name();
         }
         return list;
     }
-    
+
     @Override
-    public PlotBlock getPlotBlockFromString(final String block) {
+    public PlotBlock getPlotBlockFromString(final String block)
+    {
         final Material material = Material.valueOf(block.toUpperCase());
-        if (material == null) {
-            return new PlotBlock((short) -1, (byte) 0);
-        }
+        if (material == null) { return new PlotBlock((short) -1, (byte) 0); }
         return new PlotBlock((short) material.getId(), (byte) 0);
     }
 
     @Override
-    public boolean addItems(String worldname, PlotItem items) {
-        World world = getWorld(worldname);
-        Block block = world.getBlockAt(items.x, items.y, items.z);
-        if (block == null) {
-            return false;
-        }
-        BlockState state = block.getState();
-        if (state != null && state instanceof InventoryHolder) {
-            InventoryHolder holder = ((InventoryHolder) state);
-            Inventory inv = holder.getInventory();
-            for (int i = 0; i < items.id.length; i++) {
-                ItemStack item = new ItemStack(items.id[i], items.amount[i], items.data[i]);
+    public boolean addItems(final String worldname, final PlotItem items)
+    {
+        final World world = getWorld(worldname);
+        final Block block = world.getBlockAt(items.x, items.y, items.z);
+        if (block == null) { return false; }
+        final BlockState state = block.getState();
+        if ((state != null) && (state instanceof InventoryHolder))
+        {
+            final InventoryHolder holder = ((InventoryHolder) state);
+            final Inventory inv = holder.getInventory();
+            for (int i = 0; i < items.id.length; i++)
+            {
+                final ItemStack item = new ItemStack(items.id[i], items.amount[i], items.data[i]);
                 inv.addItem(item);
             }
             state.update(true);
             return true;
         }
         return false;
-        
+
     }
 
     @Override
-    public boolean isBlockSolid(PlotBlock block) {
-        try {
-            Material material = Material.getMaterial(block.id);
-            if (material.isBlock() && material.isSolid() && !material.hasGravity()) {
-                Class<? extends MaterialData> data = material.getData();
-                if ((data.equals(MaterialData.class) && !material.isTransparent() && material.isOccluding()) || data.equals(Tree.class) || data.equals(Sandstone.class) || data.equals(Wool.class) || data.equals(Step.class) || data.equals(WoodenStep.class)) {
-                    switch (material) {
+    public boolean isBlockSolid(final PlotBlock block)
+    {
+        try
+        {
+            final Material material = Material.getMaterial(block.id);
+            if (material.isBlock() && material.isSolid() && !material.hasGravity())
+            {
+                final Class<? extends MaterialData> data = material.getData();
+                if ((data.equals(MaterialData.class) && !material.isTransparent() && material.isOccluding())
+                || data.equals(Tree.class)
+                || data.equals(Sandstone.class)
+                || data.equals(Wool.class)
+                || data.equals(Step.class)
+                || data.equals(WoodenStep.class))
+                {
+                    switch (material)
+                    {
                         case NOTE_BLOCK:
-                        case MOB_SPAWNER: {
+                        case MOB_SPAWNER:
+                        {
                             return false;
                         }
                         default:
@@ -335,60 +371,70 @@ public class BukkitUtil extends BlockManager {
             }
             return false;
         }
-        catch (Exception e) {
+        catch (final Exception e)
+        {
             return false;
         }
     }
-    
+
     @Override
-    public String getClosestMatchingName(PlotBlock block) {
-        try {
+    public String getClosestMatchingName(final PlotBlock block)
+    {
+        try
+        {
             return Material.getMaterial(block.id).name();
         }
-        catch (Exception e) {
+        catch (final Exception e)
+        {
             return null;
         }
     }
-    
+
     @Override
-    public StringComparison<PlotBlock>.ComparisonResult getClosestBlock(String name) {
-        try {
+    public StringComparison<PlotBlock>.ComparisonResult getClosestBlock(String name)
+    {
+        try
+        {
             double match;
             short id;
             byte data;
-            String[] split = name.split(":");
-            if (split.length == 2) {
+            final String[] split = name.split(":");
+            if (split.length == 2)
+            {
                 data = Byte.parseByte(split[1]);
                 name = split[0];
             }
-            else {
+            else
+            {
                 data = 0;
             }
-            if (MathMan.isInteger(split[0])) {
+            if (MathMan.isInteger(split[0]))
+            {
                 id = Short.parseShort(split[0]);
                 match = 0;
             }
-            else {
-                StringComparison<Material>.ComparisonResult comparison = new StringComparison<Material>(name, Material.values()).getBestMatchAdvanced();
+            else
+            {
+                final StringComparison<Material>.ComparisonResult comparison = new StringComparison<Material>(name, Material.values()).getBestMatchAdvanced();
                 match = comparison.match;
-                id = (short) comparison.best.getId(); 
+                id = (short) comparison.best.getId();
             }
-            PlotBlock block = new PlotBlock(id, data);
-            StringComparison<PlotBlock> outer = new StringComparison<PlotBlock>();
+            final PlotBlock block = new PlotBlock(id, data);
+            final StringComparison<PlotBlock> outer = new StringComparison<PlotBlock>();
             return outer.new ComparisonResult(match, block);
-            
+
         }
-        catch (Exception e) {}
+        catch (final Exception e)
+        {}
         return null;
     }
 
     @Override
-    public PlotBlock getBlock(Location loc) {
+    public PlotBlock getBlock(final Location loc)
+    {
         final World world = getWorld(loc.getWorld());
         final Block block = world.getBlockAt(loc.getX(), loc.getY(), loc.getZ());
-        if (block == null) {
-            return new PlotBlock((short) 0, (byte) 0);
-        }
+        if (block == null) { return new PlotBlock((short) 0, (byte) 0); }
         return new PlotBlock((short) block.getTypeId(), block.getData());
     }
 }
diff --git a/src/main/java/com/plotsquared/bukkit/util/Metrics.java b/src/main/java/com/plotsquared/bukkit/util/Metrics.java
index 1d24aeb90..c903c957d 100644
--- a/src/main/java/com/plotsquared/bukkit/util/Metrics.java
+++ b/src/main/java/com/plotsquared/bukkit/util/Metrics.java
@@ -51,7 +51,8 @@ import com.intellectualcrafters.configuration.InvalidConfigurationException;
 import com.intellectualcrafters.configuration.file.YamlConfiguration;
 import com.intellectualcrafters.plot.PS;
 
-public class Metrics {
+public class Metrics
+{
     /**
      * The current revision number
      */
@@ -101,26 +102,26 @@ public class Metrics {
      */
     private volatile BukkitTask task = null;
 
-    public Metrics(final Plugin plugin) throws IOException {
-        if (plugin == null) {
-            throw new IllegalArgumentException("Plugin cannot be null");
-        }
+    public Metrics(final Plugin plugin) throws IOException
+    {
+        if (plugin == null) { throw new IllegalArgumentException("Plugin cannot be null"); }
         this.plugin = plugin;
         // load the config
-        this.configurationFile = getConfigFile();
-        this.configuration = YamlConfiguration.loadConfiguration(this.configurationFile);
+        configurationFile = getConfigFile();
+        configuration = YamlConfiguration.loadConfiguration(configurationFile);
         // add some defaults
-        this.configuration.addDefault("opt-out", false);
-        this.configuration.addDefault("guid", UUID.randomUUID().toString());
-        this.configuration.addDefault("debug", false);
+        configuration.addDefault("opt-out", false);
+        configuration.addDefault("guid", UUID.randomUUID().toString());
+        configuration.addDefault("debug", false);
         // Do we need to create the file?
-        if (this.configuration.get("guid", null) == null) {
-            this.configuration.options().header("http://mcstats.org").copyDefaults(true);
-            this.configuration.save(this.configurationFile);
+        if (configuration.get("guid", null) == null)
+        {
+            configuration.options().header("http://mcstats.org").copyDefaults(true);
+            configuration.save(configurationFile);
         }
         // Load the guid then
-        this.guid = this.configuration.getString("guid");
-        this.debug = this.configuration.getBoolean("debug", false);
+        guid = configuration.getString("guid");
+        debug = configuration.getBoolean("debug", false);
     }
 
     /**
@@ -130,20 +131,29 @@ public class Metrics {
      *
      * @return byte[] the file as a byte array
      */
-    public static byte[] gzip(final String input) {
+    public static byte[] gzip(final String input)
+    {
         final ByteArrayOutputStream baos = new ByteArrayOutputStream();
         GZIPOutputStream gzos = null;
-        try {
+        try
+        {
             gzos = new GZIPOutputStream(baos);
             gzos.write(input.getBytes("UTF-8"));
-        } catch (final IOException e) {
+        }
+        catch (final IOException e)
+        {
             e.printStackTrace();
-        } finally {
-            if (gzos != null) {
-                try {
+        }
+        finally
+        {
+            if (gzos != null)
+            {
+                try
+                {
                     gzos.close();
-                } catch (final IOException ignore) {
                 }
+                catch (final IOException ignore)
+                {}
             }
         }
         return baos.toByteArray();
@@ -158,24 +168,33 @@ public class Metrics {
      *
      * @throws UnsupportedEncodingException
      */
-    private static void appendJSONPair(final StringBuilder json, final String key, final String value) throws UnsupportedEncodingException {
+    private static void appendJSONPair(final StringBuilder json, final String key, final String value) throws UnsupportedEncodingException
+    {
         boolean isValueNumeric = false;
-        try {
-            if (value.equals("0") || !value.endsWith("0")) {
+        try
+        {
+            if (value.equals("0") || !value.endsWith("0"))
+            {
                 Double.parseDouble(value);
                 isValueNumeric = true;
             }
-        } catch (final NumberFormatException e) {
+        }
+        catch (final NumberFormatException e)
+        {
             isValueNumeric = false;
         }
-        if (json.charAt(json.length() - 1) != '{') {
+        if (json.charAt(json.length() - 1) != '{')
+        {
             json.append(',');
         }
         json.append(escapeJSON(key));
         json.append(':');
-        if (isValueNumeric) {
+        if (isValueNumeric)
+        {
             json.append(value);
-        } else {
+        }
+        else
+        {
             json.append(escapeJSON(value));
         }
     }
@@ -187,12 +206,15 @@ public class Metrics {
      *
      * @return String
      */
-    private static String escapeJSON(final String text) {
+    private static String escapeJSON(final String text)
+    {
         final StringBuilder builder = new StringBuilder();
         builder.append('"');
-        for (int index = 0; index < text.length(); index++) {
+        for (int index = 0; index < text.length(); index++)
+        {
             final char chr = text.charAt(index);
-            switch (chr) {
+            switch (chr)
+            {
                 case '"':
                 case '\\':
                     builder.append('\\');
@@ -211,10 +233,13 @@ public class Metrics {
                     builder.append("\\r");
                     break;
                 default:
-                    if (chr < ' ') {
+                    if (chr < ' ')
+                    {
                         final String t = "000" + Integer.toHexString(chr);
                         builder.append("\\u" + t.substring(t.length() - 4));
-                    } else {
+                    }
+                    else
+                    {
                         builder.append(chr);
                     }
                     break;
@@ -231,7 +256,8 @@ public class Metrics {
      *
      * @return the encoded text, as UTF-8
      */
-    private static String urlEncode(final String text) throws UnsupportedEncodingException {
+    private static String urlEncode(final String text) throws UnsupportedEncodingException
+    {
         return URLEncoder.encode(text, "UTF-8");
     }
 
@@ -243,14 +269,13 @@ public class Metrics {
      *
      * @return Graph object created. Will never return NULL under normal circumstances unless bad parameters are given
      */
-    public Graph createGraph(final String name) {
-        if (name == null) {
-            throw new IllegalArgumentException("Graph name cannot be null");
-        }
+    public Graph createGraph(final String name)
+    {
+        if (name == null) { throw new IllegalArgumentException("Graph name cannot be null"); }
         // Construct the graph object
         final Graph graph = new Graph(name);
         // Now we can add our graph
-        this.graphs.add(graph);
+        graphs.add(graph);
         // and return back
         return graph;
     }
@@ -260,11 +285,10 @@ public class Metrics {
      *
      * @param graph The name of the graph
      */
-    public void addGraph(final Graph graph) {
-        if (graph == null) {
-            throw new IllegalArgumentException("Graph cannot be null");
-        }
-        this.graphs.add(graph);
+    public void addGraph(final Graph graph)
+    {
+        if (graph == null) { throw new IllegalArgumentException("Graph cannot be null"); }
+        graphs.add(graph);
     }
 
     /**
@@ -274,36 +298,40 @@ public class Metrics {
      *
      * @return True if statistics measuring is running, otherwise false.
      */
-    public boolean start() {
-        synchronized (this.optOutLock) {
+    public boolean start()
+    {
+        synchronized (optOutLock)
+        {
             // Did we opt out?
-            if (isOptOut()) {
-                return false;
-            }
+            if (isOptOut()) { return false; }
             // Is metrics already running?
-            if (this.task != null) {
-                return true;
-            }
+            if (task != null) { return true; }
             // Begin hitting the server with glorious data
-            this.task = this.plugin.getServer().getScheduler().runTaskTimerAsynchronously(this.plugin, new Runnable() {
+            task = plugin.getServer().getScheduler().runTaskTimerAsynchronously(plugin, new Runnable()
+            {
                 private boolean firstPost = true;
 
                 @Override
-                public void run() {
-                    try {
+                public void run()
+                {
+                    try
+                    {
                         // This has to be synchronized or it can collide
                         // with
                         // the disable method.
-                        synchronized (Metrics.this.optOutLock) {
+                        synchronized (optOutLock)
+                        {
                             // Disable Task, if it is running and the
                             // server
                             // owner decided to opt-out
-                            if (isOptOut() && (Metrics.this.task != null)) {
-                                Metrics.this.task.cancel();
-                                Metrics.this.task = null;
+                            if (isOptOut() && (task != null))
+                            {
+                                task.cancel();
+                                task = null;
                                 // Tell all plotters to stop gathering
                                 // information.
-                                for (final Graph graph : Metrics.this.graphs) {
+                                for (final Graph graph : graphs)
+                                {
                                     graph.onOptOut();
                                 }
                             }
@@ -316,13 +344,16 @@ public class Metrics {
                         // Each time thereafter it will evaluate to
                         // TRUE, i.e
                         // PING!
-                        postPlugin(!this.firstPost);
+                        postPlugin(!firstPost);
                         // After the first post we set firstPost to
                         // false
                         // Each post thereafter will be a ping
-                        this.firstPost = false;
-                    } catch (final IOException e) {
-                        if (Metrics.this.debug) {
+                        firstPost = false;
+                    }
+                    catch (final IOException e)
+                    {
+                        if (debug)
+                        {
                             Bukkit.getLogger().log(Level.INFO, "[Metrics] " + e.getMessage());
                         }
                     }
@@ -337,23 +368,32 @@ public class Metrics {
      *
      * @return true if metrics should be opted out of it
      */
-    public boolean isOptOut() {
-        synchronized (this.optOutLock) {
-            try {
+    public boolean isOptOut()
+    {
+        synchronized (optOutLock)
+        {
+            try
+            {
                 // Reload the metrics file
-                this.configuration.load(getConfigFile());
-            } catch (final IOException ex) {
-                if (this.debug) {
-                    Bukkit.getLogger().log(Level.INFO, "[Metrics] " + ex.getMessage());
-                }
-                return true;
-            } catch (final InvalidConfigurationException ex) {
-                if (this.debug) {
+                configuration.load(getConfigFile());
+            }
+            catch (final IOException ex)
+            {
+                if (debug)
+                {
                     Bukkit.getLogger().log(Level.INFO, "[Metrics] " + ex.getMessage());
                 }
                 return true;
             }
-            return this.configuration.getBoolean("opt-out", false);
+            catch (final InvalidConfigurationException ex)
+            {
+                if (debug)
+                {
+                    Bukkit.getLogger().log(Level.INFO, "[Metrics] " + ex.getMessage());
+                }
+                return true;
+            }
+            return configuration.getBoolean("opt-out", false);
         }
     }
 
@@ -362,18 +402,22 @@ public class Metrics {
      *
      * @throws java.io.IOException
      */
-    public void enable() throws IOException {
+    public void enable() throws IOException
+    {
         // This has to be synchronized or it can collide with the check in the
         // task.
-        synchronized (this.optOutLock) {
+        synchronized (optOutLock)
+        {
             // Check if the server owner has already set opt-out, if not, set
             // it.
-            if (isOptOut()) {
-                this.configuration.set("opt-out", false);
-                this.configuration.save(this.configurationFile);
+            if (isOptOut())
+            {
+                configuration.set("opt-out", false);
+                configuration.save(configurationFile);
             }
             // Enable Task, if it is not running
-            if (this.task == null) {
+            if (task == null)
+            {
                 start();
             }
         }
@@ -384,20 +428,24 @@ public class Metrics {
      *
      * @throws java.io.IOException
      */
-    public void disable() throws IOException {
+    public void disable() throws IOException
+    {
         // This has to be synchronized or it can collide with the check in the
         // task.
-        synchronized (this.optOutLock) {
+        synchronized (optOutLock)
+        {
             // Check if the server owner has already set opt-out, if not, set
             // it.
-            if (!isOptOut()) {
-                this.configuration.set("opt-out", true);
-                this.configuration.save(this.configurationFile);
+            if (!isOptOut())
+            {
+                configuration.set("opt-out", true);
+                configuration.save(configurationFile);
             }
             // Disable Task, if it is running
-            if (this.task != null) {
-                this.task.cancel();
-                this.task = null;
+            if (task != null)
+            {
+                task.cancel();
+                task = null;
             }
         }
     }
@@ -407,14 +455,15 @@ public class Metrics {
      *
      * @return the File object for the config file
      */
-    public File getConfigFile() {
+    public File getConfigFile()
+    {
         // I believe the easiest way to get the base folder (e.g craftbukkit set
         // via -P) for plugins to use
         // is to abuse the plugin object we already have
         // plugin.getDataFolder() => base/plugins/PluginA/
         // pluginsFolder => base/plugins/
         // The base is not necessarily relative to the startup directory.
-        final File pluginsFolder = this.plugin.getDataFolder().getParentFile();
+        final File pluginsFolder = plugin.getDataFolder().getParentFile();
         // return => base/plugins/PluginMetrics/config.yml
         return new File(new File(pluginsFolder, "PluginMetrics"), "config.yml");
     }
@@ -422,9 +471,10 @@ public class Metrics {
     /**
      * Generic method that posts a plugin to the metrics website
      */
-    private void postPlugin(final boolean isPing) throws IOException {
+    private void postPlugin(final boolean isPing) throws IOException
+    {
         // Server software specific section
-        final PluginDescriptionFile description = this.plugin.getDescription();
+        final PluginDescriptionFile description = plugin.getDescription();
         final String pluginName = description.getName();
         final boolean onlineMode = Bukkit.getServer().getOnlineMode(); // TRUE
         // if
@@ -435,14 +485,19 @@ public class Metrics {
         final String pluginVersion = description.getVersion();
         final String serverVersion = Bukkit.getVersion();
         int playersOnline = 0;
-        try {
-            if (Bukkit.class.getMethod("getOnlinePlayers", new Class<?>[0]).getReturnType() == Collection.class) {
+        try
+        {
+            if (Bukkit.class.getMethod("getOnlinePlayers", new Class<?>[0]).getReturnType() == Collection.class)
+            {
                 playersOnline = ((Collection<?>) Bukkit.class.getMethod("getOnlinePlayers", new Class<?>[0]).invoke(null, new Object[0])).size();
-            } else {
+            }
+            else
+            {
                 playersOnline = ((Player[]) Bukkit.class.getMethod("getOnlinePlayers", new Class<?>[0]).invoke(null, new Object[0])).length;
             }
-        } catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException ex) {
         }
+        catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException ex)
+        {}
         // END server software specific section -- all code below does not use
         // any code outside of this class / Java
         // Construct the post data
@@ -450,7 +505,7 @@ public class Metrics {
         json.append('{');
         // The plugin's description file containg all of the plugin data such as
         // name, version, author, etc
-        appendJSONPair(json, "guid", this.guid);
+        appendJSONPair(json, "guid", guid);
         appendJSONPair(json, "plugin_version", pluginVersion);
         appendJSONPair(json, "server_version", serverVersion);
         appendJSONPair(json, "players_online", Integer.toString(playersOnline));
@@ -461,7 +516,8 @@ public class Metrics {
         final String java_version = System.getProperty("java.version");
         final int coreCount = Runtime.getRuntime().availableProcessors();
         // normalize os arch .. amd64 -> x86_64
-        if (osarch.equals("amd64")) {
+        if (osarch.equals("amd64"))
+        {
             osarch = "x86_64";
         }
         appendJSONPair(json, "osname", osname);
@@ -471,11 +527,14 @@ public class Metrics {
         appendJSONPair(json, "auth_mode", onlineMode ? "1" : "0");
         appendJSONPair(json, "java_version", java_version);
         // If we're pinging, append it
-        if (isPing) {
+        if (isPing)
+        {
             appendJSONPair(json, "ping", "1");
         }
-        if (this.graphs.size() > 0) {
-            synchronized (this.graphs) {
+        if (graphs.size() > 0)
+        {
+            synchronized (graphs)
+            {
                 json.append(',');
                 json.append('"');
                 json.append("graphs");
@@ -483,14 +542,17 @@ public class Metrics {
                 json.append(':');
                 json.append('{');
                 boolean firstGraph = true;
-                for (final Graph graph : this.graphs) {
+                for (final Graph graph : graphs)
+                {
                     final StringBuilder graphJson = new StringBuilder();
                     graphJson.append('{');
-                    for (final Plotter plotter : graph.getPlotters()) {
+                    for (final Plotter plotter : graph.getPlotters())
+                    {
                         appendJSONPair(graphJson, plotter.getColumnName(), Integer.toString(plotter.getValue()));
                     }
                     graphJson.append('}');
-                    if (!firstGraph) {
+                    if (!firstGraph)
+                    {
                         json.append(',');
                     }
                     json.append(escapeJSON(graph.getName()));
@@ -509,9 +571,12 @@ public class Metrics {
         URLConnection connection;
         // Mineshafter creates a socks proxy, so we can safely bypass it
         // It does not reroute POST requests so we need to go around it
-        if (isMineshafterPresent()) {
+        if (isMineshafterPresent())
+        {
             connection = url.openConnection(Proxy.NO_PROXY);
-        } else {
+        }
+        else
+        {
             connection = url.openConnection();
         }
         final byte[] uncompressed = json.toString().getBytes();
@@ -524,7 +589,8 @@ public class Metrics {
         connection.addRequestProperty("Accept", "application/json");
         connection.addRequestProperty("Connection", "close");
         connection.setDoOutput(true);
-        if (this.debug) {
+        if (debug)
+        {
             PS.debug("[Metrics] Prepared request for " + pluginName + " uncompressed=" + uncompressed.length + " compressed=" + compressed.length);
         }
         // Write the data
@@ -537,19 +603,29 @@ public class Metrics {
         // close resources
         os.close();
         reader.close();
-        if ((response == null) || response.startsWith("ERR") || response.startsWith("7")) {
-            if (response == null) {
+        if ((response == null) || response.startsWith("ERR") || response.startsWith("7"))
+        {
+            if (response == null)
+            {
                 response = "null";
-            } else if (response.startsWith("7")) {
+            }
+            else if (response.startsWith("7"))
+            {
                 response = response.substring(response.startsWith("7,") ? 2 : 1);
             }
             throw new IOException(response);
-        } else {
+        }
+        else
+        {
             // Is this the first update this hour?
-            if (response.equals("1") || response.contains("This is your first update this hour")) {
-                synchronized (this.graphs) {
-                    for (final Graph graph : this.graphs) {
-                        for (final Plotter plotter : graph.getPlotters()) {
+            if (response.equals("1") || response.contains("This is your first update this hour"))
+            {
+                synchronized (graphs)
+                {
+                    for (final Graph graph : graphs)
+                    {
+                        for (final Plotter plotter : graph.getPlotters())
+                        {
                             plotter.reset();
                         }
                     }
@@ -563,11 +639,15 @@ public class Metrics {
      *
      * @return true if mineshafter is installed on the server
      */
-    private boolean isMineshafterPresent() {
-        try {
+    private boolean isMineshafterPresent()
+    {
+        try
+        {
             Class.forName("mineshafter.MineServer");
             return true;
-        } catch (final Exception e) {
+        }
+        catch (final Exception e)
+        {
             return false;
         }
     }
@@ -575,7 +655,8 @@ public class Metrics {
     /**
      * Represents a custom graph on the website
      */
-    public static class Graph {
+    public static class Graph
+    {
         /**
          * The graph's name, alphanumeric and spaces only :) If it does not comply to the above when submitted, it is
          * rejected
@@ -586,7 +667,8 @@ public class Metrics {
          */
         private final Set<Plotter> plotters = new LinkedHashSet<Plotter>();
 
-        private Graph(final String name) {
+        private Graph(final String name)
+        {
             this.name = name;
         }
 
@@ -595,8 +677,9 @@ public class Metrics {
          *
          * @return the Graph's name
          */
-        public String getName() {
-            return this.name;
+        public String getName()
+        {
+            return name;
         }
 
         /**
@@ -604,8 +687,9 @@ public class Metrics {
          *
          * @param plotter the plotter to add to the graph
          */
-        public void addPlotter(final Plotter plotter) {
-            this.plotters.add(plotter);
+        public void addPlotter(final Plotter plotter)
+        {
+            plotters.add(plotter);
         }
 
         /**
@@ -613,8 +697,9 @@ public class Metrics {
          *
          * @param plotter the plotter to remove from the graph
          */
-        public void removePlotter(final Plotter plotter) {
-            this.plotters.remove(plotter);
+        public void removePlotter(final Plotter plotter)
+        {
+            plotters.remove(plotter);
         }
 
         /**
@@ -622,35 +707,37 @@ public class Metrics {
          *
          * @return an unmodifiable {@link java.util.Set} of the plotter objects
          */
-        public Set<Plotter> getPlotters() {
-            return Collections.unmodifiableSet(this.plotters);
+        public Set<Plotter> getPlotters()
+        {
+            return Collections.unmodifiableSet(plotters);
         }
 
         @Override
-        public int hashCode() {
-            return this.name.hashCode();
+        public int hashCode()
+        {
+            return name.hashCode();
         }
 
         @Override
-        public boolean equals(final Object object) {
-            if (!(object instanceof Graph)) {
-                return false;
-            }
+        public boolean equals(final Object object)
+        {
+            if (!(object instanceof Graph)) { return false; }
             final Graph graph = (Graph) object;
-            return graph.name.equals(this.name);
+            return graph.name.equals(name);
         }
 
         /**
          * Called when the server owner decides to opt-out of BukkitMetrics while the server is running.
          */
-        protected void onOptOut() {
-        }
+        protected void onOptOut()
+        {}
     }
 
     /**
      * Interface used to collect custom data for a plugin
      */
-    public static abstract class Plotter {
+    public static abstract class Plotter
+    {
         /**
          * The plot's name
          */
@@ -659,7 +746,8 @@ public class Metrics {
         /**
          * Construct a plotter with the default plot name
          */
-        public Plotter() {
+        public Plotter()
+        {
             this("Default");
         }
 
@@ -668,7 +756,8 @@ public class Metrics {
          *
          * @param name the name of the plotter to use, which will show up on the website
          */
-        public Plotter(final String name) {
+        public Plotter(final String name)
+        {
             this.name = name;
         }
 
@@ -686,28 +775,29 @@ public class Metrics {
          *
          * @return the plotted point's column name
          */
-        public String getColumnName() {
-            return this.name;
+        public String getColumnName()
+        {
+            return name;
         }
 
         /**
          * Called after the website graphs have been updated
          */
-        public void reset() {
-        }
+        public void reset()
+        {}
 
         @Override
-        public int hashCode() {
+        public int hashCode()
+        {
             return getColumnName().hashCode();
         }
 
         @Override
-        public boolean equals(final Object object) {
-            if (!(object instanceof Plotter)) {
-                return false;
-            }
+        public boolean equals(final Object object)
+        {
+            if (!(object instanceof Plotter)) { return false; }
             final Plotter plotter = (Plotter) object;
-            return plotter.name.equals(this.name) && (plotter.getValue() == getValue());
+            return plotter.name.equals(name) && (plotter.getValue() == getValue());
         }
     }
 }
diff --git a/src/main/java/com/plotsquared/bukkit/util/OfflinePlayerUtil.java b/src/main/java/com/plotsquared/bukkit/util/OfflinePlayerUtil.java
index bd112238d..982b2bccb 100644
--- a/src/main/java/com/plotsquared/bukkit/util/OfflinePlayerUtil.java
+++ b/src/main/java/com/plotsquared/bukkit/util/OfflinePlayerUtil.java
@@ -17,54 +17,62 @@ import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 
-public class OfflinePlayerUtil {
+public class OfflinePlayerUtil
+{
 
-    public static Player loadPlayer(final String name) {
+    public static Player loadPlayer(final String name)
+    {
         return loadPlayer(Bukkit.getOfflinePlayer(name));
     }
 
-    public static Player loadPlayer(final UUID id) {
+    public static Player loadPlayer(final UUID id)
+    {
         return loadPlayer(Bukkit.getOfflinePlayer(id));
     }
 
-    public static Player loadPlayer(final OfflinePlayer player) {
-        if (player == null) {
-            return null;
-        }
-        if (player instanceof Player) {
-            return (Player) player;
-        }
+    public static Player loadPlayer(final OfflinePlayer player)
+    {
+        if (player == null) { return null; }
+        if (player instanceof Player) { return (Player) player; }
         return loadPlayer(player.getUniqueId(), player.getName());
     }
 
-    private static Player loadPlayer(final UUID id, final String name) {
+    private static Player loadPlayer(final UUID id, final String name)
+    {
         final Object server = getMinecraftServer();
         final Object interactManager = newPlayerInteractManager();
         final Object worldServer = getWorldServer();
         final Object profile = newGameProfile(id, name);
         final Class<?> entityPlayerClass = getNmsClass("EntityPlayer");
-        final Constructor entityPlayerConstructor = makeConstructor(entityPlayerClass, getNmsClass("MinecraftServer"), getNmsClass("WorldServer"), getUtilClass("com.mojang.authlib.GameProfile"), getNmsClass("PlayerInteractManager"));
+        final Constructor entityPlayerConstructor = makeConstructor(entityPlayerClass, getNmsClass("MinecraftServer"), getNmsClass("WorldServer"), getUtilClass("com.mojang.authlib.GameProfile"),
+        getNmsClass("PlayerInteractManager"));
         final Object entityPlayer = callConstructor(entityPlayerConstructor, server, worldServer, profile, interactManager);
         final Player player = (Player) getBukkitEntity(entityPlayer);
         return player;
     }
 
-    private static Object newGameProfile(final UUID id, final String name) {
+    private static Object newGameProfile(final UUID id, final String name)
+    {
         final Class<?> gameProfileClass = getUtilClass("com.mojang.authlib.GameProfile");
-        if (gameProfileClass == null) { //Before uuids
+        if (gameProfileClass == null)
+        { //Before uuids
             return name;
         }
         Constructor gameProfileConstructor = null;
         gameProfileConstructor = makeConstructor(gameProfileClass, UUID.class, String.class);
-        if (gameProfileConstructor == null) { //Verson has string constructor
+        if (gameProfileConstructor == null)
+        { //Verson has string constructor
             gameProfileConstructor = makeConstructor(gameProfileClass, String.class, String.class);
             return callConstructor(gameProfileConstructor, id.toString(), name);
-        } else { //Version has uuid constructor
+        }
+        else
+        { //Version has uuid constructor
             return callConstructor(gameProfileConstructor, id, name);
         }
     }
 
-    private static Object newPlayerInteractManager() {
+    private static Object newPlayerInteractManager()
+    {
         final Object worldServer = getWorldServer();
         final Class<?> playerInteractClass = getNmsClass("PlayerInteractManager");
         final Class<?> worldClass = getNmsClass("World");
@@ -72,7 +80,8 @@ public class OfflinePlayerUtil {
         return callConstructor(c, worldServer);
     }
 
-    private static Object getWorldServer() {
+    private static Object getWorldServer()
+    {
         final Object server = getMinecraftServer();
         final Class<?> minecraftServerClass = getNmsClass("MinecraftServer");
         final Method getWorldServer = makeMethod(minecraftServerClass, "getWorldServer", int.class);
@@ -81,11 +90,13 @@ public class OfflinePlayerUtil {
 
     //NMS Utils
 
-    private static Object getMinecraftServer() {
+    private static Object getMinecraftServer()
+    {
         return callMethod(makeMethod(getCbClass("CraftServer"), "getServer"), Bukkit.getServer());
     }
 
-    private static Entity getBukkitEntity(final Object o) {
+    private static Entity getBukkitEntity(final Object o)
+    {
         final Method getBukkitEntity = makeMethod(o.getClass(), "getBukkitEntity");
         return callMethod(getBukkitEntity, o);
     }
diff --git a/src/main/java/com/plotsquared/bukkit/util/ReflectionUtil.java b/src/main/java/com/plotsquared/bukkit/util/ReflectionUtil.java
index 370e5ce59..401297c93 100644
--- a/src/main/java/com/plotsquared/bukkit/util/ReflectionUtil.java
+++ b/src/main/java/com/plotsquared/bukkit/util/ReflectionUtil.java
@@ -11,137 +11,187 @@ import org.bukkit.Bukkit;
  * Reflection Utilities for minecraft
  *
  */
-public class ReflectionUtil {
-    public static Class<?> getNmsClass(final String name) {
+public class ReflectionUtil
+{
+    public static Class<?> getNmsClass(final String name)
+    {
         final String className = "net.minecraft.server." + getVersion() + "." + name;
         return getClass(className);
     }
 
-    public static Class<?> getCbClass(final String name) {
+    public static Class<?> getCbClass(final String name)
+    {
         final String className = "org.bukkit.craftbukkit." + getVersion() + "." + name;
         return getClass(className);
     }
 
-    public static Class<?> getUtilClass(final String name) {
-        try {
+    public static Class<?> getUtilClass(final String name)
+    {
+        try
+        {
             return Class.forName(name); //Try before 1.8 first
-        } catch (final ClassNotFoundException ex) {
-            try {
+        }
+        catch (final ClassNotFoundException ex)
+        {
+            try
+            {
                 return Class.forName("net.minecraft.util." + name); //Not 1.8
-            } catch (final ClassNotFoundException ex2) {
+            }
+            catch (final ClassNotFoundException ex2)
+            {
                 return null;
             }
         }
     }
 
-    public static String getVersion() {
+    public static String getVersion()
+    {
         final String packageName = Bukkit.getServer().getClass().getPackage().getName();
         return packageName.substring(packageName.lastIndexOf('.') + 1);
     }
 
-    public static Object getHandle(final Object wrapper) {
+    public static Object getHandle(final Object wrapper)
+    {
         final Method getHandle = makeMethod(wrapper.getClass(), "getHandle");
         return callMethod(getHandle, wrapper);
     }
 
     //Utils
-    public static Method makeMethod(final Class<?> clazz, final String methodName, final Class<?>... paramaters) {
-        try {
+    public static Method makeMethod(final Class<?> clazz, final String methodName, final Class<?>... paramaters)
+    {
+        try
+        {
             return clazz.getDeclaredMethod(methodName, paramaters);
-        } catch (final NoSuchMethodException ex) {
+        }
+        catch (final NoSuchMethodException ex)
+        {
             return null;
-        } catch (final Exception ex) {
+        }
+        catch (final Exception ex)
+        {
             throw new RuntimeException(ex);
         }
     }
 
     @SuppressWarnings("unchecked")
-    public static <T> T callMethod(final Method method, final Object instance, final Object... paramaters) {
-        if (method == null) {
-            throw new RuntimeException("No such method");
-        }
+    public static <T> T callMethod(final Method method, final Object instance, final Object... paramaters)
+    {
+        if (method == null) { throw new RuntimeException("No such method"); }
         method.setAccessible(true);
-        try {
+        try
+        {
             return (T) method.invoke(instance, paramaters);
-        } catch (final InvocationTargetException ex) {
+        }
+        catch (final InvocationTargetException ex)
+        {
             throw new RuntimeException(ex.getCause());
-        } catch (final Exception ex) {
+        }
+        catch (final Exception ex)
+        {
             throw new RuntimeException(ex);
         }
     }
 
     @SuppressWarnings("unchecked")
-    public static <T> Constructor<T> makeConstructor(final Class<?> clazz, final Class<?>... paramaterTypes) {
-        try {
+    public static <T> Constructor<T> makeConstructor(final Class<?> clazz, final Class<?>... paramaterTypes)
+    {
+        try
+        {
             return (Constructor<T>) clazz.getConstructor(paramaterTypes);
-        } catch (final NoSuchMethodException ex) {
+        }
+        catch (final NoSuchMethodException ex)
+        {
             return null;
-        } catch (final Exception ex) {
+        }
+        catch (final Exception ex)
+        {
             throw new RuntimeException(ex);
         }
     }
 
-    public static <T> T callConstructor(final Constructor<T> constructor, final Object... paramaters) {
-        if (constructor == null) {
-            throw new RuntimeException("No such constructor");
-        }
+    public static <T> T callConstructor(final Constructor<T> constructor, final Object... paramaters)
+    {
+        if (constructor == null) { throw new RuntimeException("No such constructor"); }
         constructor.setAccessible(true);
-        try {
+        try
+        {
             return constructor.newInstance(paramaters);
-        } catch (final InvocationTargetException ex) {
+        }
+        catch (final InvocationTargetException ex)
+        {
             throw new RuntimeException(ex.getCause());
-        } catch (final Exception ex) {
+        }
+        catch (final Exception ex)
+        {
             throw new RuntimeException(ex);
         }
     }
 
-    public static Field makeField(final Class<?> clazz, final String name) {
-        try {
+    public static Field makeField(final Class<?> clazz, final String name)
+    {
+        try
+        {
             return clazz.getDeclaredField(name);
-        } catch (final NoSuchFieldException ex) {
+        }
+        catch (final NoSuchFieldException ex)
+        {
             return null;
-        } catch (final Exception ex) {
+        }
+        catch (final Exception ex)
+        {
             throw new RuntimeException(ex);
         }
     }
 
     @SuppressWarnings("unchecked")
-    public static <T> T getField(final Field field, final Object instance) {
-        if (field == null) {
-            throw new RuntimeException("No such field");
-        }
+    public static <T> T getField(final Field field, final Object instance)
+    {
+        if (field == null) { throw new RuntimeException("No such field"); }
         field.setAccessible(true);
-        try {
+        try
+        {
             return (T) field.get(instance);
-        } catch (final Exception ex) {
+        }
+        catch (final Exception ex)
+        {
             throw new RuntimeException(ex);
         }
     }
 
-    public static void setField(final Field field, final Object instance, final Object value) {
-        if (field == null) {
-            throw new RuntimeException("No such field");
-        }
+    public static void setField(final Field field, final Object instance, final Object value)
+    {
+        if (field == null) { throw new RuntimeException("No such field"); }
         field.setAccessible(true);
-        try {
+        try
+        {
             field.set(instance, value);
-        } catch (final Exception ex) {
+        }
+        catch (final Exception ex)
+        {
             throw new RuntimeException(ex);
         }
     }
 
-    public static Class<?> getClass(final String name) {
-        try {
+    public static Class<?> getClass(final String name)
+    {
+        try
+        {
             return Class.forName(name);
-        } catch (final ClassNotFoundException ex) {
+        }
+        catch (final ClassNotFoundException ex)
+        {
             return null;
         }
     }
 
-    public static <T> Class<? extends T> getClass(final String name, final Class<T> superClass) {
-        try {
+    public static <T> Class<? extends T> getClass(final String name, final Class<T> superClass)
+    {
+        try
+        {
             return Class.forName(name).asSubclass(superClass);
-        } catch (ClassCastException | ClassNotFoundException ex) {
+        }
+        catch (ClassCastException | ClassNotFoundException ex)
+        {
             return null;
         }
     }
diff --git a/src/main/java/com/plotsquared/bukkit/util/SendChunk.java b/src/main/java/com/plotsquared/bukkit/util/SendChunk.java
index c34605307..3e316b5e4 100644
--- a/src/main/java/com/plotsquared/bukkit/util/SendChunk.java
+++ b/src/main/java/com/plotsquared/bukkit/util/SendChunk.java
@@ -1,196 +1,212 @@
-package com.plotsquared.bukkit.util;
-
-import static com.intellectualcrafters.plot.util.ReflectionUtils.getRefClass;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-
-import org.bukkit.Chunk;
-
-import com.intellectualcrafters.plot.PS;
-import com.intellectualcrafters.plot.object.ChunkLoc;
-import com.intellectualcrafters.plot.object.Location;
-import com.intellectualcrafters.plot.object.Plot;
-import com.intellectualcrafters.plot.object.PlotPlayer;
-import com.intellectualcrafters.plot.util.ReflectionUtils.RefClass;
-import com.intellectualcrafters.plot.util.ReflectionUtils.RefConstructor;
-import com.intellectualcrafters.plot.util.ReflectionUtils.RefField;
-import com.intellectualcrafters.plot.util.ReflectionUtils.RefMethod;
-import com.intellectualcrafters.plot.util.TaskManager;
-import com.intellectualcrafters.plot.util.UUIDHandler;
-import com.plotsquared.bukkit.object.BukkitPlayer;
-
-import org.bukkit.World;
-import org.bukkit.entity.Player;
-import org.bukkit.Bukkit;
-
-
-/**
- * An utility that can be used to send chunks, rather than using bukkit code to do so (uses heavy NMS)
- *
- * @author Empire92
- */
-public class SendChunk {
-    
-//    // Ref Class
-    private final RefClass classEntityPlayer = getRefClass("{nms}.EntityPlayer");
-    private final RefClass classMapChunk = getRefClass("{nms}.PacketPlayOutMapChunk");
-    private final RefClass classPacket = getRefClass("{nms}.Packet");
-    private final RefClass classConnection = getRefClass("{nms}.PlayerConnection");
-    private final RefClass classChunk = getRefClass("{nms}.Chunk");
-    private final RefClass classCraftPlayer = getRefClass("{cb}.entity.CraftPlayer");
-    private final RefClass classCraftChunk = getRefClass("{cb}.CraftChunk");
-    private RefMethod methodGetHandlePlayer;
-    private RefMethod methodGetHandleChunk;
-    private RefConstructor MapChunk;
-    private RefField connection;
-    private RefMethod send;
-    private RefMethod methodInitLighting;
-
-    /**
-     * Constructor
-     *
-     * @throws NoSuchMethodException
-     */
-    public SendChunk() throws NoSuchMethodException {
-        methodGetHandlePlayer = classCraftPlayer.getMethod("getHandle");
-        methodGetHandleChunk = classCraftChunk.getMethod("getHandle");
-        methodInitLighting = classChunk.getMethod("initLighting");
-        MapChunk = classMapChunk.getConstructor(classChunk.getRealClass(), boolean.class, int.class);
-        connection = classEntityPlayer.getField("playerConnection");
-        send = classConnection.getMethod("sendPacket", classPacket.getRealClass());
-    }
-
-    public void sendChunk(final Collection<Chunk> input) {
-        HashSet<Chunk> chunks = new HashSet<Chunk>(input);
-        HashMap<String, ArrayList<Chunk>> map = new HashMap<>();
-        int view = Bukkit.getServer().getViewDistance();
-        for (Chunk chunk : chunks) {
-            String world = chunk.getWorld().getName();
-            ArrayList<Chunk> list = map.get(world);
-            if (list == null) {
-                list = new ArrayList<>();
-                map.put(world, list);
-            }
-            list.add(chunk);
-            Object c = methodGetHandleChunk.of(chunk).call();
-            methodInitLighting.of(c).call();
-        }
-        for (PlotPlayer pp : UUIDHandler.getPlayers().values() ) {
-            Plot plot = pp.getCurrentPlot();
-            Location loc = null;
-            String world;
-            if (plot != null) {
-                world = plot.world;
-            }
-            else {
-                loc = pp.getLocation();
-                world = loc.getWorld();
-            }
-            ArrayList<Chunk> list = map.get(world);
-            if (list == null) {
-                continue;
-            }
-            if (loc == null) {
-                loc = pp.getLocation();
-            }
-            int cx = loc.getX() >> 4;
-            int cz = loc.getZ() >> 4;
-            Player player = ((BukkitPlayer) pp).player;
-            Object entity = methodGetHandlePlayer.of(player).call();
-            
-            for (Chunk chunk : list) {
-                int dx = Math.abs(cx - chunk.getX());
-                int dz = Math.abs(cz - chunk.getZ());
-                if (dx > view || dz > view) {
-                    continue;
-                }
-                Object c = methodGetHandleChunk.of(chunk).call();
-                chunks.remove(chunk);
-                Object con = connection.of(entity).get();
-//                if (dx != 0 || dz != 0) {
-//                    Object packet = MapChunk.create(c, true, 0);
-//                    send.of(con).call(packet);
-//                }
-                Object packet = MapChunk.create(c, true, 65535);
-                send.of(con).call(packet);
-            }
-        }
-        for (final Chunk chunk : chunks) {
-            TaskManager.runTask(new Runnable() {
-                @Override
-                public void run() {
-                    try {
-                        chunk.unload(true, false);
-                    }
-                    catch (Exception e) {
-                        String worldname = chunk.getWorld().getName();
-                        PS.debug("$4Could not save chunk: " + worldname + ";" + chunk.getX() + ";" + chunk.getZ());
-                        PS.debug("$3 - $4File may be open in another process (e.g. MCEdit)");
-                        PS.debug("$3 - $4" + worldname + "/level.dat or " + worldname + "level_old.dat may be corrupt (try repairing or removing these)");
-                    }
-                }
-            });
-        }
-//        
-//        
-//        int diffx, diffz;
-//         << 4;
-//        for (final Chunk chunk : chunks) {
-//            if (!chunk.isLoaded()) {
-//                continue;
-//            }
-//            boolean unload = true;
-//            final Object c = methodGetHandle.of(chunk).call();
-//            final Object w = world.of(c).get();
-//            final Object p = players.of(w).get();
-//            for (final Object ep : (List<Object>) p) {
-//                final int x = ((Double) locX.of(ep).get()).intValue();
-//                final int z = ((Double) locZ.of(ep).get()).intValue();
-//                diffx = Math.abs(x - (chunk.getX() << 4));
-//                diffz = Math.abs(z - (chunk.getZ() << 4));
-//                if ((diffx <= view) && (diffz <= view)) {
-//                    unload = false;
-//                    if (v1_7_10) {
-//                        chunk.getWorld().refreshChunk(chunk.getX(), chunk.getZ());
-//                        chunk.load(true);
-//                    }
-//                    else {
-//                        final Object pair = ChunkCoordIntPairCon.create(chunk.getX(), chunk.getZ());
-//                        final Object pq = chunkCoordIntPairQueue.of(ep).get();
-//                        ((List) pq).add(pair);
-//                    }
-//                }
-//            }
-//            if (unload) {
-//                TaskManager.runTask(new Runnable() {
-//                    @Override
-//                    public void run() {
-//                        try {
-//                            chunk.unload(true, true);
-//                        }
-//                        catch (Exception e) {
-//                            String worldname = chunk.getWorld().getName();
-//                            PS.debug("$4Could not save chunk: " + worldname + ";" + chunk.getX() + ";" + chunk.getZ());
-//                            PS.debug("$3 - $4File may be open in another process (e.g. MCEdit)");
-//                            PS.debug("$3 - $4" + worldname + "/level.dat or " + worldname + "level_old.dat may be corrupt (try repairing or removing these)");
-//                        }
-//                    }
-//                });
-//            }
-//            
-//        }
-    }
-
-    public void sendChunk(final String worldname, final List<ChunkLoc> locs) {
-        final World myworld = Bukkit.getWorld(worldname);
-        final ArrayList<Chunk> chunks = new ArrayList<>();
-        for (final ChunkLoc loc : locs) {
-            chunks.add(myworld.getChunkAt(loc.x, loc.z));
-        }
-        sendChunk(chunks);
-    }
-}
+package com.plotsquared.bukkit.util;
+
+import static com.intellectualcrafters.plot.util.ReflectionUtils.getRefClass;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+
+import org.bukkit.Bukkit;
+import org.bukkit.Chunk;
+import org.bukkit.World;
+import org.bukkit.entity.Player;
+
+import com.intellectualcrafters.plot.PS;
+import com.intellectualcrafters.plot.object.ChunkLoc;
+import com.intellectualcrafters.plot.object.Location;
+import com.intellectualcrafters.plot.object.Plot;
+import com.intellectualcrafters.plot.object.PlotPlayer;
+import com.intellectualcrafters.plot.util.ReflectionUtils.RefClass;
+import com.intellectualcrafters.plot.util.ReflectionUtils.RefConstructor;
+import com.intellectualcrafters.plot.util.ReflectionUtils.RefField;
+import com.intellectualcrafters.plot.util.ReflectionUtils.RefMethod;
+import com.intellectualcrafters.plot.util.TaskManager;
+import com.intellectualcrafters.plot.util.UUIDHandler;
+import com.plotsquared.bukkit.object.BukkitPlayer;
+
+/**
+ * An utility that can be used to send chunks, rather than using bukkit code to do so (uses heavy NMS)
+ *

+ */
+public class SendChunk
+{
+
+    //    // Ref Class
+    private final RefClass classEntityPlayer = getRefClass("{nms}.EntityPlayer");
+    private final RefClass classMapChunk = getRefClass("{nms}.PacketPlayOutMapChunk");
+    private final RefClass classPacket = getRefClass("{nms}.Packet");
+    private final RefClass classConnection = getRefClass("{nms}.PlayerConnection");
+    private final RefClass classChunk = getRefClass("{nms}.Chunk");
+    private final RefClass classCraftPlayer = getRefClass("{cb}.entity.CraftPlayer");
+    private final RefClass classCraftChunk = getRefClass("{cb}.CraftChunk");
+    private final RefMethod methodGetHandlePlayer;
+    private final RefMethod methodGetHandleChunk;
+    private final RefConstructor MapChunk;
+    private final RefField connection;
+    private final RefMethod send;
+    private final RefMethod methodInitLighting;
+
+    /**
+     * Constructor
+     *
+     * @throws NoSuchMethodException
+     */
+    public SendChunk() throws NoSuchMethodException
+    {
+        methodGetHandlePlayer = classCraftPlayer.getMethod("getHandle");
+        methodGetHandleChunk = classCraftChunk.getMethod("getHandle");
+        methodInitLighting = classChunk.getMethod("initLighting");
+        MapChunk = classMapChunk.getConstructor(classChunk.getRealClass(), boolean.class, int.class);
+        connection = classEntityPlayer.getField("playerConnection");
+        send = classConnection.getMethod("sendPacket", classPacket.getRealClass());
+    }
+
+    public void sendChunk(final Collection<Chunk> input)
+    {
+        final HashSet<Chunk> chunks = new HashSet<Chunk>(input);
+        final HashMap<String, ArrayList<Chunk>> map = new HashMap<>();
+        final int view = Bukkit.getServer().getViewDistance();
+        for (final Chunk chunk : chunks)
+        {
+            final String world = chunk.getWorld().getName();
+            ArrayList<Chunk> list = map.get(world);
+            if (list == null)
+            {
+                list = new ArrayList<>();
+                map.put(world, list);
+            }
+            list.add(chunk);
+            final Object c = methodGetHandleChunk.of(chunk).call();
+            methodInitLighting.of(c).call();
+        }
+        for (final PlotPlayer pp : UUIDHandler.getPlayers().values())
+        {
+            final Plot plot = pp.getCurrentPlot();
+            Location loc = null;
+            String world;
+            if (plot != null)
+            {
+                world = plot.world;
+            }
+            else
+            {
+                loc = pp.getLocation();
+                world = loc.getWorld();
+            }
+            final ArrayList<Chunk> list = map.get(world);
+            if (list == null)
+            {
+                continue;
+            }
+            if (loc == null)
+            {
+                loc = pp.getLocation();
+            }
+            final int cx = loc.getX() >> 4;
+            final int cz = loc.getZ() >> 4;
+            final Player player = ((BukkitPlayer) pp).player;
+            final Object entity = methodGetHandlePlayer.of(player).call();
+
+            for (final Chunk chunk : list)
+            {
+                final int dx = Math.abs(cx - chunk.getX());
+                final int dz = Math.abs(cz - chunk.getZ());
+                if ((dx > view) || (dz > view))
+                {
+                    continue;
+                }
+                final Object c = methodGetHandleChunk.of(chunk).call();
+                chunks.remove(chunk);
+                final Object con = connection.of(entity).get();
+                //                if (dx != 0 || dz != 0) {
+                //                    Object packet = MapChunk.create(c, true, 0);
+                //                    send.of(con).call(packet);
+                //                }
+                final Object packet = MapChunk.create(c, true, 65535);
+                send.of(con).call(packet);
+            }
+        }
+        for (final Chunk chunk : chunks)
+        {
+            TaskManager.runTask(new Runnable()
+            {
+                @Override
+                public void run()
+                {
+                    try
+                    {
+                        chunk.unload(true, false);
+                    }
+                    catch (final Exception e)
+                    {
+                        final String worldname = chunk.getWorld().getName();
+                        PS.debug("$4Could not save chunk: " + worldname + ";" + chunk.getX() + ";" + chunk.getZ());
+                        PS.debug("$3 - $4File may be open in another process (e.g. MCEdit)");
+                        PS.debug("$3 - $4" + worldname + "/level.dat or " + worldname + "level_old.dat may be corrupt (try repairing or removing these)");
+                    }
+                }
+            });
+        }
+        //
+        //
+        //        int diffx, diffz;
+        //         << 4;
+        //        for (final Chunk chunk : chunks) {
+        //            if (!chunk.isLoaded()) {
+        //                continue;
+        //            }
+        //            boolean unload = true;
+        //            final Object c = methodGetHandle.of(chunk).call();
+        //            final Object w = world.of(c).get();
+        //            final Object p = players.of(w).get();
+        //            for (final Object ep : (List<Object>) p) {
+        //                final int x = ((Double) locX.of(ep).get()).intValue();
+        //                final int z = ((Double) locZ.of(ep).get()).intValue();
+        //                diffx = Math.abs(x - (chunk.getX() << 4));
+        //                diffz = Math.abs(z - (chunk.getZ() << 4));
+        //                if ((diffx <= view) && (diffz <= view)) {
+        //                    unload = false;
+        //                    if (v1_7_10) {
+        //                        chunk.getWorld().refreshChunk(chunk.getX(), chunk.getZ());
+        //                        chunk.load(true);
+        //                    }
+        //                    else {
+        //                        final Object pair = ChunkCoordIntPairCon.create(chunk.getX(), chunk.getZ());
+        //                        final Object pq = chunkCoordIntPairQueue.of(ep).get();
+        //                        ((List) pq).add(pair);
+        //                    }
+        //                }
+        //            }
+        //            if (unload) {
+        //                TaskManager.runTask(new Runnable() {
+        //                    @Override
+        //                    public void run() {
+        //                        try {
+        //                            chunk.unload(true, true);
+        //                        }
+        //                        catch (Exception e) {
+        //                            String worldname = chunk.getWorld().getName();
+        //                            PS.debug("$4Could not save chunk: " + worldname + ";" + chunk.getX() + ";" + chunk.getZ());
+        //                            PS.debug("$3 - $4File may be open in another process (e.g. MCEdit)");
+        //                            PS.debug("$3 - $4" + worldname + "/level.dat or " + worldname + "level_old.dat may be corrupt (try repairing or removing these)");
+        //                        }
+        //                    }
+        //                });
+        //            }
+        //
+        //        }
+    }
+
+    public void sendChunk(final String worldname, final List<ChunkLoc> locs)
+    {
+        final World myworld = Bukkit.getWorld(worldname);
+        final ArrayList<Chunk> chunks = new ArrayList<>();
+        for (final ChunkLoc loc : locs)
+        {
+            chunks.add(myworld.getChunkAt(loc.x, loc.z));
+        }
+        sendChunk(chunks);
+    }
+}
diff --git a/src/main/java/com/plotsquared/bukkit/util/SetBlockFast.java b/src/main/java/com/plotsquared/bukkit/util/SetBlockFast.java
index 08d70e25e..7b0a5e41f 100644
--- a/src/main/java/com/plotsquared/bukkit/util/SetBlockFast.java
+++ b/src/main/java/com/plotsquared/bukkit/util/SetBlockFast.java
@@ -1,138 +1,149 @@
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// PlotSquared - A plot manager and world generator for the Bukkit API                             /
-// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
-//                                                                                                 /
-// This program is free software; you can redistribute it and/or modify                            /
-// it under the terms of the GNU General Public License as published by                            /
-// the Free Software Foundation; either version 3 of the License, or                               /
-// (at your option) any later version.                                                             /
-//                                                                                                 /
-// This program is distributed in the hope that it will be useful,                                 /
-// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
-// GNU General Public License for more details.                                                    /
-//                                                                                                 /
-// You should have received a copy of the GNU General Public License                               /
-// along with this program; if not, write to the Free Software Foundation,                         /
-// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
-//                                                                                                 /
-// You can contact us via: support@intellectualsites.com                                           /
-////////////////////////////////////////////////////////////////////////////////////////////////////
-package com.plotsquared.bukkit.util;
-
-import static com.intellectualcrafters.plot.util.ReflectionUtils.getRefClass;
-
-import java.util.Collection;
-import java.util.HashMap;
-
-import org.bukkit.Chunk;
-
-import com.intellectualcrafters.plot.object.ChunkLoc;
-import com.intellectualcrafters.plot.util.MainUtil;
-import com.intellectualcrafters.plot.util.ReflectionUtils.RefClass;
-import com.intellectualcrafters.plot.util.ReflectionUtils.RefMethod;
-import com.intellectualcrafters.plot.util.TaskManager;
-
-/**
- * SetBlockFast class<br> Used to do fast world editing
- *
- * @author Empire92
- */
-public class SetBlockFast extends BukkitSetBlockManager {
-    private final RefClass classBlock = getRefClass("{nms}.Block");
-    private final RefClass classChunk = getRefClass("{nms}.Chunk");
-    private final RefClass classWorld = getRefClass("{nms}.World");
-    private final RefClass classCraftWorld = getRefClass("{cb}.CraftWorld");
-    private RefMethod methodGetHandle;
-    private RefMethod methodGetChunkAt;
-    private RefMethod methodA;
-    private RefMethod methodGetById;
-    private SendChunk chunksender;
-    
-    public HashMap<ChunkLoc, Chunk> toUpdate = new HashMap<>();
-
-    /**
-     * Constructor
-     *
-     * @throws NoSuchMethodException
-     */
-    public SetBlockFast() throws NoSuchMethodException {
-        methodGetHandle = classCraftWorld.getMethod("getHandle");
-        methodGetChunkAt = classWorld.getMethod("getChunkAt", int.class, int.class);
-        methodA = classChunk.getMethod("a", int.class, int.class, int.class, classBlock, int.class);
-        methodGetById = classBlock.getMethod("getById", int.class);
-        TaskManager.runTaskRepeat(new Runnable() {
-            
-            @Override
-            public void run() {
-                // TODO Auto-generated method stub
-                update(toUpdate.values());
-                toUpdate = new HashMap<>();
-            }
-        }, 20);
-        this.chunksender = new SendChunk();
-    }
-
-    private ChunkLoc lastLoc = null;
-    
-    /**
-     * Set the block at the location
-     *
-     * @param world   World in which the block should be set
-     * @param x       X Coordinate
-     * @param y       Y Coordinate
-     * @param z       Z Coordinate
-     * @param blockId Block ID
-     * @param data    Block Data Value
-     *
-     */
-    @Override
-    public void set(final org.bukkit.World world, final int x, final int y, final int z, final int blockId, final byte data) {
-        if (blockId == -1) {
-            world.getBlockAt(x, y, z).setData(data, false);
-            return;
-        }
-        int X = x >> 4;
-        int Z = z >> 4;
-        ChunkLoc loc = new ChunkLoc(X, Z);
-        if (!loc.equals(lastLoc)) {
-            Chunk chunk = toUpdate.get(loc);
-            if (chunk == null) {
-                chunk = world.getChunkAt(X, Z);
-                toUpdate.put(loc, chunk);
-            }
-            chunk.load(false);
-        }
-        
-        final Object w = methodGetHandle.of(world).call();
-        final Object chunk = methodGetChunkAt.of(w).call(x >> 4, z >> 4);
-        final Object block = methodGetById.of(null).call(blockId);
-        methodA.of(chunk).call(x & 0x0f, y, z & 0x0f, block, data);
-    }
-
-    /**
-     * Update chunks
-     *
-     * @param chunks list of chunks to update
-     */
-    @Override
-    public void update(final Collection<Chunk> chunks) {
-        if (chunks.size() == 0) {
-            return;
-        }
-        if (!MainUtil.canSendChunk) {
-            for (Chunk chunk : chunks) {
-                chunk.getWorld().refreshChunk(chunk.getX(), chunk.getZ());
-                chunk.unload(true, false);
-                chunk.load();
-            }
-            return;
-        }
-        try {
-            chunksender.sendChunk(chunks);
-        } catch (final Throwable e) {
-            e.printStackTrace();
-            MainUtil.canSendChunk = false;
-        }
-    }
-}
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// PlotSquared - A plot manager and world generator for the Bukkit API                             /
+// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
+//                                                                                                 /
+// This program is free software; you can redistribute it and/or modify                            /
+// it under the terms of the GNU General Public License as published by                            /
+// the Free Software Foundation; either version 3 of the License, or                               /
+// (at your option) any later version.                                                             /
+//                                                                                                 /
+// This program is distributed in the hope that it will be useful,                                 /
+// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
+// GNU General Public License for more details.                                                    /
+//                                                                                                 /
+// You should have received a copy of the GNU General Public License                               /
+// along with this program; if not, write to the Free Software Foundation,                         /
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
+//                                                                                                 /
+// You can contact us via: support@intellectualsites.com                                           /
+////////////////////////////////////////////////////////////////////////////////////////////////////
+package com.plotsquared.bukkit.util;
+
+import static com.intellectualcrafters.plot.util.ReflectionUtils.getRefClass;
+
+import java.util.Collection;
+import java.util.HashMap;
+
+import org.bukkit.Chunk;
+
+import com.intellectualcrafters.plot.object.ChunkLoc;
+import com.intellectualcrafters.plot.util.MainUtil;
+import com.intellectualcrafters.plot.util.ReflectionUtils.RefClass;
+import com.intellectualcrafters.plot.util.ReflectionUtils.RefMethod;
+import com.intellectualcrafters.plot.util.TaskManager;
+
+/**
+ * SetBlockFast class<br> Used to do fast world editing
+ *

+ */
+public class SetBlockFast extends BukkitSetBlockManager
+{
+    private final RefClass classBlock = getRefClass("{nms}.Block");
+    private final RefClass classChunk = getRefClass("{nms}.Chunk");
+    private final RefClass classWorld = getRefClass("{nms}.World");
+    private final RefClass classCraftWorld = getRefClass("{cb}.CraftWorld");
+    private final RefMethod methodGetHandle;
+    private final RefMethod methodGetChunkAt;
+    private final RefMethod methodA;
+    private final RefMethod methodGetById;
+    private final SendChunk chunksender;
+
+    public HashMap<ChunkLoc, Chunk> toUpdate = new HashMap<>();
+
+    /**
+     * Constructor
+     *
+     * @throws NoSuchMethodException
+     */
+    public SetBlockFast() throws NoSuchMethodException
+    {
+        methodGetHandle = classCraftWorld.getMethod("getHandle");
+        methodGetChunkAt = classWorld.getMethod("getChunkAt", int.class, int.class);
+        methodA = classChunk.getMethod("a", int.class, int.class, int.class, classBlock, int.class);
+        methodGetById = classBlock.getMethod("getById", int.class);
+        TaskManager.runTaskRepeat(new Runnable()
+        {
+
+            @Override
+            public void run()
+            {
+                // TODO Auto-generated method stub
+                update(toUpdate.values());
+                toUpdate = new HashMap<>();
+            }
+        }, 20);
+        chunksender = new SendChunk();
+    }
+
+    private final ChunkLoc lastLoc = null;
+
+    /**
+     * Set the block at the location
+     *
+     * @param world   World in which the block should be set
+     * @param x       X Coordinate
+     * @param y       Y Coordinate
+     * @param z       Z Coordinate
+     * @param blockId Block ID
+     * @param data    Block Data Value
+     *
+     */
+    @Override
+    public void set(final org.bukkit.World world, final int x, final int y, final int z, final int blockId, final byte data)
+    {
+        if (blockId == -1)
+        {
+            world.getBlockAt(x, y, z).setData(data, false);
+            return;
+        }
+        final int X = x >> 4;
+        final int Z = z >> 4;
+        final ChunkLoc loc = new ChunkLoc(X, Z);
+        if (!loc.equals(lastLoc))
+        {
+            Chunk chunk = toUpdate.get(loc);
+            if (chunk == null)
+            {
+                chunk = world.getChunkAt(X, Z);
+                toUpdate.put(loc, chunk);
+            }
+            chunk.load(false);
+        }
+
+        final Object w = methodGetHandle.of(world).call();
+        final Object chunk = methodGetChunkAt.of(w).call(x >> 4, z >> 4);
+        final Object block = methodGetById.of(null).call(blockId);
+        methodA.of(chunk).call(x & 0x0f, y, z & 0x0f, block, data);
+    }
+
+    /**
+     * Update chunks
+     *
+     * @param chunks list of chunks to update
+     */
+    @Override
+    public void update(final Collection<Chunk> chunks)
+    {
+        if (chunks.size() == 0) { return; }
+        if (!MainUtil.canSendChunk)
+        {
+            for (final Chunk chunk : chunks)
+            {
+                chunk.getWorld().refreshChunk(chunk.getX(), chunk.getZ());
+                chunk.unload(true, false);
+                chunk.load();
+            }
+            return;
+        }
+        try
+        {
+            chunksender.sendChunk(chunks);
+        }
+        catch (final Throwable e)
+        {
+            e.printStackTrace();
+            MainUtil.canSendChunk = false;
+        }
+    }
+}
diff --git a/src/main/java/com/plotsquared/bukkit/util/SetBlockFast_1_8.java b/src/main/java/com/plotsquared/bukkit/util/SetBlockFast_1_8.java
index bd11497df..fa55aee48 100644
--- a/src/main/java/com/plotsquared/bukkit/util/SetBlockFast_1_8.java
+++ b/src/main/java/com/plotsquared/bukkit/util/SetBlockFast_1_8.java
@@ -1,356 +1,383 @@
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// PlotSquared - A plot manager and world generator for the Bukkit API                             /
-// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
-//                                                                                                 /
-// This program is free software; you can redistribute it and/or modify                            /
-// it under the terms of the GNU General Public License as published by                            /
-// the Free Software Foundation; either version 3 of the License, or                               /
-// (at your option) any later version.                                                             /
-//                                                                                                 /
-// This program is distributed in the hope that it will be useful,                                 /
-// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
-// GNU General Public License for more details.                                                    /
-//                                                                                                 /
-// You should have received a copy of the GNU General Public License                               /
-// along with this program; if not, write to the Free Software Foundation,                         /
-// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
-//                                                                                                 /
-// You can contact us via: support@intellectualsites.com                                           /
-////////////////////////////////////////////////////////////////////////////////////////////////////
-package com.plotsquared.bukkit.util;
-
-import static com.intellectualcrafters.plot.util.ReflectionUtils.getRefClass;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map.Entry;
-
-import org.bukkit.Chunk;
-import org.bukkit.World;
-import org.bukkit.block.Block;
-
-import com.intellectualcrafters.plot.object.ChunkLoc;
-import com.intellectualcrafters.plot.util.MainUtil;
-import com.intellectualcrafters.plot.util.ReflectionUtils.RefClass;
-import com.intellectualcrafters.plot.util.ReflectionUtils.RefConstructor;
-import com.intellectualcrafters.plot.util.ReflectionUtils.RefMethod;
-import com.intellectualcrafters.plot.util.TaskManager;
-
-/**
- * SetBlockFast class<br> Used to do fast world editing
- *
- * @author Empire92
- */
-public class SetBlockFast_1_8 extends BukkitSetBlockManager {
-    private final RefClass classBlock = getRefClass("{nms}.Block");
-    private final RefClass classBlockPosition = getRefClass("{nms}.BlockPosition");
-    private final RefClass classIBlockData = getRefClass("{nms}.IBlockData");
-    private final RefClass classChunk = getRefClass("{nms}.Chunk");
-    private final RefClass classWorld = getRefClass("{nms}.World");
-    private final RefClass classCraftWorld = getRefClass("{cb}.CraftWorld");
-    private RefMethod methodGetHandle;
-    private RefMethod methodGetChunkAt;
-    private RefMethod methodA;
-    private RefMethod methodGetByCombinedId;
-    private RefConstructor constructorBlockPosition;
-    private SendChunk chunksender;
-
-    public static HashMap<ChunkLoc, Chunk> toUpdate = new HashMap<>();
-    
-    /**
-     * Constructor
-     *
-     * @throws NoSuchMethodException
-     */
-    public SetBlockFast_1_8() throws NoSuchMethodException {
-        constructorBlockPosition = classBlockPosition.getConstructor(int.class, int.class, int.class);
-        methodGetByCombinedId = classBlock.getMethod("getByCombinedId", int.class);
-        methodGetHandle = classCraftWorld.getMethod("getHandle");
-        methodGetChunkAt = classWorld.getMethod("getChunkAt", int.class, int.class);
-        methodA = classChunk.getMethod("a", classBlockPosition, classIBlockData);
-        TaskManager.runTaskRepeat(new Runnable() {
-            
-            @Override
-            public void run() {
-                if (toUpdate.size() == 0) {
-                    return;
-                }
-                int count = 0;
-                ArrayList<Chunk> chunks = new ArrayList<Chunk>();
-                Iterator<Entry<ChunkLoc, Chunk>> i = toUpdate.entrySet().iterator();
-                while (i.hasNext() && count < 128) {
-                    chunks.add(i.next().getValue());
-                    i.remove();
-                    count++;
-                }
-                if (count == 0) {
-                    return;
-                }
-                update(chunks);
-            }
-        }, 1);
-        this.chunksender = new SendChunk();
-    }
-
-    private ChunkLoc lastLoc = null;
-    
-    /**
-     * Set the block at the location
-     *
-     * @param world   World in which the block should be set
-     * @param x       X Coordinate
-     * @param y       Y Coordinate
-     * @param z       Z Coordinate
-     * @param id      Block ID
-     * @param data    Block Data Value
-     */
-    @SuppressWarnings("deprecation")
-    @Override
-    public void set(final World world, final int x, final int y, final int z, final int id, final byte data) {
-        if (id == -1) {
-            world.getBlockAt(x, y, z).setData(data, false);
-            return;
-        }
-        // Start blockstate workaround //
-        switch (id) {
-            case 54:
-            case 130:
-            case 142:
-            case 132:
-            case 27:
-            case 137:
-            case 52:
-            case 154:
-            case 84:
-            case 25:
-            case 144:
-            case 138:
-            case 176:
-            case 177:
-            case 119:
-            case 63:
-            case 68:
-            case 323:
-            case 117:
-            case 116:
-            case 28:
-            case 66:
-            case 157:
-            case 61:
-            case 62:
-            case 140:
-            case 146:
-            case 149:
-            case 150:
-            case 158:
-            case 23:
-            case 123:
-            case 124:
-            case 29:
-            case 33:
-            case 151:
-            case 178: {
-                final Block block = world.getBlockAt(x, y, z);
-                if (block.getData() == data) {
-                    if (block.getTypeId() != id) {
-                        block.setTypeId(id, false);
-                    }
-                } else {
-                    if (block.getTypeId() == id) {
-                        block.setData(data, false);
-                    } else {
-                        block.setTypeIdAndData(id, data, false);
-                    }
-                }
-                return;
-            }
-        }
-        
-        // Start data value shortcut
-        Block block = world.getBlockAt(x, y, z);
-        int currentId = block.getTypeId();
-        if (currentId == id) {
-            switch(id) {
-                case 0:
-                case 2:
-                case 4:
-                case 13:
-                case 14:
-                case 15:
-                case 20:
-                case 21:
-                case 22:
-                case 24:
-                case 25:
-                case 30:
-                case 32:
-                case 37:
-                case 39:
-                case 40:
-                case 41:
-                case 42:
-                case 45:
-                case 46:
-                case 47:
-                case 48:
-                case 49:
-                case 51:
-                case 52:
-                case 54:
-                case 55:
-                case 56:
-                case 57:
-                case 58:
-                case 60:
-                case 61:
-                case 62:
-                case 7:
-                case 8:
-                case 9:
-                case 10:
-                case 11:
-                case 73:
-                case 74:
-                case 78:
-                case 79:
-                case 80:
-                case 81:
-                case 82:
-                case 83:
-                case 84:
-                case 85:
-                case 87:
-                case 88:
-                case 101:
-                case 102:
-                case 103:
-                case 110:
-                case 112:
-                case 113:
-                case 117:
-                case 121:
-                case 122:
-                case 123:
-                case 124:
-                case 129:
-                case 133:
-                case 138:
-                case 137:
-                case 140:
-                case 165:
-                case 166:
-                case 169:
-                case 170:
-                case 172:
-                case 173:
-                case 174:
-                case 176:
-                case 177:
-                case 181:
-                case 182:
-                case 188:
-                case 189:
-                case 190:
-                case 191:
-                case 192: {
-                    return;
-                }
-            }
-            if (block.getData() == data) {
-                return;
-            }
-            block.setData(data);
-            return;
-        }
-        // blockstate
-        switch(currentId) {
-            case 54:
-            case 130:
-            case 132:
-            case 142:
-            case 27:
-            case 137:
-            case 52:
-            case 154:
-            case 84:
-            case 25:
-            case 144:
-            case 138:
-            case 176:
-            case 177:
-            case 63:
-            case 68:
-            case 323:
-            case 117:
-            case 119:
-            case 116:
-            case 28:
-            case 66:
-            case 157:
-            case 61:
-            case 62:
-            case 140:
-            case 146:
-            case 149:
-            case 150:
-            case 158:
-            case 23:
-            case 123:
-            case 124:
-            case 29:
-            case 33:
-            case 151:
-            case 178: {
-                if (block.getData() == data) {
-                    block.setTypeId(id, false);
-                } else {
-                    block.setTypeIdAndData(id, data, false);
-                }
-                return;
-            }
-        }
-        // End blockstate workaround //
-        
-        int X = x >> 4;
-        int Z = z >> 4;
-        ChunkLoc loc = new ChunkLoc(X, Z);
-        if (!loc.equals(lastLoc)) {
-            Chunk chunk = toUpdate.get(loc);
-            if (chunk == null) {
-                chunk = world.getChunkAt(X, Z);
-                toUpdate.put(loc, chunk);
-            }
-            chunk.load(false);
-        }
-        // check sign
-        final Object w = methodGetHandle.of(world).call();
-        final Object chunk = methodGetChunkAt.of(w).call(x >> 4, z >> 4);
-        final Object pos = constructorBlockPosition.create(x & 0x0f, y, z & 0x0f);
-        final Object combined = methodGetByCombinedId.of(null).call(id + (data << 12));
-        methodA.of(chunk).call(pos, combined);
-    }
-    
-    @Override
-    public void update(final Collection<Chunk> chunks) {
-        if (chunks.size() == 0) {
-            return;
-        }
-        if (!MainUtil.canSendChunk) {
-            for (Chunk chunk : chunks) {
-                chunk.getWorld().refreshChunk(chunk.getX(), chunk.getZ());
-                chunk.unload(true, false);
-                chunk.load();
-            }
-            return;
-        }
-        try {
-            chunksender.sendChunk(chunks);
-        } catch (final Throwable e) {
-            e.printStackTrace();
-            MainUtil.canSendChunk = false;
-        }
-    }
-}
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// PlotSquared - A plot manager and world generator for the Bukkit API                             /
+// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
+//                                                                                                 /
+// This program is free software; you can redistribute it and/or modify                            /
+// it under the terms of the GNU General Public License as published by                            /
+// the Free Software Foundation; either version 3 of the License, or                               /
+// (at your option) any later version.                                                             /
+//                                                                                                 /
+// This program is distributed in the hope that it will be useful,                                 /
+// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
+// GNU General Public License for more details.                                                    /
+//                                                                                                 /
+// You should have received a copy of the GNU General Public License                               /
+// along with this program; if not, write to the Free Software Foundation,                         /
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
+//                                                                                                 /
+// You can contact us via: support@intellectualsites.com                                           /
+////////////////////////////////////////////////////////////////////////////////////////////////////
+package com.plotsquared.bukkit.util;
+
+import static com.intellectualcrafters.plot.util.ReflectionUtils.getRefClass;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map.Entry;
+
+import org.bukkit.Chunk;
+import org.bukkit.World;
+import org.bukkit.block.Block;
+
+import com.intellectualcrafters.plot.object.ChunkLoc;
+import com.intellectualcrafters.plot.util.MainUtil;
+import com.intellectualcrafters.plot.util.ReflectionUtils.RefClass;
+import com.intellectualcrafters.plot.util.ReflectionUtils.RefConstructor;
+import com.intellectualcrafters.plot.util.ReflectionUtils.RefMethod;
+import com.intellectualcrafters.plot.util.TaskManager;
+
+/**
+ * SetBlockFast class<br> Used to do fast world editing
+ *

+ */
+public class SetBlockFast_1_8 extends BukkitSetBlockManager
+{
+    private final RefClass classBlock = getRefClass("{nms}.Block");
+    private final RefClass classBlockPosition = getRefClass("{nms}.BlockPosition");
+    private final RefClass classIBlockData = getRefClass("{nms}.IBlockData");
+    private final RefClass classChunk = getRefClass("{nms}.Chunk");
+    private final RefClass classWorld = getRefClass("{nms}.World");
+    private final RefClass classCraftWorld = getRefClass("{cb}.CraftWorld");
+    private RefMethod methodGetHandle;
+    private RefMethod methodGetChunkAt;
+    private RefMethod methodA;
+    private RefMethod methodGetByCombinedId;
+    private RefConstructor constructorBlockPosition;
+    private SendChunk chunksender;
+
+    public static HashMap<ChunkLoc, Chunk> toUpdate = new HashMap<>();
+
+    /**
+     * Constructor
+     *
+     * @throws NoSuchMethodException
+     */
+    public SetBlockFast_1_8() throws NoSuchMethodException
+    {
+        constructorBlockPosition = classBlockPosition.getConstructor(int.class, int.class, int.class);
+        methodGetByCombinedId = classBlock.getMethod("getByCombinedId", int.class);
+        methodGetHandle = classCraftWorld.getMethod("getHandle");
+        methodGetChunkAt = classWorld.getMethod("getChunkAt", int.class, int.class);
+        methodA = classChunk.getMethod("a", classBlockPosition, classIBlockData);
+        TaskManager.runTaskRepeat(new Runnable()
+        {
+
+            @Override
+            public void run()
+            {
+                if (toUpdate.size() == 0) {
+                return;
+                }
+                int count = 0;
+                final ArrayList<Chunk> chunks = new ArrayList<Chunk>();
+                final Iterator<Entry<ChunkLoc, Chunk>> i = toUpdate.entrySet().iterator();
+                while (i.hasNext() && (count < 128))
+                {
+                    chunks.add(i.next().getValue());
+                    i.remove();
+                    count++;
+                }
+                if (count == 0) {
+                return;
+                }
+                update(chunks);
+            }
+        }, 1);
+        chunksender = new SendChunk();
+    }
+
+    private final ChunkLoc lastLoc = null;
+
+    /**
+     * Set the block at the location
+     *
+     * @param world   World in which the block should be set
+     * @param x       X Coordinate
+     * @param y       Y Coordinate
+     * @param z       Z Coordinate
+     * @param id      Block ID
+     * @param data    Block Data Value
+     */
+    @SuppressWarnings("deprecation")
+    @Override
+    public void set(final World world, final int x, final int y, final int z, final int id, final byte data)
+    {
+        if (id == -1)
+        {
+            world.getBlockAt(x, y, z).setData(data, false);
+            return;
+        }
+        // Start blockstate workaround //
+        switch (id)
+        {
+            case 54:
+            case 130:
+            case 142:
+            case 132:
+            case 27:
+            case 137:
+            case 52:
+            case 154:
+            case 84:
+            case 25:
+            case 144:
+            case 138:
+            case 176:
+            case 177:
+            case 119:
+            case 63:
+            case 68:
+            case 323:
+            case 117:
+            case 116:
+            case 28:
+            case 66:
+            case 157:
+            case 61:
+            case 62:
+            case 140:
+            case 146:
+            case 149:
+            case 150:
+            case 158:
+            case 23:
+            case 123:
+            case 124:
+            case 29:
+            case 33:
+            case 151:
+            case 178:
+            {
+                final Block block = world.getBlockAt(x, y, z);
+                if (block.getData() == data)
+                {
+                    if (block.getTypeId() != id)
+                    {
+                        block.setTypeId(id, false);
+                    }
+                }
+                else
+                {
+                    if (block.getTypeId() == id)
+                    {
+                        block.setData(data, false);
+                    }
+                    else
+                    {
+                        block.setTypeIdAndData(id, data, false);
+                    }
+                }
+                return;
+            }
+        }
+
+        // Start data value shortcut
+        final Block block = world.getBlockAt(x, y, z);
+        final int currentId = block.getTypeId();
+        if (currentId == id)
+        {
+            switch (id)
+            {
+                case 0:
+                case 2:
+                case 4:
+                case 13:
+                case 14:
+                case 15:
+                case 20:
+                case 21:
+                case 22:
+                case 24:
+                case 25:
+                case 30:
+                case 32:
+                case 37:
+                case 39:
+                case 40:
+                case 41:
+                case 42:
+                case 45:
+                case 46:
+                case 47:
+                case 48:
+                case 49:
+                case 51:
+                case 52:
+                case 54:
+                case 55:
+                case 56:
+                case 57:
+                case 58:
+                case 60:
+                case 61:
+                case 62:
+                case 7:
+                case 8:
+                case 9:
+                case 10:
+                case 11:
+                case 73:
+                case 74:
+                case 78:
+                case 79:
+                case 80:
+                case 81:
+                case 82:
+                case 83:
+                case 84:
+                case 85:
+                case 87:
+                case 88:
+                case 101:
+                case 102:
+                case 103:
+                case 110:
+                case 112:
+                case 113:
+                case 117:
+                case 121:
+                case 122:
+                case 123:
+                case 124:
+                case 129:
+                case 133:
+                case 138:
+                case 137:
+                case 140:
+                case 165:
+                case 166:
+                case 169:
+                case 170:
+                case 172:
+                case 173:
+                case 174:
+                case 176:
+                case 177:
+                case 181:
+                case 182:
+                case 188:
+                case 189:
+                case 190:
+                case 191:
+                case 192:
+                {
+                    return;
+                }
+            }
+            if (block.getData() == data) { return; }
+            block.setData(data);
+            return;
+        }
+        // blockstate
+        switch (currentId)
+        {
+            case 54:
+            case 130:
+            case 132:
+            case 142:
+            case 27:
+            case 137:
+            case 52:
+            case 154:
+            case 84:
+            case 25:
+            case 144:
+            case 138:
+            case 176:
+            case 177:
+            case 63:
+            case 68:
+            case 323:
+            case 117:
+            case 119:
+            case 116:
+            case 28:
+            case 66:
+            case 157:
+            case 61:
+            case 62:
+            case 140:
+            case 146:
+            case 149:
+            case 150:
+            case 158:
+            case 23:
+            case 123:
+            case 124:
+            case 29:
+            case 33:
+            case 151:
+            case 178:
+            {
+                if (block.getData() == data)
+                {
+                    block.setTypeId(id, false);
+                }
+                else
+                {
+                    block.setTypeIdAndData(id, data, false);
+                }
+                return;
+            }
+        }
+        // End blockstate workaround //
+
+        final int X = x >> 4;
+        final int Z = z >> 4;
+        final ChunkLoc loc = new ChunkLoc(X, Z);
+        if (!loc.equals(lastLoc))
+        {
+            Chunk chunk = toUpdate.get(loc);
+            if (chunk == null)
+            {
+                chunk = world.getChunkAt(X, Z);
+                toUpdate.put(loc, chunk);
+            }
+            chunk.load(false);
+        }
+        // check sign
+        final Object w = methodGetHandle.of(world).call();
+        final Object chunk = methodGetChunkAt.of(w).call(x >> 4, z >> 4);
+        final Object pos = constructorBlockPosition.create(x & 0x0f, y, z & 0x0f);
+        final Object combined = methodGetByCombinedId.of(null).call(id + (data << 12));
+        methodA.of(chunk).call(pos, combined);
+    }
+
+    @Override
+    public void update(final Collection<Chunk> chunks)
+    {
+        if (chunks.size() == 0) { return; }
+        if (!MainUtil.canSendChunk)
+        {
+            for (final Chunk chunk : chunks)
+            {
+                chunk.getWorld().refreshChunk(chunk.getX(), chunk.getZ());
+                chunk.unload(true, false);
+                chunk.load();
+            }
+            return;
+        }
+        try
+        {
+            chunksender.sendChunk(chunks);
+        }
+        catch (final Throwable e)
+        {
+            e.printStackTrace();
+            MainUtil.canSendChunk = false;
+        }
+    }
+}
diff --git a/src/main/java/com/plotsquared/bukkit/util/SetBlockSlow.java b/src/main/java/com/plotsquared/bukkit/util/SetBlockSlow.java
index 9cae4dfd7..f98b0adc9 100644
--- a/src/main/java/com/plotsquared/bukkit/util/SetBlockSlow.java
+++ b/src/main/java/com/plotsquared/bukkit/util/SetBlockSlow.java
@@ -6,29 +6,40 @@ import org.bukkit.Chunk;
 import org.bukkit.World;
 import org.bukkit.block.Block;
 
-public class SetBlockSlow extends BukkitSetBlockManager {
+public class SetBlockSlow extends BukkitSetBlockManager
+{
     @Override
-    public void set(final World world, final int x, final int y, final int z, final int id, final byte data) {
+    public void set(final World world, final int x, final int y, final int z, final int id, final byte data)
+    {
         final Block block = world.getBlockAt(x, y, z);
-        if (id == -1) {
+        if (id == -1)
+        {
             block.setData(data, false);
             return;
         }
-        if (block.getData() == data) {
-            if (block.getTypeId() != id) {
+        if (block.getData() == data)
+        {
+            if (block.getTypeId() != id)
+            {
                 block.setTypeId(id, false);
             }
-        } else {
-            if (block.getTypeId() == id) {
+        }
+        else
+        {
+            if (block.getTypeId() == id)
+            {
                 block.setData(data, false);
-            } else {
+            }
+            else
+            {
                 block.setTypeIdAndData(id, data, false);
             }
         }
     }
 
     @Override
-    public void update(final Collection<Chunk> chunks) {
+    public void update(final Collection<Chunk> chunks)
+    {
         // TODO nothing
     }
 }
diff --git a/src/main/java/com/plotsquared/bukkit/util/SetGenCB.java b/src/main/java/com/plotsquared/bukkit/util/SetGenCB.java
index 439654a27..f2bfffa23 100644
--- a/src/main/java/com/plotsquared/bukkit/util/SetGenCB.java
+++ b/src/main/java/com/plotsquared/bukkit/util/SetGenCB.java
@@ -14,29 +14,31 @@ import com.intellectualcrafters.plot.generator.PlotGenerator;
 import com.intellectualcrafters.plot.util.SetupUtils;
 import com.plotsquared.bukkit.generator.AugmentedPopulator;
 
-public class SetGenCB {
-    public static void setGenerator(World world) throws Exception {
+public class SetGenCB
+{
+    public static void setGenerator(final World world) throws Exception
+    {
         SetupUtils.manager.updateGenerators();
         PS.get().removePlotWorldAbs(world.getName());
-        ChunkGenerator gen = world.getGenerator();
-        if (gen == null) {
-            return;
-        }
-        String name = gen.getClass().getCanonicalName();
+        final ChunkGenerator gen = world.getGenerator();
+        if (gen == null) { return; }
+        final String name = gen.getClass().getCanonicalName();
         boolean set = false;
-        for (PlotGenerator<?> wrapper : SetupUtils.generators.values()) {
-            ChunkGenerator newGen = (ChunkGenerator) wrapper.generator;
-            if (newGen.getClass().getCanonicalName().equals(name)) {
+        for (final PlotGenerator<?> wrapper : SetupUtils.generators.values())
+        {
+            final ChunkGenerator newGen = (ChunkGenerator) wrapper.generator;
+            if (newGen.getClass().getCanonicalName().equals(name))
+            {
                 // set generator
-                Field generator = world.getClass().getDeclaredField("generator");
-                Field populators = world.getClass().getDeclaredField("populators");
+                final Field generator = world.getClass().getDeclaredField("generator");
+                final Field populators = world.getClass().getDeclaredField("populators");
                 generator.setAccessible(true);
                 populators.setAccessible(true);
                 // Set populators (just in case)
                 populators.set(world, new ArrayList<>());
                 // Set generator
-                Constructor<? extends ChunkGenerator> constructor = newGen.getClass().getConstructor(String.class);
-                ChunkGenerator newNewGen = constructor.newInstance(world.getName());
+                final Constructor<? extends ChunkGenerator> constructor = newGen.getClass().getConstructor(String.class);
+                final ChunkGenerator newNewGen = constructor.newInstance(world.getName());
                 generator.set(world, newNewGen);
                 populators.set(world, newNewGen.getDefaultPopulators(world));
                 // end
@@ -44,10 +46,13 @@ public class SetGenCB {
                 break;
             }
         }
-        if (!set) {
-            Iterator<BlockPopulator> iter = world.getPopulators().iterator();
-            while (iter.hasNext()) {
-                if (iter.next() instanceof AugmentedPopulator) {
+        if (!set)
+        {
+            final Iterator<BlockPopulator> iter = world.getPopulators().iterator();
+            while (iter.hasNext())
+            {
+                if (iter.next() instanceof AugmentedPopulator)
+                {
                     iter.remove();
                 }
             }
diff --git a/src/main/java/com/plotsquared/bukkit/util/WorldEditSchematic.java b/src/main/java/com/plotsquared/bukkit/util/WorldEditSchematic.java
index 976d90cfd..f991a7840 100644
--- a/src/main/java/com/plotsquared/bukkit/util/WorldEditSchematic.java
+++ b/src/main/java/com/plotsquared/bukkit/util/WorldEditSchematic.java
@@ -13,21 +13,26 @@ import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.bukkit.BukkitWorld;
 
-public class WorldEditSchematic {
-    public void saveSchematic(String file, final String world, final PlotId id) {
-        Location bot = MainUtil.getPlotBottomLoc(world, id).add(1, 0, 1);
-        Location top = MainUtil.getPlotTopLoc(world, id);
-        Vector size = new Vector(top.getX() - bot.getX() + 1, top.getY() - bot.getY() - 1, top.getZ() - bot.getZ() + 1);
-        Vector origin = new Vector(bot.getX(), bot.getY(), bot.getZ());
-        CuboidClipboard clipboard = new CuboidClipboard(size, origin);
-        Vector pos1 = new Vector(bot.getX(), bot.getY(), bot.getZ());
-        Vector pos2 = new Vector(top.getX(), top.getY(), top.getZ());
-        EditSession session = BukkitMain.worldEdit.getWorldEdit().getEditSessionFactory().getEditSession(new BukkitWorld(Bukkit.getWorld(world)), 999999999);
+public class WorldEditSchematic
+{
+    public void saveSchematic(final String file, final String world, final PlotId id)
+    {
+        final Location bot = MainUtil.getPlotBottomLoc(world, id).add(1, 0, 1);
+        final Location top = MainUtil.getPlotTopLoc(world, id);
+        final Vector size = new Vector((top.getX() - bot.getX()) + 1, top.getY() - bot.getY() - 1, (top.getZ() - bot.getZ()) + 1);
+        final Vector origin = new Vector(bot.getX(), bot.getY(), bot.getZ());
+        final CuboidClipboard clipboard = new CuboidClipboard(size, origin);
+        new Vector(bot.getX(), bot.getY(), bot.getZ());
+        new Vector(top.getX(), top.getY(), top.getZ());
+        final EditSession session = BukkitMain.worldEdit.getWorldEdit().getEditSessionFactory().getEditSession(new BukkitWorld(Bukkit.getWorld(world)), 999999999);
         clipboard.copy(session);
-        try {
+        try
+        {
             clipboard.saveSchematic(new File(file));
             MainUtil.sendMessage(null, "&7 - &a  success: " + id);
-        } catch (Exception e) {
+        }
+        catch (final Exception e)
+        {
             e.printStackTrace();
             MainUtil.sendMessage(null, "&7 - Failed to save &c" + id);
         }
diff --git a/src/main/java/com/plotsquared/bukkit/uuid/DefaultUUIDWrapper.java b/src/main/java/com/plotsquared/bukkit/uuid/DefaultUUIDWrapper.java
index 01284621a..23bcf025c 100644
--- a/src/main/java/com/plotsquared/bukkit/uuid/DefaultUUIDWrapper.java
+++ b/src/main/java/com/plotsquared/bukkit/uuid/DefaultUUIDWrapper.java
@@ -11,32 +11,39 @@ import com.intellectualcrafters.plot.uuid.UUIDWrapper;
 import com.plotsquared.bukkit.object.BukkitOfflinePlayer;
 import com.plotsquared.bukkit.object.BukkitPlayer;
 
-public class DefaultUUIDWrapper extends UUIDWrapper {
+public class DefaultUUIDWrapper extends UUIDWrapper
+{
     @Override
-    public UUID getUUID(final PlotPlayer player) {
+    public UUID getUUID(final PlotPlayer player)
+    {
         return ((BukkitPlayer) player).player.getUniqueId();
     }
 
     @Override
-    public UUID getUUID(final OfflinePlotPlayer player) {
+    public UUID getUUID(final OfflinePlotPlayer player)
+    {
         return player.getUUID();
     }
 
     @Override
-    public OfflinePlotPlayer getOfflinePlayer(final UUID uuid) {
+    public OfflinePlotPlayer getOfflinePlayer(final UUID uuid)
+    {
         return new BukkitOfflinePlayer(Bukkit.getOfflinePlayer(uuid));
     }
 
     @Override
-    public UUID getUUID(final String name) {
+    public UUID getUUID(final String name)
+    {
         return Bukkit.getOfflinePlayer(name).getUniqueId();
     }
 
     @Override
-    public OfflinePlotPlayer[] getOfflinePlayers() {
-        OfflinePlayer[] ops = Bukkit.getOfflinePlayers();
-        BukkitOfflinePlayer[] toReturn = new BukkitOfflinePlayer[ops.length] ;
-        for (int i = 0; i < ops.length; i++) {
+    public OfflinePlotPlayer[] getOfflinePlayers()
+    {
+        final OfflinePlayer[] ops = Bukkit.getOfflinePlayers();
+        final BukkitOfflinePlayer[] toReturn = new BukkitOfflinePlayer[ops.length];
+        for (int i = 0; i < ops.length; i++)
+        {
             toReturn[i] = new BukkitOfflinePlayer(ops[i]);
         }
         return toReturn;
diff --git a/src/main/java/com/plotsquared/bukkit/uuid/FileUUIDHandler.java b/src/main/java/com/plotsquared/bukkit/uuid/FileUUIDHandler.java
index dcc6ad52d..d0642e869 100644
--- a/src/main/java/com/plotsquared/bukkit/uuid/FileUUIDHandler.java
+++ b/src/main/java/com/plotsquared/bukkit/uuid/FileUUIDHandler.java
@@ -31,104 +31,134 @@ import com.intellectualcrafters.plot.util.UUIDHandler;
 import com.intellectualcrafters.plot.util.UUIDHandlerImplementation;
 import com.intellectualcrafters.plot.uuid.UUIDWrapper;
 
-public class FileUUIDHandler extends UUIDHandlerImplementation {
+public class FileUUIDHandler extends UUIDHandlerImplementation
+{
 
-    public FileUUIDHandler(UUIDWrapper wrapper) {
+    public FileUUIDHandler(final UUIDWrapper wrapper)
+    {
         super(wrapper);
     }
-    
+
     @Override
-    public boolean startCaching(Runnable whenDone) {
-        if (!super.startCaching(whenDone)) {
-            return false;
-        }
+    public boolean startCaching(final Runnable whenDone)
+    {
+        if (!super.startCaching(whenDone)) { return false; }
         return cache(whenDone);
     }
-    
-    public boolean cache(final Runnable whenDone) {
+
+    public boolean cache(final Runnable whenDone)
+    {
         final File container = Bukkit.getWorldContainer();
-        List<World> worlds = Bukkit.getWorlds();
+        final List<World> worlds = Bukkit.getWorlds();
         final String world;
-        if (worlds.size() == 0) {
+        if (worlds.size() == 0)
+        {
             world = "world";
         }
-        else {
+        else
+        {
             world = worlds.get(0).getName();
         }
-        TaskManager.runTaskAsync(new Runnable() {
+        TaskManager.runTaskAsync(new Runnable()
+        {
             @Override
-            public void run() {
+            public void run()
+            {
                 PS.debug(C.PREFIX.s() + "&6Starting player data caching for: " + world);
-                File uuidfile = new File(PS.get().IMP.getDirectory(), "uuids.txt");
-                if (uuidfile.exists()) {
-                    try {
-                        List<String> lines = Files.readAllLines(uuidfile.toPath(), StandardCharsets.UTF_8);
-                        for (String line : lines) {
-                            try {
+                final File uuidfile = new File(PS.get().IMP.getDirectory(), "uuids.txt");
+                if (uuidfile.exists())
+                {
+                    try
+                    {
+                        final List<String> lines = Files.readAllLines(uuidfile.toPath(), StandardCharsets.UTF_8);
+                        for (String line : lines)
+                        {
+                            try
+                            {
                                 line = line.trim();
-                                if (line.length() == 0) {
+                                if (line.length() == 0)
+                                {
                                     continue;
                                 }
                                 line = line.replaceAll("[\\|][0-9]+[\\|][0-9]+[\\|]", "");
-                                String[] split = line.split("\\|");
-                                String name = split[0];
-                                if (name.length() == 0 || name.length() > 16 || !StringMan.isAlphanumericUnd(name)) {
+                                final String[] split = line.split("\\|");
+                                final String name = split[0];
+                                if ((name.length() == 0) || (name.length() > 16) || !StringMan.isAlphanumericUnd(name))
+                                {
                                     continue;
                                 }
-                                UUID uuid = uuidWrapper.getUUID(name);
-                                if (uuid == null) {
+                                final UUID uuid = uuidWrapper.getUUID(name);
+                                if (uuid == null)
+                                {
                                     continue;
                                 }
                                 UUIDHandler.add(new StringWrapper(name), uuid);
                             }
-                            catch (Exception e2) {
+                            catch (final Exception e2)
+                            {
                                 e2.printStackTrace();
                             }
                         }
-                    } catch (IOException e) {
+                    }
+                    catch (final IOException e)
+                    {
                         e.printStackTrace();
                     }
                 }
-                if (Settings.TWIN_MODE_UUID) {
+                if (Settings.TWIN_MODE_UUID)
+                {
                     final HashBiMap<StringWrapper, UUID> toAdd = HashBiMap.create(new HashMap<StringWrapper, UUID>());
                     toAdd.put(new StringWrapper("*"), DBFunc.everyone);
-                    HashSet<UUID> all = UUIDHandler.getAllUUIDS();
+                    final HashSet<UUID> all = UUIDHandler.getAllUUIDS();
                     PS.debug("&aFast mode UUID caching enabled!");
                     final File playerdataFolder = new File(container, world + File.separator + "playerdata");
-                    String[] dat = playerdataFolder.list(new FilenameFilter() {
+                    final String[] dat = playerdataFolder.list(new FilenameFilter()
+                    {
                         @Override
-                        public boolean accept(final File f, final String s) {
+                        public boolean accept(final File f, final String s)
+                        {
                             return s.endsWith(".dat");
                         }
                     });
-                    boolean check = all.size() == 0;
-                    if (dat != null) {
-                        for (final String current : dat) {
+                    final boolean check = all.size() == 0;
+                    if (dat != null)
+                    {
+                        for (final String current : dat)
+                        {
                             final String s = current.replaceAll(".dat$", "");
-                            try {
-                                UUID uuid = UUID.fromString(s);
-                                if (check || all.remove(uuid)) {
-                                    File file = new File(playerdataFolder + File.separator + current);
-                                    InputSupplier<FileInputStream> is = com.google.common.io.Files.newInputStreamSupplier(file);
-                                    NbtFactory.NbtCompound compound = NbtFactory.fromStream(is, NbtFactory.StreamOptions.GZIP_COMPRESSION);
-                                    NbtFactory.NbtCompound bukkit = (NbtFactory.NbtCompound) compound.get("bukkit");
-                                    String name = (String) bukkit.get("lastKnownName");
-                                    long last = (long) bukkit.get("lastPlayed");
+                            try
+                            {
+                                final UUID uuid = UUID.fromString(s);
+                                if (check || all.remove(uuid))
+                                {
+                                    final File file = new File(playerdataFolder + File.separator + current);
+                                    final InputSupplier<FileInputStream> is = com.google.common.io.Files.newInputStreamSupplier(file);
+                                    final NbtFactory.NbtCompound compound = NbtFactory.fromStream(is, NbtFactory.StreamOptions.GZIP_COMPRESSION);
+                                    final NbtFactory.NbtCompound bukkit = (NbtFactory.NbtCompound) compound.get("bukkit");
+                                    final String name = (String) bukkit.get("lastKnownName");
+                                    final long last = (long) bukkit.get("lastPlayed");
                                     ExpireManager.dates.put(uuid, last);
                                     toAdd.put(new StringWrapper(name), uuid);
                                 }
-                            } catch (final Exception e) {
+                            }
+                            catch (final Exception e)
+                            {
                                 e.printStackTrace();
                                 PS.debug(C.PREFIX.s() + "Invalid playerdata: " + current);
                             }
                         }
                     }
                     add(toAdd);
-                    if (all.size() == 0) {
-                        if (whenDone != null) whenDone.run();
+                    if (all.size() == 0)
+                    {
+                        if (whenDone != null)
+                        {
+                            whenDone.run();
+                        }
                         return;
                     }
-                    else {
+                    else
+                    {
                         PS.debug("Failed to cache: " + all.size() + " uuids - slowly processing all files");
                     }
                 }
@@ -140,22 +170,30 @@ public class FileUUIDHandler extends UUIDHandlerImplementation {
                 final HashSet<UUID> uuids = new HashSet<>();
                 final HashSet<String> names = new HashSet<>();
                 File playerdataFolder = null;
-                for (final String worldname : worlds) {
+                for (final String worldname : worlds)
+                {
                     // Getting UUIDs
                     playerdataFolder = new File(container, worldname + File.separator + "playerdata");
-                    String[] dat = playerdataFolder.list(new FilenameFilter() {
+                    String[] dat = playerdataFolder.list(new FilenameFilter()
+                    {
                         @Override
-                        public boolean accept(final File f, final String s) {
+                        public boolean accept(final File f, final String s)
+                        {
                             return s.endsWith(".dat");
                         }
                     });
-                    if (dat != null && dat.length != 0) {
-                        for (final String current : dat) {
+                    if ((dat != null) && (dat.length != 0))
+                    {
+                        for (final String current : dat)
+                        {
                             final String s = current.replaceAll(".dat$", "");
-                            try {
+                            try
+                            {
                                 final UUID uuid = UUID.fromString(s);
                                 uuids.add(uuid);
-                            } catch (final Exception e) {
+                            }
+                            catch (final Exception e)
+                            {
                                 PS.debug(C.PREFIX.s() + "Invalid playerdata: " + current);
                             }
                         }
@@ -163,72 +201,94 @@ public class FileUUIDHandler extends UUIDHandlerImplementation {
                     }
                     // Getting names
                     final File playersFolder = new File(worldname + File.separator + "players");
-                    dat = playersFolder.list(new FilenameFilter() {
+                    dat = playersFolder.list(new FilenameFilter()
+                    {
                         @Override
-                        public boolean accept(final File f, final String s) {
+                        public boolean accept(final File f, final String s)
+                        {
                             return s.endsWith(".dat");
                         }
                     });
-                    if (dat != null && dat.length != 0) {
-                        for (final String current : dat) {
+                    if ((dat != null) && (dat.length != 0))
+                    {
+                        for (final String current : dat)
+                        {
                             names.add(current.replaceAll(".dat$", ""));
                         }
                         break;
                     }
                 }
-                for (UUID uuid : uuids) {
-                    try {
-                        File file = new File(playerdataFolder + File.separator + uuid.toString() + ".dat");
-                        InputSupplier<FileInputStream> is = com.google.common.io.Files.newInputStreamSupplier(file);
-                        NbtFactory.NbtCompound compound = NbtFactory.fromStream(is, NbtFactory.StreamOptions.GZIP_COMPRESSION);
-                        NbtFactory.NbtCompound bukkit = (NbtFactory.NbtCompound) compound.get("bukkit");
-                        String name = (String) bukkit.get("lastKnownName");
-                        long last = (long) bukkit.get("lastPlayed");
-                        if (Settings.OFFLINE_MODE) {
-                            if (Settings.UUID_LOWERCASE && !name.toLowerCase().equals(name)) {
+                for (UUID uuid : uuids)
+                {
+                    try
+                    {
+                        final File file = new File(playerdataFolder + File.separator + uuid.toString() + ".dat");
+                        final InputSupplier<FileInputStream> is = com.google.common.io.Files.newInputStreamSupplier(file);
+                        final NbtFactory.NbtCompound compound = NbtFactory.fromStream(is, NbtFactory.StreamOptions.GZIP_COMPRESSION);
+                        final NbtFactory.NbtCompound bukkit = (NbtFactory.NbtCompound) compound.get("bukkit");
+                        final String name = (String) bukkit.get("lastKnownName");
+                        final long last = (long) bukkit.get("lastPlayed");
+                        if (Settings.OFFLINE_MODE)
+                        {
+                            if (Settings.UUID_LOWERCASE && !name.toLowerCase().equals(name))
+                            {
                                 uuid = uuidWrapper.getUUID(name);
-                            } else {
-                                long most = (long) compound.get("UUIDMost");
-                                long least = (long) compound.get("UUIDLeast");
+                            }
+                            else
+                            {
+                                final long most = (long) compound.get("UUIDMost");
+                                final long least = (long) compound.get("UUIDLeast");
                                 uuid = new UUID(most, least);
                             }
                         }
                         ExpireManager.dates.put(uuid, last);
                         toAdd.put(new StringWrapper(name), uuid);
-                    } catch (final Throwable e) {
+                    }
+                    catch (final Throwable e)
+                    {
                         PS.debug(C.PREFIX.s() + "&6Invalid playerdata: " + uuid.toString() + ".dat");
                     }
                 }
-                for (final String name : names) {
+                for (final String name : names)
+                {
                     final UUID uuid = uuidWrapper.getUUID(name);
                     final StringWrapper nameWrap = new StringWrapper(name);
                     toAdd.put(nameWrap, uuid);
                 }
 
-                if (getUUIDMap().size() == 0) {
-                    for (OfflinePlotPlayer op : uuidWrapper.getOfflinePlayers()) {
-                        long last = op.getLastPlayed();
-                        if (last != 0) {
-                            String name = op.getName();
-                            StringWrapper wrap = new StringWrapper(name);
-                            UUID uuid = uuidWrapper.getUUID(op);
+                if (getUUIDMap().size() == 0)
+                {
+                    for (final OfflinePlotPlayer op : uuidWrapper.getOfflinePlayers())
+                    {
+                        final long last = op.getLastPlayed();
+                        if (last != 0)
+                        {
+                            final String name = op.getName();
+                            final StringWrapper wrap = new StringWrapper(name);
+                            final UUID uuid = uuidWrapper.getUUID(op);
                             toAdd.put(wrap, uuid);
                             ExpireManager.dates.put(uuid, last);
                         }
                     }
                 }
                 add(toAdd);
-                if (whenDone != null) whenDone.run();
+                if (whenDone != null)
+                {
+                    whenDone.run();
+                }
             }
         });
         return true;
     }
 
     @Override
-    public void fetchUUID(final String name, final RunnableVal<UUID> ifFetch) {
-        TaskManager.runTaskAsync(new Runnable() {
+    public void fetchUUID(final String name, final RunnableVal<UUID> ifFetch)
+    {
+        TaskManager.runTaskAsync(new Runnable()
+        {
             @Override
-            public void run() {
+            public void run()
+            {
                 ifFetch.value = uuidWrapper.getUUID(name);
                 TaskManager.runTask(ifFetch);
             }
diff --git a/src/main/java/com/plotsquared/bukkit/uuid/LowerOfflineUUIDWrapper.java b/src/main/java/com/plotsquared/bukkit/uuid/LowerOfflineUUIDWrapper.java
index 103a77853..a94712a9e 100644
--- a/src/main/java/com/plotsquared/bukkit/uuid/LowerOfflineUUIDWrapper.java
+++ b/src/main/java/com/plotsquared/bukkit/uuid/LowerOfflineUUIDWrapper.java
@@ -18,87 +18,109 @@ import com.intellectualcrafters.plot.object.StringWrapper;
 import com.intellectualcrafters.plot.util.UUIDHandler;
 import com.plotsquared.bukkit.object.BukkitOfflinePlayer;
 
-public class LowerOfflineUUIDWrapper extends OfflineUUIDWrapper {
+public class LowerOfflineUUIDWrapper extends OfflineUUIDWrapper
+{
     private Method getOnline = null;
     private final Object[] arg = new Object[0];
 
-    public LowerOfflineUUIDWrapper() {
-        try {
-            this.getOnline = Server.class.getMethod("getOnlinePlayers", new Class[0]);
-        } catch (final NoSuchMethodException e) {
+    public LowerOfflineUUIDWrapper()
+    {
+        try
+        {
+            getOnline = Server.class.getMethod("getOnlinePlayers", new Class[0]);
+        }
+        catch (final NoSuchMethodException e)
+        {
             e.printStackTrace();
-        } catch (final SecurityException e) {
+        }
+        catch (final SecurityException e)
+        {
             e.printStackTrace();
         }
     }
 
     @Override
-    public UUID getUUID(final PlotPlayer player) {
+    public UUID getUUID(final PlotPlayer player)
+    {
         return UUID.nameUUIDFromBytes(("OfflinePlayer:" + player.getName().toLowerCase()).getBytes(Charsets.UTF_8));
     }
 
     @Override
-    public UUID getUUID(final OfflinePlotPlayer player) {
+    public UUID getUUID(final OfflinePlotPlayer player)
+    {
         return UUID.nameUUIDFromBytes(("OfflinePlayer:" + player.getName().toLowerCase()).getBytes(Charsets.UTF_8));
     }
 
-    public UUID getUUID(final OfflinePlayer player) {
-        return UUID.nameUUIDFromBytes(("OfflinePlayer:" + player.getName().toLowerCase() ).getBytes(Charsets.UTF_8));
+    @Override
+    public UUID getUUID(final OfflinePlayer player)
+    {
+        return UUID.nameUUIDFromBytes(("OfflinePlayer:" + player.getName().toLowerCase()).getBytes(Charsets.UTF_8));
     }
 
     @Override
-    public OfflinePlotPlayer getOfflinePlayer(final UUID uuid) {
+    public OfflinePlotPlayer getOfflinePlayer(final UUID uuid)
+    {
         final BiMap<UUID, StringWrapper> map = UUIDHandler.getUuidMap().inverse();
         String name;
-        try {
+        try
+        {
             name = map.get(uuid).value;
-        } catch (final NullPointerException e) {
+        }
+        catch (final NullPointerException e)
+        {
             name = null;
         }
-        if (name != null) {
+        if (name != null)
+        {
             final OfflinePlayer op = Bukkit.getOfflinePlayer(name);
-            if (op.hasPlayedBefore()) {
-                return new BukkitOfflinePlayer(op);
-            }
+            if (op.hasPlayedBefore()) { return new BukkitOfflinePlayer(op); }
         }
-        for (final OfflinePlayer player : Bukkit.getOfflinePlayers()) {
-            if (getUUID(player).equals(uuid)) {
-                return new BukkitOfflinePlayer(player);
-            }
+        for (final OfflinePlayer player : Bukkit.getOfflinePlayers())
+        {
+            if (getUUID(player).equals(uuid)) { return new BukkitOfflinePlayer(player); }
         }
         return null;
     }
 
-    public Player[] getOnlinePlayers() {
-        if (this.getOnline == null) {
-            return Bukkit.getOnlinePlayers().toArray(new Player[0]);
-        }
-        try {
-            final Object players = this.getOnline.invoke(Bukkit.getServer(), this.arg);
-            if (players instanceof Player[]) {
+    @Override
+    public Player[] getOnlinePlayers()
+    {
+        if (getOnline == null) { return Bukkit.getOnlinePlayers().toArray(new Player[0]); }
+        try
+        {
+            final Object players = getOnline.invoke(Bukkit.getServer(), arg);
+            if (players instanceof Player[])
+            {
                 return (Player[]) players;
-            } else {
+            }
+            else
+            {
                 @SuppressWarnings("unchecked")
                 final Collection<? extends Player> p = (Collection<? extends Player>) players;
                 return p.toArray(new Player[0]);
             }
-        } catch (final Exception e) {
+        }
+        catch (final Exception e)
+        {
             PS.debug("Failed to resolve online players");
-            this.getOnline = null;
+            getOnline = null;
             return Bukkit.getOnlinePlayers().toArray(new Player[0]);
         }
     }
 
     @Override
-    public UUID getUUID(final String name) {
+    public UUID getUUID(final String name)
+    {
         return UUID.nameUUIDFromBytes(("OfflinePlayer:" + name.toLowerCase()).getBytes(Charsets.UTF_8));
     }
-    
+
     @Override
-    public OfflinePlotPlayer[] getOfflinePlayers() {
-        OfflinePlayer[] ops = Bukkit.getOfflinePlayers();
-        BukkitOfflinePlayer[] toReturn = new BukkitOfflinePlayer[ops.length] ;
-        for (int i = 0; i < ops.length; i++) {
+    public OfflinePlotPlayer[] getOfflinePlayers()
+    {
+        final OfflinePlayer[] ops = Bukkit.getOfflinePlayers();
+        final BukkitOfflinePlayer[] toReturn = new BukkitOfflinePlayer[ops.length];
+        for (int i = 0; i < ops.length; i++)
+        {
             toReturn[i] = new BukkitOfflinePlayer(ops[i]);
         }
         return toReturn;
diff --git a/src/main/java/com/plotsquared/bukkit/uuid/OfflineUUIDWrapper.java b/src/main/java/com/plotsquared/bukkit/uuid/OfflineUUIDWrapper.java
index 60b0782d7..fbd4e9935 100644
--- a/src/main/java/com/plotsquared/bukkit/uuid/OfflineUUIDWrapper.java
+++ b/src/main/java/com/plotsquared/bukkit/uuid/OfflineUUIDWrapper.java
@@ -19,87 +19,107 @@ import com.intellectualcrafters.plot.util.UUIDHandler;
 import com.intellectualcrafters.plot.uuid.UUIDWrapper;
 import com.plotsquared.bukkit.object.BukkitOfflinePlayer;
 
-public class OfflineUUIDWrapper extends UUIDWrapper {
+public class OfflineUUIDWrapper extends UUIDWrapper
+{
     private Method getOnline = null;
     private final Object[] arg = new Object[0];
 
-    public OfflineUUIDWrapper() {
-        try {
-            this.getOnline = Server.class.getMethod("getOnlinePlayers", new Class[0]);
-        } catch (final NoSuchMethodException e) {
+    public OfflineUUIDWrapper()
+    {
+        try
+        {
+            getOnline = Server.class.getMethod("getOnlinePlayers", new Class[0]);
+        }
+        catch (final NoSuchMethodException e)
+        {
             e.printStackTrace();
-        } catch (final SecurityException e) {
+        }
+        catch (final SecurityException e)
+        {
             e.printStackTrace();
         }
     }
 
     @Override
-    public UUID getUUID(final PlotPlayer player) {
+    public UUID getUUID(final PlotPlayer player)
+    {
         return UUID.nameUUIDFromBytes(("OfflinePlayer:" + player.getName()).getBytes(Charsets.UTF_8));
     }
 
     @Override
-    public UUID getUUID(final OfflinePlotPlayer player) {
+    public UUID getUUID(final OfflinePlotPlayer player)
+    {
         return UUID.nameUUIDFromBytes(("OfflinePlayer:" + player.getName()).getBytes(Charsets.UTF_8));
     }
 
-    public UUID getUUID(final OfflinePlayer player) {
+    public UUID getUUID(final OfflinePlayer player)
+    {
         return UUID.nameUUIDFromBytes(("OfflinePlayer:" + player.getName()).getBytes(Charsets.UTF_8));
     }
 
     @Override
-    public OfflinePlotPlayer getOfflinePlayer(final UUID uuid) {
+    public OfflinePlotPlayer getOfflinePlayer(final UUID uuid)
+    {
         final BiMap<UUID, StringWrapper> map = UUIDHandler.getUuidMap().inverse();
         String name;
-        try {
+        try
+        {
             name = map.get(uuid).value;
-        } catch (final NullPointerException e) {
+        }
+        catch (final NullPointerException e)
+        {
             name = null;
         }
-        if (name != null) {
+        if (name != null)
+        {
             final OfflinePlayer op = Bukkit.getOfflinePlayer(name);
-            if (op.hasPlayedBefore()) {
-                return new BukkitOfflinePlayer(op);
-            }
+            if (op.hasPlayedBefore()) { return new BukkitOfflinePlayer(op); }
         }
-        for (final OfflinePlayer player : Bukkit.getOfflinePlayers()) {
-            if (getUUID(player).equals(uuid)) {
-                return new BukkitOfflinePlayer(player);
-            }
+        for (final OfflinePlayer player : Bukkit.getOfflinePlayers())
+        {
+            if (getUUID(player).equals(uuid)) { return new BukkitOfflinePlayer(player); }
         }
         return null;
     }
 
-    public Player[] getOnlinePlayers() {
-        if (this.getOnline == null) {
-            return Bukkit.getOnlinePlayers().toArray(new Player[0]);
-        }
-        try {
-            final Object players = this.getOnline.invoke(Bukkit.getServer(), this.arg);
-            if (players instanceof Player[]) {
+    public Player[] getOnlinePlayers()
+    {
+        if (getOnline == null) { return Bukkit.getOnlinePlayers().toArray(new Player[0]); }
+        try
+        {
+            final Object players = getOnline.invoke(Bukkit.getServer(), arg);
+            if (players instanceof Player[])
+            {
                 return (Player[]) players;
-            } else {
+            }
+            else
+            {
                 @SuppressWarnings("unchecked")
                 final Collection<? extends Player> p = (Collection<? extends Player>) players;
                 return p.toArray(new Player[0]);
             }
-        } catch (final Exception e) {
+        }
+        catch (final Exception e)
+        {
             PS.debug("Failed to resolve online players");
-            this.getOnline = null;
+            getOnline = null;
             return Bukkit.getOnlinePlayers().toArray(new Player[0]);
         }
     }
 
     @Override
-    public UUID getUUID(final String name) {
+    public UUID getUUID(final String name)
+    {
         return UUID.nameUUIDFromBytes(("OfflinePlayer:" + name).getBytes(Charsets.UTF_8));
     }
-    
+
     @Override
-    public OfflinePlotPlayer[] getOfflinePlayers() {
-        OfflinePlayer[] ops = Bukkit.getOfflinePlayers();
-        BukkitOfflinePlayer[] toReturn = new BukkitOfflinePlayer[ops.length] ;
-        for (int i = 0; i < ops.length; i++) {
+    public OfflinePlotPlayer[] getOfflinePlayers()
+    {
+        final OfflinePlayer[] ops = Bukkit.getOfflinePlayers();
+        final BukkitOfflinePlayer[] toReturn = new BukkitOfflinePlayer[ops.length];
+        for (int i = 0; i < ops.length; i++)
+        {
             toReturn[i] = new BukkitOfflinePlayer(ops[i]);
         }
         return toReturn;
diff --git a/src/main/java/com/plotsquared/bukkit/uuid/SQLUUIDHandler.java b/src/main/java/com/plotsquared/bukkit/uuid/SQLUUIDHandler.java
index 7a218ec41..0560de621 100644
--- a/src/main/java/com/plotsquared/bukkit/uuid/SQLUUIDHandler.java
+++ b/src/main/java/com/plotsquared/bukkit/uuid/SQLUUIDHandler.java
@@ -29,60 +29,72 @@ import com.intellectualcrafters.plot.util.UUIDHandler;
 import com.intellectualcrafters.plot.util.UUIDHandlerImplementation;
 import com.intellectualcrafters.plot.uuid.UUIDWrapper;
 
-public class SQLUUIDHandler extends UUIDHandlerImplementation {
-    
-    public SQLUUIDHandler(UUIDWrapper wrapper) {
+public class SQLUUIDHandler extends UUIDHandlerImplementation
+{
+
+    public SQLUUIDHandler(final UUIDWrapper wrapper)
+    {
         super(wrapper);
         _sqLite = new SQLite("./plugins/PlotSquared/usercache.db");
-        try {
+        try
+        {
             _sqLite.openConnection();
-        } catch (final Exception e) {
+        }
+        catch (final Exception e)
+        {
             e.printStackTrace();
         }
-        
-        try {
-            PreparedStatement stmt = getConnection().prepareStatement("CREATE TABLE IF NOT EXISTS `usercache` (uuid VARCHAR(32) NOT NULL, username VARCHAR(32) NOT NULL, PRIMARY KEY (uuid, username))");
+
+        try
+        {
+            final PreparedStatement stmt = getConnection()
+            .prepareStatement("CREATE TABLE IF NOT EXISTS `usercache` (uuid VARCHAR(32) NOT NULL, username VARCHAR(32) NOT NULL, PRIMARY KEY (uuid, username))");
             stmt.execute();
             stmt.close();
-        } catch (SQLException e) {
+        }
+        catch (final SQLException e)
+        {
             e.printStackTrace();
         }
         startCaching(null);
     }
-    
-    private class SQLUUIDHandlerException extends RuntimeException {
-        SQLUUIDHandlerException(String s, Throwable c) {
+
+    private class SQLUUIDHandlerException extends RuntimeException
+    {
+        SQLUUIDHandlerException(final String s, final Throwable c)
+        {
             super("SQLUUIDHandler caused an exception: " + s, c);
         }
-        @SuppressWarnings("unused")
-        SQLUUIDHandlerException(String s) {
-            super("SQLUUIDHandler caused an exception: " + s);
-        }
     }
-    
+
     private final SQLite _sqLite;
-    
-    private Connection getConnection() {
-        synchronized (_sqLite) {
+
+    private Connection getConnection()
+    {
+        synchronized (_sqLite)
+        {
             return _sqLite.getConnection();
         }
     }
-    
+
     @Override
-    public boolean startCaching(final Runnable whenDone) {
-        if (!super.startCaching(whenDone)) {
-            return false;
-        }
-        TaskManager.runTaskAsync(new Runnable() {
+    public boolean startCaching(final Runnable whenDone)
+    {
+        if (!super.startCaching(whenDone)) { return false; }
+        TaskManager.runTaskAsync(new Runnable()
+        {
             @Override
-            public void run() {
-                try {
+            public void run()
+            {
+                try
+                {
                     final HashBiMap<StringWrapper, UUID> toAdd = HashBiMap.create(new HashMap<StringWrapper, UUID>());
-                    PreparedStatement statement = getConnection().prepareStatement("SELECT `uuid`, `username` FROM `usercache`");
-                    ResultSet resultSet = statement.executeQuery();
+                    final PreparedStatement statement = getConnection().prepareStatement("SELECT `uuid`, `username` FROM `usercache`");
+                    final ResultSet resultSet = statement.executeQuery();
                     StringWrapper username;
                     UUID uuid;
-                    while (resultSet.next()) {
+                    while (resultSet.next())
+                    {
                         username = new StringWrapper(resultSet.getString("username"));
                         uuid = UUID.fromString(resultSet.getString("uuid"));
                         toAdd.put(new StringWrapper(username.value), uuid);
@@ -90,131 +102,176 @@ public class SQLUUIDHandler extends UUIDHandlerImplementation {
                     statement.close();
                     add(toAdd);
                     add(new StringWrapper("*"), DBFunc.everyone);
-                    
+
                     // This should be called as long as there are some unknown plots
                     final List<UUID> toFetch = new ArrayList<>();
-                    for (UUID u : UUIDHandler.getAllUUIDS()) {
-                        if (!uuidExists(u)) {
+                    for (final UUID u : UUIDHandler.getAllUUIDS())
+                    {
+                        if (!uuidExists(u))
+                        {
                             toFetch.add(u);
                         }
                     }
-                    if (toFetch.isEmpty()) {
-                        if (whenDone != null) whenDone.run();
+                    if (toFetch.isEmpty())
+                    {
+                        if (whenDone != null)
+                        {
+                            whenDone.run();
+                        }
                         return;
                     }
-                    FileUUIDHandler fileHandler = new FileUUIDHandler(SQLUUIDHandler.this.uuidWrapper);
-                    fileHandler.startCaching(new Runnable() {
+                    final FileUUIDHandler fileHandler = new FileUUIDHandler(SQLUUIDHandler.this.uuidWrapper);
+                    fileHandler.startCaching(new Runnable()
+                    {
                         @Override
-                        public void run() {
+                        public void run()
+                        {
                             // If the file based UUID handler didn't cache it, then we can't cache offline mode
                             // Also, trying to cache based on files again, is useless as that's what the file based uuid cacher does
-                            if (Settings.OFFLINE_MODE) {
-                                if (whenDone != null) whenDone.run();
+                            if (Settings.OFFLINE_MODE)
+                            {
+                                if (whenDone != null)
+                                {
+                                    whenDone.run();
+                                }
                                 return;
                             }
-                            if (!Settings.OFFLINE_MODE) {
+                            if (!Settings.OFFLINE_MODE)
+                            {
                                 PS.debug(C.PREFIX.s() + "&cWill fetch &6" + toFetch.size() + "&c from mojang!");
                                 int i = 0;
-                                Iterator<UUID> iterator = toFetch.iterator();
-                                while (iterator.hasNext()) {
-                                    StringBuilder url = new StringBuilder("http://api.intellectualsites.com/uuid/?user=");
-                                    List<UUID> currentIteration = new ArrayList<>();
-                                    while (i++ <= 15 && iterator.hasNext()) {
-                                        UUID _uuid = iterator.next();
+                                final Iterator<UUID> iterator = toFetch.iterator();
+                                while (iterator.hasNext())
+                                {
+                                    final StringBuilder url = new StringBuilder("http://api.intellectualsites.com/uuid/?user=");
+                                    final List<UUID> currentIteration = new ArrayList<>();
+                                    while ((i++ <= 15) && iterator.hasNext())
+                                    {
+                                        final UUID _uuid = iterator.next();
                                         url.append(_uuid.toString());
-                                        if (iterator.hasNext()) {
+                                        if (iterator.hasNext())
+                                        {
                                             url.append(",");
                                         }
                                         currentIteration.add(_uuid);
                                     }
                                     PS.debug(C.PREFIX.s() + "&cWill attempt to fetch &6" + currentIteration.size() + "&c uuids from: &6" + url.toString());
-                                    try {
-                                        HttpURLConnection connection = (HttpURLConnection) new URL(url.toString()).openConnection();
+                                    try
+                                    {
+                                        final HttpURLConnection connection = (HttpURLConnection) new URL(url.toString()).openConnection();
                                         connection.setRequestProperty("User-Agent", "Mozilla/5.0");
-                                        BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream()));
+                                        final BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream()));
                                         String line;
-                                        StringBuilder rawJSON = new StringBuilder();
-                                        while ((line = reader.readLine()) != null) {
+                                        final StringBuilder rawJSON = new StringBuilder();
+                                        while ((line = reader.readLine()) != null)
+                                        {
                                             rawJSON.append(line);
                                         }
                                         reader.close();
-                                        JSONObject object = new JSONObject(rawJSON.toString());
-                                        for (UUID _u : currentIteration) {
-                                            Object o = object.getJSONObject(_u.toString().replace("-", "")).get("username");
-                                            if (o == null || !(o instanceof String)) {
+                                        final JSONObject object = new JSONObject(rawJSON.toString());
+                                        for (final UUID _u : currentIteration)
+                                        {
+                                            final Object o = object.getJSONObject(_u.toString().replace("-", "")).get("username");
+                                            if ((o == null) || !(o instanceof String))
+                                            {
                                                 continue;
                                             }
                                             add(new StringWrapper(o.toString()), _u);
                                         }
-                                    } catch (final Exception e) {
+                                    }
+                                    catch (final Exception e)
+                                    {
                                         e.printStackTrace();
                                     }
                                     i = 0;
                                 }
                             }
-                            if (whenDone != null) whenDone.run();
+                            if (whenDone != null)
+                            {
+                                whenDone.run();
+                            }
                         }
                     });
-                } catch (SQLException e) {
+                }
+                catch (final SQLException e)
+                {
                     throw new SQLUUIDHandlerException("Couldn't select :s", e);
                 }
             }
         });
         return true;
     }
-    
+
     @Override
-    public void fetchUUID(final String name, final RunnableVal<UUID> ifFetch) {
+    public void fetchUUID(final String name, final RunnableVal<UUID> ifFetch)
+    {
         PS.debug(C.PREFIX.s() + "UUID for '" + name + "' was null. We'll cache this from the mojang servers!");
-        TaskManager.runTaskAsync(new Runnable() {
+        TaskManager.runTaskAsync(new Runnable()
+        {
             @Override
-            public void run() {
-                String url = "http://api.intellectualsites.com/uuid/?user=" + name;
-                try {
-                    HttpURLConnection connection = (HttpURLConnection) new URL(url).openConnection();
+            public void run()
+            {
+                final String url = "http://api.intellectualsites.com/uuid/?user=" + name;
+                try
+                {
+                    final HttpURLConnection connection = (HttpURLConnection) new URL(url).openConnection();
                     connection.setRequestProperty("User-Agent", "Mozilla/5.0");
-                    BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream()));
+                    final BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream()));
                     String line;
-                    StringBuilder rawJSON = new StringBuilder();
-                    while ((line = reader.readLine()) != null) {
+                    final StringBuilder rawJSON = new StringBuilder();
+                    while ((line = reader.readLine()) != null)
+                    {
                         rawJSON.append(line);
                     }
                     reader.close();
-                    JSONObject object = new JSONObject(rawJSON.toString());
+                    final JSONObject object = new JSONObject(rawJSON.toString());
                     ifFetch.value = UUID.fromString(object.getJSONObject(name).getString("dashed"));
                     add(new StringWrapper(name), ifFetch.value);
-                } catch (IOException e) {
+                }
+                catch (final IOException e)
+                {
                     e.printStackTrace();
                 }
                 TaskManager.runTask(ifFetch);
             }
         });
     }
-    
+
     @Override
-    public void handleShutdown() {
+    public void handleShutdown()
+    {
         super.handleShutdown();
-        try {
+        try
+        {
             getConnection().close();
-        } catch (SQLException e) {
+        }
+        catch (final SQLException e)
+        {
             throw new SQLUUIDHandlerException("Couldn't close database connection", e);
         }
     }
-    
+
     @Override
-    public boolean add(final StringWrapper name, final UUID uuid) {
+    public boolean add(final StringWrapper name, final UUID uuid)
+    {
         // Ignoring duplicates
-        if (super.add(name, uuid)) {
-            TaskManager.runTaskAsync(new Runnable() {
+        if (super.add(name, uuid))
+        {
+            TaskManager.runTaskAsync(new Runnable()
+            {
                 @Override
-                public void run() {
-                    try {
-                        PreparedStatement statement = getConnection().prepareStatement("INSERT INTO usercache (`uuid`, `username`) VALUES(?, ?)");
+                public void run()
+                {
+                    try
+                    {
+                        final PreparedStatement statement = getConnection().prepareStatement("INSERT INTO usercache (`uuid`, `username`) VALUES(?, ?)");
                         statement.setString(1, uuid.toString());
                         statement.setString(2, name.toString());
                         statement.execute();
                         PS.debug(C.PREFIX.s() + "&cAdded '&6" + uuid + "&c' - '&6" + name + "&c'");
-                    } catch (SQLException e) {
+                    }
+                    catch (final SQLException e)
+                    {
                         e.printStackTrace();
                     }
                 }
@@ -223,33 +280,40 @@ public class SQLUUIDHandler extends UUIDHandlerImplementation {
         }
         return false;
     }
-    
+
     /**
      * This isn't used as any UUID that is unknown is bulk cached (in lots of 16)
      * @param uuid
      * @return
      */
     @Deprecated
-    public String getName__unused__(final UUID uuid) {
+    public String getName__unused__(final UUID uuid)
+    {
         PS.debug(C.PREFIX.s() + "Name for '" + uuid + "' was null. We'll cache this from the mojang servers!");
-        TaskManager.runTaskAsync(new Runnable() {
+        TaskManager.runTaskAsync(new Runnable()
+        {
             @Override
-            public void run() {
-                String url = "http://api.intellectualsites.com/uuid/?user=" + uuid;
-                try {
-                    HttpURLConnection connection = (HttpURLConnection) new URL(url).openConnection();
+            public void run()
+            {
+                final String url = "http://api.intellectualsites.com/uuid/?user=" + uuid;
+                try
+                {
+                    final HttpURLConnection connection = (HttpURLConnection) new URL(url).openConnection();
                     connection.setRequestProperty("User-Agent", "Mozilla/5.0");
-                    BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream()));
+                    final BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream()));
                     String line;
-                    StringBuilder rawJSON = new StringBuilder();
-                    while ((line = reader.readLine()) != null) {
+                    final StringBuilder rawJSON = new StringBuilder();
+                    while ((line = reader.readLine()) != null)
+                    {
                         rawJSON.append(line);
                     }
                     reader.close();
-                    JSONObject object = new JSONObject(rawJSON.toString());
-                    String username = object.getJSONObject(uuid.toString().replace("-", "")).getString("username");
+                    final JSONObject object = new JSONObject(rawJSON.toString());
+                    final String username = object.getJSONObject(uuid.toString().replace("-", "")).getString("username");
                     add(new StringWrapper(username), uuid);
-                } catch (IOException e) {
+                }
+                catch (final IOException e)
+                {
                     e.printStackTrace();
                 }
             }
@@ -258,18 +322,24 @@ public class SQLUUIDHandler extends UUIDHandlerImplementation {
     }
 
     @Override
-    public void rename(final UUID uuid, final StringWrapper name) {
+    public void rename(final UUID uuid, final StringWrapper name)
+    {
         super.rename(uuid, name);
-        TaskManager.runTaskAsync(new Runnable() {
+        TaskManager.runTaskAsync(new Runnable()
+        {
             @Override
-            public void run() {
-                try {
-                    PreparedStatement statement = getConnection().prepareStatement("UPDATE usercache SET `username`=? WHERE `uuid`=?");
+            public void run()
+            {
+                try
+                {
+                    final PreparedStatement statement = getConnection().prepareStatement("UPDATE usercache SET `username`=? WHERE `uuid`=?");
                     statement.setString(1, name.value);
                     statement.setString(2, uuid.toString());
                     statement.execute();
                     PS.debug(C.PREFIX.s() + "Name change for '" + uuid + "' to '" + name.value + "'");
-                } catch (SQLException e) {
+                }
+                catch (final SQLException e)
+                {
                     e.printStackTrace();
                 }
             }
diff --git a/src/main/java/com/plotsquared/general/commands/Argument.java b/src/main/java/com/plotsquared/general/commands/Argument.java
index 502b32ffa..d451d9573 100644
--- a/src/main/java/com/plotsquared/general/commands/Argument.java
+++ b/src/main/java/com/plotsquared/general/commands/Argument.java
@@ -5,79 +5,102 @@ import com.intellectualcrafters.plot.object.Plot;
 import com.intellectualcrafters.plot.object.PlotId;
 import com.intellectualcrafters.plot.util.MainUtil;
 
-public abstract class Argument<T> {
+public abstract class Argument<T>
+{
 
     private final String name;
     private final T example;
 
-    public Argument(String name, T example) {
+    public Argument(final String name, final T example)
+    {
         this.name = name;
         this.example = example;
     }
 
-    public abstract T parse(String in);
+    public abstract T parse(final String in);
 
     @Override
-    public final String toString() {
+    public final String toString()
+    {
         return this.getName();
     }
 
-    public final String getName() {
+    public final String getName()
+    {
         return this.name;
     }
 
-    public final T getExample() {
+    public final T getExample()
+    {
         return this.example;
     }
 
-    public static final Argument<Integer> Integer = new Argument<Integer>("int", 16) {
+    public static final Argument<Integer> Integer = new Argument<Integer>("int", 16)
+    {
         @Override
-        public Integer parse(String in) {
+        public Integer parse(final String in)
+        {
             Integer value = null;
-            try {
+            try
+            {
                 value = java.lang.Integer.parseInt(in);
-            } catch(final Exception ignored) {}
+            }
+            catch (final Exception ignored)
+            {}
             return value;
         }
     };
 
-    public static final Argument<Boolean> Boolean = new Argument<Boolean>("boolean", true) {
+    public static final Argument<Boolean> Boolean = new Argument<Boolean>("boolean", true)
+    {
         @Override
-        public Boolean parse(String in) {
+        public Boolean parse(final String in)
+        {
             Boolean value = null;
-            if (in.equalsIgnoreCase("true") || in.equalsIgnoreCase("Yes") || in.equalsIgnoreCase("1")) {
+            if (in.equalsIgnoreCase("true") || in.equalsIgnoreCase("Yes") || in.equalsIgnoreCase("1"))
+            {
                 value = true;
-            } else if (in.equalsIgnoreCase("false") || in.equalsIgnoreCase("No") || in.equalsIgnoreCase("0")) {
+            }
+            else if (in.equalsIgnoreCase("false") || in.equalsIgnoreCase("No") || in.equalsIgnoreCase("0"))
+            {
                 value = false;
             }
             return value;
         }
     };
 
-    public static final Argument<String> String = new Argument<String>("String", "Example") {
+    public static final Argument<String> String = new Argument<String>("String", "Example")
+    {
         @Override
-        public String parse(String in) {
+        public String parse(final String in)
+        {
             return in;
         }
     };
 
-    public static Argument<String> PlayerName = new Argument<String>("PlayerName", "Dinnerbone") {
+    public static Argument<String> PlayerName = new Argument<String>("PlayerName", "Dinnerbone")
+    {
         @Override
-        public String parse(String in) {
+        public String parse(final String in)
+        {
             return in.length() <= 16 ? in : null;
         }
     };
 
-    public static Argument<PlotId> PlotID = new Argument<PlotId>("PlotID", new PlotId(-6, 3)) {
+    public static Argument<PlotId> PlotID = new Argument<PlotId>("PlotID", new PlotId(-6, 3))
+    {
         @Override
-        public PlotId parse(String in) {
+        public PlotId parse(final String in)
+        {
             return PlotId.fromString(in);
         }
     };
-    
-    public static Argument<Plot> Plot = new Argument<Plot>("Plot", new Plot("plotworld", new PlotId(3, -6), null)) {
+
+    public static Argument<Plot> Plot = new Argument<Plot>("Plot", new Plot("plotworld", new PlotId(3, -6), null))
+    {
         @Override
-        public Plot parse(String in) {
+        public Plot parse(final String in)
+        {
             return MainUtil.getPlotFromString(ConsolePlayer.getConsole(), in, false);
         }
     };
diff --git a/src/main/java/com/plotsquared/general/commands/Command.java b/src/main/java/com/plotsquared/general/commands/Command.java
index 99f3b8523..c5820a3ee 100644
--- a/src/main/java/com/plotsquared/general/commands/Command.java
+++ b/src/main/java/com/plotsquared/general/commands/Command.java
@@ -9,7 +9,8 @@ import java.util.Set;
 import com.intellectualcrafters.plot.commands.CommandCategory;
 import com.intellectualcrafters.plot.commands.RequiredType;
 
-public abstract class Command<E extends CommandCaller> extends CommandManager {
+public abstract class Command<E extends CommandCaller> extends CommandManager
+{
 
     private RequiredType requiredType = RequiredType.NONE;
     private String command, usage = "", description = "", permission = "";
@@ -17,29 +18,34 @@ public abstract class Command<E extends CommandCaller> extends CommandManager {
     private CommandCategory category;
     protected Argument<?>[] requiredArguments;
 
-    public Command() {
+    public Command()
+    {
         super(null, new ArrayList<Command>());
     }
 
-    public Command(String command) {
+    public Command(final String command)
+    {
         super(null, new ArrayList<Command>());
         this.command = command;
     }
 
-    public Command(String command, String usage) {
+    public Command(final String command, final String usage)
+    {
         super(null, new ArrayList<Command>());
         this.command = command;
         this.usage = usage;
     }
 
-    public Command(String command, String usage, String description) {
+    public Command(final String command, final String usage, final String description)
+    {
         super(null, new ArrayList<Command>());
         this.command = command;
         this.usage = usage;
         this.description = description;
     }
 
-    public Command(String command, String usage, String description, String permission) {
+    public Command(final String command, final String usage, final String description, final String permission)
+    {
         super(null, new ArrayList<Command>());
         this.command = command;
         this.usage = usage;
@@ -47,20 +53,23 @@ public abstract class Command<E extends CommandCaller> extends CommandManager {
         this.permission = permission;
     }
 
-    public Command(String command, String[] aliases, String usage) {
+    public Command(final String command, final String[] aliases, final String usage)
+    {
         super(null, new ArrayList<Command>());
         this.command = command;
         this.aliases = new HashSet<>(Arrays.asList(aliases));
         this.usage = usage;
     }
 
-    public Command(String command, String[] aliases) {
+    public Command(final String command, final String[] aliases)
+    {
         super(null, new ArrayList<Command>());
         this.command = command;
         this.aliases = new HashSet<>(Arrays.asList(aliases));
     }
 
-    public Command(String command, String usage, String description, String permission, String[] aliases, RequiredType requiredType) {
+    public Command(final String command, final String usage, final String description, final String permission, final String[] aliases, final RequiredType requiredType)
+    {
         super(null, new ArrayList<Command>());
         this.command = command;
         this.usage = usage;
@@ -70,16 +79,16 @@ public abstract class Command<E extends CommandCaller> extends CommandManager {
         this.requiredType = requiredType;
     }
 
-    final public RequiredType getRequiredType() {
+    final public RequiredType getRequiredType()
+    {
         return this.requiredType;
     }
 
-    final protected void create() {
-        Annotation annotation = getClass().getAnnotation(CommandDeclaration.class);
-        if (annotation == null) {
-            throw new RuntimeException("Command does not have a CommandDeclaration");
-        }
-        CommandDeclaration declaration = (CommandDeclaration) annotation;
+    final protected void create()
+    {
+        final Annotation annotation = getClass().getAnnotation(CommandDeclaration.class);
+        if (annotation == null) { throw new RuntimeException("Command does not have a CommandDeclaration"); }
+        final CommandDeclaration declaration = (CommandDeclaration) annotation;
         this.command = declaration.command();
         this.usage = declaration.usage();
         this.description = declaration.description();
@@ -91,87 +100,85 @@ public abstract class Command<E extends CommandCaller> extends CommandManager {
     }
 
     @Override
-    final public String toString() {
+    final public String toString()
+    {
         return this.command;
     }
 
-    public abstract boolean onCommand(E plr, String[] arguments);
+    public abstract boolean onCommand(final E plr, final String[] arguments);
 
-    final public int handle(E plr, String[] args) {
-        if (args.length == 0) {
-            return super.handle(plr, "");
-        }
-        StringBuilder builder = new StringBuilder();
-        for (String s : args) {
+    final public int handle(final E plr, final String[] args)
+    {
+        if (args.length == 0) { return super.handle(plr, ""); }
+        final StringBuilder builder = new StringBuilder();
+        for (final String s : args)
+        {
             builder.append(s).append(" ");
         }
-        String s = builder.substring(0, builder.length() - 1);
+        final String s = builder.substring(0, builder.length() - 1);
         return super.handle(plr, s);
     }
 
-    final public String getCommand() {
+    final public String getCommand()
+    {
         return this.command;
     }
 
-    public String getUsage() {
-        if (this.usage.length() == 0) {
-            return "/{label} " + command; 
-        }
+    public String getUsage()
+    {
+        if (this.usage.length() == 0) { return "/{label} " + command; }
         return this.usage;
     }
 
-    final public String getPermission() {
-        if (this.permission == null || this.permission.length() == 0) {
+    final public String getPermission()
+    {
+        if ((this.permission == null) || (this.permission.length() == 0))
+        {
             this.permission = "plots." + command.toLowerCase();
         }
         return this.permission;
     }
 
-    public String getDescription() {
+    public String getDescription()
+    {
         return this.description;
     }
 
-    final public Set<String> getAliases() {
+    final public Set<String> getAliases()
+    {
         return this.aliases;
     }
 
-    final public Argument<?>[] getRequiredArguments() {
-        if (this.requiredArguments == null) {
-            return new Argument<?>[0];
-        }
+    final public Argument<?>[] getRequiredArguments()
+    {
+        if (this.requiredArguments == null) { return new Argument<?>[0]; }
         return this.requiredArguments;
     }
 
-    final public CommandCategory getCategory() {
-        if (category == null) {
-            return CommandCategory.DEBUG;
-        }
+    final public CommandCategory getCategory()
+    {
+        if (category == null) { return CommandCategory.DEBUG; }
         return this.category;
     }
-    
+
     @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
+    public boolean equals(final Object obj)
+    {
+        if (this == obj) { return true; }
+        if (obj == null) { return false; }
+        if (getClass() != obj.getClass()) { return false; }
         final Command<?> other = (Command<?>) obj;
-        if (this.hashCode() != other.hashCode()) {
-            return false;
-        }
+        if (this.hashCode() != other.hashCode()) { return false; }
         return this.command.equals(other.command);
     }
-    
+
     private int hash;
-    
+
     @Override
-    public int hashCode() {
-        if (hash == 0) {
+    public int hashCode()
+    {
+        if (hash == 0)
+        {
             hash = getCommand().hashCode();
         }
         return hash;
diff --git a/src/main/java/com/plotsquared/general/commands/CommandCaller.java b/src/main/java/com/plotsquared/general/commands/CommandCaller.java
index 5358ff71c..d3333583a 100644
--- a/src/main/java/com/plotsquared/general/commands/CommandCaller.java
+++ b/src/main/java/com/plotsquared/general/commands/CommandCaller.java
@@ -3,12 +3,13 @@ package com.plotsquared.general.commands;
 import com.intellectualcrafters.plot.commands.RequiredType;
 import com.intellectualcrafters.plot.config.C;
 
-public interface CommandCaller {
+public interface CommandCaller
+{
     void sendMessage(final String message);
 
-    void sendMessage(C c, String ... args);
-    
+    void sendMessage(final C c, final String... args);
+
     boolean hasPermission(final String perm);
-    
+
     RequiredType getSuperCaller();
 }
diff --git a/src/main/java/com/plotsquared/general/commands/CommandDeclaration.java b/src/main/java/com/plotsquared/general/commands/CommandDeclaration.java
index a1e04a2cd..753b6593a 100644
--- a/src/main/java/com/plotsquared/general/commands/CommandDeclaration.java
+++ b/src/main/java/com/plotsquared/general/commands/CommandDeclaration.java
@@ -10,7 +10,8 @@ import com.intellectualcrafters.plot.commands.RequiredType;
 
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
-public @interface CommandDeclaration {
+public @interface CommandDeclaration
+{
 
     String command();
 
diff --git a/src/main/java/com/plotsquared/general/commands/CommandHandlingOutput.java b/src/main/java/com/plotsquared/general/commands/CommandHandlingOutput.java
index 10f9d1203..8e4242e68 100644
--- a/src/main/java/com/plotsquared/general/commands/CommandHandlingOutput.java
+++ b/src/main/java/com/plotsquared/general/commands/CommandHandlingOutput.java
@@ -2,7 +2,8 @@ package com.plotsquared.general.commands;
 
 import java.lang.reflect.Field;
 
-public class CommandHandlingOutput {
+public class CommandHandlingOutput
+{
 
     public static int CALLER_OF_WRONG_TYPE = -6;
     public static int NOT_COMMAND = -5;
@@ -13,15 +14,19 @@ public class CommandHandlingOutput {
 
     public static int SUCCESS = 1;
 
-    public static String nameField(int code) {
-        Field[] fields = CommandHandlingOutput.class.getDeclaredFields();
-        for (final Field field : fields) {
-            if (field.getGenericType() == Integer.TYPE) {
-                try {
-                    if ((Integer) field.get(CommandHandlingOutput.class) == code) {
-                        return field.getName();
-                    }
-                } catch (IllegalAccessException e) {
+    public static String nameField(final int code)
+    {
+        final Field[] fields = CommandHandlingOutput.class.getDeclaredFields();
+        for (final Field field : fields)
+        {
+            if (field.getGenericType() == Integer.TYPE)
+            {
+                try
+                {
+                    if ((Integer) field.get(CommandHandlingOutput.class) == code) { return field.getName(); }
+                }
+                catch (final IllegalAccessException e)
+                {
                     e.printStackTrace();
                 }
             }
diff --git a/src/main/java/com/plotsquared/general/commands/CommandManager.java b/src/main/java/com/plotsquared/general/commands/CommandManager.java
index c9979e32b..8cd156b3c 100644
--- a/src/main/java/com/plotsquared/general/commands/CommandManager.java
+++ b/src/main/java/com/plotsquared/general/commands/CommandManager.java
@@ -11,141 +11,168 @@ import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.util.Permissions;
 
 @SuppressWarnings("unused")
-public class CommandManager<T extends CommandCaller> {
+public class CommandManager<T extends CommandCaller>
+{
 
     protected final ConcurrentHashMap<String, Command<T>> commands;
     protected final Character initialCharacter;
 
-    public CommandManager() {
+    public CommandManager()
+    {
         this('/', new ArrayList<Command<T>>());
     }
 
-    public CommandManager(Character initialCharacter, List<Command<T>> commands) {
+    public CommandManager(final Character initialCharacter, final List<Command<T>> commands)
+    {
         this.commands = new ConcurrentHashMap<>();
-        for (Command<T> command : commands) {
+        for (final Command<T> command : commands)
+        {
             addCommand(command);
         }
         this.initialCharacter = initialCharacter;
     }
 
-    final public void addCommand(final Command<T> command) {
-        if (command.getCommand() == null) {
+    final public void addCommand(final Command<T> command)
+    {
+        if (command.getCommand() == null)
+        {
             command.create();
         }
         this.commands.put(command.getCommand().toLowerCase(), command);
-        for (String alias : command.getAliases()) {
+        for (final String alias : command.getAliases())
+        {
             this.commands.put(alias.toLowerCase(), command);
         }
     }
-    
-    final public Command<T> getCommand(String command) {
+
+    final public Command<T> getCommand(final String command)
+    {
         return commands.get(command);
     }
 
-    final public boolean createCommand(final Command<T> command) {
-        try {
+    final public boolean createCommand(final Command<T> command)
+    {
+        try
+        {
             command.create();
-        } catch(final Exception e) {
+        }
+        catch (final Exception e)
+        {
             e.printStackTrace();
             return false;
         }
-        if (command.getCommand() != null) {
+        if (command.getCommand() != null)
+        {
             addCommand(command);
             return true;
         }
         return false;
     }
 
-    final public ArrayList<Command<T>> getCommands() {
-        HashSet<Command<T>> set = new HashSet<>(this.commands.values());
-        ArrayList<Command<T>> result = new ArrayList<>(set);
-        Collections.sort(result, new Comparator<Command<T>>() {
+    final public ArrayList<Command<T>> getCommands()
+    {
+        final HashSet<Command<T>> set = new HashSet<>(this.commands.values());
+        final ArrayList<Command<T>> result = new ArrayList<>(set);
+        Collections.sort(result, new Comparator<Command<T>>()
+        {
             @Override
-            public int compare(Command<T> a, Command<T> b) {
+            public int compare(final Command<T> a, final Command<T> b)
+            {
                 if (a == b) {
-                    return 0;
+                return 0;
                 }
                 if (a == null) {
-                    return -1;
+                return -1;
                 }
                 if (b == null) {
-                    return 1;
+                return 1;
                 }
                 return a.getCommand().compareTo(b.getCommand());
             }
         });
         return result;
     }
-    
-    final public ArrayList<String> getCommandLabels(ArrayList<Command<T>> cmds) {
-        ArrayList<String> labels = new ArrayList<>(cmds.size());
-        for (Command<T> cmd : cmds) {
+
+    final public ArrayList<String> getCommandLabels(final ArrayList<Command<T>> cmds)
+    {
+        final ArrayList<String> labels = new ArrayList<>(cmds.size());
+        for (final Command<T> cmd : cmds)
+        {
             labels.add(cmd.getCommand());
         }
         return labels;
     }
 
-    public int handle(T plr, String input) {
-        if (initialCharacter != null && !input.startsWith(initialCharacter + "")) {
-            return CommandHandlingOutput.NOT_COMMAND;
-        }
+    public int handle(final T plr, String input)
+    {
+        if ((initialCharacter != null) && !input.startsWith(initialCharacter + "")) { return CommandHandlingOutput.NOT_COMMAND; }
         input = initialCharacter == null ? input : input.substring(1);
-        String[] parts = input.split(" ");
+        final String[] parts = input.split(" ");
         String[] args;
-        String command = parts[0].toLowerCase();
-        if (parts.length == 1) {
+        final String command = parts[0].toLowerCase();
+        if (parts.length == 1)
+        {
             args = new String[0];
-        } else {
+        }
+        else
+        {
             args = new String[parts.length - 1];
             System.arraycopy(parts, 1, args, 0, args.length);
         }
         Command<T> cmd = null;
         cmd = commands.get(command);
-        if (cmd == null) {
-            return CommandHandlingOutput.NOT_FOUND;
-        }
-        if (!cmd.getRequiredType().allows(plr)) {
-            return CommandHandlingOutput.CALLER_OF_WRONG_TYPE;
-        }
-        if (!Permissions.hasPermission(plr, cmd.getPermission())) {
-            return CommandHandlingOutput.NOT_PERMITTED;
-        }
-        Argument<?>[] requiredArguments = cmd.getRequiredArguments();
-        if (requiredArguments != null && requiredArguments.length > 0) {
+        if (cmd == null) { return CommandHandlingOutput.NOT_FOUND; }
+        if (!cmd.getRequiredType().allows(plr)) { return CommandHandlingOutput.CALLER_OF_WRONG_TYPE; }
+        if (!Permissions.hasPermission(plr, cmd.getPermission())) { return CommandHandlingOutput.NOT_PERMITTED; }
+        final Argument<?>[] requiredArguments = cmd.getRequiredArguments();
+        if ((requiredArguments != null) && (requiredArguments.length > 0))
+        {
             boolean success = true;
-            if (args.length < requiredArguments.length) {
+            if (args.length < requiredArguments.length)
+            {
                 success = false;
-            } else {
-                for (int i = 0; i < requiredArguments.length; i++) {
-                    if (requiredArguments[i].parse(args[i]) == null) {
+            }
+            else
+            {
+                for (int i = 0; i < requiredArguments.length; i++)
+                {
+                    if (requiredArguments[i].parse(args[i]) == null)
+                    {
                         success = false;
                         break;
                     }
                 }
             }
-            if (!success) {
-                String usage = cmd.getUsage().replaceAll("\\{label\\}", parts[0]);
+            if (!success)
+            {
+                cmd.getUsage().replaceAll("\\{label\\}", parts[0]);
                 C.COMMAND_SYNTAX.send(plr, cmd.getUsage());
                 return CommandHandlingOutput.WRONG_USAGE;
             }
         }
-        try {
-            boolean a = cmd.onCommand(plr, args);
-            if (!a) {
-                String usage = cmd.getUsage();
-                if (usage != null && !usage.isEmpty()) {
+        try
+        {
+            final boolean a = cmd.onCommand(plr, args);
+            if (!a)
+            {
+                final String usage = cmd.getUsage();
+                if ((usage != null) && !usage.isEmpty())
+                {
                     plr.sendMessage(usage);
                 }
                 return CommandHandlingOutput.WRONG_USAGE;
             }
-        } catch(final Throwable t) {
+        }
+        catch (final Throwable t)
+        {
             t.printStackTrace();
             return CommandHandlingOutput.ERROR;
         }
         return CommandHandlingOutput.SUCCESS;
     }
 
-    final public char getInitialCharacter() {
+    final public char getInitialCharacter()
+    {
         return this.initialCharacter;
     }
 }
diff --git a/src/main/java/com/plotsquared/listener/ExtentWrapper.java b/src/main/java/com/plotsquared/listener/ExtentWrapper.java
index 3773061b2..9f59cb46b 100644
--- a/src/main/java/com/plotsquared/listener/ExtentWrapper.java
+++ b/src/main/java/com/plotsquared/listener/ExtentWrapper.java
@@ -3,10 +3,12 @@ package com.plotsquared.listener;
 import com.sk89q.worldedit.extent.AbstractDelegateExtent;
 import com.sk89q.worldedit.extent.Extent;
 
-public class ExtentWrapper extends AbstractDelegateExtent {
+public class ExtentWrapper extends AbstractDelegateExtent
+{
 
-    protected ExtentWrapper(Extent extent) {
+    protected ExtentWrapper(final Extent extent)
+    {
         super(extent);
     }
-    
+
 }
diff --git a/src/main/java/com/plotsquared/listener/HeightLimitExtent.java b/src/main/java/com/plotsquared/listener/HeightLimitExtent.java
index 8cc0e1253..9adc65ab7 100644
--- a/src/main/java/com/plotsquared/listener/HeightLimitExtent.java
+++ b/src/main/java/com/plotsquared/listener/HeightLimitExtent.java
@@ -6,26 +6,25 @@ import com.sk89q.worldedit.blocks.BaseBlock;
 import com.sk89q.worldedit.extent.AbstractDelegateExtent;
 import com.sk89q.worldedit.extent.Extent;
 
-public class HeightLimitExtent extends AbstractDelegateExtent {
+public class HeightLimitExtent extends AbstractDelegateExtent
+{
 
-    private int max;
-    private int min;
+    private final int max;
+    private final int min;
 
-    public HeightLimitExtent(int min, int max, Extent child) {
+    public HeightLimitExtent(final int min, final int max, final Extent child)
+    {
         super(child);
         this.min = min;
         this.max = max;
     }
-    
-    
+
     @Override
-    public boolean setBlock(Vector location, BaseBlock block) throws WorldEditException {
-        int y = location.getBlockY();
-        if (y < min || y > max) {
-            return false;
-        }
+    public boolean setBlock(final Vector location, final BaseBlock block) throws WorldEditException
+    {
+        final int y = location.getBlockY();
+        if ((y < min) || (y > max)) { return false; }
         return super.setBlock(location, block);
     }
-    
-    
+
 }
diff --git a/src/main/java/com/plotsquared/listener/NullExtent.java b/src/main/java/com/plotsquared/listener/NullExtent.java
index 403e25a4d..d6f1f6179 100644
--- a/src/main/java/com/plotsquared/listener/NullExtent.java
+++ b/src/main/java/com/plotsquared/listener/NullExtent.java
@@ -15,61 +15,73 @@ import com.sk89q.worldedit.regions.Region;
 import com.sk89q.worldedit.util.Location;
 import com.sk89q.worldedit.world.biome.BaseBiome;
 
-public class NullExtent implements Extent {
+public class NullExtent implements Extent
+{
 
     @Override
-    public BaseBiome getBiome(Vector2D arg0) {
+    public BaseBiome getBiome(final Vector2D arg0)
+    {
         return null;
     }
 
     @Override
-    public BaseBlock getBlock(Vector arg0) {
+    public BaseBlock getBlock(final Vector arg0)
+    {
         return null;
     }
 
     @Override
-    public BaseBlock getLazyBlock(Vector arg0) {
+    public BaseBlock getLazyBlock(final Vector arg0)
+    {
         return null;
     }
 
     @Override
-    public Operation commit() {
+    public Operation commit()
+    {
         return null;
     }
 
     @Override
-    public boolean setBiome(Vector2D arg0, BaseBiome arg1) {
+    public boolean setBiome(final Vector2D arg0, final BaseBiome arg1)
+    {
         return false;
     }
 
     @Override
-    public boolean setBlock(Vector arg0, BaseBlock arg1) throws WorldEditException {
+    public boolean setBlock(final Vector arg0, final BaseBlock arg1) throws WorldEditException
+    {
         return false;
     }
 
     @Override
-    public Entity createEntity(Location arg0, BaseEntity arg1) {
+    public Entity createEntity(final Location arg0, final BaseEntity arg1)
+    {
         return null;
     }
 
     @Override
-    public List<? extends Entity> getEntities() {
+    public List<? extends Entity> getEntities()
+    {
         return new ArrayList<>();
     }
 
     @Override
-    public List<? extends Entity> getEntities(Region arg0) {
+    public List<? extends Entity> getEntities(final Region arg0)
+    {
         return new ArrayList<>();
     }
 
     @Override
-    public Vector getMaximumPoint() {
+    public Vector getMaximumPoint()
+    {
         return new Vector(0, 0, 0);
     }
 
     @Override
-    public Vector getMinimumPoint() {
+    public Vector getMinimumPoint()
+    {
         return new Vector(0, 0, 0);
     }
-    
+
 }
diff --git a/src/main/java/com/plotsquared/listener/PlotListener.java b/src/main/java/com/plotsquared/listener/PlotListener.java
index 0cf3060a7..d8cc5ba40 100644
--- a/src/main/java/com/plotsquared/listener/PlotListener.java
+++ b/src/main/java/com/plotsquared/listener/PlotListener.java
@@ -1,251 +1,299 @@
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// PlotSquared - A plot manager and world generator for the Bukkit API                             /
-// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
-//                                                                                                 /
-// This program is free software; you can redistribute it and/or modify                            /
-// it under the terms of the GNU General Public License as published by                            /
-// the Free Software Foundation; either version 3 of the License, or                               /
-// (at your option) any later version.                                                             /
-//                                                                                                 /
-// This program is distributed in the hope that it will be useful,                                 /
-// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
-// GNU General Public License for more details.                                                    /
-//                                                                                                 /
-// You should have received a copy of the GNU General Public License                               /
-// along with this program; if not, write to the Free Software Foundation,                         /
-// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
-//                                                                                                 /
-// You can contact us via: support@intellectualsites.com                                           /
-////////////////////////////////////////////////////////////////////////////////////////////////////
-package com.plotsquared.listener;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
-import org.bukkit.ChatColor;
-import org.bukkit.entity.Player;
-
-import com.intellectualcrafters.plot.PS;
-import com.intellectualcrafters.plot.config.C;
-import com.intellectualcrafters.plot.config.Settings;
-import com.intellectualcrafters.plot.flag.Flag;
-import com.intellectualcrafters.plot.flag.FlagManager;
-import com.intellectualcrafters.plot.object.Location;
-import com.intellectualcrafters.plot.object.Plot;
-import com.intellectualcrafters.plot.object.PlotHandler;
-import com.intellectualcrafters.plot.object.PlotPlayer;
-import com.intellectualcrafters.plot.object.PlotWorld;
-import com.intellectualcrafters.plot.util.AbstractTitle;
-import com.intellectualcrafters.plot.util.CommentManager;
-import com.intellectualcrafters.plot.util.EventUtil;
-import com.intellectualcrafters.plot.util.MainUtil;
-import com.intellectualcrafters.plot.util.Permissions;
-import com.intellectualcrafters.plot.util.PlotGamemode;
-import com.intellectualcrafters.plot.util.PlotWeather;
-import com.intellectualcrafters.plot.util.StringMan;
-import com.intellectualcrafters.plot.util.TaskManager;
-import com.intellectualcrafters.plot.util.UUIDHandler;
-import com.plotsquared.bukkit.util.BukkitUtil;
-
-/**
- * @author Citymonstret
- * @author Empire92
- */
-public class PlotListener {
-    
-    public static boolean plotEntry(final PlotPlayer pp, final Plot plot) {
-        if (plot.isDenied(pp.getUUID()) && !Permissions.hasPermission(pp, "plots.admin.entry.denied")) {
-            return false;
-        }
-        Plot last = (Plot) pp.getMeta("lastplot");
-        if (last != null && !last.id.equals(plot.id)) {
-            plotExit(pp, last);
-        }
-        pp.setMeta("lastplot", plot);
-        EventUtil.manager.callEntry(pp, plot);
-        if (plot.hasOwner()) {
-            HashMap<String, Flag> flags = FlagManager.getPlotFlags(plot);
-            int size = flags.size();
-            boolean titles = Settings.TITLES;
-            final String greeting;
-            
-            if (size != 0) {
-                Flag titleFlag = flags.get("titles");
-                    if (titleFlag != null) {
-                    titles = (Boolean) titleFlag.getValue();
-                }
-                Flag greetingFlag = flags.get("greeting");
-                if (greetingFlag != null) {
-                    greeting = (String) greetingFlag.getValue();
-                    pp.sendMessage(ChatColor.translateAlternateColorCodes('&', C.PREFIX_GREETING.s().replaceAll("%id%", plot.id + "") + greeting));
-                }
-                else {
-                    greeting = "";
-                }
-                if (greeting != null) {
-                    
-                }
-                Flag enter = flags.get("notify-enter");
-                if (enter != null && ((Boolean) enter.getValue())) {
-                    if (!Permissions.hasPermission(pp, "plots.flag.notify-enter.bypass")) {
-                        for (UUID uuid : PlotHandler.getOwners(plot)) {
-                            final PlotPlayer owner = UUIDHandler.getPlayer(uuid);
-                            if (owner != null && !owner.getUUID().equals(pp.getUUID())) {
-                                MainUtil.sendMessage(pp, C.NOTIFY_ENTER.s().replace("%player", pp.getName()).replace("%plot", plot.getId().toString()));
-                            }
-                        }
-                    }
-                }
-                final Flag gamemodeFlag = flags.get("gamemode");
-                if (gamemodeFlag != null) {
-                    if (pp.getGamemode() != gamemodeFlag.getValue()) {
-                        if (!Permissions.hasPermission(pp, "plots.gamemode.bypass")) {
-                            pp.setGamemode((PlotGamemode) gamemodeFlag.getValue());
-                        }
-                        else {
-                            MainUtil.sendMessage(pp, StringMan.replaceAll(C.GAMEMODE_WAS_BYPASSED.s(), "{plot}", plot.id, "{gamemode}", gamemodeFlag.getValue()));
-                        }
-                    }
-                }
-                final Flag flyFlag = flags.get("fly");
-                if (flyFlag != null) {
-                    pp.setFlight((boolean) flyFlag.getValue());
-                }
-                final Flag timeFlag = flags.get("time");
-                if (timeFlag != null) {
-                    try {
-                        final long time = (long) timeFlag.getValue();
-                        pp.setTime(time);
-                    } catch (final Exception e) {
-                        FlagManager.removePlotFlag(plot, "time");
-                    }
-                }
-                final Flag weatherFlag = flags.get("weather");
-                if (weatherFlag != null) {
-                    pp.setWeather((PlotWeather) weatherFlag.getValue());
-                }
-                
-                Flag musicFlag = flags.get("music");
-                if (musicFlag != null) {
-                    final Integer id = (Integer) musicFlag.getValue();
-                    if ((id >= 2256 && id <= 2267) || id == 0) {
-                        Location loc = pp.getLocation();
-                        Location lastLoc = (Location) pp.getMeta("music");
-                        if (lastLoc != null) {
-                            pp.playMusic(lastLoc, 0);
-                            if (id == 0) {
-                                pp.deleteMeta("music");
-                            }
-                        }
-                        if (id != 0) {
-                            try {
-                                pp.setMeta("music", loc);
-                                pp.playMusic(loc, id);
-                            }
-                            catch (Exception e) {}
-                        }
-                    }
-                }
-                else {
-                    Location lastLoc = (Location) pp.getMeta("music");
-                    if (lastLoc != null) {
-                        pp.deleteMeta("music");
-                        pp.playMusic(lastLoc, 0);
-                    }
-                }
-                CommentManager.sendTitle(pp, plot);
-            }
-            else if (titles) {
-                greeting = "";
-            }
-            else {
-                return true;
-            }
-            if (titles) { 
-                if (C.TITLE_ENTERED_PLOT.s().length() != 0 || C.TITLE_ENTERED_PLOT_SUB.s().length() != 0) {
-                    TaskManager.runTaskLaterAsync(new Runnable() {
-                        @Override
-                        public void run() {
-                            Plot lastPlot = (Plot) pp.getMeta("lastplot");
-                            if (lastPlot != null && plot.id.equals(lastPlot.id)) {
-                                Map<String, String> replacements = new HashMap<>();
-                                replacements.put("%x%", lastPlot.id.x + "");
-                                replacements.put("%z%", lastPlot.id.y + "");
-                                replacements.put("%world%", plot.world);
-                                replacements.put("%greeting%", greeting);
-                                replacements.put("%alias", plot.toString());
-                                replacements.put("%s", MainUtil.getName(plot.owner));
-                                String main = StringMan.replaceFromMap(C.TITLE_ENTERED_PLOT.s(), replacements);
-                                String sub = StringMan.replaceFromMap(C.TITLE_ENTERED_PLOT_SUB.s(), replacements);
-                                AbstractTitle.sendTitle(pp, main, sub);
-                            }
-                        }
-                    }, 20);
-                }
-            }
-            return true;
-        }
-        return true;
-    }
-
-    public static boolean plotExit(final PlotPlayer pp, final Plot plot) {
-        pp.deleteMeta("lastplot");
-        EventUtil.manager.callLeave(pp, plot);
-        if (plot.hasOwner()) {
-            PlotWorld pw = PS.get().getPlotWorld(pp.getLocation().getWorld());
-            if (pw == null) {
-                return true;
-            }
-            if (FlagManager.getPlotFlag(plot, "gamemode") != null) {
-                if (pp.getGamemode() != pw.GAMEMODE) {
-                    if (!Permissions.hasPermission(pp, "plots.gamemode.bypass")) {
-                        pp.setGamemode(pw.GAMEMODE);
-                    }
-                    else {
-                        MainUtil.sendMessage(pp, StringMan.replaceAll(C.GAMEMODE_WAS_BYPASSED.s(), "{plot}", plot.world, "{gamemode}", pw.GAMEMODE.name().toLowerCase()));
-                    }
-                }
-            }
-            Flag farewell = FlagManager.getPlotFlag(plot, "farewell"); 
-            if (farewell != null) {
-                pp.sendMessage(ChatColor.translateAlternateColorCodes('&', C.PREFIX_FAREWELL.s().replaceAll("%id%", plot.id + "") + farewell.getValueString()));
-            }
-            Flag leave = FlagManager.getPlotFlag(plot, "notify-leave");
-            if (leave != null && ((Boolean) leave.getValue())) {
-                if (!Permissions.hasPermission(pp, "plots.flag.notify-enter.bypass")) {
-                    for (UUID uuid : PlotHandler.getOwners(plot)) {
-                        final PlotPlayer owner = UUIDHandler.getPlayer(uuid);
-                        if (owner != null && !owner.getUUID().equals(pp.getUUID())) {
-                            MainUtil.sendMessage(pp, C.NOTIFY_LEAVE.s().replace("%player", pp.getName()).replace("%plot", plot.getId().toString()));
-                        }
-                    }
-                }
-            }
-            if (FlagManager.getPlotFlag(plot, "fly") != null) {
-                PlotGamemode gamemode = pp.getGamemode();
-                if (gamemode == PlotGamemode.SURVIVAL || gamemode == PlotGamemode.ADVENTURE) {
-                    pp.setFlight(false);
-                }
-            }
-            if (FlagManager.getPlotFlag(plot, "time") != null) {
-                pp.setTime(Long.MAX_VALUE);
-            }
-            if (FlagManager.getPlotFlag(plot, "weather") != null) {
-                pp.setWeather(PlotWeather.RESET);
-            }
-            Location lastLoc = (Location) pp.getMeta("music");
-            if (lastLoc != null) {
-                pp.deleteMeta("music");
-                pp.playMusic(lastLoc, 0);
-            }
-        }
-        return true;
-    }
-
-    public boolean getFlagValue(final String value) {
-        return Arrays.asList("true", "on", "enabled", "yes").contains(value.toLowerCase());
-    }
-}
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// PlotSquared - A plot manager and world generator for the Bukkit API                             /
+// Copyright (c) 2014 IntellectualSites/IntellectualCrafters                                       /
+//                                                                                                 /
+// This program is free software; you can redistribute it and/or modify                            /
+// it under the terms of the GNU General Public License as published by                            /
+// the Free Software Foundation; either version 3 of the License, or                               /
+// (at your option) any later version.                                                             /
+//                                                                                                 /
+// This program is distributed in the hope that it will be useful,                                 /
+// but WITHOUT ANY WARRANTY; without even the implied warranty of                                  /
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                   /
+// GNU General Public License for more details.                                                    /
+//                                                                                                 /
+// You should have received a copy of the GNU General Public License                               /
+// along with this program; if not, write to the Free Software Foundation,                         /
+// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA                               /
+//                                                                                                 /
+// You can contact us via: support@intellectualsites.com                                           /
+////////////////////////////////////////////////////////////////////////////////////////////////////
+package com.plotsquared.listener;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+import org.bukkit.ChatColor;
+
+import com.intellectualcrafters.plot.PS;
+import com.intellectualcrafters.plot.config.C;
+import com.intellectualcrafters.plot.config.Settings;
+import com.intellectualcrafters.plot.flag.Flag;
+import com.intellectualcrafters.plot.flag.FlagManager;
+import com.intellectualcrafters.plot.object.Location;
+import com.intellectualcrafters.plot.object.Plot;
+import com.intellectualcrafters.plot.object.PlotHandler;
+import com.intellectualcrafters.plot.object.PlotPlayer;
+import com.intellectualcrafters.plot.object.PlotWorld;
+import com.intellectualcrafters.plot.util.AbstractTitle;
+import com.intellectualcrafters.plot.util.CommentManager;
+import com.intellectualcrafters.plot.util.EventUtil;
+import com.intellectualcrafters.plot.util.MainUtil;
+import com.intellectualcrafters.plot.util.Permissions;
+import com.intellectualcrafters.plot.util.PlotGamemode;
+import com.intellectualcrafters.plot.util.PlotWeather;
+import com.intellectualcrafters.plot.util.StringMan;
+import com.intellectualcrafters.plot.util.TaskManager;
+import com.intellectualcrafters.plot.util.UUIDHandler;
+
+/**


+ */
+public class PlotListener
+{
+
+    public static boolean plotEntry(final PlotPlayer pp, final Plot plot)
+    {
+        if (plot.isDenied(pp.getUUID()) && !Permissions.hasPermission(pp, "plots.admin.entry.denied")) { return false; }
+        final Plot last = (Plot) pp.getMeta("lastplot");
+        if ((last != null) && !last.id.equals(plot.id))
+        {
+            plotExit(pp, last);
+        }
+        pp.setMeta("lastplot", plot);
+        EventUtil.manager.callEntry(pp, plot);
+        if (plot.hasOwner())
+        {
+            final HashMap<String, Flag> flags = FlagManager.getPlotFlags(plot);
+            final int size = flags.size();
+            boolean titles = Settings.TITLES;
+            final String greeting;
+
+            if (size != 0)
+            {
+                final Flag titleFlag = flags.get("titles");
+                if (titleFlag != null)
+                {
+                    titles = (Boolean) titleFlag.getValue();
+                }
+                final Flag greetingFlag = flags.get("greeting");
+                if (greetingFlag != null)
+                {
+                    greeting = (String) greetingFlag.getValue();
+                    pp.sendMessage(ChatColor.translateAlternateColorCodes('&', C.PREFIX_GREETING.s().replaceAll("%id%", plot.id + "") + greeting));
+                }
+                else
+                {
+                    greeting = "";
+                }
+                if (greeting != null)
+                {
+
+                }
+                final Flag enter = flags.get("notify-enter");
+                if ((enter != null) && ((Boolean) enter.getValue()))
+                {
+                    if (!Permissions.hasPermission(pp, "plots.flag.notify-enter.bypass"))
+                    {
+                        for (final UUID uuid : PlotHandler.getOwners(plot))
+                        {
+                            final PlotPlayer owner = UUIDHandler.getPlayer(uuid);
+                            if ((owner != null) && !owner.getUUID().equals(pp.getUUID()))
+                            {
+                                MainUtil.sendMessage(pp, C.NOTIFY_ENTER.s().replace("%player", pp.getName()).replace("%plot", plot.getId().toString()));
+                            }
+                        }
+                    }
+                }
+                final Flag gamemodeFlag = flags.get("gamemode");
+                if (gamemodeFlag != null)
+                {
+                    if (pp.getGamemode() != gamemodeFlag.getValue())
+                    {
+                        if (!Permissions.hasPermission(pp, "plots.gamemode.bypass"))
+                        {
+                            pp.setGamemode((PlotGamemode) gamemodeFlag.getValue());
+                        }
+                        else
+                        {
+                            MainUtil.sendMessage(pp, StringMan.replaceAll(C.GAMEMODE_WAS_BYPASSED.s(), "{plot}", plot.id, "{gamemode}", gamemodeFlag.getValue()));
+                        }
+                    }
+                }
+                final Flag flyFlag = flags.get("fly");
+                if (flyFlag != null)
+                {
+                    pp.setFlight((boolean) flyFlag.getValue());
+                }
+                final Flag timeFlag = flags.get("time");
+                if (timeFlag != null)
+                {
+                    try
+                    {
+                        final long time = (long) timeFlag.getValue();
+                        pp.setTime(time);
+                    }
+                    catch (final Exception e)
+                    {
+                        FlagManager.removePlotFlag(plot, "time");
+                    }
+                }
+                final Flag weatherFlag = flags.get("weather");
+                if (weatherFlag != null)
+                {
+                    pp.setWeather((PlotWeather) weatherFlag.getValue());
+                }
+
+                final Flag musicFlag = flags.get("music");
+                if (musicFlag != null)
+                {
+                    final Integer id = (Integer) musicFlag.getValue();
+                    if (((id >= 2256) && (id <= 2267)) || (id == 0))
+                    {
+                        final Location loc = pp.getLocation();
+                        final Location lastLoc = (Location) pp.getMeta("music");
+                        if (lastLoc != null)
+                        {
+                            pp.playMusic(lastLoc, 0);
+                            if (id == 0)
+                            {
+                                pp.deleteMeta("music");
+                            }
+                        }
+                        if (id != 0)
+                        {
+                            try
+                            {
+                                pp.setMeta("music", loc);
+                                pp.playMusic(loc, id);
+                            }
+                            catch (final Exception e)
+                            {}
+                        }
+                    }
+                }
+                else
+                {
+                    final Location lastLoc = (Location) pp.getMeta("music");
+                    if (lastLoc != null)
+                    {
+                        pp.deleteMeta("music");
+                        pp.playMusic(lastLoc, 0);
+                    }
+                }
+                CommentManager.sendTitle(pp, plot);
+            }
+            else if (titles)
+            {
+                greeting = "";
+            }
+            else
+            {
+                return true;
+            }
+            if (titles)
+            {
+                if ((C.TITLE_ENTERED_PLOT.s().length() != 0) || (C.TITLE_ENTERED_PLOT_SUB.s().length() != 0))
+                {
+                    TaskManager.runTaskLaterAsync(new Runnable()
+                    {
+                        @Override
+                        public void run()
+                        {
+                            final Plot lastPlot = (Plot) pp.getMeta("lastplot");
+                            if ((lastPlot != null) && plot.id.equals(lastPlot.id))
+                            {
+                                final Map<String, String> replacements = new HashMap<>();
+                                replacements.put("%x%", lastPlot.id.x + "");
+                                replacements.put("%z%", lastPlot.id.y + "");
+                                replacements.put("%world%", plot.world);
+                                replacements.put("%greeting%", greeting);
+                                replacements.put("%alias", plot.toString());
+                                replacements.put("%s", MainUtil.getName(plot.owner));
+                                final String main = StringMan.replaceFromMap(C.TITLE_ENTERED_PLOT.s(), replacements);
+                                final String sub = StringMan.replaceFromMap(C.TITLE_ENTERED_PLOT_SUB.s(), replacements);
+                                AbstractTitle.sendTitle(pp, main, sub);
+                            }
+                        }
+                    }, 20);
+                }
+            }
+            return true;
+        }
+        return true;
+    }
+
+    public static boolean plotExit(final PlotPlayer pp, final Plot plot)
+    {
+        pp.deleteMeta("lastplot");
+        EventUtil.manager.callLeave(pp, plot);
+        if (plot.hasOwner())
+        {
+            final PlotWorld pw = PS.get().getPlotWorld(pp.getLocation().getWorld());
+            if (pw == null) { return true; }
+            if (FlagManager.getPlotFlag(plot, "gamemode") != null)
+            {
+                if (pp.getGamemode() != pw.GAMEMODE)
+                {
+                    if (!Permissions.hasPermission(pp, "plots.gamemode.bypass"))
+                    {
+                        pp.setGamemode(pw.GAMEMODE);
+                    }
+                    else
+                    {
+                        MainUtil.sendMessage(pp, StringMan.replaceAll(C.GAMEMODE_WAS_BYPASSED.s(), "{plot}", plot.world, "{gamemode}", pw.GAMEMODE.name().toLowerCase()));
+                    }
+                }
+            }
+            final Flag farewell = FlagManager.getPlotFlag(plot, "farewell");
+            if (farewell != null)
+            {
+                pp.sendMessage(ChatColor.translateAlternateColorCodes('&', C.PREFIX_FAREWELL.s().replaceAll("%id%", plot.id + "") + farewell.getValueString()));
+            }
+            final Flag leave = FlagManager.getPlotFlag(plot, "notify-leave");
+            if ((leave != null) && ((Boolean) leave.getValue()))
+            {
+                if (!Permissions.hasPermission(pp, "plots.flag.notify-enter.bypass"))
+                {
+                    for (final UUID uuid : PlotHandler.getOwners(plot))
+                    {
+                        final PlotPlayer owner = UUIDHandler.getPlayer(uuid);
+                        if ((owner != null) && !owner.getUUID().equals(pp.getUUID()))
+                        {
+                            MainUtil.sendMessage(pp, C.NOTIFY_LEAVE.s().replace("%player", pp.getName()).replace("%plot", plot.getId().toString()));
+                        }
+                    }
+                }
+            }
+            if (FlagManager.getPlotFlag(plot, "fly") != null)
+            {
+                final PlotGamemode gamemode = pp.getGamemode();
+                if ((gamemode == PlotGamemode.SURVIVAL) || (gamemode == PlotGamemode.ADVENTURE))
+                {
+                    pp.setFlight(false);
+                }
+            }
+            if (FlagManager.getPlotFlag(plot, "time") != null)
+            {
+                pp.setTime(Long.MAX_VALUE);
+            }
+            if (FlagManager.getPlotFlag(plot, "weather") != null)
+            {
+                pp.setWeather(PlotWeather.RESET);
+            }
+            final Location lastLoc = (Location) pp.getMeta("music");
+            if (lastLoc != null)
+            {
+                pp.deleteMeta("music");
+                pp.playMusic(lastLoc, 0);
+            }
+        }
+        return true;
+    }
+
+    public boolean getFlagValue(final String value)
+    {
+        return Arrays.asList("true", "on", "enabled", "yes").contains(value.toLowerCase());
+    }
+}
diff --git a/src/main/java/com/plotsquared/listener/ProcessedWEExtent.java b/src/main/java/com/plotsquared/listener/ProcessedWEExtent.java
index 549990cd4..42e30bd4b 100644
--- a/src/main/java/com/plotsquared/listener/ProcessedWEExtent.java
+++ b/src/main/java/com/plotsquared/listener/ProcessedWEExtent.java
@@ -19,33 +19,38 @@ import com.sk89q.worldedit.extent.Extent;
 import com.sk89q.worldedit.util.Location;
 import com.sk89q.worldedit.world.biome.BaseBiome;
 
-public class ProcessedWEExtent extends AbstractDelegateExtent {
+public class ProcessedWEExtent extends AbstractDelegateExtent
+{
     private final HashSet<RegionWrapper> mask;
     int BScount = 0;
     int Ecount = 0;
     boolean BSblocked = false;
     boolean Eblocked = false;
-    private String world;
-    private int max;
+    private final String world;
+    private final int max;
     private int count;
     private Extent parent;
- 
-    public ProcessedWEExtent(String world, HashSet<RegionWrapper> mask, int max, Extent child, Extent parent) {
+
+    public ProcessedWEExtent(final String world, final HashSet<RegionWrapper> mask, int max, final Extent child, final Extent parent)
+    {
         super(child);
         this.mask = mask;
         this.world = world;
-        if (max == -1) {
+        if (max == -1)
+        {
             max = Integer.MAX_VALUE;
         }
         this.max = max;
-        this.count = 0;
+        count = 0;
         this.parent = parent;
     }
-    
+
     @Override
-    public boolean setBlock(Vector location, BaseBlock block) throws WorldEditException {
-        int id = block.getType();
-        switch (id) {
+    public boolean setBlock(final Vector location, final BaseBlock block) throws WorldEditException
+    {
+        final int id = block.getType();
+        switch (id)
+        {
             case 54:
             case 130:
             case 142:
@@ -80,23 +85,29 @@ public class ProcessedWEExtent extends AbstractDelegateExtent {
             case 29:
             case 33:
             case 151:
-            case 178: {
-                if (BSblocked) {
-                    return false;
-                }
+            case 178:
+            {
+                if (BSblocked) { return false; }
                 BScount++;
-                if (BScount > Settings.CHUNK_PROCESSOR_MAX_BLOCKSTATES) {
+                if (BScount > Settings.CHUNK_PROCESSOR_MAX_BLOCKSTATES)
+                {
                     BSblocked = true;
                     PS.debug("&cPlotSquared detected unsafe WorldEdit: " + (location.getBlockX()) + "," + (location.getBlockZ()));
                 }
-                if (WEManager.maskContains(mask, location.getBlockX(), location.getBlockY(), location.getBlockZ())) {
-                    if (count++ > max) {
-                        if (parent != null) {
-                            try {
-                                Field field = AbstractDelegateExtent.class.getDeclaredField("extent");
+                if (WEManager.maskContains(mask, location.getBlockX(), location.getBlockY(), location.getBlockZ()))
+                {
+                    if (count++ > max)
+                    {
+                        if (parent != null)
+                        {
+                            try
+                            {
+                                final Field field = AbstractDelegateExtent.class.getDeclaredField("extent");
                                 field.setAccessible(true);
                                 field.set(parent, new NullExtent());
-                            } catch (Exception e) {
+                            }
+                            catch (final Exception e)
+                            {
                                 e.printStackTrace();
                             }
                             parent = null;
@@ -107,25 +118,33 @@ public class ProcessedWEExtent extends AbstractDelegateExtent {
                 }
                 break;
             }
-            default: {
-                int x = location.getBlockX();
-                int y = location.getBlockY();
-                int z = location.getBlockZ();
-                if (WEManager.maskContains(mask, location.getBlockX(), location.getBlockY(), location.getBlockZ())) {
-                    if (count++ > max) {
-                        if (parent != null) {
-                            try {
-                                Field field = AbstractDelegateExtent.class.getDeclaredField("extent");
+            default:
+            {
+                final int x = location.getBlockX();
+                final int y = location.getBlockY();
+                final int z = location.getBlockZ();
+                if (WEManager.maskContains(mask, location.getBlockX(), location.getBlockY(), location.getBlockZ()))
+                {
+                    if (count++ > max)
+                    {
+                        if (parent != null)
+                        {
+                            try
+                            {
+                                final Field field = AbstractDelegateExtent.class.getDeclaredField("extent");
                                 field.setAccessible(true);
                                 field.set(parent, new NullExtent());
-                            } catch (Exception e) {
+                            }
+                            catch (final Exception e)
+                            {
                                 e.printStackTrace();
                             }
                             parent = null;
                         }
                         return false;
                     }
-                    switch(id) {
+                    switch (id)
+                    {
                         case 0:
                         case 2:
                         case 4:
@@ -210,56 +229,59 @@ public class ProcessedWEExtent extends AbstractDelegateExtent {
                         case 189:
                         case 190:
                         case 191:
-                        case 192: {
-                            if (Settings.EXPERIMENTAL_FAST_ASYNC_WORLDEDIT) {
+                        case 192:
+                        {
+                            if (Settings.EXPERIMENTAL_FAST_ASYNC_WORLDEDIT)
+                            {
                                 SetBlockQueue.setBlock(world, x, y, z, id);
                             }
-                            else {
+                            else
+                            {
                                 super.setBlock(location, block);
                             }
                             break;
                         }
-                        default: {
-                            if (Settings.EXPERIMENTAL_FAST_ASYNC_WORLDEDIT) {
+                        default:
+                        {
+                            if (Settings.EXPERIMENTAL_FAST_ASYNC_WORLDEDIT)
+                            {
                                 SetBlockQueue.setBlock(world, x, y, z, new PlotBlock((short) id, (byte) block.getData()));
                             }
-                            else {
+                            else
+                            {
                                 super.setBlock(location, block);
                             }
                             break;
                         }
                     }
                     return true;
-//                    BlockManager.manager.functionSetBlock(world, x, y, z, id, data);
-//                    return super.setBlock(location, block);
+                    //                    BlockManager.manager.functionSetBlock(world, x, y, z, id, data);
+                    //                    return super.setBlock(location, block);
                 }
             }
-            
+
         }
         return false;
     }
-    
+
     @Override
-    public Entity createEntity(Location location, BaseEntity entity) {
-        if (Eblocked) {
-            return null;
-        }
+    public Entity createEntity(final Location location, final BaseEntity entity)
+    {
+        if (Eblocked) { return null; }
         Ecount++;
-        if (Ecount > Settings.CHUNK_PROCESSOR_MAX_ENTITIES) {
+        if (Ecount > Settings.CHUNK_PROCESSOR_MAX_ENTITIES)
+        {
             Eblocked = true;
             PS.debug("&cPlotSquared detected unsafe WorldEdit: " + (location.getBlockX()) + "," + (location.getBlockZ()));
         }
-        if (WEManager.maskContains(mask, location.getBlockX(), location.getBlockY(), location.getBlockZ())) {
-            return super.createEntity(location, entity);
-        }
+        if (WEManager.maskContains(mask, location.getBlockX(), location.getBlockY(), location.getBlockZ())) { return super.createEntity(location, entity); }
         return null;
     }
-    
+
     @Override
-    public boolean setBiome(Vector2D position, BaseBiome biome) {
-        if (WEManager.maskContains(mask, position.getBlockX(), position.getBlockZ())) {
-            return super.setBiome(position, biome);
-        }
+    public boolean setBiome(final Vector2D position, final BaseBiome biome)
+    {
+        if (WEManager.maskContains(mask, position.getBlockX(), position.getBlockZ())) { return super.setBiome(position, biome); }
         return false;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/plotsquared/listener/WEExtent.java b/src/main/java/com/plotsquared/listener/WEExtent.java
index 8020ba805..516d88505 100644
--- a/src/main/java/com/plotsquared/listener/WEExtent.java
+++ b/src/main/java/com/plotsquared/listener/WEExtent.java
@@ -14,35 +14,34 @@ import com.sk89q.worldedit.extent.Extent;
 import com.sk89q.worldedit.util.Location;
 import com.sk89q.worldedit.world.biome.BaseBiome;
 
-public class WEExtent extends AbstractDelegateExtent {
+public class WEExtent extends AbstractDelegateExtent
+{
     private final HashSet<RegionWrapper> mask;
- 
-    public WEExtent(HashSet<RegionWrapper> mask, Extent extent) {
+
+    public WEExtent(final HashSet<RegionWrapper> mask, final Extent extent)
+    {
         super(extent);
         this.mask = mask;
     }
-    
+
     @Override
-    public boolean setBlock(Vector location, BaseBlock block) throws WorldEditException {
-        if (WEManager.maskContains(mask, location.getBlockX(), location.getBlockY(), location.getBlockZ())) {
-            return super.setBlock(location, block);
-        }
+    public boolean setBlock(final Vector location, final BaseBlock block) throws WorldEditException
+    {
+        if (WEManager.maskContains(mask, location.getBlockX(), location.getBlockY(), location.getBlockZ())) { return super.setBlock(location, block); }
         return false;
     }
-    
+
     @Override
-    public Entity createEntity(Location location, BaseEntity entity) {
-        if (WEManager.maskContains(mask, location.getBlockX(), location.getBlockY(), location.getBlockZ())) {
-            return super.createEntity(location, entity);
-        }
+    public Entity createEntity(final Location location, final BaseEntity entity)
+    {
+        if (WEManager.maskContains(mask, location.getBlockX(), location.getBlockY(), location.getBlockZ())) { return super.createEntity(location, entity); }
         return null;
     }
-    
+
     @Override
-    public boolean setBiome(Vector2D position, BaseBiome biome) {
-        if (WEManager.maskContains(mask, position.getBlockX(), position.getBlockZ())) {
-            return super.setBiome(position, biome);
-        }
+    public boolean setBiome(final Vector2D position, final BaseBiome biome)
+    {
+        if (WEManager.maskContains(mask, position.getBlockX(), position.getBlockZ())) { return super.setBiome(position, biome); }
         return false;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/plotsquared/listener/WEManager.java b/src/main/java/com/plotsquared/listener/WEManager.java
index e8d5fdfbf..e132bb682 100644
--- a/src/main/java/com/plotsquared/listener/WEManager.java
+++ b/src/main/java/com/plotsquared/listener/WEManager.java
@@ -12,58 +12,65 @@ import com.intellectualcrafters.plot.object.PlotPlayer;
 import com.intellectualcrafters.plot.object.RegionWrapper;
 import com.intellectualcrafters.plot.util.MainUtil;
 
-public class WEManager {
-//    public static HashSet<String> bypass = new HashSet<>();
-    
-    public static boolean maskContains(HashSet<RegionWrapper> mask, int x, int y, int z) {
-        for (RegionWrapper region : mask) {
-            if (region.isIn(x, y, z)) {
-                return true;
-            }
+public class WEManager
+{
+    //    public static HashSet<String> bypass = new HashSet<>();
+
+    public static boolean maskContains(final HashSet<RegionWrapper> mask, final int x, final int y, final int z)
+    {
+        for (final RegionWrapper region : mask)
+        {
+            if (region.isIn(x, y, z)) { return true; }
         }
         return false;
     }
-    
-    public static boolean maskContains(HashSet<RegionWrapper> mask, int x, int z) {
-        for (RegionWrapper region : mask) {
-            if (region.isIn(x, z)) {
-                return true;
-            }
+
+    public static boolean maskContains(final HashSet<RegionWrapper> mask, final int x, final int z)
+    {
+        for (final RegionWrapper region : mask)
+        {
+            if (region.isIn(x, z)) { return true; }
         }
         return false;
     }
-    
-    public static HashSet<RegionWrapper> getMask(PlotPlayer player) {
-        HashSet<RegionWrapper> regions = new HashSet<>();
-        UUID uuid = player.getUUID();
-        Location location = player.getLocation();
-        String world = location.getWorld();
-        if (!PS.get().isPlotWorld(world)) {
+
+    public static HashSet<RegionWrapper> getMask(final PlotPlayer player)
+    {
+        final HashSet<RegionWrapper> regions = new HashSet<>();
+        final UUID uuid = player.getUUID();
+        final Location location = player.getLocation();
+        final String world = location.getWorld();
+        if (!PS.get().isPlotWorld(world))
+        {
             regions.add(new RegionWrapper(Integer.MIN_VALUE, Integer.MAX_VALUE, Integer.MIN_VALUE, Integer.MAX_VALUE));
             return regions;
         }
-        for (Plot plot : PS.get().getPlotsInWorld(player.getLocation().getWorld())) {
-            if (!plot.isBasePlot() || (Settings.DONE_RESTRICTS_BUILDING && FlagManager.getPlotFlag(plot, "done") != null)) {
+        for (final Plot plot : PS.get().getPlotsInWorld(player.getLocation().getWorld()))
+        {
+            if (!plot.isBasePlot() || (Settings.DONE_RESTRICTS_BUILDING && (FlagManager.getPlotFlag(plot, "done") != null)))
+            {
                 continue;
             }
-            if (Settings.WE_ALLOW_HELPER ? plot.isAdded(uuid) : (plot.isOwner(uuid) || plot.getTrusted().contains(uuid))) {
-                Location pos1 = MainUtil.getPlotBottomLoc(plot.world, plot.id).add(1, 0, 1);
-                Location pos2 = MainUtil.getPlotTopLoc(plot.world, plot.id);
+            if (Settings.WE_ALLOW_HELPER ? plot.isAdded(uuid) : (plot.isOwner(uuid) || plot.getTrusted().contains(uuid)))
+            {
+                final Location pos1 = MainUtil.getPlotBottomLoc(plot.world, plot.id).add(1, 0, 1);
+                final Location pos2 = MainUtil.getPlotTopLoc(plot.world, plot.id);
                 regions.add(new RegionWrapper(pos1.getX(), pos2.getX(), pos1.getY(), pos2.getY(), pos1.getZ(), pos2.getZ()));
             }
         }
         return regions;
     }
-    
-    public static boolean intersects(RegionWrapper region1, RegionWrapper region2) {
+
+    public static boolean intersects(final RegionWrapper region1, final RegionWrapper region2)
+    {
         return (region1.minX <= region2.maxX) && (region1.maxX >= region2.minX) && (region1.minZ <= region2.maxZ) && (region1.maxZ >= region2.minZ);
     }
-    
-    public static boolean regionContains(RegionWrapper selection, HashSet<RegionWrapper> mask) {
-        for (RegionWrapper region : mask) {
-            if (intersects(region, selection)) {
-                return true;
-            }
+
+    public static boolean regionContains(final RegionWrapper selection, final HashSet<RegionWrapper> mask)
+    {
+        for (final RegionWrapper region : mask)
+        {
+            if (intersects(region, selection)) { return true; }
         }
         return false;
     }
diff --git a/src/main/java/com/plotsquared/listener/WESubscriber.java b/src/main/java/com/plotsquared/listener/WESubscriber.java
index 74c4c13ba..32ab675ac 100644
--- a/src/main/java/com/plotsquared/listener/WESubscriber.java
+++ b/src/main/java/com/plotsquared/listener/WESubscriber.java
@@ -27,94 +27,118 @@ import com.sk89q.worldedit.util.eventbus.EventHandler.Priority;
 import com.sk89q.worldedit.util.eventbus.Subscribe;
 import com.sk89q.worldedit.world.World;
 
-public class WESubscriber {
-    
-    @Subscribe(priority=Priority.VERY_EARLY)
-    public void onEditSession(EditSessionEvent event) {
-        WorldEdit worldedit = PS.get().worldedit;
-        if (worldedit == null) {
+public class WESubscriber
+{
+
+    @Subscribe(priority = Priority.VERY_EARLY)
+    public void onEditSession(final EditSessionEvent event)
+    {
+        final WorldEdit worldedit = PS.get().worldedit;
+        if (worldedit == null)
+        {
             worldedit.getEventBus().unregister(this);
             return;
         }
-        World worldObj = event.getWorld();
-        String world = worldObj.getName();
-        Actor actor = event.getActor();
-        if (actor != null && actor.isPlayer()) {
-            String name = actor.getName();
-            PlotPlayer pp = PlotPlayer.wrap(name);
-            if (pp != null && pp.getAttribute("worldedit")) {
-                return;
-            }
-            HashSet<RegionWrapper> mask = WEManager.getMask(pp);
-            PlotWorld plotworld = PS.get().getPlotWorld(world);
-            if (mask.size() == 0) {
-                if (Permissions.hasPermission(pp, "plots.worldedit.bypass")) {
+        final World worldObj = event.getWorld();
+        final String world = worldObj.getName();
+        final Actor actor = event.getActor();
+        if ((actor != null) && actor.isPlayer())
+        {
+            final String name = actor.getName();
+            final PlotPlayer pp = PlotPlayer.wrap(name);
+            if ((pp != null) && pp.getAttribute("worldedit")) { return; }
+            final HashSet<RegionWrapper> mask = WEManager.getMask(pp);
+            final PlotWorld plotworld = PS.get().getPlotWorld(world);
+            if (mask.size() == 0)
+            {
+                if (Permissions.hasPermission(pp, "plots.worldedit.bypass"))
+                {
                     MainUtil.sendMessage(pp, C.WORLDEDIT_BYPASS);
                 }
-                if (plotworld != null) {
+                if (plotworld != null)
+                {
                     event.setExtent(new NullExtent());
                 }
                 return;
             }
-            if (Settings.CHUNK_PROCESSOR) {
-                if (Settings.EXPERIMENTAL_FAST_ASYNC_WORLDEDIT) {
-                    try {
-                        LocalSession session = worldedit.getSession(name);
+            if (Settings.CHUNK_PROCESSOR)
+            {
+                if (Settings.EXPERIMENTAL_FAST_ASYNC_WORLDEDIT)
+                {
+                    try
+                    {
+                        final LocalSession session = worldedit.getSession(name);
                         boolean hasMask = session.getMask() != null;
-                        Player objPlayer = (Player) actor;
-                        int item = objPlayer.getItemInHand();
-                        if (!hasMask) {
-                            try {
-                                Tool tool = session.getTool(item);
-                                if (tool != null && tool instanceof BrushTool) {
+                        final Player objPlayer = (Player) actor;
+                        final int item = objPlayer.getItemInHand();
+                        if (!hasMask)
+                        {
+                            try
+                            {
+                                final Tool tool = session.getTool(item);
+                                if ((tool != null) && (tool instanceof BrushTool))
+                                {
                                     hasMask = ((BrushTool) tool).getMask() != null;
                                 }
                             }
-                            catch (Exception e) {}
+                            catch (final Exception e)
+                            {}
                         }
                         AbstractDelegateExtent extent = (AbstractDelegateExtent) event.getExtent();
                         ChangeSetExtent history = null;
                         MultiStageReorder reorder = null;
                         MaskingExtent maskextent = null;
-                        boolean fast = session.hasFastMode();
-                        while (extent.getExtent() != null && extent.getExtent() instanceof AbstractDelegateExtent) {
-                            AbstractDelegateExtent tmp = (AbstractDelegateExtent) extent.getExtent();
-                            if (tmp.getExtent() != null && tmp.getExtent() instanceof AbstractDelegateExtent) {
-                                if (tmp instanceof ChangeSetExtent) {
+                        final boolean fast = session.hasFastMode();
+                        while ((extent.getExtent() != null) && (extent.getExtent() instanceof AbstractDelegateExtent))
+                        {
+                            final AbstractDelegateExtent tmp = (AbstractDelegateExtent) extent.getExtent();
+                            if ((tmp.getExtent() != null) && (tmp.getExtent() instanceof AbstractDelegateExtent))
+                            {
+                                if (tmp instanceof ChangeSetExtent)
+                                {
                                     history = (ChangeSetExtent) tmp;
                                 }
-                                if (tmp instanceof MultiStageReorder) {
+                                if (tmp instanceof MultiStageReorder)
+                                {
                                     reorder = (MultiStageReorder) tmp;
                                 }
-                                if (hasMask && tmp instanceof MaskingExtent) {
+                                if (hasMask && (tmp instanceof MaskingExtent))
+                                {
                                     maskextent = (MaskingExtent) tmp;
                                 }
                                 extent = tmp;
                             }
-                            else {
+                            else
+                            {
                                 break;
                             }
                         }
-                        int max = event.getMaxBlocks();
-                        Field field = AbstractDelegateExtent.class.getDeclaredField("extent");
+                        final int max = event.getMaxBlocks();
+                        final Field field = AbstractDelegateExtent.class.getDeclaredField("extent");
                         field.setAccessible(true);
-                        if (history == null) {
-                            ExtentWrapper wrapper = new ExtentWrapper(event.getExtent());
+                        if (history == null)
+                        {
+                            final ExtentWrapper wrapper = new ExtentWrapper(event.getExtent());
                             event.setExtent(wrapper);
                             field.set(extent, new ProcessedWEExtent(world, mask, max, new FastModeExtent(worldObj, true), wrapper));
                         }
-                        else {
-                            if (fast) {
+                        else
+                        {
+                            if (fast)
+                            {
                                 event.setExtent(new ExtentWrapper(extent));
                             }
-                            else {
+                            else
+                            {
                                 ExtentWrapper wrapper;
-                                if (maskextent != null) {
+                                if (maskextent != null)
+                                {
                                     wrapper = new ExtentWrapper(maskextent);
                                     field.set(maskextent, history);
                                     event.setExtent(wrapper);
                                 }
-                                else {
+                                else
+                                {
                                     wrapper = new ExtentWrapper(history);
                                     event.setExtent(wrapper);
                                 }
@@ -124,15 +148,18 @@ public class WESubscriber {
                         }
                         return;
                     }
-                    catch (Exception e) {
+                    catch (final Exception e)
+                    {
                         e.printStackTrace();
                     }
                 }
-                if (PS.get().isPlotWorld(world)) {
+                if (PS.get().isPlotWorld(world))
+                {
                     event.setExtent(new ProcessedWEExtent(world, mask, event.getMaxBlocks(), event.getExtent(), event.getExtent()));
                 }
             }
-            else if (plotworld != null) {
+            else if (plotworld != null)
+            {
                 event.setExtent(new WEExtent(mask, event.getExtent()));
             }
         }
diff --git a/src/main/java/com/plotsquared/object/schematic/StateWrapper.java b/src/main/java/com/plotsquared/object/schematic/StateWrapper.java
index 97fdfc88e..8adf12e2f 100644
--- a/src/main/java/com/plotsquared/object/schematic/StateWrapper.java
+++ b/src/main/java/com/plotsquared/object/schematic/StateWrapper.java
@@ -21,34 +21,38 @@ import com.intellectualcrafters.plot.object.schematic.PlotItem;
 import com.intellectualcrafters.plot.util.MathMan;
 import com.intellectualcrafters.plot.util.SchematicHandler.Schematic;
 
-public class StateWrapper {
-    
+public class StateWrapper
+{
+
     public BlockState state = null;
     public CompoundTag tag = null;
-    
-    public StateWrapper(BlockState state) {
+
+    public StateWrapper(final BlockState state)
+    {
         this.state = state;
     }
-    
-    public StateWrapper(CompoundTag tag) {
+
+    public StateWrapper(final CompoundTag tag)
+    {
         this.tag = tag;
     }
-    
-    public boolean restoreTag(short x, short y, short z, Schematic schematic) {
-        if (this.tag == null) {
-            return false;
-        }
-        List<Tag> itemsTag = this.tag.getListTag("Items").getValue();
-        int length = itemsTag.size();
-        short[] ids = new short[length];
-        byte[] datas = new byte[length];
-        byte[] amounts = new byte[length];
-        for (int i = 0; i < length; i++) {
-            Tag itemTag = itemsTag.get(i);
-            CompoundTag itemComp = (CompoundTag) itemTag;
+
+    public boolean restoreTag(final short x, final short y, final short z, final Schematic schematic)
+    {
+        if (tag == null) { return false; }
+        final List<Tag> itemsTag = tag.getListTag("Items").getValue();
+        final int length = itemsTag.size();
+        final short[] ids = new short[length];
+        final byte[] datas = new byte[length];
+        final byte[] amounts = new byte[length];
+        for (int i = 0; i < length; i++)
+        {
+            final Tag itemTag = itemsTag.get(i);
+            final CompoundTag itemComp = (CompoundTag) itemTag;
             short id = itemComp.getShort("id");
             String idStr = itemComp.getString("id");
-            if (idStr != null && !MathMan.isInteger(idStr)) {
+            if ((idStr != null) && !MathMan.isInteger(idStr))
+            {
                 idStr = idStr.split(":")[1].toLowerCase();
                 id = (short) ItemType.getId(idStr);
             }
@@ -56,64 +60,73 @@ public class StateWrapper {
             datas[i] = (byte) itemComp.getShort("Damage");
             amounts[i] = itemComp.getByte("Count");
         }
-        if (length != 0) {
+        if (length != 0)
+        {
             schematic.addItem(new PlotItem(x, y, z, ids, datas, amounts));
         }
         return true;
     }
-    
-    public CompoundTag getTag() {
-        if (this.tag != null) {
-            return this.tag;
-        }
-        if (state instanceof InventoryHolder) {
-            InventoryHolder inv = (InventoryHolder) state;
-            ItemStack[] contents = inv.getInventory().getContents();
-            Map<String, Tag> values = new HashMap<String, Tag>();
+
+    public CompoundTag getTag()
+    {
+        if (tag != null) { return tag; }
+        if (state instanceof InventoryHolder)
+        {
+            final InventoryHolder inv = (InventoryHolder) state;
+            final ItemStack[] contents = inv.getInventory().getContents();
+            final Map<String, Tag> values = new HashMap<String, Tag>();
             values.put("Items", new ListTag("Items", CompoundTag.class, serializeInventory(contents)));
             return new CompoundTag(values);
         }
         return null;
     }
-    
-    public String getId() {
+
+    public String getId()
+    {
         return "Chest";
     }
-    
-    public List<CompoundTag> serializeInventory(ItemStack[] items) {
-        List<CompoundTag> tags = new ArrayList<CompoundTag>();
-        for (int i = 0; i < items.length; ++i) {
-            if (items[i] != null) {
-                Map<String, Tag> tagData = serializeItem(items[i]);
+
+    public List<CompoundTag> serializeInventory(final ItemStack[] items)
+    {
+        final List<CompoundTag> tags = new ArrayList<CompoundTag>();
+        for (int i = 0; i < items.length; ++i)
+        {
+            if (items[i] != null)
+            {
+                final Map<String, Tag> tagData = serializeItem(items[i]);
                 tagData.put("Slot", new ByteTag("Slot", (byte) i));
                 tags.add(new CompoundTag(tagData));
             }
         }
         return tags;
     }
-    
-    public Map<String, Tag> serializeItem(org.spongepowered.api.item.inventory.ItemStack item) {
-        Map<String, Tag> data = new HashMap<String, Tag>();
-        
+
+    public Map<String, Tag> serializeItem(final org.spongepowered.api.item.inventory.ItemStack item)
+    {
+        final Map<String, Tag> data = new HashMap<String, Tag>();
+
         // FIXME serialize sponge item
-        
+
         return data;
     }
-    
-    public Map<String, Tag> serializeItem(ItemStack item) {
-        Map<String, Tag> data = new HashMap<String, Tag>();
+
+    public Map<String, Tag> serializeItem(final ItemStack item)
+    {
+        final Map<String, Tag> data = new HashMap<String, Tag>();
         data.put("id", new ShortTag("id", (short) item.getTypeId()));
         data.put("Damage", new ShortTag("Damage", item.getDurability()));
         data.put("Count", new ByteTag("Count", (byte) item.getAmount()));
-        if (!item.getEnchantments().isEmpty()) {
-            List<CompoundTag> enchantmentList = new ArrayList<CompoundTag>();
-            for(Entry<Enchantment, Integer> entry : item.getEnchantments().entrySet()) {
-                Map<String, Tag> enchantment = new HashMap<String, Tag>();
+        if (!item.getEnchantments().isEmpty())
+        {
+            final List<CompoundTag> enchantmentList = new ArrayList<CompoundTag>();
+            for (final Entry<Enchantment, Integer> entry : item.getEnchantments().entrySet())
+            {
+                final Map<String, Tag> enchantment = new HashMap<String, Tag>();
                 enchantment.put("id", new ShortTag("id", (short) entry.getKey().getId()));
                 enchantment.put("lvl", new ShortTag("lvl", entry.getValue().shortValue()));
                 enchantmentList.add(new CompoundTag(enchantment));
             }
-            Map<String, Tag> auxData = new HashMap<String, Tag>();
+            final Map<String, Tag> auxData = new HashMap<String, Tag>();
             auxData.put("ench", new ListTag("ench", CompoundTag.class, enchantmentList));
             data.put("tag", new CompoundTag("tag", auxData));
         }
diff --git a/src/main/java/com/plotsquared/sponge/SpongeHybridUtils.java b/src/main/java/com/plotsquared/sponge/SpongeHybridUtils.java
index 531629495..480d7dc8b 100644
--- a/src/main/java/com/plotsquared/sponge/SpongeHybridUtils.java
+++ b/src/main/java/com/plotsquared/sponge/SpongeHybridUtils.java
@@ -12,35 +12,45 @@ import com.intellectualcrafters.plot.object.PlotBlock;
 import com.intellectualcrafters.plot.object.RunnableVal;
 import com.plotsquared.sponge.util.SpongeUtil;
 
-public class SpongeHybridUtils extends HybridUtils {
-    
+public class SpongeHybridUtils extends HybridUtils
+{
+
     @Override
-    public void analyzePlot(Plot plot, RunnableVal<PlotAnalysis> whenDone) {
+    public void analyzePlot(final Plot plot, final RunnableVal<PlotAnalysis> whenDone)
+    {
         // TODO Auto-generated method stub
         PS.debug("analyzePlot is not implemented");
-        if (whenDone != null) {
+        if (whenDone != null)
+        {
             whenDone.run();
         }
     }
-    
+
     @Override
-    public int checkModified(String worldname, int x1, int x2, int y1, int y2, int z1, int z2, PlotBlock[] blocks) {
+    public int checkModified(final String worldname, final int x1, final int x2, final int y1, final int y2, final int z1, final int z2, final PlotBlock[] blocks)
+    {
         PS.debug("checkModified is not implemented");
         final World world = SpongeUtil.getWorld(worldname);
         int count = 0;
-        for (int y = y1; y <= y2; y++) {
-            for (int x = x1; x <= x2; x++) {
-                for (int z = z1; z <= z2; z++) {
-                    BlockState state = world.getBlock(x, y, z);
-                    PlotBlock block = SpongeMain.THIS.getPlotBlock(state);
+        for (int y = y1; y <= y2; y++)
+        {
+            for (int x = x1; x <= x2; x++)
+            {
+                for (int z = z1; z <= z2; z++)
+                {
+                    final BlockState state = world.getBlock(x, y, z);
+                    final PlotBlock block = SpongeMain.THIS.getPlotBlock(state);
                     boolean same = false;
-                    for (final PlotBlock p : blocks) {
-                        if (block.id == p.id) {
+                    for (final PlotBlock p : blocks)
+                    {
+                        if (block.id == p.id)
+                        {
                             same = true;
                             break;
                         }
                     }
-                    if (!same) {
+                    if (!same)
+                    {
                         count++;
                     }
                 }
@@ -48,17 +58,23 @@ public class SpongeHybridUtils extends HybridUtils {
         }
         return count;
     }
-    
+
     @Override
-    public int get_ey(String worldname, int sx, int ex, int sz, int ez, int sy) {
+    public int get_ey(final String worldname, final int sx, final int ex, final int sz, final int ez, final int sy)
+    {
         final World world = SpongeUtil.getWorld(worldname);
         int ey = sy;
-        for (int x = sx; x <= ex; x++) {
-            for (int z = sz; z <= ez; z++) {
-                for (int y = sy; y < 256; y++) {
-                    if (y > ey) {
-                        BlockState state = world.getBlock(x, y, z);
-                        if (state != null && state.getType() != BlockTypes.AIR) {
+        for (int x = sx; x <= ex; x++)
+        {
+            for (int z = sz; z <= ez; z++)
+            {
+                for (int y = sy; y < 256; y++)
+                {
+                    if (y > ey)
+                    {
+                        final BlockState state = world.getBlock(x, y, z);
+                        if ((state != null) && (state.getType() != BlockTypes.AIR))
+                        {
                             ey = y;
                         }
                     }
@@ -67,5 +83,5 @@ public class SpongeHybridUtils extends HybridUtils {
         }
         return ey;
     }
-    
+
 }
diff --git a/src/main/java/com/plotsquared/sponge/SpongeMain.java b/src/main/java/com/plotsquared/sponge/SpongeMain.java
index 5a90673b4..801778de9 100644
--- a/src/main/java/com/plotsquared/sponge/SpongeMain.java
+++ b/src/main/java/com/plotsquared/sponge/SpongeMain.java
@@ -80,189 +80,225 @@ import com.plotsquared.sponge.util.SpongeUtil;
 import com.plotsquared.sponge.uuid.SpongeLowerOfflineUUIDWrapper;
 import com.plotsquared.sponge.uuid.SpongeOnlineUUIDWrapper;
 import com.plotsquared.sponge.uuid.SpongeUUIDHandler;
-import com.sk89q.worldedit.WorldEdit;
 
 /**
  * Created by robin on 01/11/2014
  */
 
-@Plugin(id = "PlotSquared", name = "PlotSquared", version = "3.0.0", dependencies="before:WorldEdit")
-public class SpongeMain implements IPlotMain, PluginContainer {
+@Plugin(id = "PlotSquared", name = "PlotSquared", version = "3.0.0", dependencies = "before:WorldEdit")
+public class SpongeMain implements IPlotMain, PluginContainer
+{
     public static SpongeMain THIS;
-    
-    @Inject private Logger logger;
-    @Inject private Game game;
+
+    @Inject
+    private Logger logger;
+    @Inject
+    private Game game;
     private Server server;
-    
+
     private GameProfileResolver resolver;
-    
+
     private WorldModify modify;
-    
+
     private Object plugin;
-    
+
     // stuff //
-    public Logger getLogger() {
+    public Logger getLogger()
+    {
         return logger;
     }
-    
-    public Game getGame() {
+
+    public Game getGame()
+    {
         return game;
     }
-    
-    public Server getServer() {
+
+    public Server getServer()
+    {
         return server;
     }
-    
-    public GameProfileResolver getResolver() {
+
+    public GameProfileResolver getResolver()
+    {
         return resolver;
     }
-    
-    public Object getPlugin() {
+
+    public Object getPlugin()
+    {
         return plugin;
     }
-    
-    public Text getText(String m) {
+
+    public Text getText(final String m)
+    {
         return Texts.of(m);
     }
-    
-    public Translatable getTranslation(final String m) {
-        return new Translatable() {
+
+    public Translatable getTranslation(final String m)
+    {
+        return new Translatable()
+        {
             @Override
-            public Translation getTranslation() {
-                return new Translation() {
-                    
+            public Translation getTranslation()
+            {
+                return new Translation()
+                {
+
                     @Override
-                    public String getId() {
+                    public String getId()
+                    {
                         return m;
                     }
-                    
+
                     @Override
-                    public String get(Locale l, Object... args) {
+                    public String get(final Locale l, final Object... args)
+                    {
                         return m;
                     }
-                    
+
                     @Override
-                    public String get(Locale l) {
+                    public String get(final Locale l)
+                    {
                         return m;
                     }
                 };
             }
         };
     }
-    
-    private PlotBlock NULL_BLOCK = new PlotBlock((short) 0, (byte) 0);
+
+    private final PlotBlock NULL_BLOCK = new PlotBlock((short) 0, (byte) 0);
     private BlockState[][] blockMap;
     private Map<BlockState, PlotBlock> blockMapReverse;
-    
-    public BlockState getBlockState(PlotBlock block) {
-        if (blockMap[block.id] == null) {
+
+    public BlockState getBlockState(final PlotBlock block)
+    {
+        if (blockMap[block.id] == null)
+        {
             log("UNKNOWN BLOCK: " + block.toString());
             return null;
         }
-        else if (blockMap[block.id].length <= block.data) {
+        else if (blockMap[block.id].length <= block.data)
+        {
             log("UNKNOWN BLOCK: " + block.toString() + " -> Using " + block.id + ":0 instead");
             return blockMap[block.id][0];
         }
         return blockMap[block.id][block.data];
     }
-    
-    public BlockState getBlockState(int id) {
+
+    public BlockState getBlockState(final int id)
+    {
         return blockMap[id][0];
     }
 
-    public Collection<BlockState> getAllStates() {
-        return this.blockMapReverse.keySet();
+    public Collection<BlockState> getAllStates()
+    {
+        return blockMapReverse.keySet();
     }
-    
-    public PlotBlock getPlotBlock(BlockState state) {
-        PlotBlock val = blockMapReverse.get(state);
-        if (val == null) {
-            return NULL_BLOCK;
-        }
+
+    public PlotBlock getPlotBlock(final BlockState state)
+    {
+        final PlotBlock val = blockMapReverse.get(state);
+        if (val == null) { return NULL_BLOCK; }
         return val;
     }
+
     /////////
 
     ////////////////////// SPONGE PLUGIN REGISTRATION ////////////////////
     @Override
-    public String getId() {
+    public String getId()
+    {
         return "PlotSquared";
     }
 
     @Override
-    public Object getInstance() {
+    public Object getInstance()
+    {
         return THIS;
     }
 
     @Override
-    public String getName() {
+    public String getName()
+    {
         return "PlotSquared";
     }
 
     @Override
-    public String getVersion() {
-        int[] version = PS.get().getVersion();
+    public String getVersion()
+    {
+        final int[] version = PS.get().getVersion();
         String result = "";
         String prefix = "";
-        for (int i : version) {
+        for (final int i : version)
+        {
             result += prefix + i;
             prefix = ".";
         }
         return result;
     }
+
     ///////////////////////////////////////////////////////////////////////
-    
+
     ///////////////////// ON ENABLE /////////////////////
     @Subscribe
-    public void init(InitializationEvent event) {
+    public void init(final InitializationEvent event)
+    {
         log("INIT");
     }
-    
+
     @Subscribe
-    public void onInit(PreInitializationEvent event) {
+    public void onInit(final PreInitializationEvent event)
+    {
         log("PRE INIT");
     }
-    
+
     @Subscribe
-    public void onServerAboutToStart(ServerAboutToStartEvent event) {
+    public void onServerAboutToStart(final ServerAboutToStartEvent event)
+    {
         log("ABOUT START");
         THIS = this;
-        
+
         //
         resolver = game.getServiceManager().provide(GameProfileResolver.class).get();
         plugin = this;
         server = game.getServer();
         //
-        
+
         PS.instance = new PS(this, "Sponge");
-        
+
         registerBlocks();
-        
-        ConfigurationSection worldSection = PS.get().config.getConfigurationSection("worlds");
-        if (worldSection != null) {
-            for (String world : worldSection.getKeys(false)) {
+
+        final ConfigurationSection worldSection = PS.get().config.getConfigurationSection("worlds");
+        if (worldSection != null)
+        {
+            for (final String world : worldSection.getKeys(false))
+            {
                 createWorldFromConfig(world);
             }
         }
     }
-    
-    public World createWorldFromConfig(String world) {
-        SpongeBasicGen generator = new SpongeBasicGen(world);
-        PlotWorld plotworld = generator.getNewPlotWorld(world);
+
+    public World createWorldFromConfig(final String world)
+    {
+        final SpongeBasicGen generator = new SpongeBasicGen(world);
+        final PlotWorld plotworld = generator.getNewPlotWorld(world);
         SpongeGeneratorWrapper wrapper;
-        if (plotworld.TYPE == 0) {
+        if (plotworld.TYPE == 0)
+        {
             wrapper = new SpongeGeneratorWrapper(world, generator);
         }
-        else {
+        else
+        {
             wrapper = new SpongeGeneratorWrapper(world, null);
         }
         PS.get().loadWorld(world, wrapper);
-        switch (plotworld.TYPE) {
-            // Normal
-            case 0: {
-                this.modify = new WorldModify(generator, false);
+        switch (plotworld.TYPE)
+        {
+        // Normal
+            case 0:
+            {
+                modify = new WorldModify(generator, false);
                 game.getRegistry().registerWorldGeneratorModifier(modify);
-                Optional<World> builder = game.getRegistry().createWorldBuilder()
+                final Optional<World> builder = game.getRegistry().createWorldBuilder()
                 .name(world)
                 .enabled(true)
                 .loadsOnStartup(true)
@@ -275,10 +311,11 @@ public class SpongeMain implements IPlotMain, PluginContainer {
                 return builder.get();
             }
             // Augmented
-            default: {
-                this.modify = new WorldModify(generator, true);
+            default:
+            {
+                modify = new WorldModify(generator, true);
                 game.getRegistry().registerWorldGeneratorModifier(modify);
-                Optional<World> builder = game.getRegistry().createWorldBuilder()
+                final Optional<World> builder = game.getRegistry().createWorldBuilder()
                 .name(world)
                 .enabled(true)
                 .loadsOnStartup(true)
@@ -292,100 +329,119 @@ public class SpongeMain implements IPlotMain, PluginContainer {
             }
         }
     }
-    
-    public void registerBlock(PlotBlock block, BlockState state) {
-        BlockState[] val = blockMap[block.id];
-        if (val == null) {
+
+    public void registerBlock(final PlotBlock block, final BlockState state)
+    {
+        final BlockState[] val = blockMap[block.id];
+        if (val == null)
+        {
             blockMap[block.id] = new BlockState[block.data + 1];
         }
-        else if (val.length <= block.data) {
+        else if (val.length <= block.data)
+        {
             blockMap[block.id] = Arrays.copyOf(val, block.data + 1);
         }
-        else if (val[block.data] != null) {
-            return;
-        }
+        else if (val[block.data] != null) { return; }
         blockMap[block.id][block.data] = state;
         blockMapReverse.put(state, block);
     }
-    
-    public PlotBlock registerBlock(BlockState state) {
-        PlotBlock val = blockMapReverse.get(state);
-        if (val != null) {
-            return val;
-        }
+
+    public PlotBlock registerBlock(final BlockState state)
+    {
+        final PlotBlock val = blockMapReverse.get(state);
+        if (val != null) { return val; }
         byte data;
-        if (blockMap[0] == null) {
+        if (blockMap[0] == null)
+        {
             blockMap[0] = new BlockState[1];
             data = 0;
         }
-        else {
+        else
+        {
             data = (byte) (blockMap[0].length);
         }
-        PlotBlock block = new PlotBlock((short) 0, data);
+        final PlotBlock block = new PlotBlock((short) 0, data);
         registerBlock(block, state);
         return block;
     }
-    
-    public void registerBlocks() {
+
+    public void registerBlocks()
+    {
         blockMap = new BlockState[256][];
         blockMapReverse = new HashMap<BlockState, PlotBlock>();
-        HashMap<String, BlockState> states = new HashMap<>();
-        
+        final HashMap<String, BlockState> states = new HashMap<>();
+
         PS.get().copyFile("ids.txt", "config");
         PS.get().copyFile("data.txt", "config");
-        
-        try {
-            
-            File id_file = new File(getDirectory(), "config" + File.separator + "ids.txt");
-            List<String> id_lines = Files.readAllLines(id_file.toPath(), StandardCharsets.UTF_8);
-            
-            File data_file = new File(getDirectory(), "config" + File.separator + "data.txt");
-            List<String> data_lines = Files.readAllLines(data_file.toPath(), StandardCharsets.UTF_8);
-            
+
+        try
+        {
+
+            final File id_file = new File(getDirectory(), "config" + File.separator + "ids.txt");
+            final List<String> id_lines = Files.readAllLines(id_file.toPath(), StandardCharsets.UTF_8);
+
+            final File data_file = new File(getDirectory(), "config" + File.separator + "data.txt");
+            final List<String> data_lines = Files.readAllLines(data_file.toPath(), StandardCharsets.UTF_8);
+
             Field[] fields = BlockTypes.class.getDeclaredFields();
-            for (Field field : fields) {
-                BlockType type = (BlockType) field.get(null);
-                BlockState state = type.getDefaultState();
-                if (state != null) {
-                    try {
+            for (final Field field : fields)
+            {
+                final BlockType type = (BlockType) field.get(null);
+                final BlockState state = type.getDefaultState();
+                if (state != null)
+                {
+                    try
+                    {
                         states.put(type.getId() + ":" + 0, state);
                     }
-                    catch (Exception e) {}
+                    catch (final Exception e)
+                    {}
                 }
             }
-            String packaze = "org.spongepowered.api.data.type.";
-            for (int i = 0; i < data_lines.size(); i++) {
-                String classname = packaze + data_lines.get(i).trim();
-                try {
-                    Class<?> clazz = Class.forName(classname);
+            final String packaze = "org.spongepowered.api.data.type.";
+            for (int i = 0; i < data_lines.size(); i++)
+            {
+                final String classname = packaze + data_lines.get(i).trim();
+                try
+                {
+                    final Class<?> clazz = Class.forName(classname);
                     fields = clazz.getDeclaredFields();
-                    for (Field field : fields) {
-                        CatalogType type = (CatalogType) field.get(null);
-                        String minecraft_id = type.getId();
-                        BlockState state = states.get(minecraft_id + ":" + 0);
-                        if (state == null) {
+                    for (final Field field : fields)
+                    {
+                        final CatalogType type = (CatalogType) field.get(null);
+                        final String minecraft_id = type.getId();
+                        final BlockState state = states.get(minecraft_id + ":" + 0);
+                        if (state == null)
+                        {
                             continue;
                         }
                     }
                 }
-                catch (Throwable e) {}
+                catch (final Throwable e)
+                {}
             }
-            
+
             PlotBlock block = null;
-            for (int i = 0; i < id_lines.size(); i++) {
-                String line = id_lines.get(i).trim();
-                switch(i%3) {
-                    case 0: {
+            for (int i = 0; i < id_lines.size(); i++)
+            {
+                final String line = id_lines.get(i).trim();
+                switch (i % 3)
+                {
+                    case 0:
+                    {
                         block = Configuration.BLOCK.parseString(line);
                         break;
                     }
-                    case 1: {
+                    case 1:
+                    {
                         break;
                     }
-                    case 2: {
-                        String minecraft_id = line;
-                        BlockState state = states.remove(minecraft_id + ":" + block.data);
-                        if (state == null) {
+                    case 2:
+                    {
+                        final String minecraft_id = line;
+                        final BlockState state = states.remove(minecraft_id + ":" + block.data);
+                        if (state == null)
+                        {
                             continue;
                         }
                         registerBlock(block, state);
@@ -393,29 +449,35 @@ public class SpongeMain implements IPlotMain, PluginContainer {
                     }
                 }
             }
-            for (Entry<String, BlockState> state : states.entrySet()) {
+            for (final Entry<String, BlockState> state : states.entrySet())
+            {
                 log("REGISTERING: " + registerBlock(state.getValue()) + " | " + state.getValue().getType());
             }
         }
-        catch (Exception e) {
+        catch (final Exception e)
+        {
             e.printStackTrace();
         }
     }
-    
+
     @Subscribe
-    public void onPlayerChat(PlayerChatEvent event) {
+    public void onPlayerChat(final PlayerChatEvent event)
+    {
         // This is how events sort of work?
-        Player player  = event.getUser();
+        final Player player = event.getUser();
         log(player.getWorld().getName());
     }
 
     @Override
-    public void log(String message) {
+    public void log(String message)
+    {
         message = C.format(message, C.replacements);
-        if (!Settings.CONSOLE_COLOR) {
+        if (!Settings.CONSOLE_COLOR)
+        {
             message = message.replaceAll('\u00a7' + "[a-z|0-9]", "");
         }
-        if (server == null || server.getConsole() == null) {
+        if ((server == null) || (server.getConsole() == null))
+        {
             logger.info(message);
             return;
         }
@@ -423,53 +485,60 @@ public class SpongeMain implements IPlotMain, PluginContainer {
     }
 
     @Override
-    public File getDirectory() {
+    public File getDirectory()
+    {
         return new File("mods/PlotSquared");
     }
 
     @Override
-    public void disable() {
+    public void disable()
+    {
         PS.get().disable();
         THIS = null;
     }
 
     @Override
-    public int[] getPluginVersion() {
-        PluginContainer plugin = game.getPluginManager().getPlugin("PlotSquared").get();
-        String version = plugin.getVersion();
+    public int[] getPluginVersion()
+    {
+        final PluginContainer plugin = game.getPluginManager().getPlugin("PlotSquared").get();
+        final String version = plugin.getVersion();
         log("Checking plugin version: PlotSquared: ");
-        String[] split = version.split("\\.");
+        final String[] split = version.split("\\.");
         return new int[] { Integer.parseInt(split[0]), Integer.parseInt(split[1]), (split.length == 3) ? Integer.parseInt(split[2]) : 0 };
     }
 
     @Override
-    public int[] getServerVersion() {
+    public int[] getServerVersion()
+    {
         log("Checking minecraft version: Sponge: ");
-        String version = game.getPlatform().getMinecraftVersion().getName();
-        String[] split = version.split("\\.");
+        final String version = game.getPlatform().getMinecraftVersion().getName();
+        final String[] split = version.split("\\.");
         return new int[] { Integer.parseInt(split[0]), Integer.parseInt(split[1]), (split.length == 3) ? Integer.parseInt(split[2]) : 0 };
     }
-    
+
     @Override
-    public InventoryUtil initInventoryUtil() {
+    public InventoryUtil initInventoryUtil()
+    {
         return new SpongeInventoryUtil();
     }
-    
+
     @Override
-    public SpongeGeneratorWrapper getGenerator(String world, String name) {
-        if (name == null) {
-            return new SpongeGeneratorWrapper(world, null);
-        }
-        if (name.equals("PlotSquared")) {
+    public SpongeGeneratorWrapper getGenerator(final String world, final String name)
+    {
+        if (name == null) { return new SpongeGeneratorWrapper(world, null); }
+        if (name.equals("PlotSquared"))
+        {
             return new SpongeGeneratorWrapper(world, new SpongeBasicGen(world));
         }
-        else {
+        else
+        {
             throw new UnsupportedOperationException("NOT IMPLEMENTED YET");
         }
     }
-    
+
     @Override
-    public EconHandler getEconomyHandler() {
+    public EconHandler getEconomyHandler()
+    {
         // TODO Auto-generated method stub
         // Nothing like Vault exists yet
         PS.log("getEconomyHandler NOT IMPLEMENTED YET");
@@ -477,179 +546,212 @@ public class SpongeMain implements IPlotMain, PluginContainer {
     }
 
     @Override
-    public BlockManager initBlockManager() {
+    public BlockManager initBlockManager()
+    {
         return new SpongeBlockManager();
     }
 
     @Override
-    public EventUtil initEventUtil() {
+    public EventUtil initEventUtil()
+    {
         return new SpongeEventUtil();
     }
 
     @Override
-    public ChunkManager initChunkManager() {
+    public ChunkManager initChunkManager()
+    {
         return new SpongeChunkManager();
     }
 
     @Override
-    public SetupUtils initSetupUtils() {
+    public SetupUtils initSetupUtils()
+    {
         return new SpongeSetupUtils();
     }
 
     @Override
-    public HybridUtils initHybridUtils() {
+    public HybridUtils initHybridUtils()
+    {
         return new SpongeHybridUtils();
     }
-    
 
     @Override
-    public SchematicHandler initSchematicHandler() {
+    public SchematicHandler initSchematicHandler()
+    {
         return new SpongeSchematicHandler();
     }
 
     @Override
-    public TaskManager getTaskManager() {
+    public TaskManager getTaskManager()
+    {
         return new SpongeTaskManager();
     }
 
     @Override
-    public void runEntityTask() {
+    public void runEntityTask()
+    {
         new KillRoadMobs().run();
     }
 
     @Override
-    public void registerCommands() {
-        getGame().getCommandDispatcher().register(plugin, new SpongeCommand(), new String[] {"plots", "p", "plot", "ps", "plotsquared", "p2", "2"});
+    public void registerCommands()
+    {
+        getGame().getCommandDispatcher().register(plugin, new SpongeCommand(), new String[] { "plots", "p", "plot", "ps", "plotsquared", "p2", "2" });
     }
 
     @Override
-    public void registerPlayerEvents() {
+    public void registerPlayerEvents()
+    {
         game.getEventManager().register(this, new MainListener());
     }
 
     @Override
-    public void registerInventoryEvents() {
+    public void registerInventoryEvents()
+    {
         // TODO Auto-generated method stub
         log("registerInventoryEvents is not implemented!");
     }
 
     @Override
-    public void registerPlotPlusEvents() {
+    public void registerPlotPlusEvents()
+    {
         // TODO Auto-generated method stub
         log("registerPlotPlusEvents is not implemented!");
     }
 
     @Override
-    public void registerForceFieldEvents() {
+    public void registerForceFieldEvents()
+    {
         // TODO Auto-generated method stub
         log("registerForceFieldEvents is not implemented!");
     }
 
     @Override
-    public boolean initWorldEdit() {
-        try {
+    public boolean initWorldEdit()
+    {
+        try
+        {
             log("CHECKING FOR WORLDEDIT!?");
             Class.forName("com.sk89q.worldedit.WorldEdit");
             return true;
         }
-        catch (Throwable e) {
+        catch (final Throwable e)
+        {
             return false;
         }
     }
 
     @Override
-    public void registerTNTListener() {
+    public void registerTNTListener()
+    {
         // TODO Auto-generated method stub
         log("registerTNTListener is not implemented!");
     }
 
     @Override
-    public UUIDHandlerImplementation initUUIDHandler() {
+    public UUIDHandlerImplementation initUUIDHandler()
+    {
         UUIDWrapper wrapper;
-        if (Settings.OFFLINE_MODE || !PS.get().checkVersion(this.getServerVersion(), 1, 7, 6)) {
+        if (Settings.OFFLINE_MODE || !PS.get().checkVersion(getServerVersion(), 1, 7, 6))
+        {
             wrapper = new SpongeLowerOfflineUUIDWrapper();
         }
-        else {
+        else
+        {
             wrapper = new SpongeOnlineUUIDWrapper();
         }
         return new SpongeUUIDHandler(wrapper);
     }
 
     @Override
-    public boolean initPlotMeConverter() {
+    public boolean initPlotMeConverter()
+    {
         // TODO Auto-generated method stub
         PS.log("initPlotMeConverter NOT IMPLEMENTED YET");
         return false;
     }
 
     @Override
-    public void unregister(PlotPlayer player) {
+    public void unregister(final PlotPlayer player)
+    {
         SpongeUtil.removePlayer(player.getName());
     }
 
     @Override
-    public void registerChunkProcessor() {
+    public void registerChunkProcessor()
+    {
         // TODO Auto-generated method stub
         PS.log("registerChunkProcessor NOT IMPLEMENTED YET");
     }
 
     @Override
-    public void registerWorldEvents() {
+    public void registerWorldEvents()
+    {
         // TODO Auto-generated method stub
         PS.log("registerWorldEvents NOT IMPLEMENTED YET");
     }
 
     @Override
-    public String getServerName() {
+    public String getServerName()
+    {
         // TODO FIXME
         throw new UnsupportedOperationException("NOT IMPLEMENTED YET");
     }
 
     @Override
-    public void startMetrics() {
-        try {
+    public void startMetrics()
+    {
+        try
+        {
             final SpongeMetrics metrics = new SpongeMetrics(game, this);
             metrics.start();
             log(C.PREFIX.s() + "&6Metrics enabled.");
-        } catch (final Exception e) {
+        }
+        catch (final Exception e)
+        {
             log(C.PREFIX.s() + "&cFailed to load up metrics.");
         }
     }
 
     @Override
-    public void setGenerator(String world) {
+    public void setGenerator(final String world)
+    {
         // TODO THIS IS DONE DURING STARTUP ALREADY
     }
 
     @Override
-    public AbstractTitle initTitleManager() {
+    public AbstractTitle initTitleManager()
+    {
         return new SpongeTitleManager();
     }
 
     @Override
-    public PlotPlayer wrapPlayer(Object obj) {
-        if (obj instanceof Player) {
+    public PlotPlayer wrapPlayer(final Object obj)
+    {
+        if (obj instanceof Player)
+        {
             return SpongeUtil.getPlayer((Player) obj);
         }
-//        else if (obj instanceof OfflinePlayer) {
-//            return BukkitUtil.getPlayer((OfflinePlayer) obj);
-//        }
-        else if (obj instanceof String) {
+        //        else if (obj instanceof OfflinePlayer) {
+        //            return BukkitUtil.getPlayer((OfflinePlayer) obj);
+        //        }
+        else if (obj instanceof String)
+        {
             return UUIDHandler.getPlayer((String) obj);
         }
-        else if (obj instanceof UUID) {
-            return UUIDHandler.getPlayer((UUID) obj);
-        }
+        else if (obj instanceof UUID) { return UUIDHandler.getPlayer((UUID) obj); }
         return null;
     }
 
     @Override
-    public String getNMSPackage() {
+    public String getNMSPackage()
+    {
         return "1_8_R3";
     }
 
     @Override
-    public ChatManager<?> initChatManager() {
+    public ChatManager<?> initChatManager()
+    {
         return new SpongeChatManager();
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/plotsquared/sponge/SpongeSchematicHandler.java b/src/main/java/com/plotsquared/sponge/SpongeSchematicHandler.java
index dbac4dc4a..acb1eb59b 100644
--- a/src/main/java/com/plotsquared/sponge/SpongeSchematicHandler.java
+++ b/src/main/java/com/plotsquared/sponge/SpongeSchematicHandler.java
@@ -22,16 +22,20 @@ import com.intellectualcrafters.plot.util.SchematicHandler;
 import com.intellectualcrafters.plot.util.TaskManager;
 import com.plotsquared.sponge.util.SpongeUtil;
 
-public class SpongeSchematicHandler extends SchematicHandler {
-    
+public class SpongeSchematicHandler extends SchematicHandler
+{
+
     @Override
-    public void getCompoundTag(final String world, final Location pos1, final Location pos2, final RunnableVal<CompoundTag> whenDone) {
+    public void getCompoundTag(final String world, final Location pos1, final Location pos2, final RunnableVal<CompoundTag> whenDone)
+    {
 
         // async
-        TaskManager.runTaskAsync(new Runnable() {
+        TaskManager.runTaskAsync(new Runnable()
+        {
 
             @Override
-            public void run() {
+            public void run()
+            {
                 // Main positions
                 final int p1x = pos1.getX();
                 final int p1z = pos1.getZ();
@@ -69,64 +73,79 @@ public class SpongeSchematicHandler extends SchematicHandler {
 
                 // Generate list of chunks
                 final ArrayList<ChunkLoc> chunks = new ArrayList<ChunkLoc>();
-                for (int x = bcx; x <= tcx; x++) {
-                    for (int z = bcz; z <= tcz; z++) {
+                for (int x = bcx; x <= tcx; x++)
+                {
+                    for (int z = bcz; z <= tcz; z++)
+                    {
                         chunks.add(new ChunkLoc(x, z));
                     }
                 }
 
                 final World worldObj = SpongeUtil.getWorld(world);
                 // Main thread
-                TaskManager.runTask(new Runnable() {
+                TaskManager.runTask(new Runnable()
+                {
                     @Override
-                    public void run() {
-                        long start = System.currentTimeMillis();
-                        while (chunks.size() > 0 && System.currentTimeMillis() - start < 20) {
+                    public void run()
+                    {
+                        final long start = System.currentTimeMillis();
+                        while ((chunks.size() > 0) && ((System.currentTimeMillis() - start) < 20))
+                        {
                             // save schematics
-                            ChunkLoc chunk = chunks.remove(0);
+                            final ChunkLoc chunk = chunks.remove(0);
 
-                            if (!worldObj.loadChunk(chunk.x << 4, 1, chunk.z << 4, false).isPresent()) {
+                            if (!worldObj.loadChunk(chunk.x << 4, 1, chunk.z << 4, false).isPresent())
+                            {
                                 System.out.println("COULD NOT LOAD CHUNK AT: " + chunk.x + "," + chunk.z);
                                 // TODO continue - right now sponge chunk api seems to be broken :(
                                 // continue;
                             }
 
-                            int X = chunk.x;
-                            int Z = chunk.z;
+                            final int X = chunk.x;
+                            final int Z = chunk.z;
                             int xxb = X << 4;
                             int zzb = Z << 4;
                             int xxt = xxb + 15;
                             int zzt = zzb + 15;
 
-                            if (X == bcx) {
+                            if (X == bcx)
+                            {
                                 xxb = p1x;
                             }
-                            if (X == tcx) {
+                            if (X == tcx)
+                            {
                                 xxt = p2x;
                             }
-                            if (Z == bcz) {
+                            if (Z == bcz)
+                            {
                                 zzb = p1z;
                             }
-                            if (Z == tcz) {
+                            if (Z == tcz)
+                            {
                                 zzt = p2z;
                             }
-                            for (int y = sy; y <= Math.min(255, ey); y++) {
-                                int ry = y - sy;
-                                int i1 = (ry * width * length);
-                                for (int z = zzb; z <= zzt; z++) {
-                                    int rz = z - p1z;
-                                    int i2 = i1 + (rz * width);
-                                    for (int x = xxb; x <= xxt; x++) {
-                                        int rx = x - p1x;
+                            for (int y = sy; y <= Math.min(255, ey); y++)
+                            {
+                                final int ry = y - sy;
+                                final int i1 = (ry * width * length);
+                                for (int z = zzb; z <= zzt; z++)
+                                {
+                                    final int rz = z - p1z;
+                                    final int i2 = i1 + (rz * width);
+                                    for (int x = xxb; x <= xxt; x++)
+                                    {
+                                        final int rx = x - p1x;
                                         final int index = i2 + rx;
-                                        
-                                        BlockState state = worldObj.getBlock(x, y, z);
+
+                                        final BlockState state = worldObj.getBlock(x, y, z);
                                         PlotBlock block = SpongeMain.THIS.getPlotBlock(state);
-                                        if (block == null) {
+                                        if (block == null)
+                                        {
                                             block = SpongeMain.THIS.registerBlock(state);
                                         }
-                                        int id = block.id;
-                                        switch (id) {
+                                        final int id = block.id;
+                                        switch (id)
+                                        {
                                             case 0:
                                             case 2:
                                             case 4:
@@ -197,7 +216,8 @@ public class SpongeSchematicHandler extends SchematicHandler {
                                             case 189:
                                             case 190:
                                             case 191:
-                                            case 192: {
+                                            case 192:
+                                            {
                                                 break;
                                             }
                                             case 54:
@@ -234,11 +254,13 @@ public class SpongeSchematicHandler extends SchematicHandler {
                                             case 29:
                                             case 33:
                                             case 151:
-                                            case 178: {
+                                            case 178:
+                                            {
                                                 // TODO wrap block state...
                                                 // TODO add block state to map
                                             }
-                                            default: {
+                                            default:
+                                            {
                                                 blockData[index] = block.data;
                                             }
                                         }
@@ -248,12 +270,17 @@ public class SpongeSchematicHandler extends SchematicHandler {
                             }
 
                         }
-                        if (chunks.size() != 0) {
+                        if (chunks.size() != 0)
+                        {
                             TaskManager.runTaskLater(this, 1);
-                        } else {
-                            TaskManager.runTaskAsync(new Runnable() {
+                        }
+                        else
+                        {
+                            TaskManager.runTaskAsync(new Runnable()
+                            {
                                 @Override
-                                public void run() {
+                                public void run()
+                                {
                                     schematic.put("Blocks", new ByteArrayTag("Blocks", blocks));
                                     schematic.put("Data", new ByteArrayTag("Data", blockData));
                                     schematic.put("Entities", new ListTag("Entities", CompoundTag.class, new ArrayList<Tag>()));
@@ -270,5 +297,5 @@ public class SpongeSchematicHandler extends SchematicHandler {
             }
         });
     }
-    
+
 }
diff --git a/src/main/java/com/plotsquared/sponge/SpongeSetupUtils.java b/src/main/java/com/plotsquared/sponge/SpongeSetupUtils.java
index 6edaa7b1b..7998e602a 100644
--- a/src/main/java/com/plotsquared/sponge/SpongeSetupUtils.java
+++ b/src/main/java/com/plotsquared/sponge/SpongeSetupUtils.java
@@ -19,62 +19,67 @@ import com.plotsquared.sponge.generator.SpongeGeneratorWrapper;
 import com.plotsquared.sponge.generator.SpongePlotGenerator;
 import com.plotsquared.sponge.util.SpongeUtil;
 
-public class SpongeSetupUtils extends SetupUtils {
-    
+public class SpongeSetupUtils extends SetupUtils
+{
+
     @Override
-    public void updateGenerators() {
-        if (SetupUtils.generators.size() > 0) {
-            return;
-        }
+    public void updateGenerators()
+    {
+        if (SetupUtils.generators.size() > 0) { return; }
         // TODO get external world generators
         final String testWorld = "CheckingPlotSquaredGenerator";
         SetupUtils.generators.put("PlotSquared", new SpongeGeneratorWrapper(testWorld, new SpongeBasicGen(testWorld)));
     }
-    
+
     @Override
-    public String getGenerator(PlotWorld plotworld) {
-        if (SetupUtils.generators.size() == 0) {
+    public String getGenerator(final PlotWorld plotworld)
+    {
+        if (SetupUtils.generators.size() == 0)
+        {
             updateGenerators();
         }
-        World world = SpongeUtil.getWorld(plotworld.worldname);
-        if (world == null) {
-            return null;
-        }
-        WorldGenerator generator = world.getWorldGenerator();
-        if (!(generator instanceof SpongePlotGenerator)) {
-            return null;
-        }
-        for (Entry<String, PlotGenerator<?>> entry : generators.entrySet()) {
-            if (entry.getValue().generator.getClass().getName().equals(generator.getClass().getName())) {
-                return entry.getKey();
-            }
+        final World world = SpongeUtil.getWorld(plotworld.worldname);
+        if (world == null) { return null; }
+        final WorldGenerator generator = world.getWorldGenerator();
+        if (!(generator instanceof SpongePlotGenerator)) { return null; }
+        for (final Entry<String, PlotGenerator<?>> entry : generators.entrySet())
+        {
+            if (entry.getValue().generator.getClass().getName().equals(generator.getClass().getName())) { return entry.getKey(); }
         }
         return null;
     }
-    
+
     @Override
-    public String setupWorld(SetupObject object) {
+    public String setupWorld(final SetupObject object)
+    {
         SetupUtils.manager.updateGenerators();
         final ConfigurationNode[] steps = object.step;
         final String world = object.world;
-        for (final ConfigurationNode step : steps) {
+        for (final ConfigurationNode step : steps)
+        {
             PS.get().config.set("worlds." + world + "." + step.getConstant(), step.getValue());
         }
-        if (object.type != 0) {
+        if (object.type != 0)
+        {
             PS.get().config.set("worlds." + world + "." + "generator.type", object.type);
             PS.get().config.set("worlds." + world + "." + "generator.terrain", object.terrain);
             PS.get().config.set("worlds." + world + "." + "generator.plugin", object.plotManager);
-            if (object.setupGenerator != null && !object.setupGenerator.equals(object.plotManager)) {
+            if ((object.setupGenerator != null) && !object.setupGenerator.equals(object.plotManager))
+            {
                 PS.get().config.set("worlds." + world + "." + "generator.init", object.setupGenerator);
             }
-            PlotGenerator<WorldGenerator> gen = (PlotGenerator<WorldGenerator>) generators.get(object.setupGenerator);
-            if (gen != null && gen.generator instanceof SpongePlotGenerator) {
+            final PlotGenerator<WorldGenerator> gen = (PlotGenerator<WorldGenerator>) generators.get(object.setupGenerator);
+            if ((gen != null) && (gen.generator instanceof SpongePlotGenerator))
+            {
                 object.setupGenerator = null;
             }
         }
-        try {
+        try
+        {
             PS.get().config.save(PS.get().configFile);
-        } catch (final IOException e) {
+        }
+        catch (final IOException e)
+        {
             e.printStackTrace();
         }
         SpongeMain.THIS.createWorldFromConfig(world);
@@ -82,7 +87,8 @@ public class SpongeSetupUtils extends SetupUtils {
     }
 
     @Override
-    public void removePopulator(String world, PlotCluster cluster) {
+    public void removePopulator(final String world, final PlotCluster cluster)
+    {
         AugmentedPopulator.removePopulator(world, cluster);
     }
 }
diff --git a/src/main/java/com/plotsquared/sponge/events/ClusterFlagRemoveEvent.java b/src/main/java/com/plotsquared/sponge/events/ClusterFlagRemoveEvent.java
index 5f4bc362f..6202c0e1b 100644
--- a/src/main/java/com/plotsquared/sponge/events/ClusterFlagRemoveEvent.java
+++ b/src/main/java/com/plotsquared/sponge/events/ClusterFlagRemoveEvent.java
@@ -6,24 +6,27 @@ import org.spongepowered.api.event.Cancellable;
 import com.intellectualcrafters.plot.flag.Flag;
 import com.intellectualcrafters.plot.object.PlotCluster;
 
-public class ClusterFlagRemoveEvent extends AbstractEvent implements Cancellable {
+public class ClusterFlagRemoveEvent extends AbstractEvent implements Cancellable
+{
 
     private final PlotCluster cluster;
     private final Flag flag;
     private boolean cancelled;
-    
-    public ClusterFlagRemoveEvent(final Flag flag, final PlotCluster cluster) {
+
+    public ClusterFlagRemoveEvent(final Flag flag, final PlotCluster cluster)
+    {
         this.cluster = cluster;
         this.flag = flag;
     }
-    
+
     /**
      * Get the cluster involved
      *
      * @return PlotCluster
      */
-    public PlotCluster getCluster() {
-        return this.cluster;
+    public PlotCluster getCluster()
+    {
+        return cluster;
     }
 
     /**
@@ -31,17 +34,20 @@ public class ClusterFlagRemoveEvent extends AbstractEvent implements Cancellable
      *
      * @return Flag
      */
-    public Flag getFlag() {
-        return this.flag;
+    public Flag getFlag()
+    {
+        return flag;
     }
 
     @Override
-    public boolean isCancelled() {
-       return cancelled;
+    public boolean isCancelled()
+    {
+        return cancelled;
     }
 
     @Override
-    public void setCancelled(boolean cancel) {
-       cancelled = cancel;
+    public void setCancelled(final boolean cancel)
+    {
+        cancelled = cancel;
     }
- }
\ No newline at end of file
+}
diff --git a/src/main/java/com/plotsquared/sponge/events/PlayerClaimPlotEvent.java b/src/main/java/com/plotsquared/sponge/events/PlayerClaimPlotEvent.java
index fc5790244..669b0eb9e 100644
--- a/src/main/java/com/plotsquared/sponge/events/PlayerClaimPlotEvent.java
+++ b/src/main/java/com/plotsquared/sponge/events/PlayerClaimPlotEvent.java
@@ -5,47 +5,53 @@ import org.spongepowered.api.event.Cancellable;
 
 import com.intellectualcrafters.plot.object.Plot;
 
-public class PlayerClaimPlotEvent extends PlayerEvent implements Cancellable {
+public class PlayerClaimPlotEvent extends PlayerEvent implements Cancellable
+{
 
     private final Plot plot;
     private final boolean auto;
     private boolean cancelled;
-    
+
     /**
      * PlayerClaimPlotEvent: Called when a plot is claimed
      *
      * @param player Player that claimed the plot
      * @param plot   Plot that was claimed
      */
-    public PlayerClaimPlotEvent(final Player player, final Plot plot, final boolean auto) {
+    public PlayerClaimPlotEvent(final Player player, final Plot plot, final boolean auto)
+    {
         super(player);
         this.plot = plot;
         this.auto = auto;
     }
-    
+
     /**
      * Get the plot involved
      *
      * @return Plot
      */
-    public Plot getPlot() {
-        return this.plot;
+    public Plot getPlot()
+    {
+        return plot;
     }
 
     /**
      * @return true if it was an automated claim, else false
      */
-    public boolean wasAuto() {
-        return this.auto;
+    public boolean wasAuto()
+    {
+        return auto;
     }
 
     @Override
-    public boolean isCancelled() {
-       return cancelled;
+    public boolean isCancelled()
+    {
+        return cancelled;
     }
 
     @Override
-    public void setCancelled(boolean cancel) {
-       cancelled = cancel;
+    public void setCancelled(final boolean cancel)
+    {
+        cancelled = cancel;
     }
- }
\ No newline at end of file
+}
diff --git a/src/main/java/com/plotsquared/sponge/events/PlayerEnterPlotEvent.java b/src/main/java/com/plotsquared/sponge/events/PlayerEnterPlotEvent.java
index 9ff6d895e..54fa05729 100644
--- a/src/main/java/com/plotsquared/sponge/events/PlayerEnterPlotEvent.java
+++ b/src/main/java/com/plotsquared/sponge/events/PlayerEnterPlotEvent.java
@@ -4,28 +4,30 @@ import org.spongepowered.api.entity.player.Player;
 
 import com.intellectualcrafters.plot.object.Plot;
 
-public class PlayerEnterPlotEvent extends PlayerEvent {
+public class PlayerEnterPlotEvent extends PlayerEvent
+{
 
     private final Plot plot;
-    private boolean cancelled;
-    
+
     /**
      * PlayerEnterPlotEvent: Called when a player leaves a plot
      *
      * @param player Player that entered the plot
      * @param plot   Plot that was entered
      */
-    public PlayerEnterPlotEvent(final Player player, final Plot plot) {
+    public PlayerEnterPlotEvent(final Player player, final Plot plot)
+    {
         super(player);
         this.plot = plot;
     }
-    
+
     /**
      * Get the plot involved
      *
      * @return Plot
      */
-    public Plot getPlot() {
-        return this.plot;
+    public Plot getPlot()
+    {
+        return plot;
     }
- }
\ No newline at end of file
+}
diff --git a/src/main/java/com/plotsquared/sponge/events/PlayerEvent.java b/src/main/java/com/plotsquared/sponge/events/PlayerEvent.java
index 474aa70cc..2f77bccfa 100644
--- a/src/main/java/com/plotsquared/sponge/events/PlayerEvent.java
+++ b/src/main/java/com/plotsquared/sponge/events/PlayerEvent.java
@@ -3,16 +3,19 @@ package com.plotsquared.sponge.events;
 import org.spongepowered.api.entity.player.Player;
 import org.spongepowered.api.event.AbstractEvent;
 
-public abstract class PlayerEvent extends AbstractEvent {
+public abstract class PlayerEvent extends AbstractEvent
+{
 
     public final Player player;
 
-    public PlayerEvent(Player player) {
+    public PlayerEvent(final Player player)
+    {
         this.player = player;
     }
-    
-    public Player getPlayer() {
-        return this.player;
+
+    public Player getPlayer()
+    {
+        return player;
     }
-    
+
 }
diff --git a/src/main/java/com/plotsquared/sponge/events/PlayerLeavePlotEvent.java b/src/main/java/com/plotsquared/sponge/events/PlayerLeavePlotEvent.java
index 4af5b76c7..da0135041 100644
--- a/src/main/java/com/plotsquared/sponge/events/PlayerLeavePlotEvent.java
+++ b/src/main/java/com/plotsquared/sponge/events/PlayerLeavePlotEvent.java
@@ -4,28 +4,30 @@ import org.spongepowered.api.entity.player.Player;
 
 import com.intellectualcrafters.plot.object.Plot;
 
-public class PlayerLeavePlotEvent extends PlayerEvent {
+public class PlayerLeavePlotEvent extends PlayerEvent
+{
 
     private final Plot plot;
-    private boolean cancelled;
-    
+
     /**
      * PlayerLeavePlotEvent: Called when a player leaves a plot
      *
      * @param player Player that left the plot
      * @param plot   Plot that was left
      */
-    public PlayerLeavePlotEvent(final Player player, final Plot plot) {
+    public PlayerLeavePlotEvent(final Player player, final Plot plot)
+    {
         super(player);
         this.plot = plot;
     }
-    
+
     /**
      * Get the plot involved
      *
      * @return Plot
      */
-    public Plot getPlot() {
-        return this.plot;
+    public Plot getPlot()
+    {
+        return plot;
     }
- }
\ No newline at end of file
+}
diff --git a/src/main/java/com/plotsquared/sponge/events/PlayerPlotDeniedEvent.java b/src/main/java/com/plotsquared/sponge/events/PlayerPlotDeniedEvent.java
index f6a0157c2..3faee12a2 100644
--- a/src/main/java/com/plotsquared/sponge/events/PlayerPlotDeniedEvent.java
+++ b/src/main/java/com/plotsquared/sponge/events/PlayerPlotDeniedEvent.java
@@ -6,12 +6,13 @@ import org.spongepowered.api.entity.player.Player;
 
 import com.intellectualcrafters.plot.object.Plot;
 
-public class PlayerPlotDeniedEvent extends PlotEvent {
+public class PlayerPlotDeniedEvent extends PlotEvent
+{
 
     private final Player initiator;
     private final boolean added;
     private final UUID player;
-    
+
     /**
      * PlayerPlotDeniedEvent: Called when the denied UUID list is modified for a plot
      *
@@ -20,20 +21,22 @@ public class PlayerPlotDeniedEvent extends PlotEvent {
      * @param player    Player that was denied/un-denied
      * @param added     true of add to deny list, false if removed
      */
-    public PlayerPlotDeniedEvent(final Player initiator, final Plot plot, final UUID player, final boolean added) {
+    public PlayerPlotDeniedEvent(final Player initiator, final Plot plot, final UUID player, final boolean added)
+    {
         super(plot);
         this.initiator = initiator;
         this.added = added;
         this.player = player;
     }
-    
+
     /**
      * If a user was added
      *
      * @return boolean
      */
-    public boolean wasAdded() {
-        return this.added;
+    public boolean wasAdded()
+    {
+        return added;
     }
 
     /**
@@ -41,8 +44,9 @@ public class PlayerPlotDeniedEvent extends PlotEvent {
      *
      * @return UUID
      */
-    public UUID getPlayer() {
-        return this.player;
+    public UUID getPlayer()
+    {
+        return player;
     }
 
     /**
@@ -50,7 +54,8 @@ public class PlayerPlotDeniedEvent extends PlotEvent {
      *
      * @return Player
      */
-    public Player getInitiator() {
-        return this.initiator;
+    public Player getInitiator()
+    {
+        return initiator;
     }
- }
\ No newline at end of file
+}
diff --git a/src/main/java/com/plotsquared/sponge/events/PlayerPlotHelperEvent.java b/src/main/java/com/plotsquared/sponge/events/PlayerPlotHelperEvent.java
index 9e40411fa..9eff0be6e 100644
--- a/src/main/java/com/plotsquared/sponge/events/PlayerPlotHelperEvent.java
+++ b/src/main/java/com/plotsquared/sponge/events/PlayerPlotHelperEvent.java
@@ -6,12 +6,13 @@ import org.spongepowered.api.entity.player.Player;
 
 import com.intellectualcrafters.plot.object.Plot;
 
-public class PlayerPlotHelperEvent extends PlotEvent {
+public class PlayerPlotHelperEvent extends PlotEvent
+{
 
     private final Player initiator;
     private final boolean added;
     private final UUID player;
-    
+
     /**
      * PlayerPlotHelperEvent: Called when a plot helper is added/removed
      *
@@ -20,20 +21,22 @@ public class PlayerPlotHelperEvent extends PlotEvent {
      * @param player    Player that was added/removed from the helper list
      * @param added     true of the player was added, false if the player was removed
      */
-    public PlayerPlotHelperEvent(final Player initiator, final Plot plot, final UUID player, final boolean added) {
+    public PlayerPlotHelperEvent(final Player initiator, final Plot plot, final UUID player, final boolean added)
+    {
         super(plot);
         this.initiator = initiator;
         this.added = added;
         this.player = player;
     }
-    
+
     /**
      * If a user was added
      *
      * @return boolean
      */
-    public boolean wasAdded() {
-        return this.added;
+    public boolean wasAdded()
+    {
+        return added;
     }
 
     /**
@@ -41,8 +44,9 @@ public class PlayerPlotHelperEvent extends PlotEvent {
      *
      * @return UUID
      */
-    public UUID getPlayer() {
-        return this.player;
+    public UUID getPlayer()
+    {
+        return player;
     }
 
     /**
@@ -50,7 +54,8 @@ public class PlayerPlotHelperEvent extends PlotEvent {
      *
      * @return Player
      */
-    public Player getInitiator() {
-        return this.initiator;
+    public Player getInitiator()
+    {
+        return initiator;
     }
- }
\ No newline at end of file
+}
diff --git a/src/main/java/com/plotsquared/sponge/events/PlayerPlotTrustedEvent.java b/src/main/java/com/plotsquared/sponge/events/PlayerPlotTrustedEvent.java
index 2886cd768..d3919d1c7 100644
--- a/src/main/java/com/plotsquared/sponge/events/PlayerPlotTrustedEvent.java
+++ b/src/main/java/com/plotsquared/sponge/events/PlayerPlotTrustedEvent.java
@@ -6,12 +6,13 @@ import org.spongepowered.api.entity.player.Player;
 
 import com.intellectualcrafters.plot.object.Plot;
 
-public class PlayerPlotTrustedEvent extends PlotEvent {
+public class PlayerPlotTrustedEvent extends PlotEvent
+{
 
     private final Player initiator;
     private final boolean added;
     private final UUID player;
-    
+
     /**
      * PlayerPlotTrustedEvent: Called when a plot trusted user is added/removed
      *
@@ -20,20 +21,22 @@ public class PlayerPlotTrustedEvent extends PlotEvent {
      * @param player    Player that was added/removed from the trusted list
      * @param added     true of the player was added, false if the player was removed
      */
-    public PlayerPlotTrustedEvent(final Player initiator, final Plot plot, final UUID player, final boolean added) {
+    public PlayerPlotTrustedEvent(final Player initiator, final Plot plot, final UUID player, final boolean added)
+    {
         super(plot);
         this.initiator = initiator;
         this.added = added;
         this.player = player;
     }
-    
+
     /**
      * If a user was added
      *
      * @return boolean
      */
-    public boolean wasAdded() {
-        return this.added;
+    public boolean wasAdded()
+    {
+        return added;
     }
 
     /**
@@ -41,8 +44,9 @@ public class PlayerPlotTrustedEvent extends PlotEvent {
      *
      * @return UUID
      */
-    public UUID getPlayer() {
-        return this.player;
+    public UUID getPlayer()
+    {
+        return player;
     }
 
     /**
@@ -50,7 +54,8 @@ public class PlayerPlotTrustedEvent extends PlotEvent {
      *
      * @return Player
      */
-    public Player getInitiator() {
-        return this.initiator;
+    public Player getInitiator()
+    {
+        return initiator;
     }
- }
\ No newline at end of file
+}
diff --git a/src/main/java/com/plotsquared/sponge/events/PlayerTeleportToPlotEvent.java b/src/main/java/com/plotsquared/sponge/events/PlayerTeleportToPlotEvent.java
index f7b5ca5c0..1cf6a579b 100644
--- a/src/main/java/com/plotsquared/sponge/events/PlayerTeleportToPlotEvent.java
+++ b/src/main/java/com/plotsquared/sponge/events/PlayerTeleportToPlotEvent.java
@@ -6,12 +6,13 @@ import org.spongepowered.api.event.Cancellable;
 import com.intellectualcrafters.plot.object.Location;
 import com.intellectualcrafters.plot.object.Plot;
 
-public class PlayerTeleportToPlotEvent extends PlayerEvent implements Cancellable {
+public class PlayerTeleportToPlotEvent extends PlayerEvent implements Cancellable
+{
 
     private final Location from;
     private final Plot plot;
     private boolean cancelled;
-    
+
     /**
      * PlayerTeleportToPlotEvent: Called when a player teleports to a plot
      *
@@ -19,19 +20,21 @@ public class PlayerTeleportToPlotEvent extends PlayerEvent implements Cancellabl
      * @param from   Start location
      * @param plot   Plot to which the player was teleported
      */
-    public PlayerTeleportToPlotEvent(final Player player, final Location from, final Plot plot) {
+    public PlayerTeleportToPlotEvent(final Player player, final Location from, final Plot plot)
+    {
         super(player);
         this.from = from;
         this.plot = plot;
     }
-    
+
     /**
      * Get the from location
      *
      * @return Location
      */
-    public Location getFrom() {
-        return this.from;
+    public Location getFrom()
+    {
+        return from;
     }
 
     /**
@@ -39,17 +42,20 @@ public class PlayerTeleportToPlotEvent extends PlayerEvent implements Cancellabl
      *
      * @return Plot
      */
-    public Plot getPlot() {
-        return this.plot;
+    public Plot getPlot()
+    {
+        return plot;
     }
 
     @Override
-    public boolean isCancelled() {
-       return cancelled;
+    public boolean isCancelled()
+    {
+        return cancelled;
     }
 
     @Override
-    public void setCancelled(boolean cancel) {
-       cancelled = cancel;
+    public void setCancelled(final boolean cancel)
+    {
+        cancelled = cancel;
     }
- }
\ No newline at end of file
+}
diff --git a/src/main/java/com/plotsquared/sponge/events/PlotClearEvent.java b/src/main/java/com/plotsquared/sponge/events/PlotClearEvent.java
index 108ee2a41..9db18fe77 100644
--- a/src/main/java/com/plotsquared/sponge/events/PlotClearEvent.java
+++ b/src/main/java/com/plotsquared/sponge/events/PlotClearEvent.java
@@ -5,7 +5,8 @@ import org.spongepowered.api.event.Cancellable;
 
 import com.intellectualcrafters.plot.object.PlotId;
 
-public class PlotClearEvent extends AbstractEvent implements Cancellable {
+public class PlotClearEvent extends AbstractEvent implements Cancellable
+{
     private final PlotId id;
     private final String world;
     private boolean cancelled;
@@ -16,18 +17,20 @@ public class PlotClearEvent extends AbstractEvent implements Cancellable {
      * @param world The world in which the plot was cleared
      * @param id    The plot that was cleared
      */
-    public PlotClearEvent(final String world, final PlotId id) {
+    public PlotClearEvent(final String world, final PlotId id)
+    {
         this.id = id;
         this.world = world;
     }
-    
+
     /**
      * Get the PlotId
      *
      * @return PlotId
      */
-    public PlotId getPlotId() {
-        return this.id;
+    public PlotId getPlotId()
+    {
+        return id;
     }
 
     /**
@@ -35,17 +38,20 @@ public class PlotClearEvent extends AbstractEvent implements Cancellable {
      *
      * @return String
      */
-    public String getWorld() {
-        return this.world;
+    public String getWorld()
+    {
+        return world;
     }
 
     @Override
-    public boolean isCancelled() {
-       return cancelled;
+    public boolean isCancelled()
+    {
+        return cancelled;
     }
 
     @Override
-    public void setCancelled(boolean cancel) {
-       cancelled = cancel;
+    public void setCancelled(final boolean cancel)
+    {
+        cancelled = cancel;
     }
- }
\ No newline at end of file
+}
diff --git a/src/main/java/com/plotsquared/sponge/events/PlotDeleteEvent.java b/src/main/java/com/plotsquared/sponge/events/PlotDeleteEvent.java
index c667bcd21..d4eddd072 100644
--- a/src/main/java/com/plotsquared/sponge/events/PlotDeleteEvent.java
+++ b/src/main/java/com/plotsquared/sponge/events/PlotDeleteEvent.java
@@ -4,7 +4,8 @@ import org.spongepowered.api.event.AbstractEvent;
 
 import com.intellectualcrafters.plot.object.PlotId;
 
-public class PlotDeleteEvent extends AbstractEvent  {
+public class PlotDeleteEvent extends AbstractEvent
+{
     private final PlotId id;
     private final String world;
 
@@ -14,18 +15,20 @@ public class PlotDeleteEvent extends AbstractEvent  {
      * @param world The world in which the plot was deleted
      * @param id    The ID of the plot that was deleted
      */
-    public PlotDeleteEvent(final String world, final PlotId id) {
+    public PlotDeleteEvent(final String world, final PlotId id)
+    {
         this.id = id;
         this.world = world;
     }
-    
+
     /**
      * Get the PlotId
      *
      * @return PlotId
      */
-    public PlotId getPlotId() {
-        return this.id;
+    public PlotId getPlotId()
+    {
+        return id;
     }
 
     /**
@@ -33,7 +36,8 @@ public class PlotDeleteEvent extends AbstractEvent  {
      *
      * @return String
      */
-    public String getWorld() {
-        return this.world;
+    public String getWorld()
+    {
+        return world;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/plotsquared/sponge/events/PlotEvent.java b/src/main/java/com/plotsquared/sponge/events/PlotEvent.java
index da2eb1143..134feb14a 100644
--- a/src/main/java/com/plotsquared/sponge/events/PlotEvent.java
+++ b/src/main/java/com/plotsquared/sponge/events/PlotEvent.java
@@ -4,16 +4,19 @@ import org.spongepowered.api.event.AbstractEvent;
 
 import com.intellectualcrafters.plot.object.Plot;
 
-public abstract class PlotEvent extends AbstractEvent  {
+public abstract class PlotEvent extends AbstractEvent
+{
 
     private final Plot plot;
 
-    public PlotEvent(final Plot plot) {
+    public PlotEvent(final Plot plot)
+    {
         this.plot = plot;
     }
 
-    public final Plot getPlot() {
-        return this.plot;
+    public final Plot getPlot()
+    {
+        return plot;
     }
 
 }
diff --git a/src/main/java/com/plotsquared/sponge/events/PlotFlagAddEvent.java b/src/main/java/com/plotsquared/sponge/events/PlotFlagAddEvent.java
index 0040da65f..2f884760e 100644
--- a/src/main/java/com/plotsquared/sponge/events/PlotFlagAddEvent.java
+++ b/src/main/java/com/plotsquared/sponge/events/PlotFlagAddEvent.java
@@ -5,7 +5,8 @@ import org.spongepowered.api.event.Cancellable;
 import com.intellectualcrafters.plot.flag.Flag;
 import com.intellectualcrafters.plot.object.Plot;
 
-public class PlotFlagAddEvent extends PlotEvent implements Cancellable {
+public class PlotFlagAddEvent extends PlotEvent implements Cancellable
+{
     private final Flag flag;
     private boolean cancelled;
 
@@ -15,27 +16,31 @@ public class PlotFlagAddEvent extends PlotEvent implements Cancellable {
      * @param flag Flag that was added
      * @param plot Plot to which the flag was added
      */
-    public PlotFlagAddEvent(final Flag flag, final Plot plot) {
+    public PlotFlagAddEvent(final Flag flag, final Plot plot)
+    {
         super(plot);
         this.flag = flag;
     }
-    
+
     /**
      * Get the flag involved
      *
      * @return Flag
      */
-    public Flag getFlag() {
-        return this.flag;
+    public Flag getFlag()
+    {
+        return flag;
     }
 
     @Override
-    public boolean isCancelled() {
-       return cancelled;
+    public boolean isCancelled()
+    {
+        return cancelled;
     }
 
     @Override
-    public void setCancelled(boolean cancel) {
-       cancelled = cancel;
+    public void setCancelled(final boolean cancel)
+    {
+        cancelled = cancel;
     }
- }
\ No newline at end of file
+}
diff --git a/src/main/java/com/plotsquared/sponge/events/PlotFlagRemoveEvent.java b/src/main/java/com/plotsquared/sponge/events/PlotFlagRemoveEvent.java
index b0e140869..8ffd3fe5f 100644
--- a/src/main/java/com/plotsquared/sponge/events/PlotFlagRemoveEvent.java
+++ b/src/main/java/com/plotsquared/sponge/events/PlotFlagRemoveEvent.java
@@ -5,7 +5,8 @@ import org.spongepowered.api.event.Cancellable;
 import com.intellectualcrafters.plot.flag.Flag;
 import com.intellectualcrafters.plot.object.Plot;
 
-public class PlotFlagRemoveEvent extends PlotEvent implements Cancellable {
+public class PlotFlagRemoveEvent extends PlotEvent implements Cancellable
+{
     private final Flag flag;
     private boolean cancelled;
 
@@ -15,27 +16,31 @@ public class PlotFlagRemoveEvent extends PlotEvent implements Cancellable {
      * @param flag Flag that was removed
      * @param plot Plot from which the flag was removed
      */
-    public PlotFlagRemoveEvent(final Flag flag, final Plot plot) {
+    public PlotFlagRemoveEvent(final Flag flag, final Plot plot)
+    {
         super(plot);
         this.flag = flag;
     }
-    
+
     /**
      * Get the flag involved
      *
      * @return Flag
      */
-    public Flag getFlag() {
-        return this.flag;
+    public Flag getFlag()
+    {
+        return flag;
     }
 
     @Override
-    public boolean isCancelled() {
-       return cancelled;
+    public boolean isCancelled()
+    {
+        return cancelled;
     }
 
     @Override
-    public void setCancelled(boolean cancel) {
-       cancelled = cancel;
+    public void setCancelled(final boolean cancel)
+    {
+        cancelled = cancel;
     }
- }
\ No newline at end of file
+}
diff --git a/src/main/java/com/plotsquared/sponge/events/PlotMergeEvent.java b/src/main/java/com/plotsquared/sponge/events/PlotMergeEvent.java
index 317340434..4e9540893 100644
--- a/src/main/java/com/plotsquared/sponge/events/PlotMergeEvent.java
+++ b/src/main/java/com/plotsquared/sponge/events/PlotMergeEvent.java
@@ -9,7 +9,8 @@ import org.spongepowered.api.world.World;
 import com.intellectualcrafters.plot.object.Plot;
 import com.intellectualcrafters.plot.object.PlotId;
 
-public class PlotMergeEvent extends AbstractEvent implements Cancellable {
+public class PlotMergeEvent extends AbstractEvent implements Cancellable
+{
     private final ArrayList<PlotId> plots;
     private boolean cancelled;
     private Plot plot;
@@ -22,17 +23,19 @@ public class PlotMergeEvent extends AbstractEvent implements Cancellable {
      * @param plot  Plot that was merged
      * @param plots A list of plots involved in the event
      */
-    public PlotMergeEvent(final World world, final Plot plot, final ArrayList<PlotId> plots) {
+    public PlotMergeEvent(final World world, final Plot plot, final ArrayList<PlotId> plots)
+    {
         this.plots = plots;
     }
-    
+
     /**
      * Get the plots being added;
      *
      * @return Plot
      */
-    public ArrayList<PlotId> getPlots() {
-        return this.plots;
+    public ArrayList<PlotId> getPlots()
+    {
+        return plots;
     }
 
     /**
@@ -40,21 +43,25 @@ public class PlotMergeEvent extends AbstractEvent implements Cancellable {
      *
      * @return Plot
      */
-    public Plot getPlot() {
-        return this.plot;
+    public Plot getPlot()
+    {
+        return plot;
     }
 
-    public World getWorld() {
-        return this.world;
+    public World getWorld()
+    {
+        return world;
     }
 
     @Override
-    public boolean isCancelled() {
-       return cancelled;
+    public boolean isCancelled()
+    {
+        return cancelled;
     }
 
     @Override
-    public void setCancelled(boolean cancel) {
-       cancelled = cancel;
+    public void setCancelled(final boolean cancel)
+    {
+        cancelled = cancel;
     }
- }
\ No newline at end of file
+}
diff --git a/src/main/java/com/plotsquared/sponge/events/PlotRateEvent.java b/src/main/java/com/plotsquared/sponge/events/PlotRateEvent.java
index c7eb835d7..292083774 100644
--- a/src/main/java/com/plotsquared/sponge/events/PlotRateEvent.java
+++ b/src/main/java/com/plotsquared/sponge/events/PlotRateEvent.java
@@ -4,25 +4,30 @@ import com.intellectualcrafters.plot.object.Plot;
 import com.intellectualcrafters.plot.object.PlotPlayer;
 import com.intellectualcrafters.plot.object.Rating;
 
-public class PlotRateEvent extends PlotEvent {
+public class PlotRateEvent extends PlotEvent
+{
     private final PlotPlayer rater;
     private Rating rating;
 
-    public PlotRateEvent(final PlotPlayer rater, final Rating rating, final Plot plot) {
+    public PlotRateEvent(final PlotPlayer rater, final Rating rating, final Plot plot)
+    {
         super(plot);
         this.rater = rater;
         this.rating = rating;
     }
-    
-    public PlotPlayer getRater() {
-        return this.rater;
+
+    public PlotPlayer getRater()
+    {
+        return rater;
     }
 
-    public void setRating(Rating rating) {
+    public void setRating(final Rating rating)
+    {
         this.rating = rating;
     }
 
-    public Rating getRating() {
-        return this.rating;
+    public Rating getRating()
+    {
+        return rating;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/plotsquared/sponge/events/PlotUnlinkEvent.java b/src/main/java/com/plotsquared/sponge/events/PlotUnlinkEvent.java
index b657b2aac..05e5be6b6 100644
--- a/src/main/java/com/plotsquared/sponge/events/PlotUnlinkEvent.java
+++ b/src/main/java/com/plotsquared/sponge/events/PlotUnlinkEvent.java
@@ -8,7 +8,8 @@ import org.spongepowered.api.world.World;
 
 import com.intellectualcrafters.plot.object.PlotId;
 
-public class PlotUnlinkEvent extends AbstractEvent implements Cancellable {
+public class PlotUnlinkEvent extends AbstractEvent implements Cancellable
+{
     private final ArrayList<PlotId> plots;
     private final World world;
     private boolean cancelled;
@@ -19,7 +20,8 @@ public class PlotUnlinkEvent extends AbstractEvent implements Cancellable {
      * @param world World in which the event occurred
      * @param plots Plots that are involved in the event
      */
-    public PlotUnlinkEvent(final World world, final ArrayList<PlotId> plots) {
+    public PlotUnlinkEvent(final World world, final ArrayList<PlotId> plots)
+    {
         this.plots = plots;
         this.world = world;
     }
@@ -29,21 +31,25 @@ public class PlotUnlinkEvent extends AbstractEvent implements Cancellable {
      *
      * @return PlotId
      */
-    public ArrayList<PlotId> getPlots() {
-        return this.plots;
+    public ArrayList<PlotId> getPlots()
+    {
+        return plots;
     }
 
-    public World getWorld() {
-        return this.world;
+    public World getWorld()
+    {
+        return world;
     }
 
     @Override
-    public boolean isCancelled() {
-       return cancelled;
+    public boolean isCancelled()
+    {
+        return cancelled;
     }
 
     @Override
-    public void setCancelled(boolean cancel) {
-       cancelled = cancel;
+    public void setCancelled(final boolean cancel)
+    {
+        cancelled = cancel;
     }
- }
\ No newline at end of file
+}
diff --git a/src/main/java/com/plotsquared/sponge/generator/AugmentedPopulator.java b/src/main/java/com/plotsquared/sponge/generator/AugmentedPopulator.java
index 0278d5b26..a69fb2ba0 100644
--- a/src/main/java/com/plotsquared/sponge/generator/AugmentedPopulator.java
+++ b/src/main/java/com/plotsquared/sponge/generator/AugmentedPopulator.java
@@ -33,7 +33,8 @@ import com.intellectualcrafters.plot.util.TaskManager;
 import com.plotsquared.sponge.SpongeMain;
 import com.plotsquared.sponge.util.SpongeUtil;
 
-public class AugmentedPopulator implements Populator {
+public class AugmentedPopulator implements Populator
+{
 
     public final PlotWorld plotworld;
     public final PlotManager manager;
@@ -49,55 +50,67 @@ public class AugmentedPopulator implements Populator {
     private final int tx;
     private final int tz;
 
-    public AugmentedPopulator(String worldname, WorldGenerator gen, final SpongePlotGenerator generator, final PlotCluster cluster, final boolean p, final boolean b) {
-//        MainUtil.initCache();
+    public AugmentedPopulator(final String worldname, final WorldGenerator gen, final SpongePlotGenerator generator, final PlotCluster cluster, final boolean p, final boolean b)
+    {
+        //        MainUtil.initCache();
         // Initialize any chach that's needed
         this.cluster = cluster;
         this.generator = generator;
-        this.populator = generator.getBaseGeneratorPopulator();
-        this.plotworld = generator.getNewPlotWorld(worldname);
-        this.manager = generator.getPlotManager();
+        populator = generator.getBaseGeneratorPopulator();
+        plotworld = generator.getNewPlotWorld(worldname);
+        manager = generator.getPlotManager();
         this.p = p;
         this.b = b;
-        this.o = (this.plotworld.TERRAIN == 1) || (this.plotworld.TERRAIN == 2);
-        if (cluster != null) {
-            final Location bl = this.manager.getPlotBottomLocAbs(this.plotworld, cluster.getP1());
-            final Location tl = this.manager.getPlotTopLocAbs(this.plotworld, cluster.getP2()).add(1, 0, 1);
-            this.bx = bl.getX();
-            this.bz = bl.getZ();
-            this.tx = tl.getX();
-            this.tz = tl.getZ();
-        } else {
-            this.bx = Integer.MIN_VALUE;
-            this.bz = Integer.MIN_VALUE;
-            this.tx = Integer.MAX_VALUE;
-            this.tz = Integer.MAX_VALUE;
+        o = (plotworld.TERRAIN == 1) || (plotworld.TERRAIN == 2);
+        if (cluster != null)
+        {
+            final Location bl = manager.getPlotBottomLocAbs(plotworld, cluster.getP1());
+            final Location tl = manager.getPlotTopLocAbs(plotworld, cluster.getP2()).add(1, 0, 1);
+            bx = bl.getX();
+            bz = bl.getZ();
+            tx = tl.getX();
+            tz = tl.getZ();
+        }
+        else
+        {
+            bx = Integer.MIN_VALUE;
+            bz = Integer.MIN_VALUE;
+            tx = Integer.MAX_VALUE;
+            tz = Integer.MAX_VALUE;
         }
         // Add the populator
-        List<Populator> populators = gen.getPopulators();
-        if (this.o) {
+        final List<Populator> populators = gen.getPopulators();
+        if (o)
+        {
             populators.add(0, this);
-        } else {
+        }
+        else
+        {
             populators.add(this);
         }
     }
-    
-    public static void removePopulator(final String worldname, final PlotCluster cluster) {
+
+    public static void removePopulator(final String worldname, final PlotCluster cluster)
+    {
         final World world = SpongeUtil.getWorld(worldname);
-        List<Populator> populators = world.getWorldGenerator().getPopulators();
-        for (final Iterator<Populator> iterator = populators.iterator(); iterator.hasNext();) {
+        final List<Populator> populators = world.getWorldGenerator().getPopulators();
+        for (final Iterator<Populator> iterator = populators.iterator(); iterator.hasNext();)
+        {
             final Populator populator = iterator.next();
-            if (populator instanceof AugmentedPopulator) {
-                if (((AugmentedPopulator) populator).cluster.equals(cluster)) {
+            if (populator instanceof AugmentedPopulator)
+            {
+                if (((AugmentedPopulator) populator).cluster.equals(cluster))
+                {
                     iterator.remove();
                 }
             }
         }
     }
-    
+
     @Override
-    public void populate(final Chunk chunk, Random r_unused) {
-        Vector3i min = chunk.getBlockMin();
+    public void populate(final Chunk chunk, final Random r_unused)
+    {
+        final Vector3i min = chunk.getBlockMin();
         final World worldObj = chunk.getWorld();
         final String world = worldObj.getName();
         final int cx = min.getX() >> 4;
@@ -112,24 +125,29 @@ public class AugmentedPopulator implements Populator {
         final boolean inZ2 = ((tz >= this.bz) && (tz <= this.tz));
         final boolean inX = inX1 || inX2;
         final boolean inZ = inZ1 || inZ2;
-        if (!inX || !inZ) {
-            return;
-        }
-        if (this.plotworld.TERRAIN == 3) {
-            int X = min.getX();
-            int Z = min.getZ();
-            if (ChunkManager.FORCE_PASTE) {
-                for (short x = 0; x < 16; x++) {
-                    for (short z = 0; z < 16; z++) {
+        if (!inX || !inZ) { return; }
+        if (plotworld.TERRAIN == 3)
+        {
+            final int X = min.getX();
+            final int Z = min.getZ();
+            if (ChunkManager.FORCE_PASTE)
+            {
+                for (short x = 0; x < 16; x++)
+                {
+                    for (short z = 0; z < 16; z++)
+                    {
                         final PlotLoc loc = new PlotLoc((short) (X + x), (short) (Z + z));
                         final HashMap<Short, Short> blocks = ChunkManager.GENERATE_BLOCKS.get(loc);
-                        HashMap<Short, Byte> datas = ChunkManager.GENERATE_DATA.get(loc);
-                        for (final Entry<Short, Short> entry : blocks.entrySet()) {
-                            int y = entry.getKey();
-                            if (datas != null) {
+                        final HashMap<Short, Byte> datas = ChunkManager.GENERATE_DATA.get(loc);
+                        for (final Entry<Short, Short> entry : blocks.entrySet())
+                        {
+                            final int y = entry.getKey();
+                            if (datas != null)
+                            {
                                 SetBlockQueue.setBlock(world, x, y, z, new PlotBlock(blocks.get(y), datas.get(y)));
                             }
-                            else {
+                            else
+                            {
                                 SetBlockQueue.setBlock(world, x, y, z, blocks.get(y));
                             }
                         }
@@ -137,24 +155,31 @@ public class AugmentedPopulator implements Populator {
                 }
                 return;
             }
-            if (ChunkManager.CURRENT_PLOT_CLEAR != null) {
+            if (ChunkManager.CURRENT_PLOT_CLEAR != null)
+            {
                 PlotLoc loc;
-                for (Entry<PlotLoc, HashMap<Short, Byte>> entry : ChunkManager.GENERATE_DATA.entrySet()) {
-                    HashMap<Short, Byte> datas = ChunkManager.GENERATE_DATA.get(entry.getKey());
-                    for (Entry<Short, Byte> entry2 : entry.getValue().entrySet()) {
-                        Short y = entry2.getKey();
+                for (final Entry<PlotLoc, HashMap<Short, Byte>> entry : ChunkManager.GENERATE_DATA.entrySet())
+                {
+                    final HashMap<Short, Byte> datas = ChunkManager.GENERATE_DATA.get(entry.getKey());
+                    for (final Entry<Short, Byte> entry2 : entry.getValue().entrySet())
+                    {
+                        final Short y = entry2.getKey();
                         byte data;
-                        if (datas != null) {
+                        if (datas != null)
+                        {
                             data = datas.get(y);
                         }
-                        else {
+                        else
+                        {
                             data = 0;
                         }
                         loc = entry.getKey();
-                        int xx = loc.x - X;
-                        int zz = loc.z - Z;
-                        if (xx >= 0 && xx < 16) {
-                            if (zz >= 0 && zz < 16) {
+                        final int xx = loc.x - X;
+                        final int zz = loc.z - Z;
+                        if ((xx >= 0) && (xx < 16))
+                        {
+                            if ((zz >= 0) && (zz < 16))
+                            {
                                 SetBlockQueue.setBlock(world, xx, y, zz, new PlotBlock(entry2.getValue(), data));
                             }
                         }
@@ -165,172 +190,208 @@ public class AugmentedPopulator implements Populator {
         }
         final boolean check;
         check = !inX1 || !inX2 || !inZ1 || !inZ2;
-        if (this.plotworld.TERRAIN > 1) {
-            final PlotId plot1 = this.manager.getPlotIdAbs(this.plotworld, bx, 0, bz);
-            final PlotId plot2 = this.manager.getPlotIdAbs(this.plotworld, tx, 0, tz);
-            if ((plot1 != null) && (plot2 != null) && plot1.equals(plot2)) {
-                return;
-            }
+        if (plotworld.TERRAIN > 1)
+        {
+            final PlotId plot1 = manager.getPlotIdAbs(plotworld, bx, 0, bz);
+            final PlotId plot2 = manager.getPlotIdAbs(plotworld, tx, 0, tz);
+            if ((plot1 != null) && (plot2 != null) && plot1.equals(plot2)) { return; }
         }
-        if (this.o) {
+        if (o)
+        {
             populateBlocks(worldObj, chunk, cx, cz, bx, bz, check);
-        } else {
-            TaskManager.runTaskLater(new Runnable() {
+        }
+        else
+        {
+            TaskManager.runTaskLater(new Runnable()
+            {
                 @Override
-                public void run() {
+                public void run()
+                {
                     // TODO populate biome
                 }
             }, 20 + r.nextInt(10));
-            TaskManager.runTaskLater(new Runnable() {
+            TaskManager.runTaskLater(new Runnable()
+            {
                 @Override
-                public void run() {
+                public void run()
+                {
                     populateBlocks(worldObj, chunk, cx, cz, bx, bz, check);
                 }
             }, 40 + r.nextInt(40));
         }
     }
-    
-    private void populateBlocks(final World world, final Chunk chunk, final int X, final int Z, final int x, final int z, final boolean check) {
+
+    private void populateBlocks(final World world, final Chunk chunk, final int X, final int Z, final int x, final int z, final boolean check)
+    {
         final String worldname = world.getName();
-        MutableBlockVolume blocks = new MutableBlockVolume() {
+        final MutableBlockVolume blocks = new MutableBlockVolume()
+        {
             @Override
-            public void setBlock(int x, int y, int z, BlockState t) {
+            public void setBlock(final int x, final int y, final int z, final BlockState t)
+            {
                 if (check && (((z) < bz) || ((z) > tz) || ((x) < bx) || ((x) > tx))) {
-                    return;
+                return;
                 }
-                if (p) {
-                    if (ChunkManager.CURRENT_PLOT_CLEAR != null) {
+                if (p)
+                {
+                    if (ChunkManager.CURRENT_PLOT_CLEAR != null)
+                    {
                         if (ChunkManager.CURRENT_PLOT_CLEAR.isIn(x, z)) {
-                            return;
-                        }
-                    } else if (manager.getPlotIdAbs(plotworld, x, 0, z) != null) {
                         return;
+                        }
+                    }
+                    else if (manager.getPlotIdAbs(plotworld, x, 0, z) != null) {
+                    return;
                     }
                 }
-                PlotBlock block = SpongeMain.THIS.getPlotBlock(t);
-                if (block != null) {
+                final PlotBlock block = SpongeMain.THIS.getPlotBlock(t);
+                if (block != null)
+                {
                     SetBlockQueue.setBlock(worldname, x, y, z, block);
                 }
             }
-            
+
             @Override
-            public void setBlock(Vector3i v, BlockState t) {
+            public void setBlock(final Vector3i v, final BlockState t)
+            {
                 setBlock(v.getX(), v.getY(), v.getZ(), t);
             }
-            
+
             @Override
-            public BlockType getBlockType(int x, int y, int z) {
+            public BlockType getBlockType(final int x, final int y, final int z)
+            {
                 return world.getBlockType(x, y, z);
             }
-            
+
             @Override
-            public BlockType getBlockType(Vector3i v) {
+            public BlockType getBlockType(final Vector3i v)
+            {
                 return getBlockType(v.getX(), v.getY(), v.getZ());
             }
-            
+
             @Override
-            public Vector3i getBlockSize() {
+            public Vector3i getBlockSize()
+            {
                 return chunk.getBlockSize();
             }
-            
+
             @Override
-            public Vector3i getBlockMin() {
+            public Vector3i getBlockMin()
+            {
                 return chunk.getBlockMin();
             }
-            
+
             @Override
-            public Vector3i getBlockMax() {
+            public Vector3i getBlockMax()
+            {
                 return chunk.getBlockMax();
             }
-            
+
             @Override
-            public BlockState getBlock(int x, int y, int z) {
+            public BlockState getBlock(final int x, final int y, final int z)
+            {
                 return world.getBlock(x, y, z);
             }
-            
+
             @Override
-            public BlockState getBlock(Vector3i v) {
+            public BlockState getBlock(final Vector3i v)
+            {
                 return getBlock(v.getX(), v.getY(), v.getZ());
             }
-            
+
             @Override
-            public boolean containsBlock(int x, int y, int z) {
+            public boolean containsBlock(final int x, final int y, final int z)
+            {
                 return ((x) >= bz) && ((z) <= tz) && ((x) >= bx) && ((z) <= tx);
             }
-            
+
             @Override
-            public boolean containsBlock(Vector3i v) {
+            public boolean containsBlock(final Vector3i v)
+            {
                 return containsBlock(v.getX(), v.getY(), v.getZ());
             }
-            
+
             @Override
-            public void setBlockType(int x, int y, int z, BlockType t) {
+            public void setBlockType(final int x, final int y, final int z, final BlockType t)
+            {
                 if (check && (((z) < bz) || ((z) > tz) || ((x) < bx) || ((x) > tx))) {
-                    return;
+                return;
                 }
-                if (p) {
-                    if (ChunkManager.CURRENT_PLOT_CLEAR != null) {
+                if (p)
+                {
+                    if (ChunkManager.CURRENT_PLOT_CLEAR != null)
+                    {
                         if (ChunkManager.CURRENT_PLOT_CLEAR.isIn(x, z)) {
-                            return;
-                        }
-                    } else if (manager.getPlotIdAbs(plotworld, x, 0, z) != null) {
                         return;
+                        }
+                    }
+                    else if (manager.getPlotIdAbs(plotworld, x, 0, z) != null) {
+                    return;
                     }
                 }
-                PlotBlock block = SpongeMain.THIS.getPlotBlock(t.getDefaultState());
-                if (block != null) {
+                final PlotBlock block = SpongeMain.THIS.getPlotBlock(t.getDefaultState());
+                if (block != null)
+                {
                     SetBlockQueue.setBlock(worldname, x, y, z, block);
                 }
             }
-            
+
             @Override
-            public void setBlockType(Vector3i v, BlockType t) {
+            public void setBlockType(final Vector3i v, final BlockType t)
+            {
                 setBlockType(v.getX(), v.getY(), v.getZ(), t);
             }
 
             @Override
-            public MutableBlockVolume getBlockCopy() {
-             // TODO Auto-generated method stub
+            public MutableBlockVolume getBlockCopy()
+            {
+                // TODO Auto-generated method stub
                 return this;
             }
 
             @Override
-            public MutableBlockVolume getBlockCopy(StorageType arg0) {
-             // TODO Auto-generated method stub
+            public MutableBlockVolume getBlockCopy(final StorageType arg0)
+            {
+                // TODO Auto-generated method stub
                 return this;
             }
 
             @Override
-            public ImmutableBlockVolume getImmutableBlockCopy() {
+            public ImmutableBlockVolume getImmutableBlockCopy()
+            {
                 // TODO Auto-generated method stub
                 return null;
             }
 
             @Override
-            public UnmodifiableBlockVolume getUnmodifiableBlockView() {
+            public UnmodifiableBlockVolume getUnmodifiableBlockView()
+            {
                 // TODO Auto-generated method stub
                 return null;
             }
 
             @Override
-            public MutableBlockVolume getBlockView(DiscreteTransform3 arg0) {
+            public MutableBlockVolume getBlockView(final DiscreteTransform3 arg0)
+            {
                 // TODO Auto-generated method stub
                 return this;
             }
 
             @Override
-            public MutableBlockVolume getBlockView(Vector3i arg0, Vector3i arg1) {
+            public MutableBlockVolume getBlockView(final Vector3i arg0, final Vector3i arg1)
+            {
                 // TODO Auto-generated method stub
                 return this;
             }
 
             @Override
-            public MutableBlockVolume getRelativeBlockView() {
+            public MutableBlockVolume getRelativeBlockView()
+            {
                 // TODO Auto-generated method stub
                 return this;
             }
         };
-        this.populator.populate(world, blocks , null);
+        populator.populate(world, blocks, null);
     }
-    
+
 }
diff --git a/src/main/java/com/plotsquared/sponge/generator/SpongeBasicBiomeProvider.java b/src/main/java/com/plotsquared/sponge/generator/SpongeBasicBiomeProvider.java
index 8d8bbe74d..75f90e4e1 100644
--- a/src/main/java/com/plotsquared/sponge/generator/SpongeBasicBiomeProvider.java
+++ b/src/main/java/com/plotsquared/sponge/generator/SpongeBasicBiomeProvider.java
@@ -8,31 +8,38 @@ import org.spongepowered.api.world.gen.BiomeGenerator;
 import com.flowpowered.math.vector.Vector2i;
 import com.intellectualcrafters.plot.object.PlotWorld;
 
-public class SpongeBasicBiomeProvider implements BiomeGenerator {
+public class SpongeBasicBiomeProvider implements BiomeGenerator
+{
 
-    private PlotWorld plotworld;
+    private final PlotWorld plotworld;
 
-    public SpongeBasicBiomeProvider(PlotWorld plotworld) {
+    public SpongeBasicBiomeProvider(final PlotWorld plotworld)
+    {
         this.plotworld = plotworld;
     }
-    
+
     @Override
-    public void generateBiomes(MutableBiomeArea biomeBase) {
-        Vector2i min = biomeBase.getBiomeMin();
-        int bx = min.getX();
-        int bz = min.getY();
+    public void generateBiomes(final MutableBiomeArea biomeBase)
+    {
+        final Vector2i min = biomeBase.getBiomeMin();
+        final int bx = min.getX();
+        final int bz = min.getY();
         BiomeType biome = BiomeTypes.FOREST;
-        try {
+        try
+        {
             biome = (BiomeType) BiomeTypes.class.getField(plotworld.PLOT_BIOME.toUpperCase()).get(null);
         }
-        catch (Exception e) {
+        catch (final Exception e)
+        {
             e.printStackTrace();
         }
-        for (int x = bx; x < bx + 16; x++) {
-            for (int z = bz; z < bz + 16; z++) {
+        for (int x = bx; x < (bx + 16); x++)
+        {
+            for (int z = bz; z < (bz + 16); z++)
+            {
                 biomeBase.setBiome(x, z, biome);
             }
         }
     }
-    
+
 }
diff --git a/src/main/java/com/plotsquared/sponge/generator/SpongeBasicGen.java b/src/main/java/com/plotsquared/sponge/generator/SpongeBasicGen.java
index dff2de73f..4f5f9295d 100644
--- a/src/main/java/com/plotsquared/sponge/generator/SpongeBasicGen.java
+++ b/src/main/java/com/plotsquared/sponge/generator/SpongeBasicGen.java
@@ -14,22 +14,24 @@ import com.intellectualcrafters.plot.object.PlotManager;
 import com.intellectualcrafters.plot.object.PlotWorld;
 import com.plotsquared.sponge.SpongeMain;
 
-public class SpongeBasicGen extends SpongePlotGenerator {
+public class SpongeBasicGen extends SpongePlotGenerator
+{
 
     public final BlockState AIR = BlockTypes.AIR.getDefaultState();
-    
+
     private static HybridPlotManager manager;
     public HybridPlotWorld plotworld;
 
-    public SpongeBasicGen(String world) {
+    public SpongeBasicGen(final String world)
+    {
         super(world);
     }
-    
+
     /**
      * Some generator specific variables (implementation dependent)
-     * 
+     *
      * TODO USE THESE
-     * 
+     *
      */
     public int plotsize;
     public int pathsize;
@@ -40,7 +42,7 @@ public class SpongeBasicGen extends SpongePlotGenerator {
     public short pathWidthLower;
     public short pathWidthUpper;
     public boolean doState = false;
-    
+
     BlockState wall;
     BlockState wallfilling;
     BlockState roadblock;
@@ -48,88 +50,108 @@ public class SpongeBasicGen extends SpongePlotGenerator {
     BlockState[] filling;
 
     @Override
-    public void init(PlotWorld plotworld) {
-        if (plotworld != null) {
+    public void init(final PlotWorld plotworld)
+    {
+        if (plotworld != null)
+        {
             this.plotworld = (HybridPlotWorld) plotworld;
         }
-        this.plotsize = this.plotworld.PLOT_WIDTH;
-        this.pathsize = this.plotworld.ROAD_WIDTH;
-        this.size = this.pathsize + this.plotsize;
-        this.wallheight = this.plotworld.WALL_HEIGHT;
-        this.roadheight = this.plotworld.ROAD_HEIGHT;
-        this.plotheight = this.plotworld.PLOT_HEIGHT;
-        if (this.pathsize == 0) {
-            this.pathWidthLower = (short) -1;
-            this.pathWidthUpper = (short) (this.plotsize + 1);
+        plotsize = this.plotworld.PLOT_WIDTH;
+        pathsize = this.plotworld.ROAD_WIDTH;
+        size = pathsize + plotsize;
+        wallheight = this.plotworld.WALL_HEIGHT;
+        roadheight = this.plotworld.ROAD_HEIGHT;
+        plotheight = this.plotworld.PLOT_HEIGHT;
+        if (pathsize == 0)
+        {
+            pathWidthLower = (short) -1;
+            pathWidthUpper = (short) (plotsize + 1);
         }
-        else {
-            if ((this.pathsize % 2) == 0) {
-                this.pathWidthLower = (short) (Math.floor(this.pathsize / 2) - 1);
-            } else {
-                this.pathWidthLower = (short) (Math.floor(this.pathsize / 2));
+        else
+        {
+            if ((pathsize % 2) == 0)
+            {
+                pathWidthLower = (short) (Math.floor(pathsize / 2) - 1);
             }
-            this.pathWidthUpper = (short) (this.pathWidthLower + this.plotsize + 1);
+            else
+            {
+                pathWidthLower = (short) (Math.floor(pathsize / 2));
+            }
+            pathWidthUpper = (short) (pathWidthLower + plotsize + 1);
         }
-        
-        this.roadblock = SpongeMain.THIS.getBlockState(this.plotworld.ROAD_BLOCK);
-        this.wallfilling = SpongeMain.THIS.getBlockState(this.plotworld.WALL_FILLING);
-        this.wall = SpongeMain.THIS.getBlockState(this.plotworld.WALL_BLOCK);
-        this.plotfloors = new BlockState[this.plotworld.TOP_BLOCK.length];
-        for (int i = 0; i < this.plotworld.TOP_BLOCK.length; i++) {
-            this.plotfloors[i] = SpongeMain.THIS.getBlockState(this.plotworld.TOP_BLOCK[i]);
+
+        roadblock = SpongeMain.THIS.getBlockState(this.plotworld.ROAD_BLOCK);
+        wallfilling = SpongeMain.THIS.getBlockState(this.plotworld.WALL_FILLING);
+        wall = SpongeMain.THIS.getBlockState(this.plotworld.WALL_BLOCK);
+        plotfloors = new BlockState[this.plotworld.TOP_BLOCK.length];
+        for (int i = 0; i < this.plotworld.TOP_BLOCK.length; i++)
+        {
+            plotfloors[i] = SpongeMain.THIS.getBlockState(this.plotworld.TOP_BLOCK[i]);
         }
-        this.filling = new BlockState[this.plotworld.MAIN_BLOCK.length];
-        for (int i = 0; i < this.plotworld.MAIN_BLOCK.length; i++) {
-            this.filling[i] = SpongeMain.THIS.getBlockState(this.plotworld.MAIN_BLOCK[i]);
+        filling = new BlockState[this.plotworld.MAIN_BLOCK.length];
+        for (int i = 0; i < this.plotworld.MAIN_BLOCK.length; i++)
+        {
+            filling[i] = SpongeMain.THIS.getBlockState(this.plotworld.MAIN_BLOCK[i]);
         }
-        if ((this.filling.length > 1) || (this.plotfloors.length > 1)) {
-            this.doState = true;
+        if ((filling.length > 1) || (plotfloors.length > 1))
+        {
+            doState = true;
         }
     }
 
     @Override
-    public PlotWorld getNewPlotWorld(String world) {
-        if (this.plotworld == null) {
-            this.plotworld = (HybridPlotWorld) PS.get().getPlotWorld(world);
-            if (this.plotworld == null) {
-                this.plotworld = new HybridPlotWorld(world);
+    public PlotWorld getNewPlotWorld(final String world)
+    {
+        if (plotworld == null)
+        {
+            plotworld = (HybridPlotWorld) PS.get().getPlotWorld(world);
+            if (plotworld == null)
+            {
+                plotworld = new HybridPlotWorld(world);
             }
         }
-        return this.plotworld;
+        return plotworld;
     }
 
     @Override
-    public PlotManager getPlotManager() {
-        if (SpongeBasicGen.manager == null) {
+    public PlotManager getPlotManager()
+    {
+        if (SpongeBasicGen.manager == null)
+        {
             SpongeBasicGen.manager = new HybridPlotManager();
         }
         return SpongeBasicGen.manager;
     }
 
     @Override
-    public List<SpongePlotPopulator> getPlotPopulators() {
+    public List<SpongePlotPopulator> getPlotPopulators()
+    {
         // TODO Auto-generated method stub
         return new ArrayList<>();
     }
 
     private SpongeBasicPop generator;
-    
+
     @Override
-    public SpongePlotPopulator getGenerator() {
-        if (generator == null) {
+    public SpongePlotPopulator getGenerator()
+    {
+        if (generator == null)
+        {
             generator = new SpongeBasicPop(this);
         }
         return generator;
     }
-    
+
     private BiomeGenerator biome;
 
     @Override
-    public BiomeGenerator getPlotBiomeProvider() {
-        if (biome == null) {
+    public BiomeGenerator getPlotBiomeProvider()
+    {
+        if (biome == null)
+        {
             biome = new SpongeBasicBiomeProvider(plotworld);
         }
         return biome;
     }
-    
+
 }
diff --git a/src/main/java/com/plotsquared/sponge/generator/SpongeBasicPop.java b/src/main/java/com/plotsquared/sponge/generator/SpongeBasicPop.java
index b26326e55..2a99a303c 100644
--- a/src/main/java/com/plotsquared/sponge/generator/SpongeBasicPop.java
+++ b/src/main/java/com/plotsquared/sponge/generator/SpongeBasicPop.java
@@ -13,24 +13,31 @@ import com.intellectualcrafters.plot.object.schematic.PlotItem;
 import com.intellectualcrafters.plot.util.BlockManager;
 import com.plotsquared.sponge.SpongeMain;
 
-public class SpongeBasicPop extends SpongePlotPopulator<SpongeBasicGen> {
+public class SpongeBasicPop extends SpongePlotPopulator<SpongeBasicGen>
+{
 
-    public SpongeBasicPop(SpongeBasicGen generator) {
+    public SpongeBasicPop(final SpongeBasicGen generator)
+    {
         super(generator);
     }
 
     @Override
-    public void populate(World world, RegionWrapper requiredRegion, PseudoRandom random, int cx, int cz) {
-        int sx = (short) ((this.X - generator.plotworld.ROAD_OFFSET_X) % generator.size);
-        int sz = (short) ((this.Z - generator.plotworld.ROAD_OFFSET_Z) % generator.size);
-        if (sx < 0) {
+    public void populate(final World world, final RegionWrapper requiredRegion, final PseudoRandom random, final int cx, final int cz)
+    {
+        int sx = (short) ((X - generator.plotworld.ROAD_OFFSET_X) % generator.size);
+        int sz = (short) ((Z - generator.plotworld.ROAD_OFFSET_Z) % generator.size);
+        if (sx < 0)
+        {
             sx += generator.size;
         }
-        if (sz < 0) {
+        if (sz < 0)
+        {
             sz += generator.size;
         }
-        for (short x = 0; x < 16; x++) {
-            for (short z = 0; z < 16; z++) {
+        for (short x = 0; x < 16; x++)
+        {
+            for (short z = 0; z < 16; z++)
+            {
                 final int absX = ((sx + x) % generator.size);
                 final int absZ = ((sz + z) % generator.size);
                 final boolean gx = absX > generator.pathWidthLower;
@@ -38,83 +45,113 @@ public class SpongeBasicPop extends SpongePlotPopulator<SpongeBasicGen> {
                 final boolean lx = absX < generator.pathWidthUpper;
                 final boolean lz = absZ < generator.pathWidthUpper;
                 // inside plot
-                if (gx && gz && lx && lz) {
-                    for (short y = 1; y < generator.plotheight; y++) {
+                if (gx && gz && lx && lz)
+                {
+                    for (short y = 1; y < generator.plotheight; y++)
+                    {
                         setBlock(x, y, z, generator.filling);
                     }
                     setBlock(x, (short) generator.plotheight, z, generator.plotfloors);
-                    if (generator.plotworld.TYPE != 0 && generator.plotworld.TERRAIN < 2) {
-                        for (int y = generator.plotheight + 1; y < 128; y++) {
+                    if ((generator.plotworld.TYPE != 0) && (generator.plotworld.TERRAIN < 2))
+                    {
+                        for (int y = generator.plotheight + 1; y < 128; y++)
+                        {
                             setBlock(x, y, z, generator.AIR);
                         }
                     }
-                    if (generator.plotworld.PLOT_SCHEMATIC) {
+                    if (generator.plotworld.PLOT_SCHEMATIC)
+                    {
                         final PlotLoc loc = new PlotLoc(absX, absZ);
                         final HashMap<Short, Short> blocks = generator.plotworld.G_SCH.get(loc);
-                        if (blocks != null) {
+                        if (blocks != null)
+                        {
                             final HashMap<Short, Byte> datas = generator.plotworld.G_SCH_DATA.get(loc);
-                            if (datas != null) {
-                                for (final short y : blocks.keySet()) {
-                                    Byte data = datas.get(y);
+                            if (datas != null)
+                            {
+                                for (final short y : blocks.keySet())
+                                {
+                                    final Byte data = datas.get(y);
                                     setBlock(x, (short) (generator.plotheight + y), z, SpongeMain.THIS.getBlockState(new PlotBlock(blocks.get(y), data == null ? 0 : data)));
                                 }
                             }
-                            else {
-                                for (final short y : blocks.keySet()) {
+                            else
+                            {
+                                for (final short y : blocks.keySet())
+                                {
                                     setBlock(x, (short) (generator.plotheight + y), z, SpongeMain.THIS.getBlockState(blocks.get(y)));
                                 }
                             }
                         }
-                        if (generator.plotworld.G_SCH_STATE != null) {
-                            HashSet<PlotItem> states = generator.plotworld.G_SCH_STATE.get(loc);
-                            if (states != null) {
-                                for (PlotItem items : states) {
-                                    items.x = this.X + x;
-                                    items.z = this.Z + z;
+                        if (generator.plotworld.G_SCH_STATE != null)
+                        {
+                            final HashSet<PlotItem> states = generator.plotworld.G_SCH_STATE.get(loc);
+                            if (states != null)
+                            {
+                                for (final PlotItem items : states)
+                                {
+                                    items.x = X + x;
+                                    items.z = Z + z;
                                     BlockManager.manager.addItems(generator.plotworld.worldname, items);
                                 }
                             }
                         }
                     }
-                } else if (generator.pathsize != 0) {
+                }
+                else if (generator.pathsize != 0)
+                {
                     // wall
-                    if (((absX >= generator.pathWidthLower) && (absX <= generator.pathWidthUpper) && (absZ >= generator.pathWidthLower) && (absZ <= generator.pathWidthUpper))) {
-                        for (short y = 1; y <= generator.wallheight; y++) {
+                    if (((absX >= generator.pathWidthLower) && (absX <= generator.pathWidthUpper) && (absZ >= generator.pathWidthLower) && (absZ <= generator.pathWidthUpper)))
+                    {
+                        for (short y = 1; y <= generator.wallheight; y++)
+                        {
                             setBlock(x, y, z, generator.wallfilling);
                         }
-                        if (generator.plotworld.TYPE != 0 && generator.plotworld.TERRAIN < 3) {
-                            for (int y = generator.wallheight + 2; y < 128; y++) {
+                        if ((generator.plotworld.TYPE != 0) && (generator.plotworld.TERRAIN < 3))
+                        {
+                            for (int y = generator.wallheight + 2; y < 128; y++)
+                            {
                                 setBlock(x, y, z, generator.AIR);
                             }
                         }
-                        if (!generator.plotworld.ROAD_SCHEMATIC_ENABLED) {
+                        if (!generator.plotworld.ROAD_SCHEMATIC_ENABLED)
+                        {
                             setBlock(x, generator.wallheight + 1, z, generator.wall);
                         }
                     }
                     // road
-                    else {
-                        for (short y = 1; y <= generator.roadheight; y++) {
+                    else
+                    {
+                        for (short y = 1; y <= generator.roadheight; y++)
+                        {
                             setBlock(x, y, z, generator.roadblock);
                         }
-                        if (generator.plotworld.TYPE != 0 && generator.plotworld.TERRAIN < 3) {
-                            for (int y = generator.roadheight + 1; y < 128; y++) {
+                        if ((generator.plotworld.TYPE != 0) && (generator.plotworld.TERRAIN < 3))
+                        {
+                            for (int y = generator.roadheight + 1; y < 128; y++)
+                            {
                                 setBlock(x, y, z, generator.AIR);
                             }
                         }
                     }
-                    if (generator.plotworld.ROAD_SCHEMATIC_ENABLED) {
+                    if (generator.plotworld.ROAD_SCHEMATIC_ENABLED)
+                    {
                         final PlotLoc loc = new PlotLoc(absX, absZ);
                         final HashMap<Short, Short> blocks = generator.plotworld.G_SCH.get(loc);
-                        if (blocks != null) {
+                        if (blocks != null)
+                        {
                             final HashMap<Short, Byte> datas = generator.plotworld.G_SCH_DATA.get(loc);
-                            if (datas != null) {
-                                for (final short y : blocks.keySet()) {
-                                    Byte data = datas.get(y);
+                            if (datas != null)
+                            {
+                                for (final short y : blocks.keySet())
+                                {
+                                    final Byte data = datas.get(y);
                                     setBlock(x, (short) (generator.plotheight + y), z, SpongeMain.THIS.getBlockState(new PlotBlock(blocks.get(y), data == null ? 0 : data)));
                                 }
                             }
-                            else {
-                                for (final short y : blocks.keySet()) {
+                            else
+                            {
+                                for (final short y : blocks.keySet())
+                                {
                                     setBlock(x, (short) (generator.plotheight + y), z, SpongeMain.THIS.getBlockState(blocks.get(y)));
                                 }
                             }
diff --git a/src/main/java/com/plotsquared/sponge/generator/SpongeGeneratorWrapper.java b/src/main/java/com/plotsquared/sponge/generator/SpongeGeneratorWrapper.java
index 292cbc5f8..6fe46dcae 100644
--- a/src/main/java/com/plotsquared/sponge/generator/SpongeGeneratorWrapper.java
+++ b/src/main/java/com/plotsquared/sponge/generator/SpongeGeneratorWrapper.java
@@ -11,32 +11,41 @@ import com.intellectualcrafters.plot.object.PlotWorld;
 import com.intellectualcrafters.plot.object.SetupObject;
 import com.plotsquared.sponge.util.SpongeUtil;
 
-public class SpongeGeneratorWrapper extends PlotGenerator<WorldGenerator>{
+public class SpongeGeneratorWrapper extends PlotGenerator<WorldGenerator>
+{
 
     public final boolean full;
-    
-    public SpongeGeneratorWrapper(String world, WorldGenerator generator) {
+
+    public SpongeGeneratorWrapper(final String world, final WorldGenerator generator)
+    {
         super(world, generator);
         full = (generator instanceof SpongePlotGenerator);
     }
 
     @Override
-    public void initialize(PlotWorld plotworld) {
-        if (generator instanceof SpongePlotGenerator) {
+    public void initialize(final PlotWorld plotworld)
+    {
+        if (generator instanceof SpongePlotGenerator)
+        {
             ((SpongePlotGenerator) generator).init(plotworld);
         }
     }
 
     @Override
-    public void augment(PlotCluster cluster, PlotWorld plotworld) {
-        if (generator instanceof SpongePlotGenerator) {
-            SpongePlotGenerator plotgen = (SpongePlotGenerator) generator;
-            World worldObj = SpongeUtil.getWorld(world);
-            if (worldObj != null) {
-                if (cluster != null) {
+    public void augment(final PlotCluster cluster, final PlotWorld plotworld)
+    {
+        if (generator instanceof SpongePlotGenerator)
+        {
+            final SpongePlotGenerator plotgen = (SpongePlotGenerator) generator;
+            final World worldObj = SpongeUtil.getWorld(world);
+            if (worldObj != null)
+            {
+                if (cluster != null)
+                {
                     new AugmentedPopulator(world, worldObj.getWorldGenerator(), plotgen, cluster, plotworld.TERRAIN == 2, plotworld.TERRAIN != 2);
                 }
-                else {
+                else
+                {
                     new AugmentedPopulator(world, worldObj.getWorldGenerator(), plotgen, null, plotworld.TERRAIN == 2, plotworld.TERRAIN != 2);
                 }
             }
@@ -44,51 +53,56 @@ public class SpongeGeneratorWrapper extends PlotGenerator<WorldGenerator>{
     }
 
     @Override
-    public void setGenerator(String gen_string) {
-        if (gen_string == null) {
+    public void setGenerator(final String gen_string)
+    {
+        if (gen_string == null)
+        {
             generator = new SpongeBasicGen(world);
-        } else {
-            PlotGenerator<WorldGenerator> gen_wrapper = (PlotGenerator<WorldGenerator>) PS.get().IMP.getGenerator(world, gen_string);
-            if (gen_wrapper != null) {
+        }
+        else
+        {
+            final PlotGenerator<WorldGenerator> gen_wrapper = (PlotGenerator<WorldGenerator>) PS.get().IMP.getGenerator(world, gen_string);
+            if (gen_wrapper != null)
+            {
                 generator = gen_wrapper.generator;
             }
         }
     }
 
     @Override
-    public PlotWorld getNewPlotWorld(String world) {
-        if (!(generator instanceof SpongePlotGenerator)) {
-            return null;
-        }
+    public PlotWorld getNewPlotWorld(final String world)
+    {
+        if (!(generator instanceof SpongePlotGenerator)) { return null; }
         return ((SpongePlotGenerator) generator).getNewPlotWorld(world);
     }
 
     @Override
-    public PlotManager getPlotManager() {
-        if (!(generator instanceof SpongePlotGenerator)) {
-            return null;
-        }
+    public PlotManager getPlotManager()
+    {
+        if (!(generator instanceof SpongePlotGenerator)) { return null; }
         return ((SpongePlotGenerator) generator).getPlotManager();
     }
 
     @Override
-    public boolean isFull() {
+    public boolean isFull()
+    {
         return full;
     }
 
     @Override
-    public String getName() {
-        if (generator == null) {
-            return "Null";
-        }
+    public String getName()
+    {
+        if (generator == null) { return "Null"; }
         return generator.getClass().getName();
     }
 
     @Override
-    public void processSetup(SetupObject object) {
-        if (generator instanceof SpongePlotGenerator) {
+    public void processSetup(final SetupObject object)
+    {
+        if (generator instanceof SpongePlotGenerator)
+        {
             ((SpongePlotGenerator) generator).processSetup(object);
         }
     }
-    
+
 }
diff --git a/src/main/java/com/plotsquared/sponge/generator/SpongePlotGenerator.java b/src/main/java/com/plotsquared/sponge/generator/SpongePlotGenerator.java
index fb8eb7b79..828ebf444 100644
--- a/src/main/java/com/plotsquared/sponge/generator/SpongePlotGenerator.java
+++ b/src/main/java/com/plotsquared/sponge/generator/SpongePlotGenerator.java
@@ -12,64 +12,72 @@ import com.intellectualcrafters.plot.object.PlotManager;
 import com.intellectualcrafters.plot.object.PlotWorld;
 import com.intellectualcrafters.plot.object.SetupObject;
 
-public abstract class SpongePlotGenerator implements WorldGenerator {
+public abstract class SpongePlotGenerator implements WorldGenerator
+{
 
     public final String world;
-    
-    public SpongePlotGenerator(String world) {
+
+    public SpongePlotGenerator(final String world)
+    {
         this.world = world;
     }
 
     @Override
-    public GeneratorPopulator getBaseGeneratorPopulator() {
+    public GeneratorPopulator getBaseGeneratorPopulator()
+    {
         return getGenerator();
     }
 
     @Override
-    public BiomeGenerator getBiomeGenerator() {
+    public BiomeGenerator getBiomeGenerator()
+    {
         return getPlotBiomeProvider();
     }
 
     @Override
-    public List<GeneratorPopulator> getGeneratorPopulators() {
-        List<GeneratorPopulator> pops = new ArrayList<>();
-        pops.addAll(this.getPlotPopulators());
+    public List<GeneratorPopulator> getGeneratorPopulators()
+    {
+        final List<GeneratorPopulator> pops = new ArrayList<>();
+        pops.addAll(getPlotPopulators());
         return pops;
     }
 
     @Override
-    public List<Populator> getPopulators() {
+    public List<Populator> getPopulators()
+    {
         return new ArrayList<>();
     }
 
     @Override
-    public void setBaseGeneratorPopulator(GeneratorPopulator arg0) {
+    public void setBaseGeneratorPopulator(final GeneratorPopulator arg0)
+    {
         // TODO Auto-generated method stub
         throw new UnsupportedOperationException("NOT IMPLEMENTED YET");
-        
+
     }
 
     @Override
-    public void setBiomeGenerator(BiomeGenerator biomeGenerator) {
+    public void setBiomeGenerator(final BiomeGenerator biomeGenerator)
+    {
         // TODO
         throw new UnsupportedOperationException("NOT IMPLEMENTED YET");
     }
-    
+
     public abstract SpongePlotPopulator getGenerator();
-    
+
     public abstract BiomeGenerator getPlotBiomeProvider();
-    
+
     public abstract List<SpongePlotPopulator> getPlotPopulators();
-    
+
     /**
-     * This is called when the generator is initialized. 
+     * This is called when the generator is initialized.
      * You don't need to do anything with it necessarily.
      * @param plotworld
      */
-    public abstract void init(PlotWorld plotworld);
-    
+    public abstract void init(final PlotWorld plotworld);
+
     /**
-     * Return a new instance of the PlotWorld for a world 
+     * Return a new instance of the PlotWorld for a world
      * @param world
      * @return
      */
@@ -80,12 +88,13 @@ public abstract class SpongePlotGenerator implements WorldGenerator {
      * @return
      */
     public abstract PlotManager getPlotManager();
-    
+
     /**
      * If you need to do anything fancy for /plot setup<br>
      *  - Otherwise it will just use the PlotWorld configuration<br>
      * Feel free to extend BukkitSetupUtils and customize world creation
      * @param object
      */
-    public void processSetup(SetupObject object) {}
+    public void processSetup(final SetupObject object)
+    {}
 }
diff --git a/src/main/java/com/plotsquared/sponge/generator/SpongePlotPopulator.java b/src/main/java/com/plotsquared/sponge/generator/SpongePlotPopulator.java
index 5a96248e0..fccdfb4ee 100644
--- a/src/main/java/com/plotsquared/sponge/generator/SpongePlotPopulator.java
+++ b/src/main/java/com/plotsquared/sponge/generator/SpongePlotPopulator.java
@@ -11,55 +11,59 @@ import com.intellectualcrafters.plot.object.PseudoRandom;
 import com.intellectualcrafters.plot.object.RegionWrapper;
 import com.intellectualcrafters.plot.util.ChunkManager;
 
-public abstract class SpongePlotPopulator<T extends SpongePlotGenerator> implements GeneratorPopulator {
+public abstract class SpongePlotPopulator<T extends SpongePlotGenerator> implements GeneratorPopulator
+{
 
     public int X;
     public int Z;
     public String worldname;
-    private World world;
-    private PseudoRandom random = new PseudoRandom();
+    private final PseudoRandom random = new PseudoRandom();
     private MutableBlockVolume buffer;
     public final T generator;
-    
-    public SpongePlotPopulator(T generator) {
+
+    public SpongePlotPopulator(final T generator)
+    {
         this.generator = generator;
     }
-    
-//    @Override
-//    public void populate(Chunk chunk, Random random) {
-//        this.world = chunk.getWorld();
-//        this.worldname = world.getName();
-//        Vector3i min = chunk.getBlockMin();
 
-//    }
-    
-    public void populate(World world, MutableBlockVolume buffer, ImmutableBiomeArea biomeBase) {
-        try {
-            this.world = world;
+    //    @Override
+    //    public void populate(Chunk chunk, Random random) {
+    //        this.world = chunk.getWorld();
+    //        this.worldname = world.getName();
+    //        Vector3i min = chunk.getBlockMin();
+
+    //    }
+
+    @Override
+    public void populate(final World world, final MutableBlockVolume buffer, final ImmutableBiomeArea biomeBase)
+    {
+        try
+        {
             this.worldname = world.getName();
             this.buffer = buffer;
-            Vector3i min = buffer.getBlockMin();
+            final Vector3i min = buffer.getBlockMin();
             this.X = min.getX();
             this.Z = min.getZ();
-            int cx = X >> 4;
-            int cz = Z >> 4;
+            final int cx = X >> 4;
+            final int cz = Z >> 4;
             int h = 1;
             final int prime = 13;
             h = (prime * h) + cx;
             h = (prime * h) + cz;
             this.random.state = h;
-            
+
             // TODO plot clearing stuff
-            
+
             populate(world, ChunkManager.CURRENT_PLOT_CLEAR, random, cx, cz);
         }
-        catch (Exception e) {
+        catch (final Exception e)
+        {
             e.printStackTrace();
         }
     };
-    
-    public abstract void populate(World world, RegionWrapper requiredRegion, PseudoRandom random, int cx, int cz);
-    
+
+    public abstract void populate(final World world, final RegionWrapper requiredRegion, final PseudoRandom random, final int cx, final int cz);
+
     /**
      * Set the id and data at a location. (x, y, z) must be between [0,15], [0,255], [0,15]
      * @param x
@@ -68,17 +72,20 @@ public abstract class SpongePlotPopulator<T extends SpongePlotGenerator> impleme
      * @param id
      * @param data
      */
-    public void setBlock(int x, int y, int z, BlockState state) {
+    public void setBlock(final int x, final int y, final int z, final BlockState state)
+    {
         buffer.setBlock(X + x, y, Z + z, state);
     }
-    
-    public void setBlock(int x, int y, int z, BlockState[] states) {
-        if (states.length == 1) {
-            setBlock(x,y,z,states[0]);
+
+    public void setBlock(final int x, final int y, final int z, final BlockState[] states)
+    {
+        if (states.length == 1)
+        {
+            setBlock(x, y, z, states[0]);
         }
-        setBlock(x,y,z,states[random.random(states.length)]);
+        setBlock(x, y, z, states[random.random(states.length)]);
     }
-    
+
     /**
      * check if a region contains a location. (x, z) must be between [0,15], [0,15]
      * @param plot
@@ -86,10 +93,11 @@ public abstract class SpongePlotPopulator<T extends SpongePlotGenerator> impleme
      * @param z
      * @return
      */
-    public boolean contains(final RegionWrapper plot, final int x, final int z) {
-        int xx = X + x;
-        int zz = Z + z;
+    public boolean contains(final RegionWrapper plot, final int x, final int z)
+    {
+        final int xx = X + x;
+        final int zz = Z + z;
         return ((xx >= plot.minX) && (xx <= plot.maxX) && (zz >= plot.minZ) && (zz <= plot.maxZ));
     }
-    
+
 }
diff --git a/src/main/java/com/plotsquared/sponge/generator/WorldModify.java b/src/main/java/com/plotsquared/sponge/generator/WorldModify.java
index 5975f0f51..0506613bc 100644
--- a/src/main/java/com/plotsquared/sponge/generator/WorldModify.java
+++ b/src/main/java/com/plotsquared/sponge/generator/WorldModify.java
@@ -9,45 +9,55 @@ import com.intellectualcrafters.plot.object.PlotCluster;
 import com.intellectualcrafters.plot.object.PlotWorld;
 import com.intellectualcrafters.plot.util.ClusterManager;
 
-public class WorldModify implements WorldGeneratorModifier {
+public class WorldModify implements WorldGeneratorModifier
+{
 
-    private SpongePlotGenerator plotgen;
-    private boolean augment;
+    private final SpongePlotGenerator plotgen;
+    private final boolean augment;
 
-    public WorldModify(SpongePlotGenerator plotgen, boolean augment) {
+    public WorldModify(final SpongePlotGenerator plotgen, final boolean augment)
+    {
         this.plotgen = plotgen;
         this.augment = augment;
     }
 
     @Override
-    public void modifyWorldGenerator(WorldCreationSettings world, DataContainer settings, WorldGenerator gen) {
-        if (augment) {
-            String worldname = plotgen.world;
-            PlotWorld plotworld = plotgen.getNewPlotWorld(worldname);
-            if (plotworld.TYPE == 2) {
-                for (PlotCluster cluster : ClusterManager.getClusters(worldname)) {
+    public void modifyWorldGenerator(final WorldCreationSettings world, final DataContainer settings, final WorldGenerator gen)
+    {
+        if (augment)
+        {
+            final String worldname = plotgen.world;
+            final PlotWorld plotworld = plotgen.getNewPlotWorld(worldname);
+            if (plotworld.TYPE == 2)
+            {
+                for (final PlotCluster cluster : ClusterManager.getClusters(worldname))
+                {
                     new AugmentedPopulator(worldname, gen, plotgen, cluster, plotworld.TERRAIN == 2, plotworld.TERRAIN != 2);
                 }
             }
-            else {
+            else
+            {
                 new AugmentedPopulator(worldname, gen, plotgen, null, plotworld.TERRAIN == 2, plotworld.TERRAIN != 2);
             }
         }
-        else {
+        else
+        {
             gen.getGeneratorPopulators().clear();
             gen.getPopulators().clear();
             gen.setBaseGeneratorPopulator(plotgen.getBaseGeneratorPopulator());
             gen.setBiomeGenerator(plotgen.getBiomeGenerator());
         }
     }
-    
+
     @Override
-    public String getName() {
+    public String getName()
+    {
         return "plotsquared";
     }
 
     @Override
-    public String getId() {
+    public String getId()
+    {
         return "plotsquared";
     }
 }
diff --git a/src/main/java/com/plotsquared/sponge/listener/MainListener.java b/src/main/java/com/plotsquared/sponge/listener/MainListener.java
index cf4a1a754..5498179f8 100644
--- a/src/main/java/com/plotsquared/sponge/listener/MainListener.java
+++ b/src/main/java/com/plotsquared/sponge/listener/MainListener.java
@@ -73,8 +73,9 @@ import com.plotsquared.sponge.SpongeMain;
 import com.plotsquared.sponge.object.SpongePlayer;
 import com.plotsquared.sponge.util.SpongeUtil;
 
-public class MainListener {
-    
+public class MainListener
+{
+
     /*
      * TODO:
      *  - Anything marked with a TODO below
@@ -97,103 +98,131 @@ public class MainListener {
      *  - VehicleDestroy
      *  - Projectile
      */
-    
+
     @Subscribe
-    public void onFluidSpread(FluidSpreadEvent event) {
+    public void onFluidSpread(final FluidSpreadEvent event)
+    {
         // TODO This event isn't called
-        Location loc = SpongeUtil.getLocation(event.getLocation());
+        final Location loc = SpongeUtil.getLocation(event.getLocation());
         final Plot plot = MainUtil.getPlot(loc);
-        if (plot == null) {
-            if (MainUtil.isPlotAreaAbs(loc)) {
+        if (plot == null)
+        {
+            if (MainUtil.isPlotAreaAbs(loc))
+            {
                 event.setCancelled(true);
             }
             return;
         }
-        event.filterLocations(new Predicate<org.spongepowered.api.world.Location<World>>() {
+        event.filterLocations(new Predicate<org.spongepowered.api.world.Location<World>>()
+        {
             @Override
-            public boolean apply(org.spongepowered.api.world.Location<World> loc) {
+            public boolean apply(final org.spongepowered.api.world.Location<World> loc)
+            {
                 if (!plot.equals(MainUtil.getPlot(SpongeUtil.getLocation(loc)))) {
-                    return false;
+                return false;
                 }
                 return true;
             }
         });
     }
-    
+
     @Subscribe
-    public void onMobSpawn(EntitySpawnEvent event) {
-        Entity entity = event.getEntity();
-        if (entity instanceof Player) {
-            return;
-        }
+    public void onMobSpawn(final EntitySpawnEvent event)
+    {
+        final Entity entity = event.getEntity();
+        if (entity instanceof Player) { return; }
         final Location loc = SpongeUtil.getLocation(event.getLocation());
         final String world = loc.getWorld();
-        PlotWorld plotworld = PS.get().getPlotWorld(world);
-        if (plotworld == null) {
-            return;
-        }
-        Plot plot = MainUtil.getPlot(loc);
-        if (plot == null) {
-            if (MainUtil.isPlotRoad(loc)) {
+        final PlotWorld plotworld = PS.get().getPlotWorld(world);
+        if (plotworld == null) { return; }
+        final Plot plot = MainUtil.getPlot(loc);
+        if (plot == null)
+        {
+            if (MainUtil.isPlotRoad(loc))
+            {
                 event.setCancelled(true);
             }
             return;
         }
-        final PlotWorld pW = PS.get().getPlotWorld(world);
+        PS.get().getPlotWorld(world);
 
         // TODO selectively cancel depending on spawn reason
         // - Not sure if possible to get spawn reason (since there are no callbacks)
-        
-        if (entity.getType() == EntityTypes.DROPPED_ITEM) {
-            if (FlagManager.isPlotFlagFalse(plot, "item-drop")) {
+
+        if (entity.getType() == EntityTypes.DROPPED_ITEM)
+        {
+            if (FlagManager.isPlotFlagFalse(plot, "item-drop"))
+            {
                 event.setCancelled(true);
             }
             return;
         }
         int[] mobs = null;
-        if (entity instanceof Living) {
-            if (!plotworld.MOB_SPAWNING) {
+        if (entity instanceof Living)
+        {
+            if (!plotworld.MOB_SPAWNING)
+            {
                 event.setCancelled(true);
                 return;
             }
-            Flag mobCap = FlagManager.getPlotFlag(plot, "mob-cap");
-            if (mobCap != null) {
-                Integer cap = (Integer) mobCap.getValue();
-                if (cap == 0) {
+            final Flag mobCap = FlagManager.getPlotFlag(plot, "mob-cap");
+            if (mobCap != null)
+            {
+                final Integer cap = (Integer) mobCap.getValue();
+                if (cap == 0)
+                {
                     event.setCancelled(true);
                     return;
                 }
-                if (mobs == null) mobs = ChunkManager.manager.countEntities(plot);
-                if (mobs[3] >= cap) {
+                if (mobs == null)
+                {
+                    mobs = ChunkManager.manager.countEntities(plot);
+                }
+                if (mobs[3] >= cap)
+                {
                     event.setCancelled(true);
                     return;
                 }
             }
-            if (entity instanceof Ambient || entity instanceof Animal) {
-                Flag animalFlag = FlagManager.getPlotFlag(plot, "animal-cap");
-                if (animalFlag != null) {
-                    int cap = ((Integer) animalFlag.getValue());
-                    if (cap == 0) {
+            if ((entity instanceof Ambient) || (entity instanceof Animal))
+            {
+                final Flag animalFlag = FlagManager.getPlotFlag(plot, "animal-cap");
+                if (animalFlag != null)
+                {
+                    final int cap = ((Integer) animalFlag.getValue());
+                    if (cap == 0)
+                    {
                         event.setCancelled(true);
                         return;
                     }
-                    if (mobs == null) mobs = ChunkManager.manager.countEntities(plot);
-                    if (mobs[1] >= cap) {
+                    if (mobs == null)
+                    {
+                        mobs = ChunkManager.manager.countEntities(plot);
+                    }
+                    if (mobs[1] >= cap)
+                    {
                         event.setCancelled(true);
                         return;
                     }
                 }
             }
-            if (entity instanceof Monster) {
-                Flag monsterFlag = FlagManager.getPlotFlag(plot, "hostile-cap");
-                if (monsterFlag != null) {
-                    int cap = ((Integer) monsterFlag.getValue());
-                    if (cap == 0) {
+            if (entity instanceof Monster)
+            {
+                final Flag monsterFlag = FlagManager.getPlotFlag(plot, "hostile-cap");
+                if (monsterFlag != null)
+                {
+                    final int cap = ((Integer) monsterFlag.getValue());
+                    if (cap == 0)
+                    {
                         event.setCancelled(true);
                         return;
                     }
-                    if (mobs == null) mobs = ChunkManager.manager.countEntities(plot);
-                    if (mobs[2] >= cap) {
+                    if (mobs == null)
+                    {
+                        mobs = ChunkManager.manager.countEntities(plot);
+                    }
+                    if (mobs[2] >= cap)
+                    {
                         event.setCancelled(true);
                         return;
                     }
@@ -201,56 +230,75 @@ public class MainListener {
             }
             return;
         }
-        if (entity instanceof Minecart || entity instanceof Boat) {
-            Flag vehicleFlag = FlagManager.getPlotFlag(plot, "vehicle-cap");
-            if (vehicleFlag != null) {
-                int cap = ((Integer) vehicleFlag.getValue());
-                if (cap == 0) {
+        if ((entity instanceof Minecart) || (entity instanceof Boat))
+        {
+            final Flag vehicleFlag = FlagManager.getPlotFlag(plot, "vehicle-cap");
+            if (vehicleFlag != null)
+            {
+                final int cap = ((Integer) vehicleFlag.getValue());
+                if (cap == 0)
+                {
                     event.setCancelled(true);
                     return;
                 }
-                if (mobs == null) mobs = ChunkManager.manager.countEntities(plot);
-                if (mobs[4] >= cap) {
+                if (mobs == null)
+                {
+                    mobs = ChunkManager.manager.countEntities(plot);
+                }
+                if (mobs[4] >= cap)
+                {
                     event.setCancelled(true);
                     return;
                 }
             }
         }
-        Flag entityCap = FlagManager.getPlotFlag(plot, "entity-cap");
-        if (entityCap != null) {
-            Integer cap = (Integer) entityCap.getValue();
-            if (cap == 0) {
+        final Flag entityCap = FlagManager.getPlotFlag(plot, "entity-cap");
+        if (entityCap != null)
+        {
+            final Integer cap = (Integer) entityCap.getValue();
+            if (cap == 0)
+            {
                 event.setCancelled(true);
                 return;
             }
-            if (mobs == null) mobs = ChunkManager.manager.countEntities(plot);
-            if (mobs[0] >= cap) {
+            if (mobs == null)
+            {
+                mobs = ChunkManager.manager.countEntities(plot);
+            }
+            if (mobs[0] >= cap)
+            {
                 event.setCancelled(true);
                 return;
             }
         }
-        
+
     }
-    
+
     @Subscribe
-    public void onBlockChange(EntityChangeBlockEvent event) {
-        Entity entity =  event.getEntity();
-        if (entity.getType() == EntityTypes.PLAYER) {
-            return;
-        }
-        if (PS.get().isPlotWorld(entity.getWorld().getName())) {
+    public void onBlockChange(final EntityChangeBlockEvent event)
+    {
+        final Entity entity = event.getEntity();
+        if (entity.getType() == EntityTypes.PLAYER) { return; }
+        if (PS.get().isPlotWorld(entity.getWorld().getName()))
+        {
             event.setCancelled(true);
         }
     }
-    
+
     @Subscribe
-    public void onCommand(CommandEvent event) {
-        switch (event.getCommand().toLowerCase()) {
-            case "plotme": {
-                CommandSource source = event.getSource();
-                if (Settings.USE_PLOTME_ALIAS) {
+    public void onCommand(final CommandEvent event)
+    {
+        switch (event.getCommand().toLowerCase())
+        {
+            case "plotme":
+            {
+                final CommandSource source = event.getSource();
+                if (Settings.USE_PLOTME_ALIAS)
+                {
                     SpongeMain.THIS.getGame().getCommandDispatcher().process(source, ("plots " + event.getArguments()).trim());
-                } else {
+                }
+                else
+                {
                     source.sendMessage(SpongeMain.THIS.getText(C.NOT_USING_PLOTME.s()));
                 }
                 event.setCancelled(true);
@@ -258,92 +306,97 @@ public class MainListener {
         }
         // TODO
     }
-    
+
     @Subscribe
-    public void onBlockMove(BlockMoveEvent event) {
-        org.spongepowered.api.world.Location block = event.getLocations().get(0);
-        Extent extent = block.getExtent();
-        if (extent instanceof World) {
-            World world = (World) extent;
+    public void onBlockMove(final BlockMoveEvent event)
+    {
+        final org.spongepowered.api.world.Location block = event.getLocations().get(0);
+        final Extent extent = block.getExtent();
+        if (extent instanceof World)
+        {
+            final World world = (World) extent;
             final String worldname = world.getName();
-            if (!PS.get().isPlotWorld(worldname)) {
-                return;
-            }
-            event.filterLocations(new Predicate<org.spongepowered.api.world.Location<World>>() {
+            if (!PS.get().isPlotWorld(worldname)) { return; }
+            event.filterLocations(new Predicate<org.spongepowered.api.world.Location<World>>()
+            {
                 @Override
-                public boolean apply(org.spongepowered.api.world.Location loc) {
+                public boolean apply(final org.spongepowered.api.world.Location loc)
+                {
                     if (MainUtil.isPlotRoad(SpongeUtil.getLocation(worldname, loc))) {
-                        return false;
+                    return false;
                     }
                     return true;
                 }
             });
         }
     }
-    
+
     @Subscribe
-    public void onFloraGrow(FloraGrowEvent event) {
-        org.spongepowered.api.world.Location block = event.getLocation();
-        Extent extent = block.getExtent();
-        if (extent instanceof World) {
-            World world = (World) extent;
+    public void onFloraGrow(final FloraGrowEvent event)
+    {
+        final org.spongepowered.api.world.Location block = event.getLocation();
+        final Extent extent = block.getExtent();
+        if (extent instanceof World)
+        {
+            final World world = (World) extent;
             final String worldname = world.getName();
-            if (!PS.get().isPlotWorld(worldname)) {
-                return;
-            }
-            if (MainUtil.isPlotRoad(SpongeUtil.getLocation(worldname, block))) {
+            if (!PS.get().isPlotWorld(worldname)) { return; }
+            if (MainUtil.isPlotRoad(SpongeUtil.getLocation(worldname, block)))
+            {
                 event.setCancelled(true);
             }
         }
     }
-    
+
     @Subscribe
-    public void onChat(PlayerChatEvent event) {
+    public void onChat(final PlayerChatEvent event)
+    {
         final Player player = event.getEntity();
         final String world = player.getWorld().getName();
-        if (!PS.get().isPlotWorld(world)) {
-            return;
-        }
+        if (!PS.get().isPlotWorld(world)) { return; }
         final PlotWorld plotworld = PS.get().getPlotWorld(world);
         final PlotPlayer plr = SpongeUtil.getPlayer(player);
-        if (!plotworld.PLOT_CHAT && (plr.getMeta("chat") == null || !(Boolean) plr.getMeta("chat"))) {
-            return;
-        }
+        if (!plotworld.PLOT_CHAT && ((plr.getMeta("chat") == null) || !(Boolean) plr.getMeta("chat"))) { return; }
         final Location loc = SpongeUtil.getLocation(player);
         final Plot plot = MainUtil.getPlot(loc);
-        if (plot == null) {
-            return;
-        }
-        Text message = event.getUnformattedMessage();
-        
+        if (plot == null) { return; }
+        final Text message = event.getUnformattedMessage();
+
         // TODO use display name rather than username
         //  - Getting displayname currently causes NPE, so wait until sponge fixes that
-        
-        String sender = player.getName();
-        PlotId id = plot.id;
-        String newMessage = StringMan.replaceAll(C.PLOT_CHAT_FORMAT.s(), "%plot_id%", id.x + ";" + id.y, "%sender%", sender);
-        Text forcedMessage = event.getMessage();
-//        String forcedMessage = StringMan.replaceAll(C.PLOT_CHAT_FORCED.s(), "%plot_id%", id.x + ";" + id.y, "%sender%", sender);
-        for (PlotPlayer user : UUIDHandler.getPlayers().values()) {
+
+        final String sender = player.getName();
+        final PlotId id = plot.id;
+        final String newMessage = StringMan.replaceAll(C.PLOT_CHAT_FORMAT.s(), "%plot_id%", id.x + ";" + id.y, "%sender%", sender);
+        final Text forcedMessage = event.getMessage();
+        //        String forcedMessage = StringMan.replaceAll(C.PLOT_CHAT_FORCED.s(), "%plot_id%", id.x + ";" + id.y, "%sender%", sender);
+        for (final PlotPlayer user : UUIDHandler.getPlayers().values())
+        {
             String toSend;
-            if (plot.equals(MainUtil.getPlot(user.getLocation()))) {
+            if (plot.equals(MainUtil.getPlot(user.getLocation())))
+            {
                 toSend = newMessage;
             }
-            else if (Permissions.hasPermission(user, C.PERMISSION_COMMANDS_CHAT)) {
+            else if (Permissions.hasPermission(user, C.PERMISSION_COMMANDS_CHAT))
+            {
                 ((SpongePlayer) user).player.sendMessage(forcedMessage);
                 continue;
             }
-            else {
+            else
+            {
                 continue;
             }
-            String[] split = (toSend + " ").split("%msg%");
-            List<Text> components = new ArrayList<>();
+            final String[] split = (toSend + " ").split("%msg%");
+            final List<Text> components = new ArrayList<>();
             Text prefix = null;
-            for (String part : split) {
-                if (prefix != null) {
+            for (final String part : split)
+            {
+                if (prefix != null)
+                {
                     components.add(prefix);
                 }
-                else {
+                else
+                {
                     prefix = message;
                 }
                 components.add(Texts.of(part));
@@ -353,34 +406,39 @@ public class MainListener {
         event.setNewMessage(Texts.of());
         event.setCancelled(true);
     }
-    
+
     @Subscribe
-    public void onBigBoom(final WorldOnExplosionEvent event) {
-        World worldObj = event.getWorld();
+    public void onBigBoom(final WorldOnExplosionEvent event)
+    {
+        final World worldObj = event.getWorld();
         final String world = worldObj.getName();
-        if (!PS.get().isPlotWorld(world)) {
-            return;
-        }
-        Explosion explosion = event.getExplosion();
-        Vector3d origin = explosion.getOrigin();
-        Location loc = new Location(world, origin.getFloorX(), origin.getFloorY(), origin.getFloorZ());
+        if (!PS.get().isPlotWorld(world)) { return; }
+        final Explosion explosion = event.getExplosion();
+        final Vector3d origin = explosion.getOrigin();
+        final Location loc = new Location(world, origin.getFloorX(), origin.getFloorY(), origin.getFloorZ());
         final Plot plot = MainUtil.getPlot(loc);
-        if ((plot != null) && plot.hasOwner()) {
-            if (FlagManager.isPlotFlagTrue(plot, "explosion")) {
-                event.filterLocations(new Predicate<org.spongepowered.api.world.Location<World>>() {
+        if ((plot != null) && plot.hasOwner())
+        {
+            if (FlagManager.isPlotFlagTrue(plot, "explosion"))
+            {
+                event.filterLocations(new Predicate<org.spongepowered.api.world.Location<World>>()
+                {
                     @Override
-                    public boolean apply(org.spongepowered.api.world.Location loc) {
+                    public boolean apply(final org.spongepowered.api.world.Location loc)
+                    {
                         if (!plot.equals(MainUtil.getPlot(SpongeUtil.getLocation(loc)))) {
-                            return false;
+                        return false;
                         }
                         return true;
                     }
                 });
-                event.filterEntities(new Predicate<Entity>() {
+                event.filterEntities(new Predicate<Entity>()
+                {
                     @Override
-                    public boolean apply(Entity entity) {
+                    public boolean apply(final Entity entity)
+                    {
                         if (!plot.equals(MainUtil.getPlot(SpongeUtil.getLocation(entity)))) {
-                            return false;
+                        return false;
                         }
                         return true;
                     }
@@ -388,36 +446,46 @@ public class MainListener {
                 return;
             }
         }
-        if (MainUtil.isPlotArea(loc)) {
+        if (MainUtil.isPlotArea(loc))
+        {
             explosion.shouldBreakBlocks(false);
             explosion.canCauseFire(false);
             explosion.setRadius(0);
-            event.filterEntities(new Predicate<Entity>() {
+            event.filterEntities(new Predicate<Entity>()
+            {
                 @Override
-                public boolean apply(Entity entity) {
+                public boolean apply(final Entity entity)
+                {
                     if (!plot.equals(MainUtil.getPlot(SpongeUtil.getLocation(entity)))) {
-                        return false;
+                    return false;
                     }
                     return true;
                 }
             });
             return;
-        } else {
-            if (FlagManager.isPlotFlagTrue(plot, "explosion")) {
-                event.filterLocations(new Predicate<org.spongepowered.api.world.Location<World>>() {
+        }
+        else
+        {
+            if (FlagManager.isPlotFlagTrue(plot, "explosion"))
+            {
+                event.filterLocations(new Predicate<org.spongepowered.api.world.Location<World>>()
+                {
                     @Override
-                    public boolean apply(org.spongepowered.api.world.Location loc) {
+                    public boolean apply(final org.spongepowered.api.world.Location loc)
+                    {
                         if (!plot.equals(MainUtil.getPlot(SpongeUtil.getLocation(loc)))) {
-                            return false;
+                        return false;
                         }
                         return true;
                     }
                 });
-                event.filterEntities(new Predicate<Entity>() {
+                event.filterEntities(new Predicate<Entity>()
+                {
                     @Override
-                    public boolean apply(Entity entity) {
+                    public boolean apply(final Entity entity)
+                    {
                         if (!plot.equals(MainUtil.getPlot(SpongeUtil.getLocation(entity)))) {
-                            return false;
+                        return false;
                         }
                         return true;
                     }
@@ -426,97 +494,101 @@ public class MainListener {
             }
         }
     }
-    
+
     @Subscribe
-    public void onChunkPreGenerator(ChunkPreGenerateEvent event) {
-        org.spongepowered.api.world.Chunk chunk = event.getChunk();
-        World world = chunk.getWorld();
+    public void onChunkPreGenerator(final ChunkPreGenerateEvent event)
+    {
+        final org.spongepowered.api.world.Chunk chunk = event.getChunk();
+        final World world = chunk.getWorld();
         final String worldname = world.getName();
-        if (MainUtil.worldBorder.containsKey(worldname)) {
+        if (MainUtil.worldBorder.containsKey(worldname))
+        {
             final int border = MainUtil.getBorder(worldname);
-            Vector3i min = world.getBlockMin();
+            final Vector3i min = world.getBlockMin();
             final int x = Math.abs(min.getX());
             final int z = Math.abs(min.getZ());
-            if ((x > border) || (z > border)) {
+            if ((x > border) || (z > border))
+            {
                 // TODO cancel this chunk from loading
                 // - Currently not possible / this event doesn't seem to be called
             }
         }
     }
-    
-    
+
     @Subscribe
-    public void onRedstoneEvent(BlockRedstoneUpdateEvent event) {
-        org.spongepowered.api.world.Location block = event.getLocation();
-        Location loc = SpongeUtil.getLocation(block);
-        if (loc == null || !PS.get().isPlotWorld(loc.getWorld())) {
-            return;
-        }
-        Plot plot = MainUtil.getPlot(loc);
-        if (plot == null || !plot.hasOwner()) {
-            return;
-        }
-        if (event.getOldSignalStrength() > event.getNewSignalStrength()) {
-            return;
-        }
-        if (Settings.REDSTONE_DISABLER) {
-            if (UUIDHandler.getPlayer(plot.owner) == null) {
+    public void onRedstoneEvent(final BlockRedstoneUpdateEvent event)
+    {
+        final org.spongepowered.api.world.Location block = event.getLocation();
+        final Location loc = SpongeUtil.getLocation(block);
+        if ((loc == null) || !PS.get().isPlotWorld(loc.getWorld())) { return; }
+        final Plot plot = MainUtil.getPlot(loc);
+        if ((plot == null) || !plot.hasOwner()) { return; }
+        if (event.getOldSignalStrength() > event.getNewSignalStrength()) { return; }
+        if (Settings.REDSTONE_DISABLER)
+        {
+            if (UUIDHandler.getPlayer(plot.owner) == null)
+            {
                 boolean disable = true;
-                for (UUID trusted : plot.getTrusted()) {
-                    if (UUIDHandler.getPlayer(trusted) != null) {
+                for (final UUID trusted : plot.getTrusted())
+                {
+                    if (UUIDHandler.getPlayer(trusted) != null)
+                    {
                         disable = false;
                         break;
                     }
                 }
-                if (disable) {
+                if (disable)
+                {
                     event.setNewSignalStrength(0);
                     return;
                 }
             }
         }
-        Flag redstone = FlagManager.getPlotFlag(plot, "redstone");
-        if (FlagManager.isPlotFlagFalse(plot, "redstone")) {
+        FlagManager.getPlotFlag(plot, "redstone");
+        if (FlagManager.isPlotFlagFalse(plot, "redstone"))
+        {
             event.setNewSignalStrength(0);
             // TODO only disable clocks
         }
     }
-    
+
     @Subscribe
-    public void onBlockBreak(PlayerBreakBlockEvent event) {
-        Player player = event.getEntity();
-        World world = player.getWorld();
-        String worldname = world.getName();
-        org.spongepowered.api.world.Location blockLoc = event.getLocation();
+    public void onBlockBreak(final PlayerBreakBlockEvent event)
+    {
+        final Player player = event.getEntity();
+        final World world = player.getWorld();
+        final String worldname = world.getName();
+        final org.spongepowered.api.world.Location blockLoc = event.getLocation();
         final Location loc = SpongeUtil.getLocation(worldname, blockLoc);
         final Plot plot = MainUtil.getPlot(loc);
-        if (plot != null) {
-            if (blockLoc.getY() == 0) {
+        if (plot != null)
+        {
+            if (blockLoc.getY() == 0)
+            {
                 event.setCancelled(true);
                 return;
             }
             final PlotPlayer pp = SpongeUtil.getPlayer(player);
-            if (!plot.hasOwner()) {
-                if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_DESTROY_UNOWNED)) {
-                    return;
-                }
+            if (!plot.hasOwner())
+            {
+                if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_DESTROY_UNOWNED)) { return; }
                 MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_DESTROY_UNOWNED);
                 event.setCancelled(true);
                 return;
             }
-            else if (!plot.isAdded(pp.getUUID())) {
+            else if (!plot.isAdded(pp.getUUID()))
+            {
                 final Flag destroy = FlagManager.getPlotFlag(plot, "break");
-                BlockState state = blockLoc.getBlock();
-                if ((destroy != null) && ((HashSet<PlotBlock>) destroy.getValue()).contains(SpongeMain.THIS.getPlotBlock(state))) {
-                    return;
-                }
-                if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_DESTROY_OTHER)) {
-                    return;
-                }
+                final BlockState state = blockLoc.getBlock();
+                if ((destroy != null) && ((HashSet<PlotBlock>) destroy.getValue()).contains(SpongeMain.THIS.getPlotBlock(state))) { return; }
+                if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_DESTROY_OTHER)) { return; }
                 MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_DESTROY_OTHER);
                 event.setCancelled(true);
             }
-            else if (Settings.DONE_RESTRICTS_BUILDING && plot.getSettings().flags.containsKey("done")) {
-                if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_OTHER)) {
+            else if (Settings.DONE_RESTRICTS_BUILDING && plot.getSettings().flags.containsKey("done"))
+            {
+                if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_OTHER))
+                {
                     MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_OTHER);
                     event.setCancelled(true);
                     return;
@@ -525,51 +597,51 @@ public class MainListener {
             return;
         }
         final PlotPlayer pp = SpongeUtil.getPlayer(player);
-        if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_DESTROY_ROAD)) {
-            return;
-        }
-        if (MainUtil.isPlotArea(loc)) {
+        if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_DESTROY_ROAD)) { return; }
+        if (MainUtil.isPlotArea(loc))
+        {
             MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_DESTROY_ROAD);
             event.setCancelled(true);
         }
     }
-    
+
     @Subscribe
-    public void onBlockPlace(PlayerPlaceBlockEvent event) {
-        Player player = event.getEntity();
-        World world = player.getWorld();
-        String worldname = world.getName();
-        org.spongepowered.api.world.Location blockLoc = event.getLocation();
+    public void onBlockPlace(final PlayerPlaceBlockEvent event)
+    {
+        final Player player = event.getEntity();
+        final World world = player.getWorld();
+        final String worldname = world.getName();
+        final org.spongepowered.api.world.Location blockLoc = event.getLocation();
         final Location loc = SpongeUtil.getLocation(worldname, blockLoc);
         final Plot plot = MainUtil.getPlot(loc);
-        if (plot != null) {
-            if (blockLoc.getY() == 0) {
+        if (plot != null)
+        {
+            if (blockLoc.getY() == 0)
+            {
                 event.setCancelled(true);
                 return;
             }
             final PlotPlayer pp = SpongeUtil.getPlayer(player);
-            if (!plot.hasOwner()) {
-                if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_UNOWNED)) {
-                    return;
-                }
+            if (!plot.hasOwner())
+            {
+                if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_UNOWNED)) { return; }
                 MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_UNOWNED);
                 event.setCancelled(true);
                 return;
             }
-            else if (!plot.isAdded(pp.getUUID())) {
+            else if (!plot.isAdded(pp.getUUID()))
+            {
                 final Flag destroy = FlagManager.getPlotFlag(plot, "place");
-                BlockState state = blockLoc.getBlock();
-                if ((destroy != null) && ((HashSet<PlotBlock>) destroy.getValue()).contains(SpongeMain.THIS.getPlotBlock(state))) {
-                    return;
-                }
-                if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_OTHER)) {
-                    return;
-                }
+                final BlockState state = blockLoc.getBlock();
+                if ((destroy != null) && ((HashSet<PlotBlock>) destroy.getValue()).contains(SpongeMain.THIS.getPlotBlock(state))) { return; }
+                if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_OTHER)) { return; }
                 MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_DESTROY_OTHER);
                 event.setCancelled(true);
             }
-            else if (Settings.DONE_RESTRICTS_BUILDING && plot.getSettings().flags.containsKey("done")) {
-                if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_OTHER)) {
+            else if (Settings.DONE_RESTRICTS_BUILDING && plot.getSettings().flags.containsKey("done"))
+            {
+                if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_OTHER))
+                {
                     MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_OTHER);
                     event.setCancelled(true);
                     return;
@@ -578,76 +650,76 @@ public class MainListener {
             return;
         }
         final PlotPlayer pp = SpongeUtil.getPlayer(player);
-        if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_ROAD)) {
-            return;
-        }
-        if (MainUtil.isPlotArea(loc)) {
+        if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_ROAD)) { return; }
+        if (MainUtil.isPlotArea(loc))
+        {
             MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_ROAD);
             event.setCancelled(true);
         }
     }
-    
+
     @Subscribe
-    public void onBlockInteract(PlayerInteractBlockEvent event) {
-        Player player = event.getEntity();
-        World world = player.getWorld();
-        String worldname = world.getName();
-        org.spongepowered.api.world.Location blockLoc = event.getLocation();
+    public void onBlockInteract(final PlayerInteractBlockEvent event)
+    {
+        final Player player = event.getEntity();
+        final World world = player.getWorld();
+        final String worldname = world.getName();
+        final org.spongepowered.api.world.Location blockLoc = event.getLocation();
         final Location loc = SpongeUtil.getLocation(worldname, blockLoc);
         final Plot plot = MainUtil.getPlot(loc);
-        if (plot != null) {
-            if (blockLoc.getY() == 0) {
+        if (plot != null)
+        {
+            if (blockLoc.getY() == 0)
+            {
                 event.setCancelled(true);
                 return;
             }
-            if (!plot.hasOwner()) {
+            if (!plot.hasOwner())
+            {
                 final PlotPlayer pp = SpongeUtil.getPlayer(player);
-                if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_UNOWNED)) {
-                    return;
-                }
+                if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_UNOWNED)) { return; }
                 MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_INTERACT_UNOWNED);
                 event.setCancelled(true);
                 return;
             }
             final PlotPlayer pp = SpongeUtil.getPlayer(player);
-            if (!plot.isAdded(pp.getUUID())) {
+            if (!plot.isAdded(pp.getUUID()))
+            {
                 final Flag destroy = FlagManager.getPlotFlag(plot, "use");
-                BlockState state = blockLoc.getBlock();
-                if ((destroy != null) && ((HashSet<PlotBlock>) destroy.getValue()).contains(SpongeMain.THIS.getPlotBlock(state))) {
-                    return;
-                }
-                if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_OTHER)) {
-                    return;
-                }
+                final BlockState state = blockLoc.getBlock();
+                if ((destroy != null) && ((HashSet<PlotBlock>) destroy.getValue()).contains(SpongeMain.THIS.getPlotBlock(state))) { return; }
+                if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_OTHER)) { return; }
                 MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_INTERACT_OTHER);
                 event.setCancelled(true);
             }
             return;
         }
         final PlotPlayer pp = SpongeUtil.getPlayer(player);
-        if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_ROAD)) {
-            return;
-        }
-        if (MainUtil.isPlotArea(loc)) {
+        if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_ROAD)) { return; }
+        if (MainUtil.isPlotArea(loc))
+        {
             MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_INTERACT_ROAD);
             event.setCancelled(true);
         }
     }
-    
+
     @Subscribe
-    public void onConnect(PlayerConnectionEvent event) {
-        PlayerConnection connection = event.getConnection();
-        Player player = connection.getPlayer();
-        String name = player.getName();
-        PlotPlayer pp = SpongeUtil.getPlayer(player);
-        if (name.equals("PlotSquared") || pp.getUUID().equals(DBFunc.everyone)) {
+    public void onConnect(final PlayerConnectionEvent event)
+    {
+        final PlayerConnection connection = event.getConnection();
+        final Player player = connection.getPlayer();
+        final String name = player.getName();
+        final PlotPlayer pp = SpongeUtil.getPlayer(player);
+        if (name.equals("PlotSquared") || pp.getUUID().equals(DBFunc.everyone))
+        {
             player.kick();
             SpongeUtil.removePlayer(pp.getName());
         }
     }
-    
+
     @Subscribe
-    public void onJoin(PlayerJoinEvent event) {
+    public void onJoin(final PlayerJoinEvent event)
+    {
         final Player player = event.getUser();
         SpongeUtil.removePlayer(player.getName());
         final PlotPlayer pp = SpongeUtil.getPlayer(player);
@@ -656,110 +728,125 @@ public class MainListener {
         final UUID uuid = pp.getUUID();
         UUIDHandler.add(name, uuid);
         ExpireManager.dates.put(uuid, System.currentTimeMillis());
-        
+
         // TODO worldedit bypass
-        
-        if (PS.get().update != null && pp.hasPermission("plots.admin")) {
-            TaskManager.runTaskLater(new Runnable() {
+
+        if ((PS.get().update != null) && pp.hasPermission("plots.admin"))
+        {
+            TaskManager.runTaskLater(new Runnable()
+            {
                 @Override
-                public void run() {
+                public void run()
+                {
                     MainUtil.sendMessage(pp, "&6An update for PlotSquared is available: &7/plot update");
                 }
             }, 20);
         }
         final Location loc = SpongeUtil.getLocation(player);
         final Plot plot = MainUtil.getPlot(loc);
-        if (plot == null) {
-            return;
-        }
-        if (Settings.TELEPORT_ON_LOGIN) {
+        if (plot == null) { return; }
+        if (Settings.TELEPORT_ON_LOGIN)
+        {
             MainUtil.teleportPlayer(pp, pp.getLocation(), plot);
             MainUtil.sendMessage(pp, C.TELEPORTED_TO_ROAD);
         }
         PlotListener.plotEntry(pp, plot);
     }
-    
+
     @Subscribe
-    public void onQuit(PlayerQuitEvent event) {
-        Player player = event.getEntity();
-        PlotPlayer pp = SpongeUtil.getPlayer(player);
+    public void onQuit(final PlayerQuitEvent event)
+    {
+        final Player player = event.getEntity();
+        final PlotPlayer pp = SpongeUtil.getPlayer(player);
         ExpireManager.dates.put(pp.getUUID(), System.currentTimeMillis());
         EventUtil.unregisterPlayer(pp);
-        
+
         // TODO unregister WorldEdit manager
         // TODO delete plots on ban
-        
+
         SpongeUtil.removePlayer(pp.getName());
     }
-    
-    public int getInt(double value) {
+
+    public int getInt(final double value)
+    {
         return (int) (value < 0 ? value - 1 : value);
     }
-    
+
     @Subscribe
-    public void onMove(PlayerMoveEvent event) {
-        org.spongepowered.api.world.Location from = event.getOldLocation();
+    public void onMove(final PlayerMoveEvent event)
+    {
+        final org.spongepowered.api.world.Location from = event.getOldLocation();
         org.spongepowered.api.world.Location to = event.getNewLocation();
         int x2;
-        if (getInt(from.getX()) != (x2 = getInt(to.getX()))) {
-            Player player = event.getUser();
-            PlotPlayer pp = SpongeUtil.getPlayer(player);
-            Extent extent = to.getExtent();
-            if (!(extent instanceof World)) {
+        if (getInt(from.getX()) != (x2 = getInt(to.getX())))
+        {
+            final Player player = event.getUser();
+            final PlotPlayer pp = SpongeUtil.getPlayer(player);
+            final Extent extent = to.getExtent();
+            if (!(extent instanceof World))
+            {
                 pp.deleteMeta("location");
                 return;
             }
             pp.setMeta("location", SpongeUtil.getLocation(player));
-            World world = (World) extent;
-            String worldname = ((World) extent).getName();
-            PlotWorld plotworld = PS.get().getPlotWorld(worldname);
-            if (plotworld == null) {
+            final World world = (World) extent;
+            final String worldname = ((World) extent).getName();
+            final PlotWorld plotworld = PS.get().getPlotWorld(worldname);
+            if (plotworld == null) { return; }
+            final PlotManager plotManager = PS.get().getPlotManager(worldname);
+            final PlotId id = plotManager.getPlotId(plotworld, x2, 0, getInt(to.getZ()));
+            final Plot lastPlot = (Plot) pp.getMeta("lastplot");
+            if (id == null)
+            {
+                if (lastPlot == null) { return; }
+                if (!PlotListener.plotExit(pp, lastPlot))
+                {
+                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_EXIT_DENIED);
+                    if (lastPlot.equals(MainUtil.getPlot(SpongeUtil.getLocation(worldname, from))))
+                    {
+                        event.setNewLocation(from);
+                    }
+                    else
+                    {
+                        event.setNewLocation(world.getSpawnLocation());
+                    }
+                    return;
+                }
+            }
+            else if ((lastPlot != null) && id.equals(lastPlot.id))
+            {
                 return;
             }
-            PlotManager plotManager = PS.get().getPlotManager(worldname);
-            PlotId id = plotManager.getPlotId(plotworld, x2, 0, getInt(to.getZ()));
-            Plot lastPlot = (Plot) pp.getMeta("lastplot");
-            if (id == null) {
-                if (lastPlot == null) {
-                    return;
-                }
-                if (!PlotListener.plotExit(pp, lastPlot)) {
-                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_EXIT_DENIED);
-                    if (lastPlot.equals(MainUtil.getPlot(SpongeUtil.getLocation(worldname, from)))) {
-                        event.setNewLocation(from);
-                    }
-                    else {
-                        event.setNewLocation(world.getSpawnLocation());
-                    }
-                    return;
-                }
-            }
-            else if (lastPlot != null && id.equals(lastPlot.id)) {
-                    return;
-            }
-            else {
-                Plot plot = MainUtil.getPlot(worldname, id);
-                if (!PlotListener.plotEntry(pp, plot)) {
+            else
+            {
+                final Plot plot = MainUtil.getPlot(worldname, id);
+                if (!PlotListener.plotEntry(pp, plot))
+                {
                     MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_ENTRY_DENIED);
-                    if (!plot.equals(MainUtil.getPlot(SpongeUtil.getLocation(worldname, from)))) {
+                    if (!plot.equals(MainUtil.getPlot(SpongeUtil.getLocation(worldname, from))))
+                    {
                         event.setNewLocation(from);
                     }
-                    else {
+                    else
+                    {
                         event.setNewLocation(world.getSpawnLocation());
                     }
                     return;
                 }
             }
-            Integer border = MainUtil.worldBorder.get(worldname);
-            if (border != null) {
-                if (x2 > border) {
-                    Vector3d pos = to.getPosition();
+            final Integer border = MainUtil.worldBorder.get(worldname);
+            if (border != null)
+            {
+                if (x2 > border)
+                {
+                    final Vector3d pos = to.getPosition();
                     to = to.setPosition(new Vector3d(border - 4, pos.getY(), pos.getZ()));
                     event.setNewLocation(to);
                     MainUtil.sendMessage(pp, C.BORDER);
                 }
-                else if (x2 < -border) {
-                    Vector3d pos = to.getPosition();
+                else if (x2 < -border)
+                {
+                    final Vector3d pos = to.getPosition();
                     to = to.setPosition(new Vector3d(-border + 4, pos.getY(), pos.getZ()));
                     event.setNewLocation(to);
                     MainUtil.sendMessage(pp, C.BORDER);
@@ -768,65 +855,75 @@ public class MainListener {
             return;
         }
         int z2;
-        if (getInt(from.getZ()) != (z2 = getInt(to.getZ())) ) {
-            Player player = event.getUser();
-            PlotPlayer pp = SpongeUtil.getPlayer(player);
-            Extent extent = to.getExtent();
-            if (!(extent instanceof World)) {
+        if (getInt(from.getZ()) != (z2 = getInt(to.getZ())))
+        {
+            final Player player = event.getUser();
+            final PlotPlayer pp = SpongeUtil.getPlayer(player);
+            final Extent extent = to.getExtent();
+            if (!(extent instanceof World))
+            {
                 pp.deleteMeta("location");
                 return;
             }
             pp.setMeta("location", SpongeUtil.getLocation(player));
-            World world = (World) extent;
-            String worldname = ((World) extent).getName();
-            PlotWorld plotworld = PS.get().getPlotWorld(worldname);
-            if (plotworld == null) {
-                return;
-            }
-            PlotManager plotManager = PS.get().getPlotManager(worldname);
-            PlotId id = plotManager.getPlotId(plotworld, x2, 0, z2);
-            Plot lastPlot = (Plot) pp.getMeta("lastplot");
-            if (id == null) {
-                if (lastPlot == null) {
-                    return;
-                }
-                if (!PlotListener.plotExit(pp, lastPlot)) {
+            final World world = (World) extent;
+            final String worldname = ((World) extent).getName();
+            final PlotWorld plotworld = PS.get().getPlotWorld(worldname);
+            if (plotworld == null) { return; }
+            final PlotManager plotManager = PS.get().getPlotManager(worldname);
+            final PlotId id = plotManager.getPlotId(plotworld, x2, 0, z2);
+            final Plot lastPlot = (Plot) pp.getMeta("lastplot");
+            if (id == null)
+            {
+                if (lastPlot == null) { return; }
+                if (!PlotListener.plotExit(pp, lastPlot))
+                {
                     MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_EXIT_DENIED);
-                    if (lastPlot.equals(MainUtil.getPlot(SpongeUtil.getLocation(worldname, from)))) {
+                    if (lastPlot.equals(MainUtil.getPlot(SpongeUtil.getLocation(worldname, from))))
+                    {
                         event.setNewLocation(from);
                     }
-                    else {
+                    else
+                    {
                         event.setNewLocation(world.getSpawnLocation());
                     }
                     return;
                 }
             }
-            else if (lastPlot != null && id.equals(lastPlot.id)) {
+            else if ((lastPlot != null) && id.equals(lastPlot.id))
+            {
                 return;
             }
-            else {
-                Plot plot = MainUtil.getPlot(worldname, id);
-                if (!PlotListener.plotEntry(pp, plot)) {
+            else
+            {
+                final Plot plot = MainUtil.getPlot(worldname, id);
+                if (!PlotListener.plotEntry(pp, plot))
+                {
                     MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_ENTRY_DENIED);
-                    if (!plot.equals(MainUtil.getPlot(SpongeUtil.getLocation(worldname, from)))) {
+                    if (!plot.equals(MainUtil.getPlot(SpongeUtil.getLocation(worldname, from))))
+                    {
                         event.setNewLocation(from);
                     }
-                    else {
+                    else
+                    {
                         event.setNewLocation(world.getSpawnLocation());
                     }
                     return;
                 }
             }
-            Integer border = MainUtil.worldBorder.get(worldname);
-            if (border != null) {
-                if (z2 > border) {
-                    Vector3d pos = to.getPosition();
+            final Integer border = MainUtil.worldBorder.get(worldname);
+            if (border != null)
+            {
+                if (z2 > border)
+                {
+                    final Vector3d pos = to.getPosition();
                     to = to.setPosition(new Vector3d(pos.getX(), pos.getY(), border - 4));
                     event.setNewLocation(to);
                     MainUtil.sendMessage(pp, C.BORDER);
                 }
-                else if (z2 < -border) {
-                    Vector3d pos = to.getPosition();
+                else if (z2 < -border)
+                {
+                    final Vector3d pos = to.getPosition();
                     to = to.setPosition(new Vector3d(pos.getX(), pos.getY(), -border + 4));
                     event.setNewLocation(to);
                     MainUtil.sendMessage(pp, C.BORDER);
@@ -834,73 +931,85 @@ public class MainListener {
             }
         }
     }
-    
+
     @Subscribe
-    public void onWorldChange(EntityTeleportEvent event) {
-        Entity entity = event.getEntity();
-        if (entity instanceof Player) {
-            org.spongepowered.api.world.Location from = event.getOldLocation();
+    public void onWorldChange(final EntityTeleportEvent event)
+    {
+        final Entity entity = event.getEntity();
+        if (entity instanceof Player)
+        {
+            final org.spongepowered.api.world.Location from = event.getOldLocation();
             org.spongepowered.api.world.Location to = event.getNewLocation();
             int x2;
-            if (getInt(from.getX()) != (x2 = getInt(to.getX()))) {
-                Player player = (Player) entity;
-                PlotPlayer pp = SpongeUtil.getPlayer(player);
-                Extent extent = to.getExtent();
-                if (!(extent instanceof World)) {
+            if (getInt(from.getX()) != (x2 = getInt(to.getX())))
+            {
+                final Player player = (Player) entity;
+                final PlotPlayer pp = SpongeUtil.getPlayer(player);
+                final Extent extent = to.getExtent();
+                if (!(extent instanceof World))
+                {
                     pp.deleteMeta("location");
                     return;
                 }
                 pp.setMeta("location", SpongeUtil.getLocation(player));
-                World world = (World) extent;
-                String worldname = ((World) extent).getName();
-                PlotWorld plotworld = PS.get().getPlotWorld(worldname);
-                if (plotworld == null) {
+                final World world = (World) extent;
+                final String worldname = ((World) extent).getName();
+                final PlotWorld plotworld = PS.get().getPlotWorld(worldname);
+                if (plotworld == null) { return; }
+                final PlotManager plotManager = PS.get().getPlotManager(worldname);
+                final PlotId id = plotManager.getPlotId(plotworld, x2, 0, getInt(to.getZ()));
+                final Plot lastPlot = (Plot) pp.getMeta("lastplot");
+                if (id == null)
+                {
+                    if (lastPlot == null) { return; }
+                    if (!PlotListener.plotExit(pp, lastPlot))
+                    {
+                        MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_EXIT_DENIED);
+                        if (lastPlot.equals(MainUtil.getPlot(SpongeUtil.getLocation(worldname, from))))
+                        {
+                            event.setNewLocation(from);
+                        }
+                        else
+                        {
+                            event.setNewLocation(world.getSpawnLocation());
+                        }
+                        return;
+                    }
+                }
+                else if ((lastPlot != null) && id.equals(lastPlot.id))
+                {
                     return;
                 }
-                PlotManager plotManager = PS.get().getPlotManager(worldname);
-                PlotId id = plotManager.getPlotId(plotworld, x2, 0, getInt(to.getZ()));
-                Plot lastPlot = (Plot) pp.getMeta("lastplot");
-                if (id == null) {
-                    if (lastPlot == null) {
-                        return;
-                    }
-                    if (!PlotListener.plotExit(pp, lastPlot)) {
-                        MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_EXIT_DENIED);
-                        if (lastPlot.equals(MainUtil.getPlot(SpongeUtil.getLocation(worldname, from)))) {
-                            event.setNewLocation(from);
-                        }
-                        else {
-                            event.setNewLocation(world.getSpawnLocation());
-                        }
-                        return;
-                    }
-                }
-                else if (lastPlot != null && id.equals(lastPlot.id)) {
-                        return;
-                }
-                else {
-                    Plot plot = MainUtil.getPlot(worldname, id);
-                    if (!PlotListener.plotEntry(pp, plot)) {
+                else
+                {
+                    final Plot plot = MainUtil.getPlot(worldname, id);
+                    if (!PlotListener.plotEntry(pp, plot))
+                    {
                         MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_ENTRY_DENIED);
-                        if (!plot.equals(MainUtil.getPlot(SpongeUtil.getLocation(worldname, from)))) {
+                        if (!plot.equals(MainUtil.getPlot(SpongeUtil.getLocation(worldname, from))))
+                        {
                             event.setNewLocation(from);
                         }
-                        else {
+                        else
+                        {
                             event.setNewLocation(world.getSpawnLocation());
                         }
                         return;
                     }
                 }
-                Integer border = MainUtil.worldBorder.get(worldname);
-                if (border != null) {
-                    if (x2 > border) {
-                        Vector3d pos = to.getPosition();
+                final Integer border = MainUtil.worldBorder.get(worldname);
+                if (border != null)
+                {
+                    if (x2 > border)
+                    {
+                        final Vector3d pos = to.getPosition();
                         to = to.setPosition(new Vector3d(border - 4, pos.getY(), pos.getZ()));
                         event.setNewLocation(to);
                         MainUtil.sendMessage(pp, C.BORDER);
                     }
-                    else if (x2 < -border) {
-                        Vector3d pos = to.getPosition();
+                    else if (x2 < -border)
+                    {
+                        final Vector3d pos = to.getPosition();
                         to = to.setPosition(new Vector3d(-border + 4, pos.getY(), pos.getZ()));
                         event.setNewLocation(to);
                         MainUtil.sendMessage(pp, C.BORDER);
@@ -909,65 +1018,74 @@ public class MainListener {
                 return;
             }
             int z2;
-            if (getInt(from.getZ()) != (z2 = getInt(to.getZ())) ) {
-                Player player = (Player) entity;
-                PlotPlayer pp = SpongeUtil.getPlayer(player);
-                Extent extent = to.getExtent();
-                if (!(extent instanceof World)) {
+            if (getInt(from.getZ()) != (z2 = getInt(to.getZ())))
+            {
+                final Player player = (Player) entity;
+                final PlotPlayer pp = SpongeUtil.getPlayer(player);
+                final Extent extent = to.getExtent();
+                if (!(extent instanceof World))
+                {
                     pp.deleteMeta("location");
                     return;
                 }
                 pp.setMeta("location", SpongeUtil.getLocation(player));
-                World world = (World) extent;
-                String worldname = ((World) extent).getName();
-                PlotWorld plotworld = PS.get().getPlotWorld(worldname);
-                if (plotworld == null) {
-                    return;
-                }
-                PlotManager plotManager = PS.get().getPlotManager(worldname);
-                PlotId id = plotManager.getPlotId(plotworld, x2, 0, z2);
-                Plot lastPlot = (Plot) pp.getMeta("lastplot");
-                if (id == null) {
-                    if (lastPlot == null) {
-                        return;
-                    }
-                    if (!PlotListener.plotExit(pp, lastPlot)) {
+                final String worldname = ((World) extent).getName();
+                final PlotWorld plotworld = PS.get().getPlotWorld(worldname);
+                if (plotworld == null) { return; }
+                final PlotManager plotManager = PS.get().getPlotManager(worldname);
+                final PlotId id = plotManager.getPlotId(plotworld, x2, 0, z2);
+                final Plot lastPlot = (Plot) pp.getMeta("lastplot");
+                if (id == null)
+                {
+                    if (lastPlot == null) { return; }
+                    if (!PlotListener.plotExit(pp, lastPlot))
+                    {
                         MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_EXIT_DENIED);
-                        if (lastPlot.equals(MainUtil.getPlot(SpongeUtil.getLocation(worldname, from)))) {
+                        if (lastPlot.equals(MainUtil.getPlot(SpongeUtil.getLocation(worldname, from))))
+                        {
                             event.setNewLocation(from);
                         }
-                        else {
+                        else
+                        {
                             event.setNewLocation(player.getWorld().getSpawnLocation());
                         }
                         return;
                     }
                 }
-                else if (lastPlot != null && id.equals(lastPlot.id)) {
+                else if ((lastPlot != null) && id.equals(lastPlot.id))
+                {
                     return;
                 }
-                else {
-                    Plot plot = MainUtil.getPlot(worldname, id);
-                    if (!PlotListener.plotEntry(pp, plot)) {
+                else
+                {
+                    final Plot plot = MainUtil.getPlot(worldname, id);
+                    if (!PlotListener.plotEntry(pp, plot))
+                    {
                         MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_ENTRY_DENIED);
-                        if (!plot.equals(MainUtil.getPlot(SpongeUtil.getLocation(worldname, from)))) {
+                        if (!plot.equals(MainUtil.getPlot(SpongeUtil.getLocation(worldname, from))))
+                        {
                             event.setNewLocation(from);
                         }
-                        else {
+                        else
+                        {
                             event.setNewLocation(player.getWorld().getSpawnLocation());
                         }
                         return;
                     }
                 }
-                Integer border = MainUtil.worldBorder.get(worldname);
-                if (border != null) {
-                    if (z2 > border) {
-                        Vector3d pos = to.getPosition();
+                final Integer border = MainUtil.worldBorder.get(worldname);
+                if (border != null)
+                {
+                    if (z2 > border)
+                    {
+                        final Vector3d pos = to.getPosition();
                         to = to.setPosition(new Vector3d(pos.getX(), pos.getY(), border - 4));
                         event.setNewLocation(to);
                         MainUtil.sendMessage(pp, C.BORDER);
                     }
-                    else if (z2 < -border) {
-                        Vector3d pos = to.getPosition();
+                    else if (z2 < -border)
+                    {
+                        final Vector3d pos = to.getPosition();
                         to = to.setPosition(new Vector3d(pos.getX(), pos.getY(), -border + 4));
                         event.setNewLocation(to);
                         MainUtil.sendMessage(pp, C.BORDER);
@@ -976,17 +1094,19 @@ public class MainListener {
             }
         }
     }
-    
+
     @Subscribe
-    public void onWorldChange(PlayerChangeWorldEvent event) {
+    public void onWorldChange(final PlayerChangeWorldEvent event)
+    {
         final PlotPlayer player = SpongeUtil.getPlayer(event.getUser());
-        
+
         player.deleteMeta("location");
         player.deleteMeta("lastplot");
-        
+
         // TODO worldedit mask
-        
-        if (Settings.PERMISSION_CACHING) {
+
+        if (Settings.PERMISSION_CACHING)
+        {
             ((SpongePlayer) player).hasPerm = new HashSet<>();
             ((SpongePlayer) player).noPerm = new HashSet<>();
         }
diff --git a/src/main/java/com/plotsquared/sponge/object/SpongePlayer.java b/src/main/java/com/plotsquared/sponge/object/SpongePlayer.java
index 1ee840f37..1f665e9ed 100644
--- a/src/main/java/com/plotsquared/sponge/object/SpongePlayer.java
+++ b/src/main/java/com/plotsquared/sponge/object/SpongePlayer.java
@@ -10,9 +10,7 @@ import org.spongepowered.api.data.value.mutable.Value;
 import org.spongepowered.api.entity.player.Player;
 import org.spongepowered.api.entity.player.gamemode.GameMode;
 import org.spongepowered.api.entity.player.gamemode.GameModes;
-import org.spongepowered.api.text.TextBuilder;
 import org.spongepowered.api.text.Texts;
-import org.spongepowered.api.text.action.HoverAction;
 import org.spongepowered.api.text.chat.ChatTypes;
 
 import com.flowpowered.math.vector.Vector3d;
@@ -21,7 +19,6 @@ import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.config.Settings;
 import com.intellectualcrafters.plot.object.Location;
 import com.intellectualcrafters.plot.object.PlotPlayer;
-import com.intellectualcrafters.plot.util.EconHandler;
 import com.intellectualcrafters.plot.util.MainUtil;
 import com.intellectualcrafters.plot.util.PlotGamemode;
 import com.intellectualcrafters.plot.util.PlotWeather;
@@ -29,7 +26,8 @@ import com.intellectualcrafters.plot.util.UUIDHandler;
 import com.plotsquared.sponge.SpongeMain;
 import com.plotsquared.sponge.util.SpongeUtil;
 
-public class SpongePlayer extends PlotPlayer {
+public class SpongePlayer extends PlotPlayer
+{
 
     public final Player player;
     private UUID uuid;
@@ -38,84 +36,91 @@ public class SpongePlayer extends PlotPlayer {
     public HashSet<String> hasPerm = new HashSet<>();
     public HashSet<String> noPerm = new HashSet<>();
 
-    public SpongePlayer(Player player) {
+    public SpongePlayer(final Player player)
+    {
         this.player = player;
     }
-    
+
     @Override
-    public void sendMessage(C c, String... args) {
+    public void sendMessage(final C c, final String... args)
+    {
         MainUtil.sendMessage(this, c, args);
     }
 
     @Override
-    public RequiredType getSuperCaller() {
+    public RequiredType getSuperCaller()
+    {
         return RequiredType.PLAYER;
     }
 
     @Override
-    public long getPreviousLogin() {
-        Value<Date> data = player.getJoinData().lastPlayed();
-        if (data.exists()) {
-            return last = data.get().getSeconds() * 1000;
-        }
+    public long getPreviousLogin()
+    {
+        final Value<Date> data = player.getJoinData().lastPlayed();
+        if (data.exists()) { return last = data.get().getSeconds() * 1000; }
         return 0;
     }
 
     @Override
-    public Location getLocation() {
-        Location loc = super.getLocation();
-        return loc == null ? SpongeUtil.getLocation(this.player) : loc; 
+    public Location getLocation()
+    {
+        final Location loc = super.getLocation();
+        return loc == null ? SpongeUtil.getLocation(player) : loc;
     }
 
     @Override
-    public Location getLocationFull() {
+    public Location getLocationFull()
+    {
         return SpongeUtil.getLocationFull(player);
     }
 
     @Override
-    public UUID getUUID() {
-        if (this.uuid == null) {
-            this.uuid = UUIDHandler.getUUID(this);
+    public UUID getUUID()
+    {
+        if (uuid == null)
+        {
+            uuid = UUIDHandler.getUUID(this);
         }
         return uuid;
     }
 
     @Override
-    public boolean hasPermission(String perm) {
-        if (Settings.PERMISSION_CACHING) {
-            if (this.noPerm.contains(perm)) {
+    public boolean hasPermission(final String perm)
+    {
+        if (Settings.PERMISSION_CACHING)
+        {
+            if (noPerm.contains(perm)) { return false; }
+            if (hasPerm.contains(perm)) { return true; }
+            final boolean result = player.hasPermission(perm);
+            if (!result)
+            {
+                noPerm.add(perm);
                 return false;
             }
-            if (this.hasPerm.contains(perm)) {
-                return true;
-            }
-            final boolean result = this.player.hasPermission(perm);
-            if (!result) {
-                this.noPerm.add(perm);
-                return false;
-            }
-            this.hasPerm.add(perm);
+            hasPerm.add(perm);
             return true;
         }
-        boolean value = this.player.hasPermission(perm);
+        final boolean value = player.hasPermission(perm);
         return value;
     }
 
     @Override
-    public void sendMessage(String message) {
+    public void sendMessage(final String message)
+    {
         player.sendMessage(ChatTypes.CHAT, Texts.of(message));
     }
 
     @Override
-    public void teleport(Location loc) {
-        if (Math.abs(loc.getX()) >= 30000000 || Math.abs(loc.getZ()) >= 30000000) {
-            return;
-        }
-        String world = player.getWorld().getName();
-        if (!world.equals(loc.getWorld())) {
+    public void teleport(final Location loc)
+    {
+        if ((Math.abs(loc.getX()) >= 30000000) || (Math.abs(loc.getZ()) >= 30000000)) { return; }
+        final String world = player.getWorld().getName();
+        if (!world.equals(loc.getWorld()))
+        {
             player.transferToWorld(loc.getWorld(), new Vector3d(loc.getX(), loc.getY(), loc.getZ()));
         }
-        else {
+        else
+        {
             org.spongepowered.api.world.Location current = player.getLocation();
             current = current.setPosition(new Vector3d(loc.getX(), loc.getY(), loc.getZ()));
             player.setLocation(current);
@@ -123,120 +128,128 @@ public class SpongePlayer extends PlotPlayer {
     }
 
     @Override
-    public boolean isOnline() {
+    public boolean isOnline()
+    {
         return player.isOnline();
     }
 
     @Override
-    public String getName() {
-        if (this.name == null) {
-            this.name = this.player.getName();
+    public String getName()
+    {
+        if (name == null)
+        {
+            name = player.getName();
         }
-        return this.name;
+        return name;
     }
 
     @Override
-    public void setCompassTarget(Location loc) {
-        TargetedLocationData target = player.getOrCreate(TargetedLocationData.class).get();
+    public void setCompassTarget(final Location loc)
+    {
+        final TargetedLocationData target = player.getOrCreate(TargetedLocationData.class).get();
         target.set(Keys.TARGETED_LOCATION, SpongeUtil.getLocation(loc));
     }
 
     @Override
-    public void loadData() {
+    public void loadData()
+    {
         // TODO Auto-generated method stub
         throw new UnsupportedOperationException("NOT IMPLEMENTED YET");
     }
 
     @Override
-    public void saveData() {
+    public void saveData()
+    {
         // TODO Auto-generated method stub
         throw new UnsupportedOperationException("NOT IMPLEMENTED YET");
     }
 
     @Override
-    public void setAttribute(String key) {
+    public void setAttribute(String key)
+    {
         key = "plotsquared_user_attributes." + key;
-//        EconHandler.manager.setPermission(getName(), key, true);
+        //        EconHandler.manager.setPermission(getName(), key, true);
         setMeta(key, true);
     }
 
     @Override
-    public boolean getAttribute(String key) {
+    public boolean getAttribute(String key)
+    {
         key = "plotsquared_user_attributes." + key;
         return getMeta(key) != null;
         // TODO register attributes
     }
 
     @Override
-    public void removeAttribute(String key) {
+    public void removeAttribute(String key)
+    {
         key = "plotsquared_user_attributes." + key;
-//        EconHandler.manager.setPermission(getName(), key, false);
+        //        EconHandler.manager.setPermission(getName(), key, false);
         deleteMeta(key);
     }
 
     @Override
-    public void setWeather(PlotWeather weather) {
+    public void setWeather(final PlotWeather weather)
+    {
         // TODO Auto-generated method stub
         throw new UnsupportedOperationException("NOT IMPLEMENTED YET");
     }
 
     @Override
-    public PlotGamemode getGamemode() {
-        GameMode gamemode = player.getGameModeData().type().get();
-        if (gamemode == GameModes.ADVENTURE) {
-            return PlotGamemode.ADVENTURE;
-        }
-        if (gamemode == GameModes.CREATIVE) {
-            return PlotGamemode.CREATIVE;
-        }
-        if (gamemode == GameModes.SPECTATOR) {
-            return PlotGamemode.SPECTATOR;
-        }
-        if (gamemode == GameModes.SURVIVAL) {
-            return PlotGamemode.SURVIVAL;
-        }
+    public PlotGamemode getGamemode()
+    {
+        final GameMode gamemode = player.getGameModeData().type().get();
+        if (gamemode == GameModes.ADVENTURE) { return PlotGamemode.ADVENTURE; }
+        if (gamemode == GameModes.CREATIVE) { return PlotGamemode.CREATIVE; }
+        if (gamemode == GameModes.SPECTATOR) { return PlotGamemode.SPECTATOR; }
+        if (gamemode == GameModes.SURVIVAL) { return PlotGamemode.SURVIVAL; }
         throw new UnsupportedOperationException("INVALID GAMEMODE");
     }
 
     @Override
-    public void setGamemode(PlotGamemode gamemode) {
+    public void setGamemode(final PlotGamemode gamemode)
+    {
         // TODO Auto-generated method stub
-//        switch (gamemode) {
-//            case ADVENTURE:
-//                player.offer(Keys.GAME_MODE, GameModes.ADVENTURE);
-//                return;
-//            case CREATIVE:
-//                player.offer(Keys.GAME_MODE, GameModes.CREATIVE);
-//                return;
-//            case SPECTATOR:
-//                player.offer(Keys.GAME_MODE, GameModes.SPECTATOR);
-//                return;
-//            case SURVIVAL:
-//                player.offer(Keys.GAME_MODE, GameModes.SURVIVAL);
-//                return;
-//        }
+        //        switch (gamemode) {
+        //            case ADVENTURE:
+        //                player.offer(Keys.GAME_MODE, GameModes.ADVENTURE);
+        //                return;
+        //            case CREATIVE:
+        //                player.offer(Keys.GAME_MODE, GameModes.CREATIVE);
+        //                return;
+        //            case SPECTATOR:
+        //                player.offer(Keys.GAME_MODE, GameModes.SPECTATOR);
+        //                return;
+        //            case SURVIVAL:
+        //                player.offer(Keys.GAME_MODE, GameModes.SURVIVAL);
+        //                return;
+        //        }
     }
 
     @Override
-    public void setTime(long time) {
+    public void setTime(final long time)
+    {
         // TODO Auto-generated method stub
         throw new UnsupportedOperationException("NOT IMPLEMENTED YET");
     }
 
     @Override
-    public void setFlight(boolean fly) {
+    public void setFlight(final boolean fly)
+    {
         // TODO Auto-generated method stub
         throw new UnsupportedOperationException("NOT IMPLEMENTED YET");
     }
 
     @Override
-    public void playMusic(Location loc, int id) {
+    public void playMusic(final Location loc, final int id)
+    {
         // TODO Auto-generated method stub
         throw new UnsupportedOperationException("NOT IMPLEMENTED YET");
     }
 
     @Override
-    public void kick(String message) {
+    public void kick(final String message)
+    {
         player.kick(SpongeMain.THIS.getText(message));
     }
 }
diff --git a/src/main/java/com/plotsquared/sponge/util/KillRoadMobs.java b/src/main/java/com/plotsquared/sponge/util/KillRoadMobs.java
index 3a60e99b4..c322930ef 100644
--- a/src/main/java/com/plotsquared/sponge/util/KillRoadMobs.java
+++ b/src/main/java/com/plotsquared/sponge/util/KillRoadMobs.java
@@ -1,7 +1,9 @@
 package com.plotsquared.sponge.util;
 
-public class KillRoadMobs {
-    public void run() {
+public class KillRoadMobs
+{
+    public void run()
+    {
         // TODO kill road mobs
     }
 }
diff --git a/src/main/java/com/plotsquared/sponge/util/SpongeBlockManager.java b/src/main/java/com/plotsquared/sponge/util/SpongeBlockManager.java
index 4309c8431..2c5ae2705 100644
--- a/src/main/java/com/plotsquared/sponge/util/SpongeBlockManager.java
+++ b/src/main/java/com/plotsquared/sponge/util/SpongeBlockManager.java
@@ -8,7 +8,6 @@ import org.spongepowered.api.block.BlockType;
 import org.spongepowered.api.block.BlockTypes;
 import org.spongepowered.api.block.tileentity.Sign;
 import org.spongepowered.api.block.tileentity.TileEntity;
-import org.spongepowered.api.data.key.Keys;
 import org.spongepowered.api.data.manipulator.mutable.tileentity.SignData;
 import org.spongepowered.api.data.value.mutable.ListValue;
 import org.spongepowered.api.text.Text;
@@ -25,177 +24,195 @@ import com.intellectualcrafters.plot.util.MathMan;
 import com.intellectualcrafters.plot.util.StringComparison;
 import com.plotsquared.sponge.SpongeMain;
 
-public class SpongeBlockManager extends BlockManager {
-    
+public class SpongeBlockManager extends BlockManager
+{
+
     @Override
-    public boolean isBlockSolid(PlotBlock block) {
-        BlockState state = SpongeMain.THIS.getBlockState(block);
-        BlockType type = state.getType();
+    public boolean isBlockSolid(final PlotBlock block)
+    {
+        final BlockState state = SpongeMain.THIS.getBlockState(block);
+        final BlockType type = state.getType();
         return type.isSolidCube() && !type.isAffectedByGravity();
     }
-    
+
     @Override
-    public StringComparison<PlotBlock>.ComparisonResult getClosestBlock(String name) {
-        try {
+    public StringComparison<PlotBlock>.ComparisonResult getClosestBlock(String name)
+    {
+        try
+        {
             double match;
             short id;
             byte data;
-            String[] split = name.split(":");
-            if (split.length == 2) {
+            final String[] split = name.split(":");
+            if (split.length == 2)
+            {
                 data = Byte.parseByte(split[1]);
                 name = split[0];
             }
-            else {
+            else
+            {
                 data = 0;
             }
-            if (MathMan.isInteger(split[0])) {
+            if (MathMan.isInteger(split[0]))
+            {
                 id = Short.parseShort(split[0]);
                 match = 0;
             }
-            else {
-                StringComparison<BlockState>.ComparisonResult comparison = new StringComparison<BlockState>(name, SpongeMain.THIS.getAllStates()) {
-                    public String getString(BlockState o) {
+            else
+            {
+                final StringComparison<BlockState>.ComparisonResult comparison = new StringComparison<BlockState>(name, SpongeMain.THIS.getAllStates())
+                {
+                    @Override
+                    public String getString(final BlockState o)
+                    {
                         return o.getType().getId();
                     };
                 }.getBestMatchAdvanced();
                 match = comparison.match;
                 id = SpongeMain.THIS.getPlotBlock(comparison.best).id;
             }
-            PlotBlock block = new PlotBlock(id, data);
-            StringComparison<PlotBlock> outer = new StringComparison<PlotBlock>();
+            final PlotBlock block = new PlotBlock(id, data);
+            final StringComparison<PlotBlock> outer = new StringComparison<PlotBlock>();
             return outer.new ComparisonResult(match, block);
-            
+
         }
-        catch (Exception e) {}
+        catch (final Exception e)
+        {}
         return null;
     }
-    
+
     @Override
-    public String getClosestMatchingName(PlotBlock block) {
+    public String getClosestMatchingName(final PlotBlock block)
+    {
         // TODO Auto-generated method stub
         return null;
     }
-    
+
     @Override
-    public String[] getBiomeList() {
+    public String[] getBiomeList()
+    {
         // TODO Auto-generated method stub
         return null;
     }
-    
+
     @Override
-    public boolean addItems(String world, PlotItem items) {
+    public boolean addItems(final String world, final PlotItem items)
+    {
         // TODO Auto-generated method stub
         return false;
     }
-    
+
     @Override
-    public int getBiomeFromString(String biome) {
+    public int getBiomeFromString(final String biome)
+    {
         // TODO Auto-generated method stub
         return 0;
     }
-    
+
     @Override
-    public PlotBlock getPlotBlockFromString(String block) {
+    public PlotBlock getPlotBlockFromString(final String block)
+    {
         // TODO Auto-generated method stub
         return null;
     }
-    
+
     @Override
-    public int getHeighestBlock(String worldname, int x, int z) {
-        World world = SpongeUtil.getWorld(worldname);
-        if (world == null) {
-            return 64;
-        }
-        for (int y = 255; y > 0; y--) {
-            BlockState block = world.getBlock(x, y, z);
-            if (block != null && block.getType() != BlockTypes.AIR) {
-                return y+1;
-            }
+    public int getHeighestBlock(final String worldname, final int x, final int z)
+    {
+        final World world = SpongeUtil.getWorld(worldname);
+        if (world == null) { return 64; }
+        for (int y = 255; y > 0; y--)
+        {
+            final BlockState block = world.getBlock(x, y, z);
+            if ((block != null) && (block.getType() != BlockTypes.AIR)) { return y + 1; }
         }
         return 64;
     }
-    
+
     @Override
-    public String getBiome(String world, int x, int z) {
+    public String getBiome(final String world, final int x, final int z)
+    {
         return SpongeUtil.getWorld(world).getBiome(x, z).getName().toUpperCase();
     }
-    
+
     @Override
-    public PlotBlock getBlock(Location loc) {
-        BlockState state = SpongeUtil.getWorld(loc.getWorld()).getBlock(loc.getX(), loc.getY(), loc.getZ());
+    public PlotBlock getBlock(final Location loc)
+    {
+        final BlockState state = SpongeUtil.getWorld(loc.getWorld()).getBlock(loc.getX(), loc.getY(), loc.getZ());
         PlotBlock block = SpongeMain.THIS.getPlotBlock(state);
-        if (block == null) {
+        if (block == null)
+        {
             block = SpongeMain.THIS.registerBlock(state);
         }
         return block;
     }
-    
+
     @Override
-    public Location getSpawn(String world) {
-        World worldObj = SpongeUtil.getWorld(world);
-        org.spongepowered.api.world.Location loc = worldObj.getSpawnLocation();
-        Location result = SpongeUtil.getLocation(world, SpongeUtil.getWorld(world).getSpawnLocation());
+    public Location getSpawn(final String world)
+    {
+        final World worldObj = SpongeUtil.getWorld(world);
+        worldObj.getSpawnLocation();
+        final Location result = SpongeUtil.getLocation(world, SpongeUtil.getWorld(world).getSpawnLocation());
         result.setY(getHeighestBlock(world, result.getX(), result.getZ()));
         return result;
     }
-    
+
     @Override
-    public String[] getSign(Location loc) {
-        World world = SpongeUtil.getWorld(loc.getWorld());
-        Optional<TileEntity> block = world.getTileEntity(loc.getX(), loc.getY(), loc.getZ());
-        if (!block.isPresent()) {
-            return null;
-        }
-        TileEntity tile = block.get();
-        if (!(tile instanceof Sign)) {
-            return null;
-        }
-        Sign sign = (Sign) tile;
-        Optional<SignData> optional = sign.getOrCreate(SignData.class);
-        if (!optional.isPresent()) {
-            return null;
-        }
-        String[] result = new String[4];
-        ListValue<Text> lines = optional.get().lines();
-        for (int i = 0; i < 4; i++) {
+    public String[] getSign(final Location loc)
+    {
+        final World world = SpongeUtil.getWorld(loc.getWorld());
+        final Optional<TileEntity> block = world.getTileEntity(loc.getX(), loc.getY(), loc.getZ());
+        if (!block.isPresent()) { return null; }
+        final TileEntity tile = block.get();
+        if (!(tile instanceof Sign)) { return null; }
+        final Sign sign = (Sign) tile;
+        final Optional<SignData> optional = sign.getOrCreate(SignData.class);
+        if (!optional.isPresent()) { return null; }
+        final String[] result = new String[4];
+        final ListValue<Text> lines = optional.get().lines();
+        for (int i = 0; i < 4; i++)
+        {
             result[i] = lines.get(i).toString();
         }
         return result;
     }
-    
+
     @Override
-    public boolean isWorld(String world) {
+    public boolean isWorld(final String world)
+    {
         return SpongeUtil.getWorld(world) != null;
     }
-    
+
     @Override
-    public void functionSetBlocks(String worldname, int[] xv, int[] yv, int[] zv, int[] id, byte[] data) {
-        for (int i = 0; i < xv.length; i++) {
+    public void functionSetBlocks(final String worldname, final int[] xv, final int[] yv, final int[] zv, final int[] id, final byte[] data)
+    {
+        for (int i = 0; i < xv.length; i++)
+        {
             functionSetBlock(worldname, xv[i], yv[i], zv[i], id[i], data[i]);
         }
     }
-    
+
     @Override
-    public void functionSetSign(String worldname, int x, int y, int z, String[] lines) {
-        World world = SpongeUtil.getWorld(worldname);
+    public void functionSetSign(final String worldname, final int x, final int y, final int z, final String[] lines)
+    {
+        final World world = SpongeUtil.getWorld(worldname);
         world.setBlock(x, y, z, BlockTypes.WALL_SIGN.getDefaultState());
-        Optional<TileEntity> block = world.getTileEntity(x, y, z);
-        if (!block.isPresent()) {
-            return;
-        }
-        TileEntity tile = block.get();
-        if (!(tile instanceof Sign)) {
-            return;
-        }
-        Sign sign = (Sign) tile;
-        List<Text> text = new ArrayList<>(4);
-        for (int i = 0; i < 4; i++) {
+        final Optional<TileEntity> block = world.getTileEntity(x, y, z);
+        if (!block.isPresent()) { return; }
+        final TileEntity tile = block.get();
+        if (!(tile instanceof Sign)) { return; }
+        final Sign sign = (Sign) tile;
+        final List<Text> text = new ArrayList<>(4);
+        for (int i = 0; i < 4; i++)
+        {
             text.add(SpongeMain.THIS.getText(lines[i]));
         }
-        try {
-            Optional<SignData> optional = sign.getOrCreate(SignData.class);
-            if(optional.isPresent()) {
-                SignData offering = optional.get();
+        try
+        {
+            final Optional<SignData> optional = sign.getOrCreate(SignData.class);
+            if (optional.isPresent())
+            {
+                final SignData offering = optional.get();
                 offering.lines().set(0, SpongeMain.THIS.getText(lines[0]));
                 offering.lines().set(1, SpongeMain.THIS.getText(lines[1]));
                 offering.lines().set(2, SpongeMain.THIS.getText(lines[2]));
@@ -203,43 +220,51 @@ public class SpongeBlockManager extends BlockManager {
                 sign.offer(offering);
             }
         }
-        catch (NullPointerException e) {
+        catch (final NullPointerException e)
+        {
             e.printStackTrace();
         }
     }
-    
+
     @Override
-    public void functionSetBlock(String worldname, int x, int y, int z, int id, byte data) {
+    public void functionSetBlock(final String worldname, final int x, final int y, final int z, final int id, final byte data)
+    {
         BlockState state;
-        if (data == 0) {
+        if (data == 0)
+        {
             state = SpongeMain.THIS.getBlockState(id);
         }
-        else {
+        else
+        {
             state = SpongeMain.THIS.getBlockState(new PlotBlock((short) id, data));
         }
-        if (state == null) {
-            return;
-        }
-        World world = SpongeUtil.getWorld(worldname);
-        BlockState block = world.getBlock(x, y, z);
-        if (block != state) {
+        if (state == null) { return; }
+        final World world = SpongeUtil.getWorld(worldname);
+        final BlockState block = world.getBlock(x, y, z);
+        if (block != state)
+        {
             world.setBlock(x, y, z, state);
         }
-        
+
     }
-    
+
     @Override
-    public void functionSetBiomes(String worldname, int[] xv, int[] zv, String biomeName) {
+    public void functionSetBiomes(final String worldname, final int[] xv, final int[] zv, final String biomeName)
+    {
         BiomeType biome;
-        try {
+        try
+        {
             biome = (BiomeType) BiomeTypes.class.getField(biomeName.toUpperCase()).get(null);
-        } catch (Exception e) {
+        }
+        catch (final Exception e)
+        {
             e.printStackTrace();
             biome = BiomeTypes.FOREST;
         }
-        for (int i = 0; i < xv.length; i++) {
+        for (int i = 0; i < xv.length; i++)
+        {
             SpongeUtil.getWorld(worldname).setBiome(xv[i], zv[i], biome);
         }
     }
-    
+
 }
diff --git a/src/main/java/com/plotsquared/sponge/util/SpongeChatManager.java b/src/main/java/com/plotsquared/sponge/util/SpongeChatManager.java
index dd98ee736..fbca2335d 100644
--- a/src/main/java/com/plotsquared/sponge/util/SpongeChatManager.java
+++ b/src/main/java/com/plotsquared/sponge/util/SpongeChatManager.java
@@ -1,6 +1,5 @@
 package com.plotsquared.sponge.util;
 
-
 import org.spongepowered.api.text.TextBuilder;
 import org.spongepowered.api.text.Texts;
 import org.spongepowered.api.text.action.TextActions;
@@ -11,56 +10,68 @@ import com.intellectualcrafters.plot.object.PlotPlayer;
 import com.intellectualcrafters.plot.util.ChatManager;
 import com.plotsquared.sponge.object.SpongePlayer;
 
-public class SpongeChatManager extends ChatManager<TextBuilder> {
-    
+public class SpongeChatManager extends ChatManager<TextBuilder>
+{
+
     @Override
-    public TextBuilder builder() {
+    public TextBuilder builder()
+    {
         return Texts.builder();
     }
-    
+
     @Override
-    public void color(PlotMessage m, String color) {
+    public void color(final PlotMessage m, final String color)
+    {
         m.$(this).color(Texts.of(color).getColor());
     }
-    
+
     @Override
-    public void tooltip(PlotMessage m, PlotMessage... tooltips) {
-        TextBuilder builder = Texts.builder();
+    public void tooltip(final PlotMessage m, final PlotMessage... tooltips)
+    {
+        final TextBuilder builder = Texts.builder();
         boolean lb = false;
-        for (PlotMessage tooltip : tooltips) {
-            if (lb) {
+        for (final PlotMessage tooltip : tooltips)
+        {
+            if (lb)
+            {
                 builder.append(Texts.of("\n"));
             }
             builder.append(tooltip.$(this).build());
             lb = true;
         }
-//        AchievementBuilder builder = SpongeMain.THIS.getGame().getRegistry().createAchievementBuilder();
+        //        AchievementBuilder builder = SpongeMain.THIS.getGame().getRegistry().createAchievementBuilder();
         m.$(this).onHover(TextActions.showText(builder.toText()));
     }
-    
+
     @Override
-    public void command(PlotMessage m, String command) {
+    public void command(final PlotMessage m, final String command)
+    {
         m.$(this).onClick(TextActions.runCommand(command));
     }
-    
+
     @Override
-    public void text(PlotMessage m, String text) {
+    public void text(final PlotMessage m, final String text)
+    {
         m.$(this).append(Texts.of(text));
     }
-    
+
     @Override
-    public void send(PlotMessage m, PlotPlayer player) {
-        if (ConsolePlayer.isConsole(player)) {
+    public void send(final PlotMessage m, final PlotPlayer player)
+    {
+        if (ConsolePlayer.isConsole(player))
+        {
             player.sendMessage(Texts.legacy().to(m.$(this).build()));
         }
-        else {
+        else
+        {
             ((SpongePlayer) player).player.sendMessage(m.$(this).build());
         }
     }
-    
+
     @Override
-    public void suggest(PlotMessage m, String command) {
+    public void suggest(final PlotMessage m, final String command)
+    {
         m.$(this).onClick(TextActions.suggestCommand(command));
     }
-    
+
 }
diff --git a/src/main/java/com/plotsquared/sponge/util/SpongeChunkManager.java b/src/main/java/com/plotsquared/sponge/util/SpongeChunkManager.java
index 3340f5907..c772381b0 100644
--- a/src/main/java/com/plotsquared/sponge/util/SpongeChunkManager.java
+++ b/src/main/java/com/plotsquared/sponge/util/SpongeChunkManager.java
@@ -3,7 +3,6 @@ package com.plotsquared.sponge.util;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.spongepowered.api.data.DataContainer;
 import org.spongepowered.api.entity.Entity;
 import org.spongepowered.api.entity.living.Living;
 import org.spongepowered.api.entity.living.animal.Animal;
@@ -23,43 +22,56 @@ import com.intellectualcrafters.plot.util.ChunkManager;
 import com.intellectualcrafters.plot.util.SetBlockQueue.ChunkWrapper;
 import com.intellectualcrafters.plot.util.TaskManager;
 
-public class SpongeChunkManager extends ChunkManager {
-    
+public class SpongeChunkManager extends ChunkManager
+{
+
     @Override
-    public void setChunk(ChunkWrapper loc, PlotBlock[][] result) {
+    public void setChunk(final ChunkWrapper loc, final PlotBlock[][] result)
+    {
         // TODO Auto-generated method stub
-        
+
     }
-    
+
     @Override
-    public int[] countEntities(Plot plot) {
-        Location pos1 = plot.getBottom();
-        Location pos2 = plot.getTop();
-        
-        String worldname = pos1.getWorld();
-        World world = SpongeUtil.getWorld(worldname);
+    public int[] countEntities(final Plot plot)
+    {
+        final Location pos1 = plot.getBottom();
+        final Location pos2 = plot.getTop();
+
+        final String worldname = pos1.getWorld();
+        final World world = SpongeUtil.getWorld(worldname);
         final int bx = pos1.getX();
         final int bz = pos1.getZ();
         final int tx = pos2.getX();
         final int tz = pos2.getZ();
         final int[] count = new int[5];
-        world.getEntities(new Predicate<Entity>() {
+        world.getEntities(new Predicate<Entity>()
+        {
             @Override
-            public boolean apply(Entity entity) {
-                org.spongepowered.api.world.Location loc = entity.getLocation();
-                int x = loc.getBlockX();
-                if (x >= bx && x <= tx) {
-                    int z = loc.getBlockZ();
-                    if (z >= bz && z <= tz) {
+            public boolean apply(final Entity entity)
+            {
+                final org.spongepowered.api.world.Location loc = entity.getLocation();
+                final int x = loc.getBlockX();
+                if ((x >= bx) && (x <= tx))
+                {
+                    final int z = loc.getBlockZ();
+                    if ((z >= bz) && (z <= tz))
+                    {
                         count[0]++;
-                        if (entity instanceof Living) {
+                        if (entity instanceof Living)
+                        {
                             count[3]++;
-                            if (entity instanceof Animal) {
+                            if (entity instanceof Animal)
+                            {
                                 count[1]++;
-                            } else if (entity instanceof Monster){
+                            }
+                            else if (entity instanceof Monster)
+                            {
                                 count[2]++;
                             }
-                        } else {
+                        }
+                        else
+                        {
                             count[4]++;
                         }
                     }
@@ -67,108 +79,124 @@ public class SpongeChunkManager extends ChunkManager {
                 return false;
             }
         });
-        
+
         return count;
     }
-    
+
     @Override
-    public boolean loadChunk(String world, ChunkLoc loc, boolean force) {
-        World worldObj = SpongeUtil.getWorld(world);
+    public boolean loadChunk(final String world, final ChunkLoc loc, final boolean force)
+    {
+        final World worldObj = SpongeUtil.getWorld(world);
         return worldObj.loadChunk(loc.x << 4, 0, loc.z << 4, force).isPresent();
     }
-    
+
     @Override
-    public boolean unloadChunk(String world, ChunkLoc loc, boolean save, boolean safe) {
-        World worldObj = SpongeUtil.getWorld(world);
-        Optional<Chunk> chunk = worldObj.getChunk(loc.x << 4, 0, loc.z << 4);
-        if (chunk.isPresent()) {
-            return worldObj.unloadChunk(chunk.get());
-        }
+    public boolean unloadChunk(final String world, final ChunkLoc loc, final boolean save, final boolean safe)
+    {
+        final World worldObj = SpongeUtil.getWorld(world);
+        final Optional<Chunk> chunk = worldObj.getChunk(loc.x << 4, 0, loc.z << 4);
+        if (chunk.isPresent()) { return worldObj.unloadChunk(chunk.get()); }
         return false;
     }
-    
+
     @Override
-    public List<ChunkLoc> getChunkChunks(String world) {
-        ArrayList<ChunkLoc> chunks = new ArrayList<ChunkLoc>();
-        World worldObj = SpongeUtil.getWorld(world);
-        ChunkDataStream storage = worldObj.getWorldStorage().getGeneratedChunks();
-        while (storage.hasNext()) {
-            DataContainer data = storage.next();
-            
+    public List<ChunkLoc> getChunkChunks(final String world)
+    {
+        final ArrayList<ChunkLoc> chunks = new ArrayList<ChunkLoc>();
+        final World worldObj = SpongeUtil.getWorld(world);
+        final ChunkDataStream storage = worldObj.getWorldStorage().getGeneratedChunks();
+        while (storage.hasNext())
+        {
+            storage.next();
+
             // TODO get chunk from DataContainer
         }
         return chunks;
     }
-    
+
     @Override
-    public void regenerateChunk(String world, ChunkLoc loc) {
-        World worldObj = SpongeUtil.getWorld(world);
-        Optional<Chunk> chunk = worldObj.getChunk(loc.x << 4, 0, loc.z << 4);
-        if (chunk.isPresent()) {
+    public void regenerateChunk(final String world, final ChunkLoc loc)
+    {
+        final World worldObj = SpongeUtil.getWorld(world);
+        final Optional<Chunk> chunk = worldObj.getChunk(loc.x << 4, 0, loc.z << 4);
+        if (chunk.isPresent())
+        {
             // TODO regenerate chunk
         }
     }
-    
+
     @Override
-    public void deleteRegionFile(String world, ChunkLoc loc) {
+    public void deleteRegionFile(final String world, final ChunkLoc loc)
+    {
         // TODO Auto-generated method stub
-        
-    }
-    
-    @Override
-    public void deleteRegionFiles(String world, List<ChunkLoc> chunks) {
-        // TODO Auto-generated method stub
-        
-    }
-    
-    @Override
-    public Plot hasPlot(String world, ChunkLoc chunk) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-    
-    @Override
-    public boolean copyRegion(Location pos1, Location pos2, Location newPos, Runnable whenDone) {
-        // TODO Auto-generated method stub
-        TaskManager.runTask(whenDone);
-        return false;
-    }
-    
-    @Override
-    public boolean regenerateRegion(Location pos1, Location pos2, Runnable whenDone) {
-        // TODO Auto-generated method stub
-        TaskManager.runTask(whenDone);
-        return false;
-    }
-    
-    @Override
-    public void swap(String world, PlotId id, PlotId plotid) {
-        // TODO Auto-generated method stub
-        
-    }
-    
-    @Override
-    public void swap(String worldname, Location bot1, Location top1, Location bot2, Location top2) {
-        // TODO Auto-generated method stub
-        
+
     }
 
     @Override
-    public void clearAllEntities(Location pos1, Location pos2) {
-        String worldname = pos1.getWorld();
-        World world = SpongeUtil.getWorld(worldname);
+    public void deleteRegionFiles(final String world, final List<ChunkLoc> chunks)
+    {
+        // TODO Auto-generated method stub
+
+    }
+
+    @Override
+    public Plot hasPlot(final String world, final ChunkLoc chunk)
+    {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public boolean copyRegion(final Location pos1, final Location pos2, final Location newPos, final Runnable whenDone)
+    {
+        // TODO Auto-generated method stub
+        TaskManager.runTask(whenDone);
+        return false;
+    }
+
+    @Override
+    public boolean regenerateRegion(final Location pos1, final Location pos2, final Runnable whenDone)
+    {
+        // TODO Auto-generated method stub
+        TaskManager.runTask(whenDone);
+        return false;
+    }
+
+    @Override
+    public void swap(final String world, final PlotId id, final PlotId plotid)
+    {
+        // TODO Auto-generated method stub
+
+    }
+
+    @Override
+    public void swap(final String worldname, final Location bot1, final Location top1, final Location bot2, final Location top2)
+    {
+        // TODO Auto-generated method stub
+
+    }
+
+    @Override
+    public void clearAllEntities(final Location pos1, final Location pos2)
+    {
+        final String worldname = pos1.getWorld();
+        final World world = SpongeUtil.getWorld(worldname);
         final int bx = pos1.getX();
         final int bz = pos1.getZ();
         final int tx = pos2.getX();
         final int tz = pos2.getZ();
-        world.getEntities(new Predicate<Entity>() {
+        world.getEntities(new Predicate<Entity>()
+        {
             @Override
-            public boolean apply(Entity entity) {
-                org.spongepowered.api.world.Location loc = entity.getLocation();
-                int x = loc.getBlockX();
-                if (x >= bx && x <= tx) {
-                    int z = loc.getBlockZ();
-                    if (z >= bz && z <= tz) {
+            public boolean apply(final Entity entity)
+            {
+                final org.spongepowered.api.world.Location loc = entity.getLocation();
+                final int x = loc.getBlockX();
+                if ((x >= bx) && (x <= tx))
+                {
+                    final int z = loc.getBlockZ();
+                    if ((z >= bz) && (z <= tz))
+                    {
                         entity.remove();
                     }
                 }
@@ -176,5 +204,5 @@ public class SpongeChunkManager extends ChunkManager {
             }
         });
     }
-    
+
 }
diff --git a/src/main/java/com/plotsquared/sponge/util/SpongeCommand.java b/src/main/java/com/plotsquared/sponge/util/SpongeCommand.java
index 81f67345e..c73878898 100644
--- a/src/main/java/com/plotsquared/sponge/util/SpongeCommand.java
+++ b/src/main/java/com/plotsquared/sponge/util/SpongeCommand.java
@@ -19,52 +19,63 @@ import com.intellectualcrafters.plot.object.ConsolePlayer;
 import com.intellectualcrafters.plot.object.PlotPlayer;
 import com.plotsquared.sponge.SpongeMain;
 
-public class SpongeCommand implements CommandCallable {
+public class SpongeCommand implements CommandCallable
+{
 
     @Override
-    public CommandResult process(CommandSource cmd, String string) throws CommandException {
-        String id = cmd.getIdentifier();
+    public CommandResult process(final CommandSource cmd, final String string) throws CommandException
+    {
+        final String id = cmd.getIdentifier();
         PlotPlayer pp;
-        try {
-            UUID uuid = UUID.fromString(id);
-            Player player = SpongeMain.THIS.getServer().getPlayer(uuid).get();
+        try
+        {
+            final UUID uuid = UUID.fromString(id);
+            final Player player = SpongeMain.THIS.getServer().getPlayer(uuid).get();
             pp = SpongeUtil.getPlayer(player);
         }
-        catch (Exception e) {
+        catch (final Exception e)
+        {
             pp = ConsolePlayer.getConsole();
         }
-        if (MainCommand.onCommand(pp, cmd.getName(), string.length() == 0 ? new String[] {} : string.split(" "))) {
+        if (MainCommand.onCommand(pp, cmd.getName(), string.length() == 0 ? new String[] {} : string.split(" ")))
+        {
             return CommandResult.success();
         }
-        else {
+        else
+        {
             return CommandResult.empty();
         }
     }
 
     @Override
-    public List<String> getSuggestions(CommandSource cmd, String string) throws CommandException {
+    public List<String> getSuggestions(final CommandSource cmd, final String string) throws CommandException
+    {
         // TODO Auto-generated method stub
         return new ArrayList<>(Arrays.asList("TEST"));
     }
 
     @Override
-    public boolean testPermission(CommandSource cmd) {
+    public boolean testPermission(final CommandSource cmd)
+    {
         return true;
     }
 
     @Override
-    public Optional<? extends Text> getShortDescription(CommandSource cmd) {
+    public Optional<? extends Text> getShortDescription(final CommandSource cmd)
+    {
         return Optional.of(Texts.of("Shows plot help"));
     }
 
     @Override
-    public Optional<? extends Text> getHelp(CommandSource cmd) {
+    public Optional<? extends Text> getHelp(final CommandSource cmd)
+    {
         return Optional.of(Texts.of("/plot help"));
     }
 
     @Override
-    public Text getUsage(CommandSource cmd) {
+    public Text getUsage(final CommandSource cmd)
+    {
         return Texts.of("/plot <command>");
     }
-    
+
 }
diff --git a/src/main/java/com/plotsquared/sponge/util/SpongeEventUtil.java b/src/main/java/com/plotsquared/sponge/util/SpongeEventUtil.java
index 4631c15fd..de80c94da 100644
--- a/src/main/java/com/plotsquared/sponge/util/SpongeEventUtil.java
+++ b/src/main/java/com/plotsquared/sponge/util/SpongeEventUtil.java
@@ -32,97 +32,113 @@ import com.plotsquared.sponge.events.PlotMergeEvent;
 import com.plotsquared.sponge.events.PlotRateEvent;
 import com.plotsquared.sponge.events.PlotUnlinkEvent;
 
-public class SpongeEventUtil extends EventUtil {
-    
+public class SpongeEventUtil extends EventUtil
+{
+
     public EventManager events;
 
-    public SpongeEventUtil() {
-        this.events = SpongeMain.THIS.getGame().getEventManager();
+    public SpongeEventUtil()
+    {
+        events = SpongeMain.THIS.getGame().getEventManager();
     }
-    
-    public boolean callEvent(Event event) {
+
+    public boolean callEvent(final Event event)
+    {
         events.post(event);
-        if (event instanceof Cancellable) {
-            return !((Cancellable) event).isCancelled();
-        }
+        if (event instanceof Cancellable) { return !((Cancellable) event).isCancelled(); }
         return true;
     }
-    
+
     @Override
-    public boolean callClaim(PlotPlayer player, Plot plot, boolean auto) {
+    public boolean callClaim(final PlotPlayer player, final Plot plot, final boolean auto)
+    {
         return callEvent(new PlayerClaimPlotEvent(SpongeUtil.getPlayer(player), plot, auto));
     }
 
     @Override
-    public boolean callTeleport(PlotPlayer player, Location from, Plot plot) {
+    public boolean callTeleport(final PlotPlayer player, final Location from, final Plot plot)
+    {
         return callEvent(new PlayerTeleportToPlotEvent(SpongeUtil.getPlayer(player), from, plot));
     }
 
     @Override
-    public boolean callClear(String world, PlotId id) {
+    public boolean callClear(final String world, final PlotId id)
+    {
         return callEvent(new PlotClearEvent(world, id));
     }
 
     @Override
-    public void callDelete(String world, PlotId id) {
+    public void callDelete(final String world, final PlotId id)
+    {
         callEvent(new PlotDeleteEvent(world, id));
     }
 
     @Override
-    public boolean callFlagAdd(Flag flag, Plot plot) {
+    public boolean callFlagAdd(final Flag flag, final Plot plot)
+    {
         return callEvent(new PlotFlagAddEvent(flag, plot));
     }
 
     @Override
-    public boolean callFlagRemove(Flag flag, Plot plot) {
+    public boolean callFlagRemove(final Flag flag, final Plot plot)
+    {
         return callEvent(new PlotFlagRemoveEvent(flag, plot));
     }
 
     @Override
-    public boolean callMerge(String world, Plot plot, ArrayList<PlotId> plots) {
+    public boolean callMerge(final String world, final Plot plot, final ArrayList<PlotId> plots)
+    {
         return callEvent(new PlotMergeEvent(SpongeUtil.getWorld(world), plot, plots));
     }
 
     @Override
-    public boolean callUnlink(String world, ArrayList<PlotId> plots) {
+    public boolean callUnlink(final String world, final ArrayList<PlotId> plots)
+    {
         return callEvent(new PlotUnlinkEvent(SpongeUtil.getWorld(world), plots));
     }
 
     @Override
-    public void callEntry(PlotPlayer player, Plot plot) {
+    public void callEntry(final PlotPlayer player, final Plot plot)
+    {
         callEvent(new PlayerEnterPlotEvent(SpongeUtil.getPlayer(player), plot));
     }
 
     @Override
-    public void callLeave(PlotPlayer player, Plot plot) {
+    public void callLeave(final PlotPlayer player, final Plot plot)
+    {
         callEvent(new PlayerLeavePlotEvent(SpongeUtil.getPlayer(player), plot));
     }
 
     @Override
-    public void callDenied(PlotPlayer initiator, Plot plot, UUID player, boolean added) {
+    public void callDenied(final PlotPlayer initiator, final Plot plot, final UUID player, final boolean added)
+    {
         callEvent(new PlayerPlotDeniedEvent(SpongeUtil.getPlayer(initiator), plot, player, added));
     }
 
     @Override
-    public void callTrusted(PlotPlayer initiator, Plot plot, UUID player, boolean added) {
+    public void callTrusted(final PlotPlayer initiator, final Plot plot, final UUID player, final boolean added)
+    {
         callEvent(new PlayerPlotHelperEvent(SpongeUtil.getPlayer(initiator), plot, player, added));
     }
 
     @Override
-    public void callMember(PlotPlayer initiator, Plot plot, UUID player, boolean added) {
+    public void callMember(final PlotPlayer initiator, final Plot plot, final UUID player, final boolean added)
+    {
         callEvent(new PlayerPlotTrustedEvent(SpongeUtil.getPlayer(initiator), plot, player, added));
     }
 
     @Override
-    public boolean callFlagRemove(Flag flag, PlotCluster cluster) {
+    public boolean callFlagRemove(final Flag flag, final PlotCluster cluster)
+    {
         return callEvent(new ClusterFlagRemoveEvent(flag, cluster));
     }
 
     @Override
-    public Rating callRating(PlotPlayer player, Plot plot, Rating rating) {
-        PlotRateEvent event = new PlotRateEvent(player, rating, plot);
+    public Rating callRating(final PlotPlayer player, final Plot plot, final Rating rating)
+    {
+        final PlotRateEvent event = new PlotRateEvent(player, rating, plot);
         events.post(event);
         return event.getRating();
     }
-    
+
 }
diff --git a/src/main/java/com/plotsquared/sponge/util/SpongeInventoryUtil.java b/src/main/java/com/plotsquared/sponge/util/SpongeInventoryUtil.java
index c3f3b5cdd..59ec97e05 100644
--- a/src/main/java/com/plotsquared/sponge/util/SpongeInventoryUtil.java
+++ b/src/main/java/com/plotsquared/sponge/util/SpongeInventoryUtil.java
@@ -8,7 +8,6 @@ import org.spongepowered.api.item.ItemType;
 import org.spongepowered.api.item.ItemTypes;
 import org.spongepowered.api.item.inventory.Carrier;
 import org.spongepowered.api.item.inventory.Inventories;
-import org.spongepowered.api.item.inventory.Inventory;
 import org.spongepowered.api.item.inventory.ItemStack;
 import org.spongepowered.api.item.inventory.ItemStackBuilder;
 import org.spongepowered.api.item.inventory.custom.CustomInventory;
@@ -22,95 +21,97 @@ import com.intellectualcrafters.plot.util.InventoryUtil;
 import com.plotsquared.sponge.SpongeMain;
 import com.plotsquared.sponge.object.SpongePlayer;
 
-public class SpongeInventoryUtil extends InventoryUtil {
+public class SpongeInventoryUtil extends InventoryUtil
+{
 
     public ItemStackBuilder builder;
 
-    public SpongeInventoryUtil() {
-        this.builder = SpongeMain.THIS.getGame().getRegistry().createItemBuilder();
+    public SpongeInventoryUtil()
+    {
+        builder = SpongeMain.THIS.getGame().getRegistry().createItemBuilder();
     }
-    
+
     @Override
-    public void open(PlotInventory inv) {
+    public void open(final PlotInventory inv)
+    {
         // TODO Auto-generated method stub
-        SpongePlayer sp = (SpongePlayer) inv.player;
-        Player player = sp.player;
-        
-        CustomInventory inventory = Inventories.customInventoryBuilder().name(SpongeMain.THIS.getTranslation(inv.getTitle())).size(inv.size).build();
-        PlotItemStack[] items = inv.getItems();
-        for (int i = 0; i < inv.size * 9; i++) {
-            PlotItemStack item = items[i];
-            if (item != null) {
+        final SpongePlayer sp = (SpongePlayer) inv.player;
+        final Player player = sp.player;
+
+        final CustomInventory inventory = Inventories.customInventoryBuilder().name(SpongeMain.THIS.getTranslation(inv.getTitle())).size(inv.size).build();
+        final PlotItemStack[] items = inv.getItems();
+        for (int i = 0; i < (inv.size * 9); i++)
+        {
+            final PlotItemStack item = items[i];
+            if (item != null)
+            {
                 inventory.set(new SlotIndex(i), getItem(item));
             }
         }
         inv.player.setMeta("inventory", inv);
         player.openInventory(inventory);
     }
-    
 
-    public ItemStack getItem(PlotItemStack item) {
+    public ItemStack getItem(final PlotItemStack item)
+    {
         // FIXME item type, item data, item name, item lore
         return builder.itemType(ItemTypes.SPONGE).quantity(item.amount).build();
     }
 
-
     @Override
-    public void close(PlotInventory inv) {
-        if (!inv.isOpen()) {
-            return;
-        }
+    public void close(final PlotInventory inv)
+    {
+        if (!inv.isOpen()) { return; }
         inv.player.deleteMeta("inventory");
-        SpongePlayer sp = (SpongePlayer) inv.player;
+        final SpongePlayer sp = (SpongePlayer) inv.player;
         sp.player.closeInventory();
     }
 
     @Override
-    public void setItem(PlotInventory inv, int index, PlotItemStack item) {
-        if (!inv.isOpen()) {
-            return;
-        }
-        SpongePlayer sp = (SpongePlayer) inv.player;
-        Player player = sp.player;
-        Inventory inventory = player.getOpenInventory().get();
+    public void setItem(final PlotInventory inv, final int index, final PlotItemStack item)
+    {
+        if (!inv.isOpen()) { return; }
+        final SpongePlayer sp = (SpongePlayer) inv.player;
+        final Player player = sp.player;
+        player.getOpenInventory().get();
         throw new UnsupportedOperationException("NOT IMPLEMENTED YET");
-        
+
     }
-    
-    public PlotItemStack getItem(ItemStack item) {
-        if (item == null) {
-            return null;
-        }
-        ItemType type = item.getItem();
-        String id = type.getId();
-        int amount = item.getQuantity();
+
+    public PlotItemStack getItem(final ItemStack item)
+    {
+        if (item == null) { return null; }
+        final ItemType type = item.getItem();
+        final String id = type.getId();
+        final int amount = item.getQuantity();
         // TODO name / lore
         return new PlotItemStack(id, amount, null);
     }
 
     @Override
-    public PlotItemStack[] getItems(PlotPlayer player) {
-        SpongePlayer sp = (SpongePlayer) player;
-        CarriedInventory<? extends Carrier> inv = sp.player.getInventory();
-        ArrayList<PlotItemStack> list = new ArrayList<PlotItemStack>();
-        
+    public PlotItemStack[] getItems(final PlotPlayer player)
+    {
+        final SpongePlayer sp = (SpongePlayer) player;
+        sp.player.getInventory();
+        new ArrayList<PlotItemStack>();
+
         throw new UnsupportedOperationException("NOT IMPLEMENTED YET");
-        
-//        return list.toArray();
+
+        //        return list.toArray();
     }
 
     @Override
-    public boolean isOpen(PlotInventory inv) {
-        if (!inv.isOpen()) {
-            return false;
-        }
-        SpongePlayer sp = (SpongePlayer) inv.player;
-        Player player = sp.player;
-        if (player.isViewingInventory()) {
-            CarriedInventory<? extends Carrier> inventory = player.getInventory();
+    public boolean isOpen(final PlotInventory inv)
+    {
+        if (!inv.isOpen()) { return false; }
+        final SpongePlayer sp = (SpongePlayer) inv.player;
+        final Player player = sp.player;
+        if (player.isViewingInventory())
+        {
+            final CarriedInventory<? extends Carrier> inventory = player.getInventory();
             return inv.getTitle().equals(inventory.getName().getTranslation().get(Locale.ENGLISH));
         }
         return false;
     }
-    
+
 }
diff --git a/src/main/java/com/plotsquared/sponge/util/SpongeMetrics.java b/src/main/java/com/plotsquared/sponge/util/SpongeMetrics.java
index b9b544a22..848ec8f6f 100644
--- a/src/main/java/com/plotsquared/sponge/util/SpongeMetrics.java
+++ b/src/main/java/com/plotsquared/sponge/util/SpongeMetrics.java
@@ -56,7 +56,8 @@ import org.spongepowered.api.service.scheduler.TaskBuilder;
 
 import com.intellectualcrafters.plot.PS;
 
-public class SpongeMetrics {
+public class SpongeMetrics
+{
 
     /**
      * The current revision number
@@ -124,10 +125,9 @@ public class SpongeMetrics {
     private volatile Task task = null;
 
     @Inject
-    public SpongeMetrics(final Game game, final PluginContainer plugin) throws IOException {
-        if (plugin == null) {
-            throw new IllegalArgumentException("Plugin cannot be null");
-        }
+    public SpongeMetrics(final Game game, final PluginContainer plugin) throws IOException
+    {
+        if (plugin == null) { throw new IllegalArgumentException("Plugin cannot be null"); }
 
         this.game = game;
         this.plugin = plugin;
@@ -138,12 +138,15 @@ public class SpongeMetrics {
     /**
      * Loads the configuration
      */
-    private void loadConfiguration() {
+    private void loadConfiguration()
+    {
         configurationFile = getConfigFile();
         configurationLoader = HoconConfigurationLoader.builder().setFile(configurationFile).build();
 
-        try {
-            if (!configurationFile.exists()) {
+        try
+        {
+            if (!configurationFile.exists())
+            {
                 configurationFile.createNewFile();
                 config = configurationLoader.load();
 
@@ -153,13 +156,17 @@ public class SpongeMetrics {
                 config.getNode("mcstats.debug").setValue(false);
 
                 configurationLoader.save(config);
-            } else {
+            }
+            else
+            {
                 config = configurationLoader.load();
             }
 
             guid = config.getNode("mcstats.guid").getString();
             debug = config.getNode("mcstats.debug").getBoolean();
-        } catch (IOException e) {
+        }
+        catch (final IOException e)
+        {
             e.printStackTrace();
         }
     }
@@ -171,33 +178,36 @@ public class SpongeMetrics {
      *
      * @return True if statistics measuring is running, otherwise false.
      */
-    public boolean start() {
-        synchronized (optOutLock) {
+    public boolean start()
+    {
+        synchronized (optOutLock)
+        {
             // Did we opt out?
-            if (isOptOut()) {
-                return false;
-            }
+            if (isOptOut()) { return false; }
 
             // Is metrics already running?
-            if (task != null) {
-                return true;
-            }
+            if (task != null) { return true; }
 
             // Begin hitting the server with glorious data
-            TaskBuilder builder = game.getScheduler().createTaskBuilder();
+            final TaskBuilder builder = game.getScheduler().createTaskBuilder();
             builder.async()
             .interval(TimeUnit.MINUTES.toMillis(PING_INTERVAL))
-            .execute(new Runnable() {
-                
+            .execute(new Runnable()
+            {
+
                 private boolean firstPost = true;
-                
+
                 @Override
-                public void run() {
-                    try {
+                public void run()
+                {
+                    try
+                    {
                         // This has to be synchronized or it can collide with the disable method.
-                        synchronized (optOutLock) {
+                        synchronized (optOutLock)
+                        {
                             // Disable Task, if it is running and the server owner decided to opt-out
-                            if (isOptOut() && task != null) {
+                            if (isOptOut() && (task != null))
+                            {
                                 task.cancel();
                                 task = null;
                             }
@@ -211,8 +221,11 @@ public class SpongeMetrics {
                         // After the first post we set firstPost to false
                         // Each post thereafter will be a ping
                         firstPost = false;
-                    } catch (IOException e) {
-                        if (debug) {
+                    }
+                    catch (final IOException e)
+                    {
+                        if (debug)
+                        {
                             PS.debug("[Metrics] " + e.getMessage());
                         }
                     }
@@ -227,8 +240,10 @@ public class SpongeMetrics {
      *
      * @return true if metrics should be opted out of it
      */
-    public boolean isOptOut() {
-        synchronized (optOutLock) {
+    public boolean isOptOut()
+    {
+        synchronized (optOutLock)
+        {
             loadConfiguration();
 
             return config.getNode("mcstats.opt-out").getBoolean();
@@ -240,17 +255,21 @@ public class SpongeMetrics {
      *
      * @throws java.io.IOException
      */
-    public void enable() throws IOException {
+    public void enable() throws IOException
+    {
         // This has to be synchronized or it can collide with the check in the task.
-        synchronized (optOutLock) {
+        synchronized (optOutLock)
+        {
             // Check if the server owner has already set opt-out, if not, set it.
-            if (isOptOut()) {
+            if (isOptOut())
+            {
                 config.getNode("mcstats.opt-out").setValue(false);
                 configurationLoader.save(config);
             }
 
             // Enable Task, if it is not running
-            if (task == null) {
+            if (task == null)
+            {
                 start();
             }
         }
@@ -261,17 +280,21 @@ public class SpongeMetrics {
      *
      * @throws java.io.IOException
      */
-    public void disable() throws IOException {
+    public void disable() throws IOException
+    {
         // This has to be synchronized or it can collide with the check in the task.
-        synchronized (optOutLock) {
+        synchronized (optOutLock)
+        {
             // Check if the server owner has already set opt-out, if not, set it.
-            if (!isOptOut()) {
+            if (!isOptOut())
+            {
                 config.getNode("mcstats.opt-out").setValue(true);
                 configurationLoader.save(config);
             }
 
             // Disable Task, if it is running
-            if (task != null) {
+            if (task != null)
+            {
                 task.cancel();
                 task = null;
             }
@@ -283,9 +306,10 @@ public class SpongeMetrics {
      *
      * @return the File object for the config file
      */
-    public File getConfigFile() {
+    public File getConfigFile()
+    {
         // TODO configDir
-        File configFolder = new File("config");
+        final File configFolder = new File("config");
 
         return new File(configFolder, "PluginMetrics.conf");
     }
@@ -294,20 +318,21 @@ public class SpongeMetrics {
      * Generic method that posts a plugin to the metrics website
      *
      */
-    private void postPlugin(final boolean isPing) throws IOException {
+    private void postPlugin(final boolean isPing) throws IOException
+    {
         // Server software specific section
-        String pluginName = plugin.getName();
-        boolean onlineMode = game.getServer().getOnlineMode(); // TRUE if online mode is enabled
-        String pluginVersion = plugin.getVersion();
+        final String pluginName = plugin.getName();
+        final boolean onlineMode = game.getServer().getOnlineMode(); // TRUE if online mode is enabled
+        final String pluginVersion = plugin.getVersion();
         // TODO no visible way to get MC version at the moment
         // TODO added by game.getPlatform().getMinecraftVersion() -- impl in 2.1
-        String serverVersion = String.format("%s %s", "Sponge", game.getPlatform().getMinecraftVersion());
-        int playersOnline = game.getServer().getOnlinePlayers().size();
+        final String serverVersion = String.format("%s %s", "Sponge", game.getPlatform().getMinecraftVersion());
+        final int playersOnline = game.getServer().getOnlinePlayers().size();
 
         // END server software specific section -- all code below does not use any code outside of this class / Java
 
         // Construct the post data
-        StringBuilder json = new StringBuilder(1024);
+        final StringBuilder json = new StringBuilder(1024);
         json.append('{');
 
         // The plugin's description file containg all of the plugin data such as name, version, author, etc
@@ -317,14 +342,15 @@ public class SpongeMetrics {
         appendJSONPair(json, "players_online", Integer.toString(playersOnline));
 
         // New data as of R6
-        String osname = System.getProperty("os.name");
+        final String osname = System.getProperty("os.name");
         String osarch = System.getProperty("os.arch");
-        String osversion = System.getProperty("os.version");
-        String java_version = System.getProperty("java.version");
-        int coreCount = Runtime.getRuntime().availableProcessors();
+        final String osversion = System.getProperty("os.version");
+        final String java_version = System.getProperty("java.version");
+        final int coreCount = Runtime.getRuntime().availableProcessors();
 
         // normalize os arch .. amd64 -> x86_64
-        if (osarch.equals("amd64")) {
+        if (osarch.equals("amd64"))
+        {
             osarch = "x86_64";
         }
 
@@ -336,7 +362,8 @@ public class SpongeMetrics {
         appendJSONPair(json, "java_version", java_version);
 
         // If we're pinging, append it
-        if (isPing) {
+        if (isPing)
+        {
             appendJSONPair(json, "ping", "1");
         }
 
@@ -344,22 +371,24 @@ public class SpongeMetrics {
         json.append('}');
 
         // Create the url
-        URL url = new URL(BASE_URL + String.format(REPORT_URL, urlEncode(pluginName)));
+        final URL url = new URL(BASE_URL + String.format(REPORT_URL, urlEncode(pluginName)));
 
         // Connect to the website
         URLConnection connection;
 
         // Mineshafter creates a socks proxy, so we can safely bypass it
         // It does not reroute POST requests so we need to go around it
-        if (isMineshafterPresent()) {
+        if (isMineshafterPresent())
+        {
             connection = url.openConnection(Proxy.NO_PROXY);
-        } else {
+        }
+        else
+        {
             connection = url.openConnection();
         }
 
-
-        byte[] uncompressed = json.toString().getBytes();
-        byte[] compressed = gzip(json.toString());
+        final byte[] uncompressed = json.toString().getBytes();
+        final byte[] compressed = gzip(json.toString());
 
         // Headers
         connection.addRequestProperty("User-Agent", "MCStats/" + REVISION);
@@ -371,12 +400,13 @@ public class SpongeMetrics {
 
         connection.setDoOutput(true);
 
-        if (debug) {
+        if (debug)
+        {
             PS.debug("[Metrics] Prepared request for " + pluginName + " uncompressed=" + uncompressed.length + " compressed=" + compressed.length);
         }
 
         // Write the data
-        OutputStream os = connection.getOutputStream();
+        final OutputStream os = connection.getOutputStream();
         os.write(compressed);
         os.flush();
 
@@ -388,10 +418,14 @@ public class SpongeMetrics {
         os.close();
         reader.close();
 
-        if (response == null || response.startsWith("ERR") || response.startsWith("7")) {
-            if (response == null) {
+        if ((response == null) || response.startsWith("ERR") || response.startsWith("7"))
+        {
+            if (response == null)
+            {
                 response = "null";
-            } else if (response.startsWith("7")) {
+            }
+            else if (response.startsWith("7"))
+            {
                 response = response.substring(response.startsWith("7,") ? 2 : 1);
             }
 
@@ -405,19 +439,30 @@ public class SpongeMetrics {
      * @param input
      * @return
      */
-    public static byte[] gzip(String input) {
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+    public static byte[] gzip(final String input)
+    {
+        final ByteArrayOutputStream baos = new ByteArrayOutputStream();
         GZIPOutputStream gzos = null;
 
-        try {
+        try
+        {
             gzos = new GZIPOutputStream(baos);
             gzos.write(input.getBytes("UTF-8"));
-        } catch (IOException e) {
+        }
+        catch (final IOException e)
+        {
             e.printStackTrace();
-        } finally {
-            if (gzos != null) try {
-                gzos.close();
-            } catch (IOException ignore) {
+        }
+        finally
+        {
+            if (gzos != null)
+            {
+                try
+                {
+                    gzos.close();
+                }
+                catch (final IOException ignore)
+                {}
             }
         }
 
@@ -429,11 +474,15 @@ public class SpongeMetrics {
      *
      * @return true if mineshafter is installed on the server
      */
-    private boolean isMineshafterPresent() {
-        try {
+    private boolean isMineshafterPresent()
+    {
+        try
+        {
             Class.forName("mineshafter.MineServer");
             return true;
-        } catch (Exception e) {
+        }
+        catch (final Exception e)
+        {
             return false;
         }
     }
@@ -446,28 +495,37 @@ public class SpongeMetrics {
      * @param value
      * @throws java.io.UnsupportedEncodingException
      */
-    private static void appendJSONPair(StringBuilder json, String key, String value) throws UnsupportedEncodingException {
+    private static void appendJSONPair(final StringBuilder json, final String key, final String value) throws UnsupportedEncodingException
+    {
         boolean isValueNumeric = false;
 
-        try {
-            if (value.equals("0") || !value.endsWith("0")) {
+        try
+        {
+            if (value.equals("0") || !value.endsWith("0"))
+            {
                 Double.parseDouble(value);
                 isValueNumeric = true;
             }
-        } catch (NumberFormatException e) {
+        }
+        catch (final NumberFormatException e)
+        {
             isValueNumeric = false;
         }
 
-        if (json.charAt(json.length() - 1) != '{') {
+        if (json.charAt(json.length() - 1) != '{')
+        {
             json.append(',');
         }
 
         json.append(escapeJSON(key));
         json.append(':');
 
-        if (isValueNumeric) {
+        if (isValueNumeric)
+        {
             json.append(value);
-        } else {
+        }
+        else
+        {
             json.append(escapeJSON(value));
         }
     }
@@ -478,14 +536,17 @@ public class SpongeMetrics {
      * @param text
      * @return
      */
-    private static String escapeJSON(String text) {
-        StringBuilder builder = new StringBuilder();
+    private static String escapeJSON(final String text)
+    {
+        final StringBuilder builder = new StringBuilder();
 
         builder.append('"');
-        for (int index = 0; index < text.length(); index++) {
-            char chr = text.charAt(index);
+        for (int index = 0; index < text.length(); index++)
+        {
+            final char chr = text.charAt(index);
 
-            switch (chr) {
+            switch (chr)
+            {
                 case '"':
                 case '\\':
                     builder.append('\\');
@@ -504,10 +565,13 @@ public class SpongeMetrics {
                     builder.append("\\r");
                     break;
                 default:
-                    if (chr < ' ') {
-                        String t = "000" + Integer.toHexString(chr);
+                    if (chr < ' ')
+                    {
+                        final String t = "000" + Integer.toHexString(chr);
                         builder.append("\\u" + t.substring(t.length() - 4));
-                    } else {
+                    }
+                    else
+                    {
                         builder.append(chr);
                     }
                     break;
@@ -524,7 +588,8 @@ public class SpongeMetrics {
      * @param text the text to encode
      * @return the encoded text, as UTF-8
      */
-    private static String urlEncode(final String text) throws UnsupportedEncodingException {
+    private static String urlEncode(final String text) throws UnsupportedEncodingException
+    {
         return URLEncoder.encode(text, "UTF-8");
     }
 
diff --git a/src/main/java/com/plotsquared/sponge/util/SpongeTaskManager.java b/src/main/java/com/plotsquared/sponge/util/SpongeTaskManager.java
index dace73de7..ee6843105 100644
--- a/src/main/java/com/plotsquared/sponge/util/SpongeTaskManager.java
+++ b/src/main/java/com/plotsquared/sponge/util/SpongeTaskManager.java
@@ -9,62 +9,71 @@ import org.spongepowered.api.service.scheduler.TaskBuilder;
 import com.intellectualcrafters.plot.util.TaskManager;
 import com.plotsquared.sponge.SpongeMain;
 
-public class SpongeTaskManager extends TaskManager {
+public class SpongeTaskManager extends TaskManager
+{
+
+    private final AtomicInteger i = new AtomicInteger();
+
+    private final HashMap<Integer, Task> tasks = new HashMap<>();
 
-    private AtomicInteger i = new AtomicInteger();
-    
-    private HashMap<Integer, Task> tasks = new HashMap<>();
-    
     @Override
-    public int taskRepeat(Runnable r, int interval) {
-        int val = i.incrementAndGet();
-        TaskBuilder builder = SpongeMain.THIS.getGame().getScheduler().createTaskBuilder();
-        TaskBuilder built = builder.delay(interval).interval(interval).execute(r);
-        Task task = built.submit(SpongeMain.THIS.getPlugin());
-        tasks.put(val, task);
-        return val;
-    }
-    
-    @Override
-    public int taskRepeatAsync(Runnable r, int interval) {
-        int val = i.incrementAndGet();
-        TaskBuilder builder = SpongeMain.THIS.getGame().getScheduler().createTaskBuilder();
-        TaskBuilder built = builder.delay(interval).async().interval(interval).execute(r);
-        Task task = built.submit(SpongeMain.THIS.getPlugin());
+    public int taskRepeat(final Runnable r, final int interval)
+    {
+        final int val = i.incrementAndGet();
+        final TaskBuilder builder = SpongeMain.THIS.getGame().getScheduler().createTaskBuilder();
+        final TaskBuilder built = builder.delay(interval).interval(interval).execute(r);
+        final Task task = built.submit(SpongeMain.THIS.getPlugin());
         tasks.put(val, task);
         return val;
     }
 
     @Override
-    public void taskAsync(Runnable r) {
-        TaskBuilder builder = SpongeMain.THIS.getGame().getScheduler().createTaskBuilder();
+    public int taskRepeatAsync(final Runnable r, final int interval)
+    {
+        final int val = i.incrementAndGet();
+        final TaskBuilder builder = SpongeMain.THIS.getGame().getScheduler().createTaskBuilder();
+        final TaskBuilder built = builder.delay(interval).async().interval(interval).execute(r);
+        final Task task = built.submit(SpongeMain.THIS.getPlugin());
+        tasks.put(val, task);
+        return val;
+    }
+
+    @Override
+    public void taskAsync(final Runnable r)
+    {
+        final TaskBuilder builder = SpongeMain.THIS.getGame().getScheduler().createTaskBuilder();
         builder.async().execute(r).submit(SpongeMain.THIS.getPlugin());
     }
 
     @Override
-    public void task(Runnable r) {
-        TaskBuilder builder = SpongeMain.THIS.getGame().getScheduler().createTaskBuilder();
+    public void task(final Runnable r)
+    {
+        final TaskBuilder builder = SpongeMain.THIS.getGame().getScheduler().createTaskBuilder();
         builder.execute(r).submit(SpongeMain.THIS.getPlugin());
     }
 
     @Override
-    public void taskLater(Runnable r, int delay) {
-        TaskBuilder builder = SpongeMain.THIS.getGame().getScheduler().createTaskBuilder();
+    public void taskLater(final Runnable r, final int delay)
+    {
+        final TaskBuilder builder = SpongeMain.THIS.getGame().getScheduler().createTaskBuilder();
         builder.delay(delay).execute(r).submit(SpongeMain.THIS.getPlugin());
     }
 
     @Override
-    public void taskLaterAsync(Runnable r, int delay) {
-        TaskBuilder builder = SpongeMain.THIS.getGame().getScheduler().createTaskBuilder();
+    public void taskLaterAsync(final Runnable r, final int delay)
+    {
+        final TaskBuilder builder = SpongeMain.THIS.getGame().getScheduler().createTaskBuilder();
         builder.async().delay(delay).execute(r).submit(SpongeMain.THIS.getPlugin());
     }
 
     @Override
-    public void cancelTask(int i) {
-        Task task = tasks.remove(i);
-        if (task != null) {
+    public void cancelTask(final int i)
+    {
+        final Task task = tasks.remove(i);
+        if (task != null)
+        {
             task.cancel();
         }
     }
-    
+
 }
diff --git a/src/main/java/com/plotsquared/sponge/util/SpongeTitleManager.java b/src/main/java/com/plotsquared/sponge/util/SpongeTitleManager.java
index 66abbdfb0..d71b5c7eb 100644
--- a/src/main/java/com/plotsquared/sponge/util/SpongeTitleManager.java
+++ b/src/main/java/com/plotsquared/sponge/util/SpongeTitleManager.java
@@ -1,8 +1,5 @@
 package com.plotsquared.sponge.util;
 
-
-import javax.swing.border.Border;
-
 import org.spongepowered.api.text.title.Title;
 import org.spongepowered.api.text.title.TitleBuilder;
 
@@ -11,11 +8,13 @@ import com.intellectualcrafters.plot.util.AbstractTitle;
 import com.plotsquared.sponge.SpongeMain;
 import com.plotsquared.sponge.object.SpongePlayer;
 
-public class SpongeTitleManager extends AbstractTitle {
-    
+public class SpongeTitleManager extends AbstractTitle
+{
+
     @Override
-    public void sendTitle(PlotPlayer player, String head, String sub, int in, int delay, int out) {
-        Title title = new TitleBuilder()
+    public void sendTitle(final PlotPlayer player, final String head, final String sub, final int in, final int delay, final int out)
+    {
+        final Title title = new TitleBuilder()
         .title(SpongeMain.THIS.getText(head))
         .subtitle(SpongeMain.THIS.getText(sub))
         .fadeIn(in * 20)
@@ -25,4 +24,3 @@ public class SpongeTitleManager extends AbstractTitle {
         ((SpongePlayer) player).player.sendTitle(title);
     }
 }
-    
\ No newline at end of file
diff --git a/src/main/java/com/plotsquared/sponge/util/SpongeUtil.java b/src/main/java/com/plotsquared/sponge/util/SpongeUtil.java
index a13c06a8d..4d603d828 100644
--- a/src/main/java/com/plotsquared/sponge/util/SpongeUtil.java
+++ b/src/main/java/com/plotsquared/sponge/util/SpongeUtil.java
@@ -15,87 +15,84 @@ import com.intellectualcrafters.plot.util.UUIDHandler;
 import com.plotsquared.sponge.SpongeMain;
 import com.plotsquared.sponge.object.SpongePlayer;
 
-public class SpongeUtil {
+public class SpongeUtil
+{
 
-    public static Location getLocation(Entity player) {
-        String world = player.getWorld().getName();
-        org.spongepowered.api.world.Location loc = player.getLocation();
-        Vector3i pos = loc.getBlockPosition();
+    public static Location getLocation(final Entity player)
+    {
+        final String world = player.getWorld().getName();
+        final org.spongepowered.api.world.Location loc = player.getLocation();
+        final Vector3i pos = loc.getBlockPosition();
         return new Location(world, pos.getX(), pos.getY(), pos.getZ());
     }
-    
-    public static Location getLocation(org.spongepowered.api.world.Location block) {
-        Extent extent = block.getExtent();
-        if (extent instanceof World) {
-            return getLocation(((World) extent).getName(), block);
-        }
+
+    public static Location getLocation(final org.spongepowered.api.world.Location block)
+    {
+        final Extent extent = block.getExtent();
+        if (extent instanceof World) { return getLocation(((World) extent).getName(), block); }
         return null;
     }
-    
-    public static Location getLocationFull(Entity player) {
-        String world = player.getWorld().getName();
-        Vector3d rot = player.getRotation();
-        float[] pitchYaw = MathMan.getPitchAndYaw((float) rot.getX(), (float) rot.getY(), (float) rot.getZ());
-        org.spongepowered.api.world.Location loc = player.getLocation();
-        Vector3i pos = loc.getBlockPosition();
+
+    public static Location getLocationFull(final Entity player)
+    {
+        final String world = player.getWorld().getName();
+        final Vector3d rot = player.getRotation();
+        final float[] pitchYaw = MathMan.getPitchAndYaw((float) rot.getX(), (float) rot.getY(), (float) rot.getZ());
+        final org.spongepowered.api.world.Location loc = player.getLocation();
+        final Vector3i pos = loc.getBlockPosition();
         return new Location(world, pos.getX(), pos.getY(), pos.getZ(), pitchYaw[1], pitchYaw[0]);
     }
 
     private static Player lastPlayer = null;
     private static PlotPlayer lastPlotPlayer = null;
-    
-    public static PlotPlayer getPlayer(Player player) {
-        if (player == lastPlayer) {
-            return lastPlotPlayer;
-        }
-        String name = player.getName();
-        PlotPlayer pp = UUIDHandler.getPlayers().get(name);
-        if (pp != null) {
-            return pp;
-        }
+
+    public static PlotPlayer getPlayer(final Player player)
+    {
+        if (player == lastPlayer) { return lastPlotPlayer; }
+        final String name = player.getName();
+        final PlotPlayer pp = UUIDHandler.getPlayers().get(name);
+        if (pp != null) { return pp; }
         lastPlotPlayer = new SpongePlayer(player);
         UUIDHandler.getPlayers().put(name, lastPlotPlayer);
         lastPlayer = player;
         return lastPlotPlayer;
     }
 
-    public static Player getPlayer(PlotPlayer player) {
-        if (player instanceof SpongePlayer) {
-            return ((SpongePlayer) player).player;
-        }
+    public static Player getPlayer(final PlotPlayer player)
+    {
+        if (player instanceof SpongePlayer) { return ((SpongePlayer) player).player; }
         return null;
     }
-    
+
     private static World lastWorld;
     private static String last;
 
-    public static World getWorld(String world) {
-        if (world == last) {
-            return lastWorld;
-        }
-        Optional<World> optional = SpongeMain.THIS.getServer().getWorld(world);
-        if (!optional.isPresent()) {
-            return null;
-        }
+    public static World getWorld(final String world)
+    {
+        if (world == last) { return lastWorld; }
+        final Optional<World> optional = SpongeMain.THIS.getServer().getWorld(world);
+        if (!optional.isPresent()) { return null; }
         return optional.get();
     }
 
-    public static void removePlayer(String player) {
+    public static void removePlayer(final String player)
+    {
         lastPlayer = null;
         lastPlotPlayer = null;
         UUIDHandler.getPlayers().remove(player);
     }
 
-    public static Location getLocation(String world, org.spongepowered.api.world.Location spawn) {
+    public static Location getLocation(final String world, final org.spongepowered.api.world.Location spawn)
+    {
         return new Location(world, spawn.getBlockX(), spawn.getBlockY(), spawn.getBlockZ());
     }
 
-    public static String getWorldName(org.spongepowered.api.world.Location origin) {
-        Extent extent = origin.getExtent();
-        if (extent == lastWorld) {
-            return last;
-        }
-        if (extent instanceof World) {
+    public static String getWorldName(final org.spongepowered.api.world.Location origin)
+    {
+        final Extent extent = origin.getExtent();
+        if (extent == lastWorld) { return last; }
+        if (extent instanceof World)
+        {
             lastWorld = (World) extent;
             last = ((World) extent).getName();
             return last;
@@ -103,11 +100,10 @@ public class SpongeUtil {
         return null;
     }
 
-    public static org.spongepowered.api.world.Location getLocation(Location loc) {
-        Optional<World> world = SpongeMain.THIS.getServer().getWorld(loc.getWorld());
-        if (!world.isPresent()) {
-            return null;
-        }
+    public static org.spongepowered.api.world.Location getLocation(final Location loc)
+    {
+        final Optional<World> world = SpongeMain.THIS.getServer().getWorld(loc.getWorld());
+        if (!world.isPresent()) { return null; }
         return new org.spongepowered.api.world.Location(world.get(), loc.getX(), loc.getY(), loc.getZ());
     }
 }
diff --git a/src/main/java/com/plotsquared/sponge/uuid/SpongeLowerOfflineUUIDWrapper.java b/src/main/java/com/plotsquared/sponge/uuid/SpongeLowerOfflineUUIDWrapper.java
index ec5d68b69..de4eff0f0 100644
--- a/src/main/java/com/plotsquared/sponge/uuid/SpongeLowerOfflineUUIDWrapper.java
+++ b/src/main/java/com/plotsquared/sponge/uuid/SpongeLowerOfflineUUIDWrapper.java
@@ -12,80 +12,101 @@ import com.intellectualcrafters.plot.util.UUIDHandler;
 import com.intellectualcrafters.plot.uuid.UUIDWrapper;
 import com.plotsquared.sponge.SpongeMain;
 
-public class SpongeLowerOfflineUUIDWrapper extends UUIDWrapper {
+public class SpongeLowerOfflineUUIDWrapper extends UUIDWrapper
+{
 
-    public SpongeLowerOfflineUUIDWrapper() {
+    public SpongeLowerOfflineUUIDWrapper()
+    {
         // Anything?
     }
 
     @Override
-    public UUID getUUID(final PlotPlayer player) {
+    public UUID getUUID(final PlotPlayer player)
+    {
         return getUUID(player.getName());
     }
 
     @Override
-    public UUID getUUID(final OfflinePlotPlayer player) {
+    public UUID getUUID(final OfflinePlotPlayer player)
+    {
         return getUUID(player.getName());
     }
 
     @Override
-    public OfflinePlotPlayer getOfflinePlayer(final UUID uuid) {
+    public OfflinePlotPlayer getOfflinePlayer(final UUID uuid)
+    {
         String name = UUIDHandler.getName(uuid);
-        if (name == null) {
-            try {
-                GameProfile profile = SpongeMain.THIS.getResolver().get(uuid).get();
-                if (profile != null) {
+        if (name == null)
+        {
+            try
+            {
+                final GameProfile profile = SpongeMain.THIS.getResolver().get(uuid).get();
+                if (profile != null)
+                {
                     name = profile.getName();
                 }
-            } catch (Exception e) {
+            }
+            catch (final Exception e)
+            {
                 e.printStackTrace();
             }
         }
-        if (name == null) {
-            for (GameProfile profile : SpongeMain.THIS.getResolver().getCachedProfiles()) {
-                if (getUUID(profile.getName()).equals(uuid)) {
+        if (name == null)
+        {
+            for (final GameProfile profile : SpongeMain.THIS.getResolver().getCachedProfiles())
+            {
+                if (getUUID(profile.getName()).equals(uuid))
+                {
                     name = profile.getName();
                     break;
                 }
             }
         }
         final String username = name;
-        return new OfflinePlotPlayer() {
+        return new OfflinePlotPlayer()
+        {
             @Override
-            public boolean isOnline() {
+            public boolean isOnline()
+            {
                 return UUIDHandler.getPlayer(uuid) != null;
             }
-            
+
             @Override
-            public UUID getUUID() {
+            public UUID getUUID()
+            {
                 return uuid;
             }
-            
+
             @Override
-            public String getName() {
+            public String getName()
+            {
                 return username;
             }
-            
+
             @Override
-            public long getLastPlayed() {
-             // TODO FIXME
+            public long getLastPlayed()
+            {
+                // TODO FIXME
                 throw new UnsupportedOperationException("NOT IMPLEMENTED YET");
             }
         };
     }
 
-    public Player[] getOnlinePlayers() {
+    public Player[] getOnlinePlayers()
+    {
         return SpongeMain.THIS.getServer().getOnlinePlayers().toArray(new Player[0]);
     }
 
     @Override
-    public UUID getUUID(final String name) {
+    public UUID getUUID(final String name)
+    {
         return UUID.nameUUIDFromBytes(("OfflinePlayer:" + name.toLowerCase()).getBytes(Charsets.UTF_8));
     }
-    
+
     @Override
-    public OfflinePlotPlayer[] getOfflinePlayers() {
-     // TODO FIXME
+    public OfflinePlotPlayer[] getOfflinePlayers()
+    {
+        // TODO FIXME
         throw new UnsupportedOperationException("NOT IMPLEMENTED YET");
     }
 }
diff --git a/src/main/java/com/plotsquared/sponge/uuid/SpongeOnlineUUIDWrapper.java b/src/main/java/com/plotsquared/sponge/uuid/SpongeOnlineUUIDWrapper.java
index a9f1aec4e..e1f3c25ee 100644
--- a/src/main/java/com/plotsquared/sponge/uuid/SpongeOnlineUUIDWrapper.java
+++ b/src/main/java/com/plotsquared/sponge/uuid/SpongeOnlineUUIDWrapper.java
@@ -9,56 +9,71 @@ import com.intellectualcrafters.plot.uuid.UUIDWrapper;
 import com.plotsquared.sponge.SpongeMain;
 import com.plotsquared.sponge.object.SpongePlayer;
 
-public class SpongeOnlineUUIDWrapper extends UUIDWrapper {
+public class SpongeOnlineUUIDWrapper extends UUIDWrapper
+{
 
     @Override
-    public UUID getUUID(PlotPlayer player) {
+    public UUID getUUID(final PlotPlayer player)
+    {
         return ((SpongePlayer) player).player.getUniqueId();
     }
 
     @Override
-    public UUID getUUID(OfflinePlotPlayer player) {
+    public UUID getUUID(final OfflinePlotPlayer player)
+    {
         return player.getUUID();
     }
 
     @Override
-    public UUID getUUID(String name) {
-        try {
+    public UUID getUUID(final String name)
+    {
+        try
+        {
             return SpongeMain.THIS.getResolver().get(name, true).get().getUniqueId();
-        } catch (Exception e) {
+        }
+        catch (final Exception e)
+        {
             e.printStackTrace();
         }
         return null;
     }
 
     @Override
-    public OfflinePlotPlayer getOfflinePlayer(final UUID uuid) {
+    public OfflinePlotPlayer getOfflinePlayer(final UUID uuid)
+    {
         String name;
-        try {
+        try
+        {
             name = SpongeMain.THIS.getResolver().get(uuid, true).get().getName();
         }
-        catch (Exception e) {
+        catch (final Exception e)
+        {
             name = null;
         }
         final String username = name;
-        return new OfflinePlotPlayer() {
+        return new OfflinePlotPlayer()
+        {
             @Override
-            public boolean isOnline() {
+            public boolean isOnline()
+            {
                 return UUIDHandler.getPlayer(uuid) != null;
             }
-            
+
             @Override
-            public UUID getUUID() {
+            public UUID getUUID()
+            {
                 return uuid;
             }
-            
+
             @Override
-            public String getName() {
+            public String getName()
+            {
                 return username;
             }
-            
+
             @Override
-            public long getLastPlayed() {
+            public long getLastPlayed()
+            {
                 // TODO FIXME
                 throw new UnsupportedOperationException("NOT IMPLEMENTED YET");
             }
@@ -66,8 +81,9 @@ public class SpongeOnlineUUIDWrapper extends UUIDWrapper {
     }
 
     @Override
-    public OfflinePlotPlayer[] getOfflinePlayers() {
+    public OfflinePlotPlayer[] getOfflinePlayers()
+    {
         throw new UnsupportedOperationException("NOT IMPLEMENTED YET");
     }
-    
+
 }
diff --git a/src/main/java/com/plotsquared/sponge/uuid/SpongeUUIDHandler.java b/src/main/java/com/plotsquared/sponge/uuid/SpongeUUIDHandler.java
index 5e9736459..2f22edba5 100644
--- a/src/main/java/com/plotsquared/sponge/uuid/SpongeUUIDHandler.java
+++ b/src/main/java/com/plotsquared/sponge/uuid/SpongeUUIDHandler.java
@@ -12,37 +12,43 @@ import com.intellectualcrafters.plot.util.UUIDHandlerImplementation;
 import com.intellectualcrafters.plot.uuid.UUIDWrapper;
 import com.plotsquared.sponge.SpongeMain;
 
-public class SpongeUUIDHandler extends UUIDHandlerImplementation {
+public class SpongeUUIDHandler extends UUIDHandlerImplementation
+{
 
-    public SpongeUUIDHandler(UUIDWrapper wrapper) {
+    public SpongeUUIDHandler(final UUIDWrapper wrapper)
+    {
         super(wrapper);
     }
-    
+
     @Override
-    public boolean startCaching(Runnable whenDone) {
-        if (!super.startCaching(whenDone)) {
-            return false;
-        }
+    public boolean startCaching(final Runnable whenDone)
+    {
+        if (!super.startCaching(whenDone)) { return false; }
         return cache(whenDone);
     }
 
-    public boolean cache(Runnable whenDone) {
+    public boolean cache(final Runnable whenDone)
+    {
         add(new StringWrapper("*"), DBFunc.everyone);
-        for (GameProfile profile : SpongeMain.THIS.getResolver().getCachedProfiles()) {
+        for (final GameProfile profile : SpongeMain.THIS.getResolver().getCachedProfiles())
+        {
             add(new StringWrapper(profile.getName()), profile.getUniqueId());
         }
         return true;
     }
 
     @Override
-    public void fetchUUID(final String name, final RunnableVal<UUID> ifFetch) {
-        TaskManager.runTaskAsync(new Runnable() {
+    public void fetchUUID(final String name, final RunnableVal<UUID> ifFetch)
+    {
+        TaskManager.runTaskAsync(new Runnable()
+        {
             @Override
-            public void run() {
+            public void run()
+            {
                 ifFetch.value = uuidWrapper.getUUID(name);
                 TaskManager.runTask(ifFetch);
             }
         });
     }
-    
+
 }