diff --git a/src/api/java/invtweaks/api/container/ChestContainer.java b/src/api/java/invtweaks/api/container/ChestContainer.java
index 4722921..dc27377 100755
--- a/src/api/java/invtweaks/api/container/ChestContainer.java
+++ b/src/api/java/invtweaks/api/container/ChestContainer.java
@@ -12,6 +12,9 @@ import java.lang.annotation.Target;
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
 public @interface ChestContainer {
+    // Set to true if the Inventory Tweaks sorting buttons should be shown for this container.
+    boolean showButtons() default true;
+
     // Size of a chest row
     int rowSize() default 9;
 
@@ -25,4 +28,11 @@ public @interface ChestContainer {
     @Target(ElementType.METHOD)
     public @interface RowSizeCallback {
     }
+
+    // Annotation for method to get size of a chest row if it is not a fixed size for this container class
+    // Signature int func()
+    @Retention(RetentionPolicy.RUNTIME)
+    @Target(ElementType.METHOD)
+    public @interface IsLargeCallback {
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/cpw/mods/ironchest/ContainerIronChest.java b/src/main/java/cpw/mods/ironchest/ContainerIronChest.java
index 2257aeb..6c32beb 100755
--- a/src/main/java/cpw/mods/ironchest/ContainerIronChest.java
+++ b/src/main/java/cpw/mods/ironchest/ContainerIronChest.java
@@ -10,6 +10,7 @@
  ******************************************************************************/
 package cpw.mods.ironchest;
 
+import invtweaks.api.container.ChestContainer;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
@@ -17,7 +18,7 @@ import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
-//@ChestContainer(isLargeChest = true)
+@ChestContainer(isLargeChest = true)
 public class ContainerIronChest extends Container {
     private IronChestType type;
     private EntityPlayer player;
@@ -117,7 +118,7 @@ public class ContainerIronChest extends Container {
         return player;
     }
     
-    //@ChestContainer.RowSizeCallback
+    @ChestContainer.RowSizeCallback
     public int getNumColumns() {
         return type.getRowLength();
     }
diff --git a/src/main/java/cpw/mods/ironchest/IronChest.java b/src/main/java/cpw/mods/ironchest/IronChest.java
index c190510..6ecfe73 100755
--- a/src/main/java/cpw/mods/ironchest/IronChest.java
+++ b/src/main/java/cpw/mods/ironchest/IronChest.java
@@ -52,7 +52,7 @@ public class IronChest
         ironChestBlock = new BlockIronChest();
         RegistryHelper.registerBlock(ironChestBlock, ItemIronChest.class, "BlockIronChest");
         
-        if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) Minecraft.getMinecraft().getRenderItem().getItemModelMesher().getModelManager().getBlockModelShapes().func_178123_a(ironChestBlock);
+        if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) Minecraft.getMinecraft().getRenderItem().getItemModelMesher().getModelManager().getBlockModelShapes().registerBuiltInBlocks(ironChestBlock);
         
         for (IronChestType typ : IronChestType.values())
         {
diff --git a/src/main/java/cpw/mods/ironchest/ItemChestChanger.java b/src/main/java/cpw/mods/ironchest/ItemChestChanger.java
index d04343f..f8a34c3 100755
--- a/src/main/java/cpw/mods/ironchest/ItemChestChanger.java
+++ b/src/main/java/cpw/mods/ironchest/ItemChestChanger.java
@@ -12,7 +12,6 @@ package cpw.mods.ironchest;
 
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Blocks;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
diff --git a/src/main/java/cpw/mods/ironchest/client/ClientProxy.java b/src/main/java/cpw/mods/ironchest/client/ClientProxy.java
index 9c45f41..09ad48a 100755
--- a/src/main/java/cpw/mods/ironchest/client/ClientProxy.java
+++ b/src/main/java/cpw/mods/ironchest/client/ClientProxy.java
@@ -10,9 +10,7 @@
  ******************************************************************************/
 package cpw.mods.ironchest.client;
 
-import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.tileentity.TileEntityItemStackRenderer;
-import net.minecraft.client.resources.IReloadableResourceManager;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.BlockPos;
diff --git a/src/main/java/cpw/mods/ironchest/client/TileEntityIronChestRenderer.java b/src/main/java/cpw/mods/ironchest/client/TileEntityIronChestRenderer.java
index 223c915..b6235ee 100755
--- a/src/main/java/cpw/mods/ironchest/client/TileEntityIronChestRenderer.java
+++ b/src/main/java/cpw/mods/ironchest/client/TileEntityIronChestRenderer.java
@@ -136,7 +136,7 @@ public class TileEntityIronChestRenderer extends TileEntitySpecialRenderer
         GlStateManager.popMatrix();
         GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
         
-        if (type.isTransparent() && tile.getDistanceSq(this.rendererDispatcher.field_147560_j, this.rendererDispatcher.field_147561_k, this.rendererDispatcher.field_147558_l) < 128d) {
+        if (type.isTransparent() && tile.getDistanceSq(this.rendererDispatcher.entityX, this.rendererDispatcher.entityY, this.rendererDispatcher.entityZ) < 128d) {
             random.setSeed(254L);
             float shiftX;
             float shiftY;