diff --git a/src/main/java/info/jbcs/minecraft/chisel/Waila.java b/src/main/java/info/jbcs/minecraft/chisel/Waila.java
index 38cf3ddc..ae616b20 100644
--- a/src/main/java/info/jbcs/minecraft/chisel/Waila.java
+++ b/src/main/java/info/jbcs/minecraft/chisel/Waila.java
@@ -1,11 +1,15 @@
 package info.jbcs.minecraft.chisel;
 
+import info.jbcs.minecraft.chisel.block.BlockAutoChisel;
 import info.jbcs.minecraft.chisel.block.BlockCarvable;
+import info.jbcs.minecraft.chisel.block.BlockMarbleSlab;
+import info.jbcs.minecraft.chisel.block.BlockVoidstone;
 import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import mcp.mobius.waila.api.IWailaDataProvider;
 import mcp.mobius.waila.api.IWailaRegistrar;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.StatCollector;
 
 import java.util.List;
 
diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockAutoChisel.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockAutoChisel.java
index 6e08c09f..c0c51926 100644
--- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockAutoChisel.java
+++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockAutoChisel.java
@@ -10,15 +10,17 @@ import net.minecraft.block.material.Material;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
 
 import java.util.List;
 import java.util.Random;
 
-public class BlockAutoChisel extends BlockContainer {
+public class BlockAutoChisel extends BlockContainer{
     public BlockAutoChisel() {
         super(Material.rock);
         setHardness(1F);
@@ -61,7 +63,8 @@ public class BlockAutoChisel extends BlockContainer {
     }
 
     @SideOnly(Side.CLIENT)
-    public void getSubBlocks(int metadata, CreativeTabs creativeTabs, List subItems){
+    @Override
+    public void getSubBlocks(Item item, CreativeTabs creativeTabs, List subItems){
         for(int x = 0; x < 4; x++){
             subItems.add(new ItemStack(this, 1, x));
         }
diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/ItemBlockAutoChisel.java b/src/main/java/info/jbcs/minecraft/chisel/block/ItemBlockAutoChisel.java
index 9643f51d..5fcab449 100644
--- a/src/main/java/info/jbcs/minecraft/chisel/block/ItemBlockAutoChisel.java
+++ b/src/main/java/info/jbcs/minecraft/chisel/block/ItemBlockAutoChisel.java
@@ -1,8 +1,12 @@
 package info.jbcs.minecraft.chisel.block;
 
 import net.minecraft.block.Block;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.StatCollector;
+
+import java.util.List;
 
 public class ItemBlockAutoChisel extends ItemBlock{
 
@@ -11,7 +15,6 @@ public class ItemBlockAutoChisel extends ItemBlock{
 
     public ItemBlockAutoChisel(Block block) {
         super(block);
-        setMaxDamage(0);
         setHasSubtypes(true);
     }
 
@@ -25,4 +28,8 @@ public class ItemBlockAutoChisel extends ItemBlock{
         return getUnlocalizedName() + "." + names[itemStack.getItemDamage()];
     }
 
+    @Override
+    public void addInformation(ItemStack itemStack, EntityPlayer player, List list, boolean par4){
+        list.add(StatCollector.translateToLocal(getUnlocalizedName() + "." + names[itemStack.getItemDamage()] + ".desc"));
+    }
 }
diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang
index eba87ad9..80a25f65 100644
--- a/src/main/resources/assets/chisel/lang/en_US.lang
+++ b/src/main/resources/assets/chisel/lang/en_US.lang
@@ -19,7 +19,14 @@ item.upgrade_stack.desc=Allows it to manufacture stacks at a time
 #Chisel 2
 
 #Auto Chisel
-tile.autoChisel.name=Auto Chisel
+tile.autoChisel.base.name=Auto Chisel
+tile.autoChisel.base.desc=Base Version
+tile.autoChisel.speed.name=Auto Chisel (Speed)
+tile.autoChisel.speed.desc=Speed Upgrade
+tile.autoChisel.automation.name=Auto Chisel (Automation)
+tile.autoChisel.automation.desc=Automation Upgrade
+tile.autoChisel.stack.name=Auto Chisel (Stack)
+tile.autoChisel.stack.desc=Stack Upgrade
 
 #Leaves
 tile.leaves.6.desc=Dead leaves
diff --git a/src/main/resources/assets/chisel/textures/items/upgradeItem_0.png b/src/main/resources/assets/chisel/textures/items/upgradeItem_0.png
index 54fb1b4a..41b5ea14 100644
Binary files a/src/main/resources/assets/chisel/textures/items/upgradeItem_0.png and b/src/main/resources/assets/chisel/textures/items/upgradeItem_0.png differ
diff --git a/src/main/resources/assets/chisel/textures/items/upgradeItem_1.png b/src/main/resources/assets/chisel/textures/items/upgradeItem_1.png
index 5fa9c488..4ac7818f 100644
Binary files a/src/main/resources/assets/chisel/textures/items/upgradeItem_1.png and b/src/main/resources/assets/chisel/textures/items/upgradeItem_1.png differ
diff --git a/src/main/resources/assets/chisel/textures/items/upgradeItem_2.png b/src/main/resources/assets/chisel/textures/items/upgradeItem_2.png
index fda24ee8..68eebd3b 100644
Binary files a/src/main/resources/assets/chisel/textures/items/upgradeItem_2.png and b/src/main/resources/assets/chisel/textures/items/upgradeItem_2.png differ
diff --git a/src/main/resources/assets/chisel/textures/items/upgrade_automate.png b/src/main/resources/assets/chisel/textures/items/upgrade_automate.png
deleted file mode 100644
index 41b5ea14..00000000
Binary files a/src/main/resources/assets/chisel/textures/items/upgrade_automate.png and /dev/null differ
diff --git a/src/main/resources/assets/chisel/textures/items/upgrade_speed.png b/src/main/resources/assets/chisel/textures/items/upgrade_speed.png
deleted file mode 100644
index 4ac7818f..00000000
Binary files a/src/main/resources/assets/chisel/textures/items/upgrade_speed.png and /dev/null differ
diff --git a/src/main/resources/assets/chisel/textures/items/upgrade_stack.png b/src/main/resources/assets/chisel/textures/items/upgrade_stack.png
deleted file mode 100644
index 68eebd3b..00000000
Binary files a/src/main/resources/assets/chisel/textures/items/upgrade_stack.png and /dev/null differ