diff --git a/src/de/anura/core/API/Level.java b/src/de/anura/core/API/Level.java
index 09fa4a4..21b4610 100644
--- a/src/de/anura/core/API/Level.java
+++ b/src/de/anura/core/API/Level.java
@@ -122,7 +122,6 @@ public final class Level {
             }
             level += (double) (maxSmashLevel / 4);
             level += (double) maxFFLevel;
-            System.out.println(level);
             anuraLevel.put(P, (int) level);
             smashLevel.put(P, (int) sLevel);
             ffLevel.put(P, (int) fLevel);
diff --git a/src/de/anura/core/commands/PlayerCommands.java b/src/de/anura/core/commands/PlayerCommands.java
index 830f73c..3ce44e0 100644
--- a/src/de/anura/core/commands/PlayerCommands.java
+++ b/src/de/anura/core/commands/PlayerCommands.java
@@ -43,7 +43,7 @@ public class PlayerCommands implements CommandExecutor {
                     Core.statusMsg(sender, "only_player_cmd", false);
                     return true;
                 }
-                if (Core.getMainClass().getFeatures().featureEnabled.get(P).get(Features.Feature.BOAT)) {
+                if (Core.getMainClass().getFeatures().hasFeature(P, Features.Feature.BOAT) && Core.getMainClass().getFeatures().featureEnabled.get(P).get(Features.Feature.BOAT)) {
                     Core.getMainClass().getFeatures().disableFeature(P, Features.Feature.BOAT);
                 } else {
                     Core.getMainClass().getFeatures().enableFeature(P, Features.Feature.BOAT);
diff --git a/src/de/anura/core/events/PlayerInteract.java b/src/de/anura/core/events/PlayerInteract.java
index 519e20a..b9f4d13 100644
--- a/src/de/anura/core/events/PlayerInteract.java
+++ b/src/de/anura/core/events/PlayerInteract.java
@@ -153,10 +153,16 @@ public class PlayerInteract implements Listener {
                             cancelled = false;
                         } else if (event.getClickedBlock().getType().equals(Material.WOOD_BUTTON)) {
                             cancelled = false;
+                        } else if (event.getClickedBlock().getType().equals(Material.WOODEN_DOOR)) {
+                            cancelled = false;
                         }
                     } else if (event.getAction().equals(Action.PHYSICAL)) {
-                        cancelled = false;
+                        if (event.getClickedBlock().getType() != Material.SOIL) {
+                            cancelled = false;
+                        }
                     } else if (event.getAction().equals(Action.RIGHT_CLICK_AIR)) {
+                    }
+                    if (event.getAction().equals(Action.RIGHT_CLICK_AIR) || event.getAction().equals(Action.RIGHT_CLICK_BLOCK)) {
                         if (event.getPlayer().getItemInHand().getType().equals(Material.BOW)) {
                             cancelled = false;
                         } else if (event.getPlayer().getItemInHand().getType().equals(Material.EXP_BOTTLE)) {