diff --git a/src/minecraft/assemblyline/client/ClientProxy.java b/src/minecraft/assemblyline/client/ClientProxy.java
index 06aac048..c2a2921c 100644
--- a/src/minecraft/assemblyline/client/ClientProxy.java
+++ b/src/minecraft/assemblyline/client/ClientProxy.java
@@ -58,7 +58,7 @@ public class ClientProxy extends CommonProxy
 				return new GuiImprinter(player.inventory, world, new Vector3(x, y, z));
 			case GUI_ENCODER:
 				if (tileEntity != null && tileEntity instanceof TileEntityEncoder)
-					return new GuiEncoder(player.inventory, world, new Vector3(x, y, z), (TileEntityEncoder) tileEntity);
+					return new GuiEncoder(player.inventory, world, (TileEntityEncoder) tileEntity);
 		}
 
 		return null;
diff --git a/src/minecraft/assemblyline/client/gui/GuiEncoder.java b/src/minecraft/assemblyline/client/gui/GuiEncoder.java
index c378c6ef..f0515dfc 100644
--- a/src/minecraft/assemblyline/client/gui/GuiEncoder.java
+++ b/src/minecraft/assemblyline/client/gui/GuiEncoder.java
@@ -37,7 +37,6 @@ public class GuiEncoder extends GuiContainer implements IInventoryWatcher
 	private int containerWidth;
 	private int containerHeight;
 	private TileEntityEncoder tileEntity;
-	private int x, y, z;
 	private ArrayList<String> commands;
 
 	// list stuff
@@ -49,18 +48,11 @@ public class GuiEncoder extends GuiContainer implements IInventoryWatcher
 	private GuiButton pDnButton;
 	private GuiTextField commandField;
 
-	public GuiEncoder(InventoryPlayer par1InventoryPlayer, World worldObj, Vector3 position, TileEntityEncoder tileEntity)
+	public GuiEncoder(InventoryPlayer par1InventoryPlayer, World worldObj, TileEntityEncoder tileEntity)
 	{
-		super(new ContainerEncoder(par1InventoryPlayer, worldObj, position, tileEntity));
+		super(new ContainerEncoder(par1InventoryPlayer, worldObj, tileEntity));
 		this.ySize = 256;
 		this.tileEntity = tileEntity;
-		if (tileEntity != null)
-		{
-
-		}
-		this.x = position.intX();
-		this.y = position.intY();
-		this.z = position.intZ();
 	}
 
 	@Override
@@ -268,6 +260,6 @@ public class GuiEncoder extends GuiContainer implements IInventoryWatcher
 	@Override
 	public void inventoryChanged()
 	{
-		updateCommands();
+		this.updateCommands();
 	}
 }
diff --git a/src/minecraft/assemblyline/common/CommonProxy.java b/src/minecraft/assemblyline/common/CommonProxy.java
index 37b7b4dd..9619bc27 100644
--- a/src/minecraft/assemblyline/common/CommonProxy.java
+++ b/src/minecraft/assemblyline/common/CommonProxy.java
@@ -50,7 +50,7 @@ public class CommonProxy implements IGuiHandler
 			case GUI_ENCODER:
 			{
 				if (tileEntity != null && tileEntity instanceof TileEntityEncoder)
-					return new ContainerEncoder(player.inventory, world, new Vector3(x, y, z), (TileEntityEncoder) tileEntity);
+					return new ContainerEncoder(player.inventory, world, (TileEntityEncoder) tileEntity);
 			}
 		}
 
diff --git a/src/minecraft/assemblyline/common/machine/crafter/ContainerCrafter.java b/src/minecraft/assemblyline/common/machine/crafter/ContainerCrafter.java
index 2e4e4a6a..1efe02cd 100644
--- a/src/minecraft/assemblyline/common/machine/crafter/ContainerCrafter.java
+++ b/src/minecraft/assemblyline/common/machine/crafter/ContainerCrafter.java
@@ -68,7 +68,7 @@ public class ContainerCrafter extends Container
 
 			if (par1 != 0)
 			{
-				if (itemStack2.itemID == Item.coal.shiftedIndex)
+				if (itemStack2.itemID == Item.coal.itemID)
 				{
 					if (!this.mergeItemStack(itemStack2, 0, 1, false)) { return null; }
 				}
diff --git a/src/minecraft/assemblyline/common/machine/encoder/ContainerEncoder.java b/src/minecraft/assemblyline/common/machine/encoder/ContainerEncoder.java
index 21b20a44..3b27cbec 100644
--- a/src/minecraft/assemblyline/common/machine/encoder/ContainerEncoder.java
+++ b/src/minecraft/assemblyline/common/machine/encoder/ContainerEncoder.java
@@ -12,14 +12,12 @@ public class ContainerEncoder extends Container
 {
 	private ItemStack[] containingItems = new ItemStack[1];
 	private World worldObj;
-	private Vector3 position;
 	private InventoryPlayer inventoryPlayer;
 	private TileEntityEncoder encoder;
 
-	public ContainerEncoder(InventoryPlayer inventoryPlayer, World worldObj, Vector3 position, TileEntityEncoder encoder)
+	public ContainerEncoder(InventoryPlayer inventoryPlayer, World worldObj, TileEntityEncoder encoder)
 	{
 		this.worldObj = worldObj;
-		this.position = position;
 		this.inventoryPlayer = inventoryPlayer;
 		this.encoder = encoder;
 
@@ -44,12 +42,6 @@ public class ContainerEncoder extends Container
 		}
 	}
 
-	@Override
-	public void updateCraftingResults()
-	{
-		super.updateCraftingResults();
-	}
-
 	@Override
 	public boolean canInteractWith(EntityPlayer player)
 	{
diff --git a/src/minecraft/assemblyline/common/machine/encoder/SlotDisk.java b/src/minecraft/assemblyline/common/machine/encoder/SlotDisk.java
index 249eb635..e6b841d0 100644
--- a/src/minecraft/assemblyline/common/machine/encoder/SlotDisk.java
+++ b/src/minecraft/assemblyline/common/machine/encoder/SlotDisk.java
@@ -15,7 +15,7 @@ public class SlotDisk extends Slot
 
 	public boolean isItemValid(ItemStack itemStack)
 	{
-		return itemStack.itemID == AssemblyLine.itemDisk.shiftedIndex;
+		return itemStack.itemID == AssemblyLine.itemDisk.itemID;
 	}
 
 }
diff --git a/src/minecraft/assemblyline/common/machine/encoder/TileEntityEncoder.java b/src/minecraft/assemblyline/common/machine/encoder/TileEntityEncoder.java
index 43329abc..b996622e 100644
--- a/src/minecraft/assemblyline/common/machine/encoder/TileEntityEncoder.java
+++ b/src/minecraft/assemblyline/common/machine/encoder/TileEntityEncoder.java
@@ -157,8 +157,12 @@ public class TileEntityEncoder extends TileEntityAdvanced implements IPacketRece
 	{
 		try
 		{
-			// TODO: Get this to work and add commands to the stack
+			/**
+			 * Only the server receives this from the client's button click action.
+			 */
+			
 			int newAddCommandID = dataStream.readInt();
+			
 		}
 		catch (Exception e)
 		{
diff --git a/src/minecraft/assemblyline/common/machine/imprinter/ContainerImprinter.java b/src/minecraft/assemblyline/common/machine/imprinter/ContainerImprinter.java
index f5374451..d9c6c47f 100644
--- a/src/minecraft/assemblyline/common/machine/imprinter/ContainerImprinter.java
+++ b/src/minecraft/assemblyline/common/machine/imprinter/ContainerImprinter.java
@@ -57,12 +57,6 @@ public class ContainerImprinter extends Container implements IInventory, ISlotWa
 		}
 	}
 
-	@Override
-	public void updateCraftingResults()
-	{
-		super.updateCraftingResults();
-	}
-
 	@Override
 	public boolean canInteractWith(EntityPlayer player)
 	{
@@ -85,7 +79,8 @@ public class ContainerImprinter extends Container implements IInventory, ISlotWa
 
 			if (slot == 2)
 			{
-				setInventorySlotContents(0, null); // Prevents filter from being duplicated
+				setInventorySlotContents(0, null); // Prevents filter from being
+													// duplicated
 			}
 
 			if (slot > 4)
diff --git a/src/minecraft/assemblyline/common/machine/imprinter/SlotImprint.java b/src/minecraft/assemblyline/common/machine/imprinter/SlotImprint.java
index 79e83f02..ce78689d 100644
--- a/src/minecraft/assemblyline/common/machine/imprinter/SlotImprint.java
+++ b/src/minecraft/assemblyline/common/machine/imprinter/SlotImprint.java
@@ -15,7 +15,7 @@ public class SlotImprint extends Slot
 
 	public boolean isItemValid(ItemStack itemStack)
 	{
-		return itemStack.itemID == AssemblyLine.itemImprint.shiftedIndex;
+		return itemStack.itemID == AssemblyLine.itemImprint.itemID;
 	}
 
 }