diff --git a/src/main/java/com/intellectualcrafters/plot/PS.java b/src/main/java/com/intellectualcrafters/plot/PS.java
index fdbbd2250..4db8d5303 100644
--- a/src/main/java/com/intellectualcrafters/plot/PS.java
+++ b/src/main/java/com/intellectualcrafters/plot/PS.java
@@ -1843,7 +1843,7 @@ public class PS {
         options.put("chat.fancy", Settings.FANCY_CHAT);
         options.put("metrics", true);
         options.put("debug", true);
-        options.put("update-notifications", true);
+        options.put("update-notifications", Settings.UPDATE_NOTIFICATIONS);
         
         for (final Entry<String, Object> node : options.entrySet()) {
             if (!config.contains(node.getKey())) {
diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Debug.java b/src/main/java/com/intellectualcrafters/plot/commands/Debug.java
index fe1a44ffe..76e5279a8 100644
--- a/src/main/java/com/intellectualcrafters/plot/commands/Debug.java
+++ b/src/main/java/com/intellectualcrafters/plot/commands/Debug.java
@@ -23,7 +23,6 @@ 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.util.Lag;
 import com.intellectualcrafters.plot.util.MainUtil;
 import com.plotsquared.general.commands.CommandDeclaration;
 
@@ -55,9 +54,6 @@ public class Debug extends SubCommand {
             }
             information.append(header);
             information.append(getSection(section, "Lag / TPS"));
-            information.append(getLine(line, "Ticks Per Second", Lag.getTPS()));
-            information.append(getLine(line, "Lag Percentage", (int) Lag.getPercentage() + "%"));
-            information.append(getLine(line, "TPS Percentage", (int) Lag.getFullPercentage() + "%"));
             information.append(getSection(section, "PlotWorld"));
             information.append(getLine(line, "Plot Worlds", worlds));
             information.append(getLine(line, "Owned Plots", PS.get().getPlots().size()));
diff --git a/src/main/java/com/intellectualcrafters/plot/util/Lag.java b/src/main/java/com/intellectualcrafters/plot/util/Lag.java
deleted file mode 100644
index 0f6e53126..000000000
--- a/src/main/java/com/intellectualcrafters/plot/util/Lag.java
+++ /dev/null
@@ -1,102 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// 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/plotsquared/bukkit/listeners/PlayerEvents.java b/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents.java
index c2a9edaed..619ac2d9f 100644
--- a/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents.java
+++ b/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents.java
@@ -1830,16 +1830,21 @@ public class PlayerEvents extends com.plotsquared.listener.PlotListener implemen
                         e.setCancelled(true);
                     }
                 } else if (!plot.isAdded(pp.getUUID())) {
-                    if (FlagManager.isPlotFlagTrue(plot, C.FLAG_HANGING_PLACE.s())) {
+                    if (!FlagManager.isPlotFlagTrue(plot, C.FLAG_HANGING_PLACE.s())) {
+                        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);
+                            }
+                        }
                         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);
-                        }
-                    }
                 }
+                if (checkEntity(e.getEntity(), plot)) {
+                    e.setCancelled(true);
+                    return;
+                }
+
             }
         }
     }
diff --git a/target/PlotSquared-Bukkit.jar b/target/PlotSquared-Bukkit.jar
index e25d39220..28690f954 100644
Binary files a/target/PlotSquared-Bukkit.jar and b/target/PlotSquared-Bukkit.jar differ