diff --git a/src/main/java/cr0s/warpdrive/block/TileEntityAbstractBase.java b/src/main/java/cr0s/warpdrive/block/TileEntityAbstractBase.java
index fd58abad..0d07294c 100644
--- a/src/main/java/cr0s/warpdrive/block/TileEntityAbstractBase.java
+++ b/src/main/java/cr0s/warpdrive/block/TileEntityAbstractBase.java
@@ -21,7 +21,7 @@ public abstract class TileEntityAbstractBase extends TileEntity implements IBloc
 	public void updatedNeighbours() {
 	}
 	
-	protected boolean isOnEarth() {
+	protected boolean isOnPlanet() {
 		return worldObj.provider.dimensionId == 0;
 	}
 	
diff --git a/src/main/java/cr0s/warpdrive/block/TileEntityAbstractEnergy.java b/src/main/java/cr0s/warpdrive/block/TileEntityAbstractEnergy.java
index 2956a1a5..bc074048 100644
--- a/src/main/java/cr0s/warpdrive/block/TileEntityAbstractEnergy.java
+++ b/src/main/java/cr0s/warpdrive/block/TileEntityAbstractEnergy.java
@@ -376,7 +376,7 @@ public abstract class TileEntityAbstractEnergy extends TileEntityAbstractInterfa
 	}
 	
 	
-	// WarpDrive overrides for Thermal Expansion FIXME: are we really supposed to do this?
+	// WarpDrive overrides for Thermal Expansion
 	@Optional.Method(modid = "CoFHCore")
 	private void outputEnergy(ForgeDirection from, IEnergyReceiver energyReceiver) {
 		if (energyReceiver == null || worldObj.getTileEntity(xCoord + from.offsetX, yCoord + from.offsetY, zCoord + from.offsetZ) == null) {
diff --git a/src/main/java/cr0s/warpdrive/block/collection/TileEntityMiningLaser.java b/src/main/java/cr0s/warpdrive/block/collection/TileEntityMiningLaser.java
index deec55fa..f9e8ba55 100644
--- a/src/main/java/cr0s/warpdrive/block/collection/TileEntityMiningLaser.java
+++ b/src/main/java/cr0s/warpdrive/block/collection/TileEntityMiningLaser.java
@@ -88,7 +88,7 @@ public class TileEntityMiningLaser extends TileEntityAbstractMiner {
 			return;
 		}
 		
-		boolean isOnEarth = isOnEarth();
+		boolean isOnEarth = isOnPlanet();
 		
 		if (currentState == STATE_WARMUP) {
 			delayTicksWarmup++;
diff --git a/src/main/java/cr0s/warpdrive/block/movement/TileEntityShipCore.java b/src/main/java/cr0s/warpdrive/block/movement/TileEntityShipCore.java
index a5ffd971..7b6e8541 100644
--- a/src/main/java/cr0s/warpdrive/block/movement/TileEntityShipCore.java
+++ b/src/main/java/cr0s/warpdrive/block/movement/TileEntityShipCore.java
@@ -541,7 +541,7 @@ public class TileEntityShipCore extends TileEntityAbstractEnergy {
 		}
 		
 		updateShipMassAndVolume();
-		if (!isUnlimited && shipMass > WarpDriveConfig.SHIP_VOLUME_MAX_ON_PLANET_SURFACE && worldObj.provider.dimensionId == 0) {// FIXME: need to support any planets and landing movement
+		if (!isUnlimited && shipMass > WarpDriveConfig.SHIP_VOLUME_MAX_ON_PLANET_SURFACE && isOnPlanet()) {
 			reason.append("Ship is too big for a planet (max is " + WarpDriveConfig.SHIP_VOLUME_MAX_ON_PLANET_SURFACE + " blocks)");
 			return false;
 		}
diff --git a/src/main/java/cr0s/warpdrive/render/EntityCamera.java b/src/main/java/cr0s/warpdrive/render/EntityCamera.java
index 3917aeb2..4270b9e7 100644
--- a/src/main/java/cr0s/warpdrive/render/EntityCamera.java
+++ b/src/main/java/cr0s/warpdrive/render/EntityCamera.java
@@ -84,7 +84,7 @@ public final class EntityCamera extends EntityLivingBase {
 			ClientCameraHandler.overlayLoggingMessage = "Mouse " + Mouse.isButtonDown(0) + " " + Mouse.isButtonDown(1) + " " + Mouse.isButtonDown(2) + " " + Mouse.isButtonDown(3) + "\nBackspace "
 					+ Keyboard.isKeyDown(Keyboard.KEY_BACKSLASH) + " Space " + Keyboard.isKeyDown(Keyboard.KEY_SPACE) + " Shift " + "";
 			// Perform zoom
-			if (Mouse.isButtonDown(0)) {// FIXME merge: main is using right click with Mouse.isButtonDown(1), branch is using left click
+			if (Mouse.isButtonDown(0)) {
 				zoomWaitTicks++;
 				if (zoomWaitTicks >= 2) {
 					zoomWaitTicks = 0;
@@ -108,7 +108,7 @@ public final class EntityCamera extends EntityLivingBase {
 				}
 			}
 			
-			if (Keyboard.isKeyDown(Keyboard.KEY_SPACE)) {// FIXME merge: main is using left click with Mouse.isButtonDown(0), branch is using space bar
+			if (Keyboard.isKeyDown(Keyboard.KEY_SPACE)) {
 				fireWaitTicks++;
 				if (fireWaitTicks >= 2) {
 					fireWaitTicks = 0;