diff --git a/src/main/java/pw/kaboom/extras/modules/block/BlockPhysics.java b/src/main/java/pw/kaboom/extras/modules/block/BlockPhysics.java
index 7b10db5..f8a83f0 100644
--- a/src/main/java/pw/kaboom/extras/modules/block/BlockPhysics.java
+++ b/src/main/java/pw/kaboom/extras/modules/block/BlockPhysics.java
@@ -97,27 +97,18 @@ public final class BlockPhysics implements Listener {
 	void onBlockPhysics(final BlockPhysicsEvent event) {
 		try {
 			switch (event.getChangedType()) {
-			case COMPARATOR:
-			case REDSTONE_TORCH:
-			case REDSTONE_WIRE:
-			case REPEATER:
-				/*for (BlockFace face : blockFaces) {
-					if (event.getBlock().getRelative(face).getType() != event.getChangedType()) {
-						return;
-					}
-					event.setCancelled(true);
-				}*/
-				event.setCancelled(true);
-				return;
 			case ACTIVATOR_RAIL:
 			case DETECTOR_RAIL:
 			case POWERED_RAIL:
 			case RAIL:
-				for (BlockFace face : blockFaces) {
-					if (event.getBlock().getRelative(face).getType() != event.getChangedType()) {
-						return;
-					}
-					event.getBlock().setType(Material.AIR, false);
+			case COMPARATOR:
+			case REDSTONE_TORCH:
+			case REDSTONE_WIRE:
+			case REPEATER:
+				if (!event.getBlock().getRelative(BlockFace.DOWN).getType().isSolid()
+						&& !Material.AIR.equals(event.getBlock().getRelative(BlockFace.DOWN).getType())
+								&& !Material.CAVE_AIR.equals(event.getBlock().getRelative(BlockFace.DOWN).getType())) {
+					event.setCancelled(true);
 				}
 				return;
 			case TNT:
@@ -132,11 +123,11 @@ public final class BlockPhysics implements Listener {
 				break;
 			}
 			
-			if (!event.getBlock().getType().isSolid()) {
+			/*if (!event.getBlock().getType().isSolid()) {
 				for (BlockFace face : blockFaces) {
 					event.getBlock().getRelative(face).getType();
 				}
-			}
+			}*/
 		} catch (Exception e) {
 			event.setCancelled(true);
 		}
diff --git a/src/main/java/pw/kaboom/extras/modules/player/PlayerInteract.java b/src/main/java/pw/kaboom/extras/modules/player/PlayerInteract.java
index 9b3dc37..bb3ddf0 100644
--- a/src/main/java/pw/kaboom/extras/modules/player/PlayerInteract.java
+++ b/src/main/java/pw/kaboom/extras/modules/player/PlayerInteract.java
@@ -25,7 +25,7 @@ public final class PlayerInteract implements Listener {
 
 	@EventHandler
 	void onPlayerInteract(final PlayerInteractEvent event) {
-		final UUID playerUuid = event.getPlayer().getUniqueId();
+		/*final UUID playerUuid = event.getPlayer().getUniqueId();
 
 		if (interactMillisList.get(playerUuid) != null) {
 			final long millisDifference = System.currentTimeMillis() - interactMillisList.get(playerUuid);
@@ -35,7 +35,7 @@ public final class PlayerInteract implements Listener {
 			}
 		}
 
-		interactMillisList.put(playerUuid, System.currentTimeMillis());
+		interactMillisList.put(playerUuid, System.currentTimeMillis());*/
 		
     	final ItemStack item = event.getItem();