diff --git a/common/buildcraft/core/BuildCraftConfiguration.java b/common/buildcraft/core/BuildCraftConfiguration.java
index 5e7f89d3..43882732 100644
--- a/common/buildcraft/core/BuildCraftConfiguration.java
+++ b/common/buildcraft/core/BuildCraftConfiguration.java
@@ -10,9 +10,6 @@
 package buildcraft.core;
 
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.util.Properties;
 
 import net.minecraftforge.common.Configuration;
 import net.minecraftforge.common.Property;
diff --git a/common/buildcraft/core/ItemWrench.java b/common/buildcraft/core/ItemWrench.java
index 88dedf7c..bf9214f6 100644
--- a/common/buildcraft/core/ItemWrench.java
+++ b/common/buildcraft/core/ItemWrench.java
@@ -1,12 +1,14 @@
 package buildcraft.core;
 
 import buildcraft.api.tools.IToolWrench;
+import net.minecraft.src.CreativeTabs;
 import net.minecraft.src.EntityPlayer;
 
 public class ItemWrench extends ItemBuildCraft implements IToolWrench {
 
 	public ItemWrench(int i) {
 		super(i);
+		setTabToDisplayOn(CreativeTabs.tabTools);
 	}
 
 	@Override
diff --git a/common/buildcraft/energy/BlockEngine.java b/common/buildcraft/energy/BlockEngine.java
index 2822f328..6475e6f4 100644
--- a/common/buildcraft/energy/BlockEngine.java
+++ b/common/buildcraft/energy/BlockEngine.java
@@ -9,7 +9,7 @@
 
 package buildcraft.energy;
 
-import java.util.ArrayList;
+import java.util.List;
 import java.util.Random;
 
 import buildcraft.BuildCraftCore;
@@ -21,6 +21,7 @@ import buildcraft.core.IItemPipe;
 import buildcraft.core.ProxyCore;
 
 import net.minecraft.src.BlockContainer;
+import net.minecraft.src.CreativeTabs;
 import net.minecraft.src.EntityPlayer;
 import net.minecraft.src.Item;
 import net.minecraft.src.ItemStack;
@@ -34,6 +35,7 @@ public class BlockEngine extends BlockContainer {
 		super(i, Material.iron);
 
 		setHardness(0.5F);
+		setCreativeTab(CreativeTabs.tabRedstone);
 	}
 
 	@Override
@@ -119,7 +121,7 @@ public class BlockEngine extends BlockContainer {
 	}
 
 	@SuppressWarnings({ "all" })
-	// @Override (client only)
+	@Override
 	public void randomDisplayTick(World world, int i, int j, int k, Random random) {
 		TileEngine tile = (TileEngine) world.getBlockTileEntity(i, j, k);
 
@@ -141,7 +143,7 @@ public class BlockEngine extends BlockContainer {
 
 	@SuppressWarnings({ "unchecked", "rawtypes" })
 	@Override
-	public void addCreativeItems(ArrayList itemList) {
+	public void getSubBlocks(int blockid, CreativeTabs par2CreativeTabs, List itemList) {
 		itemList.add(new ItemStack(this, 1, 0));
 		itemList.add(new ItemStack(this, 1, 1));
 		itemList.add(new ItemStack(this, 1, 2));
diff --git a/common/buildcraft/energy/BlockOilFlowing.java b/common/buildcraft/energy/BlockOilFlowing.java
index 1ceecf7c..3d09e39c 100644
--- a/common/buildcraft/energy/BlockOilFlowing.java
+++ b/common/buildcraft/energy/BlockOilFlowing.java
@@ -24,15 +24,15 @@ import net.minecraft.src.World;
 
 public class BlockOilFlowing extends BlockFluid implements ILiquid {
 
+	int numAdjacentSources = 0;
+	boolean isOptimalFlowDirection[] = new boolean[4];
+	int flowCost[] = new int[4];
+
 	public BlockOilFlowing(int i, Material material) {
 		super(i, material);
 		
 		setHardness(100F);
 		setLightOpacity(3);
-		
-		numAdjacentSources = 0;
-		isOptimalFlowDirection = new boolean[4];
-		flowCost = new int[4];
 	}
 
 	@Override
@@ -255,10 +255,6 @@ public class BlockOilFlowing extends BlockFluid implements ILiquid {
 		}
 	}
 
-	int numAdjacentSources;
-	boolean isOptimalFlowDirection[];
-	int flowCost[];
-
 	@Override
 	public int stillLiquidId() {
 		return BuildCraftEnergy.oilStill.blockID;
diff --git a/common/buildcraft/factory/BlockAutoWorkbench.java b/common/buildcraft/factory/BlockAutoWorkbench.java
index 91473bd5..4280b76f 100644
--- a/common/buildcraft/factory/BlockAutoWorkbench.java
+++ b/common/buildcraft/factory/BlockAutoWorkbench.java
@@ -17,6 +17,7 @@ import buildcraft.core.GuiIds;
 import buildcraft.core.IItemPipe;
 import buildcraft.core.ProxyCore;
 
+import net.minecraft.src.CreativeTabs;
 import net.minecraft.src.EntityPlayer;
 import net.minecraft.src.ItemStack;
 import net.minecraft.src.Material;
@@ -33,6 +34,7 @@ public class BlockAutoWorkbench extends BlockBuildCraft {
 		topTexture = 2 * 16 + 11;
 		sideTexture = 2 * 16 + 12;
 		setHardness(1.0F);
+		setCreativeTab(CreativeTabs.tabDeco);
 	}
 
 	@Override
diff --git a/common/buildcraft/factory/BlockHopper.java b/common/buildcraft/factory/BlockHopper.java
index 1d658748..e131a565 100644
--- a/common/buildcraft/factory/BlockHopper.java
+++ b/common/buildcraft/factory/BlockHopper.java
@@ -9,6 +9,7 @@ import buildcraft.core.GuiIds;
 import buildcraft.core.IItemPipe;
 import buildcraft.core.ProxyCore;
 
+import net.minecraft.src.CreativeTabs;
 import net.minecraft.src.EntityPlayer;
 import net.minecraft.src.ItemStack;
 import net.minecraft.src.Material;
@@ -20,6 +21,7 @@ public class BlockHopper extends BlockBuildCraft {
 	public BlockHopper(int blockId) {
 		super(blockId, Material.iron);
 		setHardness(5F);
+		setCreativeTab(CreativeTabs.tabDeco);
 	}
 
 	@Override
diff --git a/common/buildcraft/factory/BlockMachineRoot.java b/common/buildcraft/factory/BlockMachineRoot.java
index db126e1e..95d363fc 100644
--- a/common/buildcraft/factory/BlockMachineRoot.java
+++ b/common/buildcraft/factory/BlockMachineRoot.java
@@ -11,6 +11,7 @@ package buildcraft.factory;
 
 import buildcraft.core.IMachine;
 import net.minecraft.src.BlockContainer;
+import net.minecraft.src.CreativeTabs;
 import net.minecraft.src.IBlockAccess;
 import net.minecraft.src.Material;
 import net.minecraft.src.TileEntity;
@@ -19,7 +20,7 @@ public abstract class BlockMachineRoot extends BlockContainer {
 
 	protected BlockMachineRoot(int i, Material material) {
 		super(i, material);
-		// TODO Auto-generated constructor stub
+		setCreativeTab(CreativeTabs.tabRedstone);
 	}
 
 	@Override