diff --git a/build.gradle b/build.gradle
index 3cf9e2e5..f878cc3b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,7 +23,7 @@ group = "info.jbcs.minecraft.chisel" // http://maven.apache.org/guides/mini/guid
 archivesBaseName = "Chisel 2"
 
 minecraft {
-    version = "1.7.10-10.13.0.1207"
+    version = "1.7.10-10.13.2.1230"
     runDir = "run"
 
     replaceIn "Chisel.java"
diff --git a/src/main/java/info/jbcs/minecraft/chisel/BlockNameConversion.java b/src/main/java/info/jbcs/minecraft/chisel/BlockNameConversion.java
index 04fd9c9f..9ec0d908 100644
--- a/src/main/java/info/jbcs/minecraft/chisel/BlockNameConversion.java
+++ b/src/main/java/info/jbcs/minecraft/chisel/BlockNameConversion.java
@@ -1,14 +1,13 @@
 package info.jbcs.minecraft.chisel;
 
-import info.jbcs.minecraft.chisel.utils.General;
-
-import java.util.HashMap;
-
 import cpw.mods.fml.common.FMLLog;
 import cpw.mods.fml.common.registry.GameRegistry;
+import info.jbcs.minecraft.chisel.utils.General;
 import net.minecraft.block.Block;
 import net.minecraft.item.Item;
 
+import java.util.HashMap;
+
 public class BlockNameConversion
 {
     static final private HashMap<String, String> namingConversion = new HashMap<String, String>();
diff --git a/src/main/java/info/jbcs/minecraft/chisel/Packets.java b/src/main/java/info/jbcs/minecraft/chisel/Packets.java
index 25c18077..abe3899c 100644
--- a/src/main/java/info/jbcs/minecraft/chisel/Packets.java
+++ b/src/main/java/info/jbcs/minecraft/chisel/Packets.java
@@ -1,14 +1,5 @@
 package info.jbcs.minecraft.chisel;
 
-import java.io.IOException;
-
-import info.jbcs.minecraft.chisel.carving.Carving;
-import net.minecraft.block.Block;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.network.INetHandler;
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
-
 public class Packets// extends MessageHandlerBase
 {
 
diff --git a/src/main/java/info/jbcs/minecraft/chisel/Waila.java b/src/main/java/info/jbcs/minecraft/chisel/Waila.java
index ae616b20..38cf3ddc 100644
--- a/src/main/java/info/jbcs/minecraft/chisel/Waila.java
+++ b/src/main/java/info/jbcs/minecraft/chisel/Waila.java
@@ -1,15 +1,11 @@
 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 817db102..a2ebe534 100644
--- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockAutoChisel.java
+++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockAutoChisel.java
@@ -16,7 +16,6 @@ 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;
diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleBookshelf.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleBookshelf.java
index d9ab0698..4259faed 100644
--- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleBookshelf.java
+++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleBookshelf.java
@@ -1,16 +1,15 @@
 package info.jbcs.minecraft.chisel.block;
 
-import java.util.Random;
-
-import net.minecraft.block.Block;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
+
+import java.util.Random;
 
 public class BlockMarbleBookshelf extends BlockCarvable
 {
diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleCarpet.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleCarpet.java
index 8d51d647..53af62b7 100644
--- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleCarpet.java
+++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleCarpet.java
@@ -1,12 +1,9 @@
 package info.jbcs.minecraft.chisel.block;
 
+import info.jbcs.minecraft.chisel.Chisel;
 import info.jbcs.minecraft.chisel.api.ICarvable;
 import info.jbcs.minecraft.chisel.carving.CarvableHelper;
 import info.jbcs.minecraft.chisel.carving.CarvableVariation;
-import info.jbcs.minecraft.chisel.Chisel;
-
-import java.util.List;
-
 import info.jbcs.minecraft.chisel.init.ModTabs;
 import net.minecraft.block.BlockCarpet;
 import net.minecraft.block.material.Material;
@@ -16,6 +13,8 @@ import net.minecraft.item.Item;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
 
+import java.util.List;
+
 public class BlockMarbleCarpet extends BlockCarpet implements ICarvable
 {
     public CarvableHelper carverHelper;
diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleIce.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleIce.java
index c6f15ae9..2d30e44f 100644
--- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleIce.java
+++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleIce.java
@@ -3,24 +3,19 @@ package info.jbcs.minecraft.chisel.block;
 import info.jbcs.minecraft.chisel.api.ICarvable;
 import info.jbcs.minecraft.chisel.carving.CarvableHelper;
 import info.jbcs.minecraft.chisel.carving.CarvableVariation;
-import info.jbcs.minecraft.chisel.Chisel;
-
-import java.util.List;
-import java.util.Random;
-
 import info.jbcs.minecraft.chisel.init.ModTabs;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockIce;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.enchantment.EnchantmentHelper;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
 import net.minecraft.stats.StatList;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 
+import java.util.List;
+
 public class BlockMarbleIce extends BlockIce implements ICarvable
 {
     public CarvableHelper carverHelper;
diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleIceStairs.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleIceStairs.java
index 6db42386..fb64be98 100644
--- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleIceStairs.java
+++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleIceStairs.java
@@ -1,14 +1,13 @@
 package info.jbcs.minecraft.chisel.block;
 
 import info.jbcs.minecraft.chisel.carving.CarvableHelper;
-
-import java.util.Random;
-
 import info.jbcs.minecraft.chisel.init.ModBlocks;
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.world.World;
 
+import java.util.Random;
+
 public class BlockMarbleIceStairs extends BlockMarbleStairs
 {
     public BlockMarbleIceStairs(Block block, int meta, CarvableHelper helper)
diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleStairs.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleStairs.java
index ac98a21a..0b4d8b64 100644
--- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleStairs.java
+++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleStairs.java
@@ -4,9 +4,6 @@ import info.jbcs.minecraft.chisel.api.ICarvable;
 import info.jbcs.minecraft.chisel.carving.CarvableHelper;
 import info.jbcs.minecraft.chisel.carving.CarvableVariation;
 import info.jbcs.minecraft.chisel.client.render.BlockMarbleStairsRenderer;
-
-import java.util.List;
-
 import info.jbcs.minecraft.chisel.init.ModTabs;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockStairs;
@@ -19,6 +16,8 @@ import net.minecraft.util.IIcon;
 import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
 
+import java.util.List;
+
 public class BlockMarbleStairs extends BlockStairs implements ICarvable
 {
     CarvableHelper carverHelper;
diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleStairsMaker.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleStairsMaker.java
index 9a29b102..c6c7c003 100644
--- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleStairsMaker.java
+++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleStairsMaker.java
@@ -1,12 +1,12 @@
 package info.jbcs.minecraft.chisel.block;
 
+import cpw.mods.fml.common.registry.GameRegistry;
 import info.jbcs.minecraft.chisel.carving.CarvableHelper;
 import info.jbcs.minecraft.chisel.carving.CarvableVariation;
 import info.jbcs.minecraft.chisel.item.ItemCarvable;
 import net.minecraft.block.Block;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.CraftingManager;
-import cpw.mods.fml.common.registry.GameRegistry;
 
 public class BlockMarbleStairsMaker
 {
diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleWall.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleWall.java
index 8ca566db..e1486615 100644
--- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleWall.java
+++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleWall.java
@@ -1,10 +1,6 @@
 package info.jbcs.minecraft.chisel.block;
 
 import info.jbcs.minecraft.chisel.carving.CarvableHelper;
-import info.jbcs.minecraft.chisel.Chisel;
-
-import java.util.List;
-
 import info.jbcs.minecraft.chisel.init.ModTabs;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockWall;
@@ -13,6 +9,8 @@ import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
 import net.minecraft.util.IIcon;
 
+import java.util.List;
+
 public class BlockMarbleWall extends BlockWall
 {
     CarvableHelper carverHelper;
diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockSnakestone.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockSnakestone.java
index 313f532e..24d6c1b0 100644
--- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockSnakestone.java
+++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockSnakestone.java
@@ -1,9 +1,6 @@
 package info.jbcs.minecraft.chisel.block;
 
 import info.jbcs.minecraft.chisel.client.render.BlockSnakeStoneRenderer;
-
-import java.util.List;
-
 import info.jbcs.minecraft.chisel.init.ModTabs;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
@@ -16,6 +13,8 @@ import net.minecraft.util.IIcon;
 import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
 
+import java.util.List;
+
 public class BlockSnakestone extends Block
 {
     static final int SEC_HEAD = 0;
diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockSnakestoneObsidian.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockSnakestoneObsidian.java
index 05cf10fc..be15ed9f 100644
--- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockSnakestoneObsidian.java
+++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockSnakestoneObsidian.java
@@ -2,13 +2,12 @@ package info.jbcs.minecraft.chisel.block;
 
 
 import info.jbcs.minecraft.chisel.client.GeneralChiselClient;
-
-import java.util.Random;
-
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 
+import java.util.Random;
+
 public class BlockSnakestoneObsidian extends BlockSnakestone
 {
     public IIcon[] particles = new IIcon[8];
diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockVoidstone.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockVoidstone.java
index 068d469d..dd7e5f13 100644
--- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockVoidstone.java
+++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockVoidstone.java
@@ -1,10 +1,10 @@
 package info.jbcs.minecraft.chisel.block;
 
+import info.jbcs.minecraft.chisel.Chisel;
 import info.jbcs.minecraft.chisel.api.ICarvable;
 import info.jbcs.minecraft.chisel.carving.CarvableHelper;
 import info.jbcs.minecraft.chisel.carving.CarvableVariation;
 import info.jbcs.minecraft.chisel.client.GeneralChiselClient;
-import info.jbcs.minecraft.chisel.init.ModTabs;
 import info.jbcs.minecraft.chisel.utils.General;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
@@ -12,13 +12,22 @@ import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 
-public class BlockVoidstone extends Block implements ICarvable {
+import java.util.Random;
+
+public class BlockVoidstone extends Block implements ICarvable{
+    public CarvableHelper carverHelper;
+    public static IIcon iconParticle;
+
     public BlockVoidstone() {
         super(Material.rock);
-        carvableHelper = new CarvableHelper();
+        carverHelper = new CarvableHelper();
         setHardness(5.0F);
         setResistance(10.0F);
-        setCreativeTab(ModTabs.tabChiselBlocks);
+    }
+
+    @Override
+    public void registerBlockIcons(IIconRegister icon){
+        iconParticle = icon.registerIcon(Chisel.MOD_ID + ":voidstone/particles/star");
     }
     
     @Override
@@ -27,9 +36,9 @@ public class BlockVoidstone extends Block implements ICarvable {
         if(General.rand.nextInt(4) == 0 && world.isRemote)
             GeneralChiselClient.spawnVoidstoneFX(world, this, x, y, z);
     }
-    
+
     @Override
     public CarvableVariation getVariation(int metadata) {
-        return carvableHelper.getVariation(metadata);
+        return carverHelper.getVariation(metadata);
     }
 }
diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockVoidstonePillar.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockVoidstonePillar.java
index 0e196c76..adfb9e49 100644
--- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockVoidstonePillar.java
+++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockVoidstonePillar.java
@@ -3,20 +3,15 @@ package info.jbcs.minecraft.chisel.block;
 import info.jbcs.minecraft.chisel.api.ICarvable;
 import info.jbcs.minecraft.chisel.carving.CarvableHelper;
 import info.jbcs.minecraft.chisel.carving.CarvableVariation;
-import info.jbcs.minecraft.chisel.client.GeneralChiselClient;
 import info.jbcs.minecraft.chisel.init.ModTabs;
-import info.jbcs.minecraft.chisel.utils.General;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.util.IIcon;
-import net.minecraft.world.World;
 
-import java.util.Random;
+public class BlockVoidstonePillar extends Block implements ICarvable{
 
-public class BlockVoidstonePillar extends Block implements ICarvable {
-
-    public static IIcon iconParticle, topBottom, pillarSide;
+    public static IIcon topBottom, pillarSide;
     public static CarvableHelper carvableHelper;
 
     public BlockVoidstonePillar() {
@@ -27,13 +22,6 @@ public class BlockVoidstonePillar extends Block implements ICarvable {
         setCreativeTab(ModTabs.tabChiselBlocks);
     }
 
-    @Override
-    public void randomDisplayTick(World world, int x, int y, int z, Random random)
-    {
-        if(General.rand.nextInt(4) == 0 && world.isRemote)
-            GeneralChiselClient.spawnVoidstoneFX(world, this, x, y, z);
-    }
-
     @Override
     public IIcon getIcon(int side, int meta){
         if(side == 0 || side == 1){
@@ -46,7 +34,6 @@ public class BlockVoidstonePillar extends Block implements ICarvable {
 
     @Override
     public void registerBlockIcons(IIconRegister icon){
-        iconParticle = icon.registerIcon("Chisel:voidstone/particles/star");
         topBottom = icon.registerIcon("Chisel:voidstone/pillar-top");
         pillarSide = icon.registerIcon("Chisel:voidstone/pillar-side");
     }
diff --git a/src/main/java/info/jbcs/minecraft/chisel/carving/CarvableHelper.java b/src/main/java/info/jbcs/minecraft/chisel/carving/CarvableHelper.java
index be6f2d1f..9d2eab19 100644
--- a/src/main/java/info/jbcs/minecraft/chisel/carving/CarvableHelper.java
+++ b/src/main/java/info/jbcs/minecraft/chisel/carving/CarvableHelper.java
@@ -25,7 +25,6 @@ import java.util.Set;
 
 public class CarvableHelper
 {
-    static final String modName = "chisel";
     public static final ArrayList<Block> chiselBlocks = new ArrayList<Block>();
 
     public static final int NORMAL = 0;
@@ -87,7 +86,7 @@ public class CarvableHelper
         {
             variation.texture = texture;
 
-            String path = "/assets/" + modName + "/textures/blocks/" + variation.texture;
+            String path = "/assets/" + Chisel.MOD_ID + "/textures/blocks/" + variation.texture;
 
             boolean any = Chisel.class.getResource(path + ".png") != null;
             boolean ctm3 = Chisel.class.getResource(path + "-ctm1.png") != null && Chisel.class.getResource(path + "-ctm2.png") != null && Chisel.class.getResource(path + "-ctm3.png") != null;
diff --git a/src/main/java/info/jbcs/minecraft/chisel/carving/Carving.java b/src/main/java/info/jbcs/minecraft/chisel/carving/Carving.java
index b9319147..01240803 100644
--- a/src/main/java/info/jbcs/minecraft/chisel/carving/Carving.java
+++ b/src/main/java/info/jbcs/minecraft/chisel/carving/Carving.java
@@ -1,11 +1,11 @@
 package info.jbcs.minecraft.chisel.carving;
 
+import info.jbcs.minecraft.chisel.Chisel;
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.oredict.OreDictionary;
-import info.jbcs.minecraft.chisel.Chisel;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/GeneralChiselClient.java b/src/main/java/info/jbcs/minecraft/chisel/client/GeneralChiselClient.java
index d3bf89f7..bc22a2c8 100644
--- a/src/main/java/info/jbcs/minecraft/chisel/client/GeneralChiselClient.java
+++ b/src/main/java/info/jbcs/minecraft/chisel/client/GeneralChiselClient.java
@@ -4,7 +4,7 @@ import info.jbcs.minecraft.chisel.Configurations;
 import info.jbcs.minecraft.chisel.block.BlockHolystone;
 import info.jbcs.minecraft.chisel.block.BlockLavastone;
 import info.jbcs.minecraft.chisel.block.BlockSnakestoneObsidian;
-import info.jbcs.minecraft.chisel.block.BlockVoidstonePillar;
+import info.jbcs.minecraft.chisel.block.BlockVoidstone;
 import info.jbcs.minecraft.chisel.entity.fx.EntityBallOMossFX;
 import info.jbcs.minecraft.chisel.entity.fx.EntityHolystoneFX;
 import info.jbcs.minecraft.chisel.entity.fx.EntitySnakestoneObsidianFX;
@@ -64,9 +64,6 @@ public class GeneralChiselClient {
         if (world.getBlock(x, y, z).isOpaqueCube()) return;
 
         EntityLavaFX res = new EntityLavaFX(world, x1, y1, z1);
-//		res.motionX=x1-x-0.5;
-//		res.motionY=y1-y-0.5;
-//		res.motionZ=z1-z-0.5;
         double multiplier = 0.45;
         res.motionX = -multiplier * (x1 - x - 0.5);
         res.motionY = multiplier * (y1 - y - 0.5);
@@ -123,7 +120,7 @@ public class GeneralChiselClient {
         }
     }
 
-    public static void spawnVoidstoneFX(World world, BlockVoidstonePillar block, int x, int y, int z) {
+    public static void spawnVoidstoneFX(World world, BlockVoidstone block, int x, int y, int z) {
         if (Configurations.particlesTickrate == 0 || tick++ % Configurations.particlesTickrate == 0) {
             float f = 0.15F;
             double x1 = x + rand.nextDouble() * (block.getBlockBoundsMaxX() - block.getBlockBoundsMinX() - f * 2.0F) + f + block.getBlockBoundsMinX();
@@ -206,7 +203,6 @@ public class GeneralChiselClient {
         }
 
         EntityDiggingFX res = new EntityDiggingFX(world, d0, d1, d2, 0.0D, 0.0D, 0.0D, block, world.getBlockMetadata(x, y, z), side);
-//		res.func_70596_a(x, y, z);
         res.motionX = d0 - (x + 0.5);
         res.motionY = d1 - (y + 0.5);
         res.motionZ = d2 - (z + 0.5);
diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiChisel.java b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiChisel.java
index 950d3002..cff5edc7 100644
--- a/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiChisel.java
+++ b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiChisel.java
@@ -7,7 +7,6 @@ import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
-
 import org.lwjgl.opengl.GL11;
 
 public class GuiChisel extends GuiContainer
diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiElement.java b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiElement.java
index 15908121..1fe72fe1 100644
--- a/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiElement.java
+++ b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiElement.java
@@ -1,9 +1,9 @@
 package info.jbcs.minecraft.chisel.client.gui;
 
-import java.util.ArrayList;
-
 import org.lwjgl.opengl.GL11;
 
+import java.util.ArrayList;
+
 public class GuiElement
 {
     public int x;
diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiScreenPlus.java b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiScreenPlus.java
index 8112be99..1b434c52 100644
--- a/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiScreenPlus.java
+++ b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiScreenPlus.java
@@ -7,7 +7,6 @@ import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.inventory.Container;
-
 import org.lwjgl.input.Keyboard;
 import org.lwjgl.input.Mouse;
 import org.lwjgl.opengl.GL11;
diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuilScrolledBox.java b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuilScrolledBox.java
index aa1a8a8e..b96e4429 100644
--- a/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuilScrolledBox.java
+++ b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuilScrolledBox.java
@@ -3,7 +3,6 @@ package info.jbcs.minecraft.chisel.client.gui;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Gui;
 import net.minecraft.client.renderer.Tessellator;
-
 import org.lwjgl.opengl.GL11;
 
 public class GuilScrolledBox extends GuiElement
diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/gui/Scrollbar.java b/src/main/java/info/jbcs/minecraft/chisel/client/gui/Scrollbar.java
index 1d89172f..5d35fd36 100644
--- a/src/main/java/info/jbcs/minecraft/chisel/client/gui/Scrollbar.java
+++ b/src/main/java/info/jbcs/minecraft/chisel/client/gui/Scrollbar.java
@@ -3,7 +3,6 @@ package info.jbcs.minecraft.chisel.client.gui;
 import info.jbcs.minecraft.chisel.utils.GeneralClient;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiButton;
-
 import org.lwjgl.input.Mouse;
 
 public abstract class Scrollbar extends GuiButton
diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockAdvancedMarbleRenderer.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockAdvancedMarbleRenderer.java
index 7f3fcc8f..f6a1acca 100644
--- a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockAdvancedMarbleRenderer.java
+++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockAdvancedMarbleRenderer.java
@@ -1,21 +1,17 @@
 package info.jbcs.minecraft.chisel.client.render;
 
+import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
+import cpw.mods.fml.client.registry.RenderingRegistry;
+import info.jbcs.minecraft.chisel.Chisel;
 import info.jbcs.minecraft.chisel.api.ICarvable;
 import info.jbcs.minecraft.chisel.carving.CarvableHelper;
 import info.jbcs.minecraft.chisel.carving.CarvableVariation;
-import info.jbcs.minecraft.chisel.Chisel;
-import info.jbcs.minecraft.chisel.client.render.RenderBlocksCTM;
-import info.jbcs.minecraft.chisel.client.render.RenderBlocksColumn;
 import info.jbcs.minecraft.chisel.utils.Drawing;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.world.IBlockAccess;
-
 import org.lwjgl.opengl.GL11;
 
-import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
-import cpw.mods.fml.client.registry.RenderingRegistry;
-
 public class BlockAdvancedMarbleRenderer implements ISimpleBlockRenderingHandler
 {
     public RenderBlocksCTM rendererCTM = new RenderBlocksCTM();
diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockCarpetRenderer.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockCarpetRenderer.java
index c2ead782..c0f676b9 100644
--- a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockCarpetRenderer.java
+++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockCarpetRenderer.java
@@ -1,7 +1,7 @@
 package info.jbcs.minecraft.chisel.client.render;
 
-import info.jbcs.minecraft.chisel.Chisel;
 import cpw.mods.fml.client.registry.RenderingRegistry;
+import info.jbcs.minecraft.chisel.Chisel;
 
 
 public class BlockCarpetRenderer extends BlockAdvancedMarbleRenderer
diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockEldritchRenderer.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockEldritchRenderer.java
index efa39564..25bbdaa9 100644
--- a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockEldritchRenderer.java
+++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockEldritchRenderer.java
@@ -1,17 +1,14 @@
 package info.jbcs.minecraft.chisel.client.render;
 
+import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
+import cpw.mods.fml.client.registry.RenderingRegistry;
 import info.jbcs.minecraft.chisel.Chisel;
-import info.jbcs.minecraft.chisel.client.render.RenderBlocksEldritch;
 import info.jbcs.minecraft.chisel.utils.Drawing;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.world.IBlockAccess;
-
 import org.lwjgl.opengl.GL11;
 
-import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
-import cpw.mods.fml.client.registry.RenderingRegistry;
-
 public class BlockEldritchRenderer implements ISimpleBlockRenderingHandler
 {
     public BlockEldritchRenderer()
diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockMarblePaneRenderer.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockMarblePaneRenderer.java
index 12e1b0d8..451b32d5 100644
--- a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockMarblePaneRenderer.java
+++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockMarblePaneRenderer.java
@@ -1,5 +1,7 @@
 package info.jbcs.minecraft.chisel.client.render;
 
+import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
+import cpw.mods.fml.client.registry.RenderingRegistry;
 import info.jbcs.minecraft.chisel.utils.Drawing;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockPane;
@@ -8,12 +10,8 @@ import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
-
 import org.lwjgl.opengl.GL11;
 
-import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
-import cpw.mods.fml.client.registry.RenderingRegistry;
-
 public class BlockMarblePaneRenderer implements ISimpleBlockRenderingHandler
 {
     public static int id;
diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockMarblePillarRenderer.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockMarblePillarRenderer.java
index b9875245..04e9a0ea 100644
--- a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockMarblePillarRenderer.java
+++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockMarblePillarRenderer.java
@@ -1,17 +1,15 @@
 package info.jbcs.minecraft.chisel.client.render;
 
-import info.jbcs.minecraft.chisel.carving.CarvableHelper;
+import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
+import cpw.mods.fml.client.registry.RenderingRegistry;
 import info.jbcs.minecraft.chisel.block.BlockMarblePillar;
+import info.jbcs.minecraft.chisel.carving.CarvableHelper;
 import info.jbcs.minecraft.chisel.utils.Drawing;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.world.IBlockAccess;
-
 import org.lwjgl.opengl.GL11;
 
-import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
-import cpw.mods.fml.client.registry.RenderingRegistry;
-
 public class BlockMarblePillarRenderer implements ISimpleBlockRenderingHandler
 {
     public static int id;
diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockMarbleStairsRenderer.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockMarbleStairsRenderer.java
index 5157a25d..03aea24a 100644
--- a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockMarbleStairsRenderer.java
+++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockMarbleStairsRenderer.java
@@ -1,16 +1,14 @@
 package info.jbcs.minecraft.chisel.client.render;
 
+import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
+import cpw.mods.fml.client.registry.RenderingRegistry;
 import info.jbcs.minecraft.chisel.block.BlockMarbleStairs;
 import info.jbcs.minecraft.chisel.utils.Drawing;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.world.IBlockAccess;
-
 import org.lwjgl.opengl.GL11;
 
-import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
-import cpw.mods.fml.client.registry.RenderingRegistry;
-
 public class BlockMarbleStairsRenderer implements ISimpleBlockRenderingHandler
 {
     public static int id;
diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockNoCTMRenderer.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockNoCTMRenderer.java
index 06579385..ecd6768f 100644
--- a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockNoCTMRenderer.java
+++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockNoCTMRenderer.java
@@ -1,15 +1,13 @@
 package info.jbcs.minecraft.chisel.client.render;
 
+import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
+import cpw.mods.fml.client.registry.RenderingRegistry;
 import info.jbcs.minecraft.chisel.utils.Drawing;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.world.IBlockAccess;
-
 import org.lwjgl.opengl.GL11;
 
-import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
-import cpw.mods.fml.client.registry.RenderingRegistry;
-
 public class BlockNoCTMRenderer implements ISimpleBlockRenderingHandler
 {
     static int id;
diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockRoadLineRenderer.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockRoadLineRenderer.java
index 9cf0f1e1..ae11ff60 100644
--- a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockRoadLineRenderer.java
+++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockRoadLineRenderer.java
@@ -1,5 +1,7 @@
 package info.jbcs.minecraft.chisel.client.render;
 
+import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
+import cpw.mods.fml.client.registry.RenderingRegistry;
 import info.jbcs.minecraft.chisel.block.BlockRoadLine;
 import info.jbcs.minecraft.chisel.utils.Drawing;
 import net.minecraft.block.Block;
@@ -8,8 +10,6 @@ import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
-import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
-import cpw.mods.fml.client.registry.RenderingRegistry;
 
 public class BlockRoadLineRenderer implements ISimpleBlockRenderingHandler
 {
diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockSnakeStoneRenderer.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockSnakeStoneRenderer.java
index 5193cbdc..b5515313 100644
--- a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockSnakeStoneRenderer.java
+++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockSnakeStoneRenderer.java
@@ -1,16 +1,14 @@
 package info.jbcs.minecraft.chisel.client.render;
 
+import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
+import cpw.mods.fml.client.registry.RenderingRegistry;
 import info.jbcs.minecraft.chisel.block.BlockSnakestone;
 import info.jbcs.minecraft.chisel.utils.Drawing;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.world.IBlockAccess;
-
 import org.lwjgl.opengl.GL11;
 
-import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
-import cpw.mods.fml.client.registry.RenderingRegistry;
-
 public class BlockSnakeStoneRenderer implements ISimpleBlockRenderingHandler
 {
     public static int id;
diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockSpikesRenderer.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockSpikesRenderer.java
index a998d977..cc396f77 100644
--- a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockSpikesRenderer.java
+++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockSpikesRenderer.java
@@ -1,17 +1,16 @@
 package info.jbcs.minecraft.chisel.client.render;
 
+import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
+import cpw.mods.fml.client.registry.RenderingRegistry;
 import info.jbcs.minecraft.chisel.init.ModBlocks;
 import info.jbcs.minecraft.chisel.utils.Drawing;
-
-import java.util.Random;
-
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
-import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
-import cpw.mods.fml.client.registry.RenderingRegistry;
+
+import java.util.Random;
 
 public class BlockSpikesRenderer implements ISimpleBlockRenderingHandler
 {
diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockTexturedOreRenderer.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockTexturedOreRenderer.java
index f92011d3..d8f4f612 100644
--- a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockTexturedOreRenderer.java
+++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockTexturedOreRenderer.java
@@ -1,17 +1,15 @@
 package info.jbcs.minecraft.chisel.client.render;
 
+import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
+import cpw.mods.fml.client.registry.RenderingRegistry;
 import info.jbcs.minecraft.chisel.block.BlockTexturedOre;
 import info.jbcs.minecraft.chisel.utils.Drawing;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.init.Blocks;
 import net.minecraft.world.IBlockAccess;
-
 import org.lwjgl.opengl.GL11;
 
-import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
-import cpw.mods.fml.client.registry.RenderingRegistry;
-
 public class BlockTexturedOreRenderer implements ISimpleBlockRenderingHandler
 {
     float bot = -0.001f, top = 1.0f - bot;
diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/render/TextureVirtual.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/TextureVirtual.java
index e24ee64b..75b72670 100644
--- a/src/main/java/info/jbcs/minecraft/chisel/client/render/TextureVirtual.java
+++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/TextureVirtual.java
@@ -1,8 +1,8 @@
 package info.jbcs.minecraft.chisel.client.render;
 
-import net.minecraft.util.IIcon;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.util.IIcon;
 
 public class TextureVirtual implements IIcon
 {
diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/render/item/ItemChiselRenderer.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/item/ItemChiselRenderer.java
index 5a845e8e..b0be09d7 100644
--- a/src/main/java/info/jbcs/minecraft/chisel/client/render/item/ItemChiselRenderer.java
+++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/item/ItemChiselRenderer.java
@@ -6,7 +6,6 @@ import net.minecraft.client.renderer.RenderHelper;
 import net.minecraft.client.renderer.entity.RenderItem;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.client.IItemRenderer;
-
 import org.lwjgl.opengl.GL11;
 
 public class ItemChiselRenderer implements IItemRenderer
diff --git a/src/main/java/info/jbcs/minecraft/chisel/entity/EntityCloudInABottle.java b/src/main/java/info/jbcs/minecraft/chisel/entity/EntityCloudInABottle.java
index 943edbcc..e1dec8e7 100644
--- a/src/main/java/info/jbcs/minecraft/chisel/entity/EntityCloudInABottle.java
+++ b/src/main/java/info/jbcs/minecraft/chisel/entity/EntityCloudInABottle.java
@@ -1,13 +1,13 @@
 package info.jbcs.minecraft.chisel.entity;
 
-import java.util.Random;
-
 import info.jbcs.minecraft.chisel.init.ModBlocks;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.projectile.EntityThrowable;
 import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.world.World;
 
+import java.util.Random;
+
 public class EntityCloudInABottle extends EntityThrowable
 {
     Random rand = new Random();
diff --git a/src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntityBallOMossFX.java b/src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntityBallOMossFX.java
index 9081d5de..b16e8c12 100644
--- a/src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntityBallOMossFX.java
+++ b/src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntityBallOMossFX.java
@@ -1,6 +1,7 @@
 package info.jbcs.minecraft.chisel.entity.fx;
 
-import info.jbcs.minecraft.chisel.Chisel;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import info.jbcs.minecraft.chisel.block.BlockSnakestoneObsidian;
 import info.jbcs.minecraft.chisel.init.ModItems;
 import info.jbcs.minecraft.chisel.utils.General;
@@ -8,12 +9,8 @@ import net.minecraft.client.particle.EntityFX;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
-
 import org.lwjgl.opengl.GL11;
 
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
 public class EntityBallOMossFX extends EntityFX
 {
     BlockSnakestoneObsidian block;
diff --git a/src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntitySnakestoneObsidianFX.java b/src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntitySnakestoneObsidianFX.java
index 58fb6bf2..607763f3 100644
--- a/src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntitySnakestoneObsidianFX.java
+++ b/src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntitySnakestoneObsidianFX.java
@@ -5,7 +5,6 @@ import info.jbcs.minecraft.chisel.utils.General;
 import net.minecraft.client.particle.EntityFX;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.world.World;
-
 import org.lwjgl.opengl.GL11;
 
 public class EntitySnakestoneObsidianFX extends EntityFX
diff --git a/src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntityVoidstoneFX.java b/src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntityVoidstoneFX.java
index 04f24580..6d903bfe 100644
--- a/src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntityVoidstoneFX.java
+++ b/src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntityVoidstoneFX.java
@@ -1,6 +1,6 @@
 package info.jbcs.minecraft.chisel.entity.fx;
 
-import info.jbcs.minecraft.chisel.block.BlockVoidstonePillar;
+import info.jbcs.minecraft.chisel.block.BlockVoidstone;
 import info.jbcs.minecraft.chisel.utils.General;
 import net.minecraft.client.particle.EntityFX;
 import net.minecraft.client.renderer.Tessellator;
@@ -12,7 +12,7 @@ public class EntityVoidstoneFX extends EntityFX {
     float initialScale;
     float angleOffset;
 
-    public EntityVoidstoneFX(World world, BlockVoidstonePillar blockVoidstone, double x, double y, double z) {
+    public EntityVoidstoneFX(World world, BlockVoidstone blockVoidstone, double x, double y, double z) {
         super(world, x, y, z, 0, 0, 0);
         initialScale = 1.0F + 1.0F * General.rand.nextFloat();
         angleOffset = rand.nextFloat() * 360;
diff --git a/src/main/java/info/jbcs/minecraft/chisel/init/ModBlocks.java b/src/main/java/info/jbcs/minecraft/chisel/init/ModBlocks.java
index ae5b6225..a742ab9b 100644
--- a/src/main/java/info/jbcs/minecraft/chisel/init/ModBlocks.java
+++ b/src/main/java/info/jbcs/minecraft/chisel/init/ModBlocks.java
@@ -1318,11 +1318,11 @@ public class ModBlocks {
         }
 
         if(Configurations.featureEnabled("voidstone")){
-            voidstone = (BlockVoidstone) new BlockVoidstone(Material.rock, Chisel.MOD_ID + ":void").setHardness(2.0F).setResistance(5F).setStepSound(Block.soundTypeStone);
+            voidstone = (BlockVoidstone) new BlockVoidstone().setStepSound(Block.soundTypeStone).setCreativeTab(ModTabs.tabChiselBlocks);
             voidstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.0.desc"), 0, "voidstone/metalborder");
             voidstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.1.desc"), 1, "voidstone/quarters");
             voidstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.2.desc"), 2, "voidstone/smooth");
-            voidstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.3.desc"), 3, "voidstone/skulls"
+            voidstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.3.desc"), 3, "voidstone/skulls");
             voidstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.12.desc"), 12, "voidstone/rune");
             voidstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.13.desc"), 13, "voidstone/raw");
             voidstone.carverHelper.addVariation(StatCollector.translateToLocal("tile.voidstone.14.desc"), 14, "voidstone/eye");
diff --git a/src/main/java/info/jbcs/minecraft/chisel/inventory/SlotChiselPlayer.java b/src/main/java/info/jbcs/minecraft/chisel/inventory/SlotChiselPlayer.java
index 83435eb4..08875d62 100644
--- a/src/main/java/info/jbcs/minecraft/chisel/inventory/SlotChiselPlayer.java
+++ b/src/main/java/info/jbcs/minecraft/chisel/inventory/SlotChiselPlayer.java
@@ -2,7 +2,6 @@ package info.jbcs.minecraft.chisel.inventory;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.init.Blocks;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
diff --git a/src/main/java/info/jbcs/minecraft/chisel/proxy/ClientProxy.java b/src/main/java/info/jbcs/minecraft/chisel/proxy/ClientProxy.java
index e159e4e7..34e1c166 100644
--- a/src/main/java/info/jbcs/minecraft/chisel/proxy/ClientProxy.java
+++ b/src/main/java/info/jbcs/minecraft/chisel/proxy/ClientProxy.java
@@ -15,7 +15,6 @@ import info.jbcs.minecraft.chisel.entity.EntityCloudInABottle;
 import info.jbcs.minecraft.chisel.entity.EntitySmashingRock;
 import info.jbcs.minecraft.chisel.init.ModBlocks;
 import info.jbcs.minecraft.chisel.init.ModItems;
-import net.minecraft.block.Block;
 import net.minecraft.client.renderer.entity.RenderSnowball;
 import net.minecraft.item.Item;
 import net.minecraftforge.client.MinecraftForgeClient;
diff --git a/src/main/java/info/jbcs/minecraft/chisel/utils/BlockTexturedOreRenderer.java b/src/main/java/info/jbcs/minecraft/chisel/utils/BlockTexturedOreRenderer.java
index a00a22b7..af923911 100644
--- a/src/main/java/info/jbcs/minecraft/chisel/utils/BlockTexturedOreRenderer.java
+++ b/src/main/java/info/jbcs/minecraft/chisel/utils/BlockTexturedOreRenderer.java
@@ -1,15 +1,13 @@
 package info.jbcs.minecraft.chisel.utils;
 
+import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
+import cpw.mods.fml.client.registry.RenderingRegistry;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.init.Blocks;
 import net.minecraft.world.IBlockAccess;
-
 import org.lwjgl.opengl.GL11;
 
-import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
-import cpw.mods.fml.client.registry.RenderingRegistry;
-
 public class BlockTexturedOreRenderer implements ISimpleBlockRenderingHandler
 {
     float bot = -0.001f, top = 1.0f - bot;
diff --git a/src/main/java/info/jbcs/minecraft/chisel/utils/General.java b/src/main/java/info/jbcs/minecraft/chisel/utils/General.java
index 9ee8e248..0e403ed3 100644
--- a/src/main/java/info/jbcs/minecraft/chisel/utils/General.java
+++ b/src/main/java/info/jbcs/minecraft/chisel/utils/General.java
@@ -1,8 +1,5 @@
 package info.jbcs.minecraft.chisel.utils;
 
-import java.util.HashMap;
-import java.util.Random;
-
 import net.minecraft.block.Block;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
@@ -14,6 +11,8 @@ import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.util.Vec3;
 import net.minecraft.world.World;
 
+import java.util.Random;
+
 public class General
 {
     public static Random rand = new Random();
diff --git a/src/main/java/info/jbcs/minecraft/chisel/utils/GeneralClient.java b/src/main/java/info/jbcs/minecraft/chisel/utils/GeneralClient.java
index e8f3ed08..b4553df3 100644
--- a/src/main/java/info/jbcs/minecraft/chisel/utils/GeneralClient.java
+++ b/src/main/java/info/jbcs/minecraft/chisel/utils/GeneralClient.java
@@ -1,21 +1,14 @@
 package info.jbcs.minecraft.chisel.utils;
 
-import java.util.HashMap;
-import java.util.Random;
-
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import cpw.mods.fml.common.gameevent.TickEvent;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.entity.item.EntityItem;
-import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.World;
-import scala.collection.parallel.ParIterableLike;
+
+import java.util.HashMap;
+import java.util.Random;
 
 public class GeneralClient
 {
diff --git a/src/main/java/info/jbcs/minecraft/chisel/utils/GuiHandler.java b/src/main/java/info/jbcs/minecraft/chisel/utils/GuiHandler.java
index 0dbb157d..eabdfa81 100644
--- a/src/main/java/info/jbcs/minecraft/chisel/utils/GuiHandler.java
+++ b/src/main/java/info/jbcs/minecraft/chisel/utils/GuiHandler.java
@@ -1,13 +1,13 @@
 package info.jbcs.minecraft.chisel.utils;
 
+import cpw.mods.fml.common.network.IGuiHandler;
+import cpw.mods.fml.common.network.NetworkRegistry;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.world.World;
+
 import java.util.ArrayList;
 import java.util.Collections;
 
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.world.World;
-import cpw.mods.fml.common.network.IGuiHandler;
-import cpw.mods.fml.common.network.NetworkRegistry;
-
 public abstract class GuiHandler implements Comparable
 {
     static ArrayList<GuiHandler> items = new ArrayList<GuiHandler>();