diff --git a/common/buildcraft/energy/TileEngine.java b/common/buildcraft/energy/TileEngine.java
index d76a8432..56f6e3ac 100644
--- a/common/buildcraft/energy/TileEngine.java
+++ b/common/buildcraft/energy/TileEngine.java
@@ -18,7 +18,6 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.common.ForgeDirection;
 import buildcraft.BuildCraftEnergy;
-import buildcraft.api.core.Position;
 import buildcraft.api.gates.IOverrideDefaultTriggers;
 import buildcraft.api.gates.ITrigger;
 import buildcraft.api.power.IPowerEmitter;
diff --git a/common/buildcraft/energy/TileEngineWood.java b/common/buildcraft/energy/TileEngineWood.java
index 19fa9b4f..5791cd62 100644
--- a/common/buildcraft/energy/TileEngineWood.java
+++ b/common/buildcraft/energy/TileEngineWood.java
@@ -7,6 +7,7 @@
  */
 package buildcraft.energy;
 
+import buildcraft.api.power.PowerHandler;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.common.ForgeDirection;
 import buildcraft.api.transport.IPipeTile.PipeType;
@@ -52,10 +53,8 @@ public class TileEngineWood extends TileEngine {
 	@Override
 	public float getPistonSpeed() {
 		if (CoreProxy.proxy.isSimulating(worldObj))
-			return Math.max(0.8f * getHeatLevel(), 0.01f);
+			return Math.max(0.08f * getHeatLevel(), 0.01f);
 		switch (getEnergyStage()) {
-			case BLUE:
-				return 0.01F;
 			case GREEN:
 				return 0.02F;
 			case YELLOW:
@@ -63,7 +62,7 @@ public class TileEngineWood extends TileEngine {
 			case RED:
 				return 0.08F;
 			default:
-				return 0;
+				return 0.01F;
 		}
 	}
 
@@ -72,7 +71,7 @@ public class TileEngineWood extends TileEngine {
 		super.engineUpdate();
 
 		if (isRedstonePowered)
-			if (worldObj.getTotalWorldTime() % 20 == 0)
+			if (worldObj.getTotalWorldTime() % 16 == 0)
 				addEnergy(1);
 	}
 
@@ -103,6 +102,6 @@ public class TileEngineWood extends TileEngine {
 
 	@Override
 	public float maxEnergyExtracted() {
-		return 1;
+		return 1 + PowerHandler.PerditionCalculator.MIN_POWERLOSS;
 	}
 }
diff --git a/common/buildcraft/transport/render/RenderPipe.java b/common/buildcraft/transport/render/PipeRendererTESR.java
similarity index 100%
rename from common/buildcraft/transport/render/RenderPipe.java
rename to common/buildcraft/transport/render/PipeRendererTESR.java
diff --git a/common/buildcraft/transport/render/PipeWorldRenderer.java b/common/buildcraft/transport/render/PipeRendererWorld.java
similarity index 100%
rename from common/buildcraft/transport/render/PipeWorldRenderer.java
rename to common/buildcraft/transport/render/PipeRendererWorld.java