Launch update

Only a week behind...

77 files changed, 1557 insertions, 1023 deletions

diff --git a/src/main/java/lance5057/tDefense/Reference.java b/src/main/java/lance5057/tDefense/Reference.java
index d0546ca..585e944 100644
--- a/src/main/java/lance5057/tDefense/Reference.java
+++ b/src/main/java/lance5057/tDefense/Reference.java
@@ -4,7 +4,7 @@ public class Reference
 {
 
 	public static final String	MOD_ID		= "tinkersdefense";
-	public static final String	VERSION		= "1.3a";
+	public static final String	VERSION		= "1.3.6";
 	public static final String	MOD_NAME	= "Tinkers' Defense";
 
 }
diff --git a/src/main/java/lance5057/tDefense/TD_Config.java b/src/main/java/lance5057/tDefense/TD_Config.java
index 46f301d..5544b05 100644
--- a/src/main/java/lance5057/tDefense/TD_Config.java
+++ b/src/main/java/lance5057/tDefense/TD_Config.java
@@ -38,7 +38,7 @@ public class TD_Config
 	public int[]	CrestLightID;
 
 	//public int		JokeInsultID;
-	public int		JokePyrotechID;
+	//public int		JokePyrotechID;
 	//public int		JokeCompensateID;
 
 	public int		SoulSteveID;
@@ -171,7 +171,7 @@ public class TD_Config
 		ScabbingModID = config.getInt("Scabbing Modifier ID", "BloodMagic Addon", count++, 18, Int.MaxValue(), null);
 
 		//JokeInsultID = config.getInt("Insult ID", "Joke Modifier Configs", count++, 18, Int.MaxValue(), null);
-		JokePyrotechID = config.getInt("Pyrotech ID", "Joke Modifier Configs", count++, 18, Int.MaxValue(), null);
+		//JokePyrotechID = config.getInt("Pyrotech ID", "Joke Modifier Configs", count++, 18, Int.MaxValue(), null);
 
 		config.save();
 	}
diff --git a/src/main/java/lance5057/tDefense/TinkersDefense.java b/src/main/java/lance5057/tDefense/TinkersDefense.java
index 36d4241..5a79ef1 100644
--- a/src/main/java/lance5057/tDefense/TinkersDefense.java
+++ b/src/main/java/lance5057/tDefense/TinkersDefense.java
@@ -23,7 +23,7 @@ import lance5057.tDefense.core.blocks.RedMintBlock;
 import lance5057.tDefense.core.blocks.crestMount.CrestMount;
 import lance5057.tDefense.core.blocks.crestMount.TileEntity_CrestMount;
 import lance5057.tDefense.core.events.TDEventHandler;
-import lance5057.tDefense.core.items.GuideBook;
+//import lance5057.tDefense.core.items.GuideBook;
 import lance5057.tDefense.core.liquids.MoltenFluid;
 import lance5057.tDefense.core.network.PacketHandler;
 import lance5057.tDefense.core.tools.HeaterShield;
@@ -104,35 +104,35 @@ public class TinkersDefense
 
 	public static Modifiers						mods;
 
-	public static Item							item_Guidebook;
+	//public static Item							item_Guidebook;
 
-	public static Item							item_AeonSteelIngot;
-	public static Block							block_AeonSteelBlock;
-	public static Fluid							moltenAeonsteel;
-	public static Block							moltenAeonsteelBlock;
+	public static Item							item_aeonsteelIngot;
+	public static Block							block_aeonsteelBlock;
+	public static Fluid							moltenaeonsteel;
+	public static Block							moltenaeonsteelBlock;
 
-	public static Item							item_QueensGoldIngot;
-	public static Block							block_QueensGoldBlock;
-	public static Fluid							moltenQueensGold;
-	public static Block							moltenQueensGoldBlock;
+	public static Item							item_queensgoldIngot;
+	public static Block							block_queensgoldBlock;
+	public static Fluid							moltenqueensgold;
+	public static Block							moltenqueensgoldBlock;
 
-	public static Item							item_DogbeariumIngot;
-	public static Block							block_DogbeariumBlock;
-	public static Fluid							moltenDogbearium;
-	public static Block							moltenDogbeariumBlock;
+	public static Item							item_dogbeariumIngot;
+	public static Block							block_dogbeariumBlock;
+	public static Fluid							moltendogbearium;
+	public static Block							moltendogbeariumBlock;
 
-	public static Item							item_RedMintcane;
-	public static Item							item_GreenMintcane;
+	public static Item							item_redmintcane;
+	public static Item							item_greenmintcane;
 
-	public static Item							item_RedMintIngot;
-	public static Block							block_RedMintBlock;
-	public static Fluid							moltenRedMint;
-	public static Block							moltenRedMintBlock;
+	public static Item							item_redmintIngot;
+	public static Block							block_redmintBlock;
+	public static Fluid							moltenredmint;
+	public static Block							moltenredmintBlock;
 
-	public static Item							item_GreenMintIngot;
-	public static Block							block_GreenMintBlock;
-	public static Fluid							moltenGreenMint;
-	public static Block							moltenGreenMintBlock;
+	public static Item							item_greenmintIngot;
+	public static Block							block_greenmintBlock;
+	public static Fluid							moltengreenmint;
+	public static Block							moltengreenmintBlock;
 
 	//	public static Item							item_RawSapphire;
 	//	public static Item							item_RawRuby;
@@ -210,32 +210,32 @@ public class TinkersDefense
 		mods = new Modifiers();
 
 		//Blocks
-		block_CrestMount = new CrestMount().setHardness(4.0F).setStepSound(Block.soundTypeStone).setBlockName("CrestMount").setCreativeTab(tabName);
-		block_ArmorAnvil = new FinishingAnvil().setHardness(4.0F).setStepSound(Block.soundTypeAnvil).setBlockName("ArmorAnvil").setCreativeTab(tabName);
-		block_JewelersBench = new JewelersBench().setHardness(4.0F).setStepSound(Block.soundTypeWood).setBlockName("JewelersBench").setCreativeTab(tabName);
+		block_CrestMount = new CrestMount().setHardness(4.0F).setStepSound(Block.soundTypeStone).setBlockName("crestmount").setCreativeTab(tabName);
+		block_ArmorAnvil = new FinishingAnvil().setHardness(4.0F).setStepSound(Block.soundTypeAnvil).setBlockName("armoranvil").setCreativeTab(tabName);
+		block_JewelersBench = new JewelersBench().setHardness(4.0F).setStepSound(Block.soundTypeWood).setBlockName("jewelersbench").setCreativeTab(tabName);
 
-		block_AeonSteelBlock = new AeonSteelBlock(Material.iron).setHardness(4.0F).setStepSound(Block.soundTypeMetal).setBlockName("AeonsteelBlock").setCreativeTab(tabName).setBlockTextureName(Reference.MOD_ID + ":AeonsteelBlock");
-		block_QueensGoldBlock = new QueensGoldBlock(Material.iron).setHardness(4.0F).setStepSound(Block.soundTypeMetal).setBlockName("QueensGoldBlock").setCreativeTab(tabName).setBlockTextureName(Reference.MOD_ID + ":QueensGoldBlock");
-		block_DogbeariumBlock = new DogbeariumBlock(Material.iron).setHardness(4.0F).setStepSound(Block.soundTypeMetal).setBlockName("DogbeariumBlock").setCreativeTab(tabName).setBlockTextureName(Reference.MOD_ID + ":DogbeariumBlock");
-		block_RedMintBlock = new RedMintBlock(Material.iron).setHardness(4.0F).setStepSound(Block.soundTypeMetal).setBlockName("RedMintBlock").setCreativeTab(tabName).setBlockTextureName(Reference.MOD_ID + ":redmintblock");
-		block_GreenMintBlock = new GreenMintBlock(Material.iron).setHardness(4.0F).setStepSound(Block.soundTypeMetal).setBlockName("GreenMintBlock").setCreativeTab(tabName).setBlockTextureName(Reference.MOD_ID + ":greenmintblock");
+		block_aeonsteelBlock = new AeonSteelBlock(Material.iron).setHardness(4.0F).setStepSound(Block.soundTypeMetal).setBlockName("aeonsteelblock").setCreativeTab(tabName).setBlockTextureName(Reference.MOD_ID + ":aeonsteelblock");
+		block_queensgoldBlock = new QueensGoldBlock(Material.iron).setHardness(4.0F).setStepSound(Block.soundTypeMetal).setBlockName("queensgoldblock").setCreativeTab(tabName).setBlockTextureName(Reference.MOD_ID + ":queensgoldblock");
+		block_dogbeariumBlock = new DogbeariumBlock(Material.iron).setHardness(4.0F).setStepSound(Block.soundTypeMetal).setBlockName("dogbeariumblock").setCreativeTab(tabName).setBlockTextureName(Reference.MOD_ID + ":dogbeariumblock");
+		block_redmintBlock = new RedMintBlock(Material.iron).setHardness(4.0F).setStepSound(Block.soundTypeMetal).setBlockName("redmintblock").setCreativeTab(tabName).setBlockTextureName(Reference.MOD_ID + ":redmintblock");
+		block_greenmintBlock = new GreenMintBlock(Material.iron).setHardness(4.0F).setStepSound(Block.soundTypeMetal).setBlockName("greenmintblock").setCreativeTab(tabName).setBlockTextureName(Reference.MOD_ID + ":greenmintblock");
 
 		//Items
-		item_Guidebook = new GuideBook();
-		item_AeonSteelIngot = new Item().setCreativeTab(tabName).setMaxStackSize(64).setUnlocalizedName("AeonsteelIngot").setTextureName(Reference.MOD_ID + ":AeonsteelIngot");
-		item_QueensGoldIngot = new Item().setCreativeTab(tabName).setMaxStackSize(64).setUnlocalizedName("QueensGoldIngot").setTextureName(Reference.MOD_ID + ":QueensGoldIngot");
-		item_DogbeariumIngot = new Item().setCreativeTab(tabName).setMaxStackSize(64).setUnlocalizedName("DogbeariumIngot").setTextureName(Reference.MOD_ID + ":DogbeariumIngot");
-		item_RedMintcane = new Item().setCreativeTab(tabName).setMaxStackSize(64).setUnlocalizedName("RedMintcane").setTextureName(Reference.MOD_ID + ":redmintcane");
-		item_RedMintIngot = new Item().setCreativeTab(tabName).setMaxStackSize(64).setUnlocalizedName("RedMintIngot").setTextureName(Reference.MOD_ID + ":redmintingot");
-		item_GreenMintcane = new Item().setCreativeTab(tabName).setMaxStackSize(64).setUnlocalizedName("GreenMintcane").setTextureName(Reference.MOD_ID + ":greenmintcane");
-		item_GreenMintIngot = new Item().setCreativeTab(tabName).setMaxStackSize(64).setUnlocalizedName("GreenMintIngot").setTextureName(Reference.MOD_ID + ":greenmintingot");
+		//item_Guidebook = new GuideBook();
+		item_aeonsteelIngot = new Item().setCreativeTab(tabName).setMaxStackSize(64).setUnlocalizedName("aeonsteelingot").setTextureName(Reference.MOD_ID + ":aeonsteelingot");
+		item_queensgoldIngot = new Item().setCreativeTab(tabName).setMaxStackSize(64).setUnlocalizedName("queensgoldingot").setTextureName(Reference.MOD_ID + ":queensgoldingot");
+		item_dogbeariumIngot = new Item().setCreativeTab(tabName).setMaxStackSize(64).setUnlocalizedName("dogbeariumingot").setTextureName(Reference.MOD_ID + ":dogbeariumingot");
+		item_redmintcane = new Item().setCreativeTab(tabName).setMaxStackSize(64).setUnlocalizedName("redmintcane").setTextureName(Reference.MOD_ID + ":redmintcane");
+		item_redmintIngot = new Item().setCreativeTab(tabName).setMaxStackSize(64).setUnlocalizedName("redmintIngot").setTextureName(Reference.MOD_ID + ":redmintingot");
+		item_greenmintcane = new Item().setCreativeTab(tabName).setMaxStackSize(64).setUnlocalizedName("greenmintcane").setTextureName(Reference.MOD_ID + ":greenmintcane");
+		item_greenmintIngot = new Item().setCreativeTab(tabName).setMaxStackSize(64).setUnlocalizedName("greenmintIngot").setTextureName(Reference.MOD_ID + ":greenmintingot");
 
 		//Fluids
-		moltenAeonsteel = new Fluid("moltenAeonsteel").setLuminosity(15).setDensity(3000).setViscosity(6000).setTemperature(1300);
-		moltenQueensGold = new Fluid("moltenQueensGold").setLuminosity(15).setDensity(3000).setViscosity(6000).setTemperature(1300);
-		moltenDogbearium = new Fluid("moltenDogbearium").setLuminosity(15).setDensity(3000).setViscosity(6000).setTemperature(1300);
-		moltenRedMint = new Fluid("moltenRedMint").setLuminosity(15).setDensity(3000).setViscosity(6000).setTemperature(1300);
-		moltenGreenMint = new Fluid("moltenGreenMint").setLuminosity(15).setDensity(3000).setViscosity(6000).setTemperature(1300);
+		moltenaeonsteel = new Fluid("moltenaeonsteel").setLuminosity(15).setDensity(3000).setViscosity(6000).setTemperature(1300);
+		moltenqueensgold = new Fluid("moltenqueensgold").setLuminosity(15).setDensity(3000).setViscosity(6000).setTemperature(1300);
+		moltendogbearium = new Fluid("moltendogbearium").setLuminosity(15).setDensity(3000).setViscosity(6000).setTemperature(1300);
+		moltenredmint = new Fluid("moltenredmint").setLuminosity(15).setDensity(3000).setViscosity(6000).setTemperature(1300);
+		moltengreenmint = new Fluid("moltengreenmint").setLuminosity(15).setDensity(3000).setViscosity(6000).setTemperature(1300);
 
 		//Tools
 		tool_roundShield = new RoundShield();
@@ -251,26 +251,26 @@ public class TinkersDefense
 
 		//Minecraft Registrations
 		//Blocks
-		GameRegistry.registerBlock(block_CrestMount, "Block_CrestMount");
-		GameRegistry.registerBlock(block_ArmorAnvil, "Block_ArmorAnvil");
-		GameRegistry.registerBlock(block_JewelersBench, "Block_JewelersBench");
-		GameRegistry.registerBlock(block_AeonSteelBlock, "Aeonsteelblock");
-		GameRegistry.registerBlock(block_QueensGoldBlock, "QueensGoldblock");
-		GameRegistry.registerBlock(block_DogbeariumBlock, "Dogbeariumblock");
-		GameRegistry.registerBlock(block_RedMintBlock, "redmintblock");
-		GameRegistry.registerBlock(block_GreenMintBlock, "GreenMintblock");
+		GameRegistry.registerBlock(block_CrestMount, "block_crestmount");
+		GameRegistry.registerBlock(block_ArmorAnvil, "block_armoranvil");
+		GameRegistry.registerBlock(block_JewelersBench, "block_jewelersbench");
+		GameRegistry.registerBlock(block_aeonsteelBlock, "aeonsteelblock");
+		GameRegistry.registerBlock(block_queensgoldBlock, "queensgoldblock");
+		GameRegistry.registerBlock(block_dogbeariumBlock, "dogbeariumblock");
+		GameRegistry.registerBlock(block_redmintBlock, "redmintblock");
+		GameRegistry.registerBlock(block_greenmintBlock, "greenmintblock");
 
 		//Items
-		GameRegistry.registerItem(item_Guidebook, "guidebook");
+		//GameRegistry.registerItem(item_Guidebook, "guidebook");
 
-		GameRegistry.registerItem(item_AeonSteelIngot, "AeonsteelIngot");
-		GameRegistry.registerItem(item_QueensGoldIngot, "QueensGoldIngot");
-		GameRegistry.registerItem(item_DogbeariumIngot, "DogbeariumIngot");
+		GameRegistry.registerItem(item_aeonsteelIngot, "aeonsteelingot");
+		GameRegistry.registerItem(item_queensgoldIngot, "queensgoldingot");
+		GameRegistry.registerItem(item_dogbeariumIngot, "dogbeariumingot");
 
-		GameRegistry.registerItem(item_RedMintcane, "RedMintCane");
-		GameRegistry.registerItem(item_RedMintIngot, "RedMintIngot");
-		GameRegistry.registerItem(item_GreenMintcane, "GreenMintCane");
-		GameRegistry.registerItem(item_GreenMintIngot, "GreenMintIngot");
+		GameRegistry.registerItem(item_redmintcane, "redmintcane");
+		GameRegistry.registerItem(item_redmintIngot, "redmintingot");
+		GameRegistry.registerItem(item_greenmintcane, "greenmintcane");
+		GameRegistry.registerItem(item_greenmintIngot, "greenmintingot");
 
 		//Tools
 		GameRegistry.registerItem(tool_roundShield, "Round Shield");
@@ -286,29 +286,29 @@ public class TinkersDefense
 		GameRegistry.registerItem(metalPattern, "Cast");
 
 		//TileEntities
-		GameRegistry.registerTileEntity(TileEntity_CrestMount.class, "Tile_CrestMount");
-		GameRegistry.registerTileEntity(TileEntity_FinishingAnvil.class, "Tile_ArmorAnvil");
-		GameRegistry.registerTileEntity(TileEntity_JewelersBench.class, "Tile_JewelersBench");
+		GameRegistry.registerTileEntity(TileEntity_CrestMount.class, "tile_crestmount");
+		GameRegistry.registerTileEntity(TileEntity_FinishingAnvil.class, "tile_armoranvil");
+		GameRegistry.registerTileEntity(TileEntity_JewelersBench.class, "tile_jewelersbench");
 
 		//Fluids
-		FluidRegistry.registerFluid(moltenAeonsteel);
-		FluidRegistry.registerFluid(moltenQueensGold);
-		FluidRegistry.registerFluid(moltenDogbearium);
-		FluidRegistry.registerFluid(moltenRedMint);
-		FluidRegistry.registerFluid(moltenGreenMint);
+		FluidRegistry.registerFluid(moltenaeonsteel);
+		FluidRegistry.registerFluid(moltenqueensgold);
+		FluidRegistry.registerFluid(moltendogbearium);
+		FluidRegistry.registerFluid(moltenredmint);
+		FluidRegistry.registerFluid(moltengreenmint);
 
 		//FluidBlocks
-		moltenAeonsteelBlock = new MoltenFluid(moltenAeonsteel, "Aeonsteel");
-		moltenQueensGoldBlock = new MoltenFluid(moltenQueensGold, "QueensGold");
-		moltenDogbeariumBlock = new MoltenFluid(moltenDogbearium, "dogbearium");
-		moltenRedMintBlock = new MoltenFluid(moltenRedMint, "RedMint");
-		moltenGreenMintBlock = new MoltenFluid(moltenGreenMint, "GreenMint");
-
-		GameRegistry.registerBlock(moltenAeonsteelBlock, "moltenAeonsteel");
-		GameRegistry.registerBlock(moltenQueensGoldBlock, "moltenQueensGold");
-		GameRegistry.registerBlock(moltenDogbeariumBlock, "moltenDogbearium");
-		GameRegistry.registerBlock(moltenRedMintBlock, "moltenRedMint");
-		GameRegistry.registerBlock(moltenGreenMintBlock, "moltenGreenMint");
+		moltenaeonsteelBlock = new MoltenFluid(moltenaeonsteel, "aeonsteel");
+		moltenqueensgoldBlock = new MoltenFluid(moltenqueensgold, "queensgold");
+		moltendogbeariumBlock = new MoltenFluid(moltendogbearium, "dogbearium");
+		moltenredmintBlock = new MoltenFluid(moltenredmint, "redmint");
+		moltengreenmintBlock = new MoltenFluid(moltengreenmint, "greenmint");
+
+		GameRegistry.registerBlock(moltenaeonsteelBlock, "moltenaeonsteel");
+		GameRegistry.registerBlock(moltenqueensgoldBlock, "moltenqueensgold");
+		GameRegistry.registerBlock(moltendogbeariumBlock, "moltendogbearium");
+		GameRegistry.registerBlock(moltenredmintBlock, "moltenredmint");
+		GameRegistry.registerBlock(moltengreenmintBlock, "moltengreenmint");
 
 		//Recipes
 		GameRegistry.addShapedRecipe(new ItemStack(block_CrestMount), new Object[] {"xxx", "-i-", "---", 'x', new ItemStack(
@@ -316,23 +316,23 @@ public class TinkersDefense
 						TinkerTools.toolRod, 1, 1)});
 		GameRegistry.addShapedRecipe(new ItemStack(block_ArmorAnvil), new Object[] {"ai-", "lr-", "---", 'r', new ItemStack(
 				TinkerTools.toughRod, 1, 0), 'a', Blocks.anvil, 'i', Items.iron_ingot, 'l', Blocks.log});
-		GameRegistry.addShapedRecipe(new ItemStack(block_AeonSteelBlock), new Object[] {"xxx", "xxx", "xxx", 'x', item_AeonSteelIngot});
-		GameRegistry.addShapelessRecipe(new ItemStack(item_AeonSteelIngot, 9), new Object[] {new ItemStack(
-				block_AeonSteelBlock)});
-		GameRegistry.addShapedRecipe(new ItemStack(block_QueensGoldBlock), new Object[] {"xxx", "xxx", "xxx", 'x', item_QueensGoldIngot});
-		GameRegistry.addShapelessRecipe(new ItemStack(item_QueensGoldIngot, 9), new Object[] {new ItemStack(
-				block_QueensGoldBlock)});
-		GameRegistry.addShapedRecipe(new ItemStack(block_DogbeariumBlock), new Object[] {"xxx", "xxx", "xxx", 'x', item_DogbeariumIngot});
-		GameRegistry.addShapelessRecipe(new ItemStack(item_DogbeariumIngot, 9), new Object[] {new ItemStack(
-				block_DogbeariumBlock)});
-		GameRegistry.addShapedRecipe(new ItemStack(block_RedMintBlock), new Object[] {"xxx", "xxx", "xxx", 'x', new ItemStack(
-				item_RedMintcane, 1, 2)});
-		GameRegistry.addShapelessRecipe(new ItemStack(item_RedMintcane, 9, 2), new Object[] {new ItemStack(
-				block_RedMintBlock)});
-		GameRegistry.addShapedRecipe(new ItemStack(block_GreenMintBlock), new Object[] {"xxx", "xxx", "xxx", 'x', new ItemStack(
-				item_GreenMintcane, 1, 3)});
-		GameRegistry.addShapelessRecipe(new ItemStack(item_GreenMintcane, 9, 3), new Object[] {new ItemStack(
-				block_GreenMintBlock)});
+		GameRegistry.addShapedRecipe(new ItemStack(block_aeonsteelBlock), new Object[] {"xxx", "xxx", "xxx", 'x', item_aeonsteelIngot});
+		GameRegistry.addShapelessRecipe(new ItemStack(item_aeonsteelIngot, 9), new Object[] {new ItemStack(
+				block_aeonsteelBlock)});
+		GameRegistry.addShapedRecipe(new ItemStack(block_queensgoldBlock), new Object[] {"xxx", "xxx", "xxx", 'x', item_queensgoldIngot});
+		GameRegistry.addShapelessRecipe(new ItemStack(item_queensgoldIngot, 9), new Object[] {new ItemStack(
+				block_queensgoldBlock)});
+		GameRegistry.addShapedRecipe(new ItemStack(block_dogbeariumBlock), new Object[] {"xxx", "xxx", "xxx", 'x', item_dogbeariumIngot});
+		GameRegistry.addShapelessRecipe(new ItemStack(item_dogbeariumIngot, 9), new Object[] {new ItemStack(
+				block_dogbeariumBlock)});
+		GameRegistry.addShapedRecipe(new ItemStack(block_redmintBlock), new Object[] {"xxx", "xxx", "xxx", 'x', new ItemStack(
+				item_redmintcane, 1, 2)});
+		GameRegistry.addShapelessRecipe(new ItemStack(item_redmintcane, 9, 2), new Object[] {new ItemStack(
+				block_redmintBlock)});
+		GameRegistry.addShapedRecipe(new ItemStack(block_greenmintBlock), new Object[] {"xxx", "xxx", "xxx", 'x', new ItemStack(
+				item_greenmintcane, 1, 3)});
+		GameRegistry.addShapelessRecipe(new ItemStack(item_greenmintcane, 9, 3), new Object[] {new ItemStack(
+				block_greenmintBlock)});
 
 		//TinkersConstruct Registrations
 		//Tools
@@ -423,25 +423,159 @@ public class TinkersDefense
 
 		final PatternBuilder pb = PatternBuilder.instance;
 
+		//Shields
 		TConstructClientRegistry.toolButtons.add(new ToolGuiElement(
-				1,
 				0,
 				0,
-				new int[] {9, 0, 4, 0},
-				new int[] {2, 3, 2, 0},
+				6,
+				new int[] {0, 0, 4, 0},
+				new int[] {7, 3, 2, 0},
 				StatCollector.translateToLocal("gui.toolstation.roundshield.name"),
 				StatCollector.translateToLocal("gui.toolstation.roundshield.desc"),
-				"tinkersdefense", "textures/gui/icons2.png"));
+				"tinkersdefense", "textures/gui/icons.png"));
 
 		TConstructClientRegistry.tierTwoButtons.add(new ToolGuiElement(
 				5,
-				0,
-				0,
-				new int[] {0, 0, 0, 0},
-				new int[] {2, 3, 2, 3},
+				1,
+				6,
+				new int[] {0, 8, 0, 2},
+				new int[] {7, 3, 7, 7},
 				StatCollector.translateToLocal("gui.toolstation.heatershield.name"),
 				StatCollector.translateToLocal("gui.toolstation.heatershield.desc"),
-				"tinkersdefense:", "textures/gui/icons2.png"));
+				"tinkersdefense:", "textures/gui/icons.png"));
+
+		//Cloth
+		//Hood
+		TConstructClientRegistry.toolButtons.add(new ToolGuiElement(0, 2, 6,
+				new int[] {4, 0, 4, 0}, new int[] {7, 3, 7, 0},
+				StatCollector.translateToLocal("gui.toolstation.hood.name"),
+				StatCollector.translateToLocal("gui.toolstation.hood.desc"),
+				"tinkersdefense", "textures/gui/icons.png"));
+		//Shawl
+		TConstructClientRegistry.toolButtons.add(new ToolGuiElement(0, 3, 6,
+				new int[] {4, 0, 4, 0}, new int[] {7, 7, 7, 0},
+				StatCollector.translateToLocal("gui.toolstation.shawl.name"),
+				StatCollector.translateToLocal("gui.toolstation.shawl.desc"),
+				"tinkersdefense", "textures/gui/icons.png"));
+		//Robe
+		TConstructClientRegistry.toolButtons.add(new ToolGuiElement(0, 4, 6,
+				new int[] {4, 3, 4, 0}, new int[] {7, 7, 7, 0},
+				StatCollector.translateToLocal("gui.toolstation.robe.name"),
+				StatCollector.translateToLocal("gui.toolstation.robe.desc"),
+				"tinkersdefense", "textures/gui/icons.png"));
+		//Shoes
+		TConstructClientRegistry.toolButtons.add(new ToolGuiElement(0, 5, 6,
+				new int[] {4, 2, 4, 0}, new int[] {7, 7, 7, 0},
+				StatCollector.translateToLocal("gui.toolstation.shoes.name"),
+				StatCollector.translateToLocal("gui.toolstation.shoes.desc"),
+				"tinkersdefense", "textures/gui/icons.png"));
+
+		//Chain
+		//Coif
+		TConstructClientRegistry.toolButtons.add(new ToolGuiElement(0, 6, 6,
+				new int[] {1, 8, 4, 0}, new int[] {7, 3, 7, 0},
+				StatCollector.translateToLocal("gui.toolstation.coif.name"),
+				StatCollector.translateToLocal("gui.toolstation.coif.desc"),
+				"tinkersdefense", "textures/gui/icons.png"));
+		//Hauberk
+		TConstructClientRegistry.toolButtons.add(new ToolGuiElement(0, 7, 6,
+				new int[] {1, 9, 4, 0}, new int[] {7, 2, 7, 0},
+				StatCollector.translateToLocal("gui.toolstation.hauberk.name"),
+				StatCollector.translateToLocal("gui.toolstation.hauberk.desc"),
+				"tinkersdefense", "textures/gui/icons.png"));
+		//Chausses
+		TConstructClientRegistry.toolButtons.add(new ToolGuiElement(
+				0,
+				8,
+				6,
+				new int[] {1, 0, 4, 0},
+				new int[] {7, 7, 7, 0},
+				StatCollector.translateToLocal("gui.toolstation.chausses.name"),
+				StatCollector.translateToLocal("gui.toolstation.chausses.desc"),
+				"tinkersdefense", "textures/gui/icons.png"));
+		//Boots
+		TConstructClientRegistry.toolButtons.add(new ToolGuiElement(0, 9, 6,
+				new int[] {1, 4, 2, 0}, new int[] {7, 7, 7, 0},
+				StatCollector.translateToLocal("gui.toolstation.boots.name"),
+				StatCollector.translateToLocal("gui.toolstation.boots.desc"),
+				"tinkersdefense", "textures/gui/icons.png"));
+
+		//Plate
+		//Helm
+		TConstructClientRegistry.tierTwoButtons.add(new ToolGuiElement(0, 10,
+				6,
+				new int[] {4, 8, 0, 1}, new int[] {2, 3, 7, 7},
+				StatCollector.translateToLocal("gui.toolstation.helm.name"),
+				StatCollector.translateToLocal("gui.toolstation.helm.desc"),
+				"tinkersdefense", "textures/gui/icons.png"));
+		//Breastplate
+		TConstructClientRegistry.tierTwoButtons.add(new ToolGuiElement(
+				0,
+				11,
+				6,
+				new int[] {9, 8, 0, 1},
+				new int[] {2, 3, 7, 7},
+				StatCollector.translateToLocal("gui.toolstation.breastplate.name"),
+				StatCollector.translateToLocal("gui.toolstation.breastplate.desc"),
+				"tinkersdefense", "textures/gui/icons.png"));
+		//Grieves
+		TConstructClientRegistry.tierTwoButtons.add(new ToolGuiElement(
+				0,
+				12,
+				6,
+				new int[] {0, 8, 1, 4},
+				new int[] {7, 3, 7, 7},
+				StatCollector.translateToLocal("gui.toolstation.chausses.name"),
+				StatCollector.translateToLocal("gui.toolstation.chausses.desc"),
+				"tinkersdefense", "textures/gui/icons.png"));
+		//Sabatons
+		TConstructClientRegistry.tierTwoButtons.add(new ToolGuiElement(
+				0,
+				13,
+				6,
+				new int[] {0, 8, 0, 4},
+				new int[] {7, 3, 7, 7},
+				StatCollector.translateToLocal("gui.toolstation.sabatons.name"),
+				StatCollector.translateToLocal("gui.toolstation.sabatons.desc"),
+				"tinkersdefense", "textures/gui/icons.png"));
+
+		//Gauntlets
+		TConstructClientRegistry.toolButtons.add(new ToolGuiElement(
+				0,
+				0,
+				8,
+				new int[] {0, 8, 2, 0},
+				new int[] {7, 3, 7, 0},
+				StatCollector.translateToLocal("gui.toolstation.gauntlets.name"),
+				StatCollector.translateToLocal("gui.toolstation.gauntlets.desc"),
+				"tinkersdefense", "textures/gui/icons.png"));
+
+		//Zweihander
+		TConstructClientRegistry.tierTwoButtons.add(new ToolGuiElement(
+				0,
+				3,
+				8,
+				new int[] {6, 8, 2, 1},
+				new int[] {3, 3, 3, 2},
+				StatCollector.translateToLocal("gui.toolstation.zweihander.name"),
+				StatCollector.translateToLocal("gui.toolstation.zweihander.desc"),
+				"tinkersdefense", "textures/gui/icons.png"));
+
+		//Wrench
+		TConstructClientRegistry.toolButtons.add(new ToolGuiElement(0, 1, 8,
+				new int[] {3, 0, 1, 0},
+				new int[] {3, 3, 3, 0},
+				StatCollector.translateToLocal("gui.toolstation.wrench.name"),
+				StatCollector.translateToLocal("gui.toolstation.wrench.desc"),
+				"tinkersdefense", "textures/gui/icons.png"));
+
+		//Shears
+		TConstructClientRegistry.toolButtons.add(new ToolGuiElement(0, 2, 8,
+				new int[] {7, 1, 7, 0},
+				new int[] {2, 3, 2, 0},
+				StatCollector.translateToLocal("gui.toolstation.shears.name"),
+				StatCollector.translateToLocal("gui.toolstation.shears.desc"),
+				"tinkersdefense", "textures/gui/icons.png"));
 
 		TConstructClientRegistry.stencilButtons2.add(new StencilGuiElement(0,
 				0, 50, "tinkersdefense", "textures/gui/icons.png"));
@@ -454,7 +588,7 @@ public class TinkersDefense
 		TConstructClientRegistry.stencilButtons2.add(new StencilGuiElement(0,
 				0, 54, "tinkersdefense", "textures/gui/icons.png"));
 
-		// Aeonsteel
+		// aeonsteel
 		pb.registerMaterialSet("aeonsteel", new ItemStack(
 				TinkerTools.toolShard, 1, 10), new ItemStack(
 						TinkerTools.toolRod, 1, 10), config.AeonsteelMatID);
@@ -464,31 +598,31 @@ public class TinkersDefense
 		// Tool Materials: id, name, harvestlevel, durability, speed, damage,
 		// handlemodifier, reinforced, shoddy, style color, primary color for
 		// block use
-		TConstructRegistry.addToolMaterial(config.AeonsteelMatID, "AeonSteel", 4, 822, 1100, 3, 1.6F, 2, 0f, LIGHT_PURPLE.toString(), 0xb565e6);
-		TinkerTools.registerPatternMaterial("AeonSteelIngot", 2, "AeonSteel");
+		TConstructRegistry.addToolMaterial(config.AeonsteelMatID, "aeonsteel", 4, 822, 1100, 3, 1.6F, 2, 0f, LIGHT_PURPLE.toString(), 0xb565e6);
+		TinkerTools.registerPatternMaterial("aeonsteelIngot", 2, "aeonsteel");
 		TConstructRegistry.addDefaultToolPartMaterial(config.AeonsteelMatID);
 
-		Smeltery.addMelting(new ItemStack(item_AeonSteelIngot, 1, 0), block_AeonSteelBlock, 0, 500, new FluidStack(
-				moltenAeonsteel, TConstruct.ingotLiquidValue));
-		Smeltery.addMelting(block_AeonSteelBlock, 0, 500, new FluidStack(
-				moltenAeonsteel, TConstruct.ingotLiquidValue * 9));
+		Smeltery.addMelting(new ItemStack(item_aeonsteelIngot, 1, 0), block_aeonsteelBlock, 0, 500, new FluidStack(
+				moltenaeonsteel, TConstruct.ingotLiquidValue));
+		Smeltery.addMelting(block_aeonsteelBlock, 0, 500, new FluidStack(
+				moltenaeonsteel, TConstruct.ingotLiquidValue * 9));
 
-		TConstructRegistry.instance.getTableCasting().addCastingRecipe(new ItemStack(
-				item_AeonSteelIngot, 1, 0), new FluidStack(moltenAeonsteel,
+		TConstructRegistry.getTableCasting().addCastingRecipe(new ItemStack(
+				item_aeonsteelIngot, 1, 0), new FluidStack(moltenaeonsteel,
 						TConstruct.ingotLiquidValue), TConstructRegistry.getItemStack("ingotCast"), false, 50);
 
-		TConstructRegistry.instance.getBasinCasting().addCastingRecipe(new ItemStack(
-				block_AeonSteelBlock, 1, 0), new FluidStack(moltenAeonsteel,
+		TConstructRegistry.getBasinCasting().addCastingRecipe(new ItemStack(
+				block_aeonsteelBlock, 1, 0), new FluidStack(moltenaeonsteel,
 						TConstruct.ingotLiquidValue * 9), 100);
 
-		castMolten(moltenAeonsteel, config.AeonsteelMatID);
+		castmolten(moltenaeonsteel, config.AeonsteelMatID);
 
 		PatternBuilder.instance.registerFullMaterial(new ItemStack(
-				item_AeonSteelIngot, 1, 0), 2, "Aeonsteel", new ItemStack(
+				item_aeonsteelIngot, 1, 0), 2, "aeonsteel", new ItemStack(
 						TinkerTools.toolShard, 1, config.AeonsteelMatID), new ItemStack(
 								TinkerTools.toolRod, 1, config.AeonsteelMatID), config.AeonsteelMatID);
 
-		Smeltery.addAlloyMixing(new FluidStack(moltenAeonsteel, 144), new FluidStack[] {new FluidStack(
+		Smeltery.addAlloyMixing(new FluidStack(moltenaeonsteel, 144), new FluidStack[] {new FluidStack(
 				TinkerSmeltery.moltenAlumiteFluid, 144), new FluidStack(
 						TinkerSmeltery.moltenCobaltFluid, 144)});
 
@@ -498,129 +632,129 @@ public class TinkersDefense
 						TinkerTools.toolRod, 1, 10), config.QueensGoldMatID);
 
 		TConstructClientRegistry.addMaterialRenderMapping(config.QueensGoldMatID, "tinker", "queensgold", true);
-		TConstructRegistry.addToolMaterial(config.QueensGoldMatID, "QueensGold", 3, 100, 500, 2, 1.0F, 0, 0f, GOLD.toString(), 0xeaee57);
-		TinkerTools.registerPatternMaterial("QueensGoldIngot", 2, "QueensGold");
+		TConstructRegistry.addToolMaterial(config.QueensGoldMatID, "queensgold", 3, 100, 500, 2, 1.0F, 0, 0f, GOLD.toString(), 0xeaee57);
+		TinkerTools.registerPatternMaterial("queensgoldIngot", 2, "queensgold");
 		TConstructRegistry.addDefaultToolPartMaterial(config.QueensGoldMatID);
 
-		Smeltery.addMelting(new ItemStack(item_QueensGoldIngot, 1, 0), block_QueensGoldBlock, 0, 500, new FluidStack(
-				moltenQueensGold, TConstruct.ingotLiquidValue));
-		Smeltery.addMelting(block_QueensGoldBlock, 0, 500, new FluidStack(
-				moltenQueensGold, TConstruct.ingotLiquidValue * 9));
+		Smeltery.addMelting(new ItemStack(item_queensgoldIngot, 1, 0), block_queensgoldBlock, 0, 500, new FluidStack(
+				moltenqueensgold, TConstruct.ingotLiquidValue));
+		Smeltery.addMelting(block_queensgoldBlock, 0, 500, new FluidStack(
+				moltenqueensgold, TConstruct.ingotLiquidValue * 9));
 
-		TConstructRegistry.instance.getTableCasting().addCastingRecipe(new ItemStack(
-				item_QueensGoldIngot, 1, 0), new FluidStack(moltenQueensGold,
+		TConstructRegistry.getTableCasting().addCastingRecipe(new ItemStack(
+				item_queensgoldIngot, 1, 0), new FluidStack(moltenqueensgold,
 						TConstruct.ingotLiquidValue), TConstructRegistry.getItemStack("ingotCast"), false, 50);
 
-		TConstructRegistry.instance.getBasinCasting().addCastingRecipe(new ItemStack(
-				block_QueensGoldBlock, 1, 0), new FluidStack(moltenQueensGold,
+		TConstructRegistry.getBasinCasting().addCastingRecipe(new ItemStack(
+				block_queensgoldBlock, 1, 0), new FluidStack(moltenqueensgold,
 						TConstruct.ingotLiquidValue * 9), 100);
 
-		castMolten(moltenQueensGold, config.QueensGoldMatID);
+		castmolten(moltenqueensgold, config.QueensGoldMatID);
 
 		PatternBuilder.instance.registerFullMaterial(new ItemStack(
-				item_QueensGoldIngot, 1, 0), 2, "QueensGold", new ItemStack(
+				item_queensgoldIngot, 1, 0), 2, "queensgold", new ItemStack(
 						TinkerTools.toolShard, 1, config.QueensGoldMatID), new ItemStack(
 								TinkerTools.toolRod, 1, config.QueensGoldMatID), config.QueensGoldMatID);
 
-		Smeltery.addAlloyMixing(new FluidStack(moltenQueensGold, 144 * 8), new FluidStack[] {new FluidStack(
+		Smeltery.addAlloyMixing(new FluidStack(moltenqueensgold, 144 * 8), new FluidStack[] {new FluidStack(
 				TinkerSmeltery.moltenGoldFluid, 144 * 8), new FluidStack(
 						TinkerSmeltery.moltenEmeraldFluid, 80)});
 
-		// Dogbearium
+		// dogbearium
 		pb.registerMaterialSet("dogbearium", new ItemStack(
 				TinkerTools.toolShard, 1, 10), new ItemStack(
 						TinkerTools.toolRod, 1, 10), config.DogbeariumMatID);
 
 		TConstructClientRegistry.addMaterialRenderMapping(config.DogbeariumMatID, "tinker", "dogbearium", true);
-		TConstructRegistry.addToolMaterial(config.DogbeariumMatID, "Dogbearium", 4, 600, 800, 2, 1.6F, 0, -2f, DARK_RED.toString(), 0x754200);
-		TinkerTools.registerPatternMaterial("DogbeariumIngot", 2, "Dogbearium");
+		TConstructRegistry.addToolMaterial(config.DogbeariumMatID, "dogbearium", 4, 600, 800, 2, 1.6F, 0, -2f, DARK_RED.toString(), 0x754200);
+		TinkerTools.registerPatternMaterial("dogbeariumIngot", 2, "dogbearium");
 		TConstructRegistry.addDefaultToolPartMaterial(config.DogbeariumMatID);
 
-		Smeltery.addMelting(new ItemStack(item_DogbeariumIngot, 1, 0), block_DogbeariumBlock, 0, 500, new FluidStack(
-				moltenDogbearium, TConstruct.ingotLiquidValue));
-		Smeltery.addMelting(block_DogbeariumBlock, 0, 500, new FluidStack(
-				moltenDogbearium, TConstruct.ingotLiquidValue * 9));
+		Smeltery.addMelting(new ItemStack(item_dogbeariumIngot, 1, 0), block_dogbeariumBlock, 0, 500, new FluidStack(
+				moltendogbearium, TConstruct.ingotLiquidValue));
+		Smeltery.addMelting(block_dogbeariumBlock, 0, 500, new FluidStack(
+				moltendogbearium, TConstruct.ingotLiquidValue * 9));
 
-		TConstructRegistry.instance.getTableCasting().addCastingRecipe(new ItemStack(
-				item_DogbeariumIngot, 1, 0), new FluidStack(moltenDogbearium,
+		TConstructRegistry.getTableCasting().addCastingRecipe(new ItemStack(
+				item_dogbeariumIngot, 1, 0), new FluidStack(moltendogbearium,
 						TConstruct.ingotLiquidValue), TConstructRegistry.getItemStack("ingotCast"), false, 50);
 
-		TConstructRegistry.instance.getBasinCasting().addCastingRecipe(new ItemStack(
-				block_DogbeariumBlock, 1, 0), new FluidStack(moltenDogbearium,
+		TConstructRegistry.getBasinCasting().addCastingRecipe(new ItemStack(
+				block_dogbeariumBlock, 1, 0), new FluidStack(moltendogbearium,
 						TConstruct.ingotLiquidValue * 9), 100);
 
-		castMolten(moltenDogbearium, config.DogbeariumMatID);
+		castmolten(moltendogbearium, config.DogbeariumMatID);
 
 		PatternBuilder.instance.registerFullMaterial(new ItemStack(
-				item_DogbeariumIngot, 1, 0), 2, "Dogbearium", new ItemStack(
+				item_dogbeariumIngot, 1, 0), 2, "dogbearium", new ItemStack(
 						TinkerTools.toolShard, 1, config.DogbeariumMatID), new ItemStack(
 								TinkerTools.toolRod, 1, config.DogbeariumMatID), config.DogbeariumMatID);
 
-		Smeltery.addAlloyMixing(new FluidStack(moltenDogbearium, 144 * 2), new FluidStack[] {new FluidStack(
+		Smeltery.addAlloyMixing(new FluidStack(moltendogbearium, 144 * 2), new FluidStack[] {new FluidStack(
 				TinkerSmeltery.moltenArditeFluid, 144), new FluidStack(
 						TinkerSmeltery.bloodFluid, 160), new FluidStack(
 								TinkerSmeltery.moltenEnderFluid, 250)});
 
 		//Red Mint
-		pb.registerMaterialSet("RedMint", new ItemStack(TinkerTools.toolShard,
+		pb.registerMaterialSet("redmint", new ItemStack(TinkerTools.toolShard,
 				1, 10), new ItemStack(TinkerTools.toolRod, 1, 10), config.RedMintMatID);
 
-		TConstructClientRegistry.addMaterialRenderMapping(config.RedMintMatID, "tinker", "RedMint", true);
-		TConstructRegistry.addToolMaterial(config.RedMintMatID, "RedMint", 1, 50, 10, 0, 0F, 0, 0f, DARK_RED.toString(), 0xFF0000);
-		TinkerTools.registerPatternMaterial("RedMintIngot", 2, "RedMint");
+		TConstructClientRegistry.addMaterialRenderMapping(config.RedMintMatID, "tinker", "redmint", true);
+		TConstructRegistry.addToolMaterial(config.RedMintMatID, "redmint", 1, 50, 10, 0, 0F, 0, 0f, DARK_RED.toString(), 0xFF0000);
+		TinkerTools.registerPatternMaterial("redmintIngot", 2, "redmint");
 		TConstructRegistry.addDefaultToolPartMaterial(config.RedMintMatID);
 
-		Smeltery.addMelting(new ItemStack(item_RedMintcane, 1, 0), block_RedMintBlock, 0, 250, new FluidStack(
-				moltenRedMint, TConstruct.chunkLiquidValue));
-		Smeltery.addMelting(new ItemStack(item_RedMintIngot, 1, 0), block_RedMintBlock, 0, 500, new FluidStack(
-				moltenRedMint, TConstruct.ingotLiquidValue));
-		Smeltery.addMelting(block_RedMintBlock, 0, 500, new FluidStack(
-				moltenRedMint, TConstruct.ingotLiquidValue * 9));
+		Smeltery.addMelting(new ItemStack(item_redmintcane, 1, 0), block_redmintBlock, 0, 250, new FluidStack(
+				moltenredmint, TConstruct.chunkLiquidValue));
+		Smeltery.addMelting(new ItemStack(item_redmintIngot, 1, 0), block_redmintBlock, 0, 500, new FluidStack(
+				moltenredmint, TConstruct.ingotLiquidValue));
+		Smeltery.addMelting(block_redmintBlock, 0, 500, new FluidStack(
+				moltenredmint, TConstruct.ingotLiquidValue * 9));
 
-		TConstructRegistry.instance.getTableCasting().addCastingRecipe(new ItemStack(
-				item_RedMintIngot, 1, 0), new FluidStack(moltenRedMint,
+		TConstructRegistry.getTableCasting().addCastingRecipe(new ItemStack(
+				item_redmintIngot, 1, 0), new FluidStack(moltenredmint,
 						TConstruct.ingotLiquidValue), TConstructRegistry.getItemStack("ingotCast"), false, 50);
 
-		TConstructRegistry.instance.getBasinCasting().addCastingRecipe(new ItemStack(
-				block_RedMintBlock, 1, 0), new FluidStack(moltenRedMint,
+		TConstructRegistry.getBasinCasting().addCastingRecipe(new ItemStack(
+				block_redmintBlock, 1, 0), new FluidStack(moltenredmint,
 						TConstruct.ingotLiquidValue * 9), 100);
 
-		castMolten(moltenRedMint, config.RedMintMatID);
+		castmolten(moltenredmint, config.RedMintMatID);
 
 		PatternBuilder.instance.registerFullMaterial(new ItemStack(
-				item_RedMintcane, 1, 0), 2, "RedMint", new ItemStack(
+				item_redmintcane, 1, 0), 2, "redmint", new ItemStack(
 						TinkerTools.toolShard, 1, config.RedMintMatID), new ItemStack(
 								TinkerTools.toolRod, 1, config.RedMintMatID), config.RedMintMatID);
 
 		//Green Mint
-		pb.registerMaterialSet("GreenMint", new ItemStack(
+		pb.registerMaterialSet("greenmint", new ItemStack(
 				TinkerTools.toolShard, 1, 10), new ItemStack(
 						TinkerTools.toolRod, 1, 10), config.GreenMintMatID);
 
-		TConstructClientRegistry.addMaterialRenderMapping(config.GreenMintMatID, "tinker", "GreenMint", true);
-		TConstructRegistry.addToolMaterial(config.GreenMintMatID, "GreenMint", 1, 50, 10, 0, 0F, 0, 0f, DARK_RED.toString(), 0x5bde4b);
-		TinkerTools.registerPatternMaterial("GreenMintIngot", 2, "GreenMint");
+		TConstructClientRegistry.addMaterialRenderMapping(config.GreenMintMatID, "tinker", "greenmint", true);
+		TConstructRegistry.addToolMaterial(config.GreenMintMatID, "greenmint", 1, 50, 10, 0, 0F, 0, 0f, DARK_RED.toString(), 0x5bde4b);
+		TinkerTools.registerPatternMaterial("greenmintIngot", 2, "greenmint");
 		TConstructRegistry.addDefaultToolPartMaterial(config.GreenMintMatID);
 
-		Smeltery.addMelting(new ItemStack(item_GreenMintcane, 1, 0), block_GreenMintBlock, 0, 250, new FluidStack(
-				moltenGreenMint, TConstruct.chunkLiquidValue));
-		Smeltery.addMelting(new ItemStack(item_GreenMintIngot, 1, 0), block_GreenMintBlock, 0, 500, new FluidStack(
-				moltenGreenMint, TConstruct.ingotLiquidValue));
-		Smeltery.addMelting(block_GreenMintBlock, 0, 500, new FluidStack(
-				moltenGreenMint, TConstruct.ingotLiquidValue * 9));
+		Smeltery.addMelting(new ItemStack(item_greenmintcane, 1, 0), block_greenmintBlock, 0, 250, new FluidStack(
+				moltengreenmint, TConstruct.chunkLiquidValue));
+		Smeltery.addMelting(new ItemStack(item_greenmintIngot, 1, 0), block_greenmintBlock, 0, 500, new FluidStack(
+				moltengreenmint, TConstruct.ingotLiquidValue));
+		Smeltery.addMelting(block_greenmintBlock, 0, 500, new FluidStack(
+				moltengreenmint, TConstruct.ingotLiquidValue * 9));
 
-		TConstructRegistry.instance.getTableCasting().addCastingRecipe(new ItemStack(
-				item_GreenMintIngot, 1, 0), new FluidStack(moltenGreenMint,
+		TConstructRegistry.getTableCasting().addCastingRecipe(new ItemStack(
+				item_greenmintIngot, 1, 0), new FluidStack(moltengreenmint,
 						TConstruct.ingotLiquidValue), TConstructRegistry.getItemStack("ingotCast"), false, 50);
 
-		TConstructRegistry.instance.getBasinCasting().addCastingRecipe(new ItemStack(
-				block_GreenMintBlock, 1, 0), new FluidStack(moltenGreenMint,
+		TConstructRegistry.getBasinCasting().addCastingRecipe(new ItemStack(
+				block_greenmintBlock, 1, 0), new FluidStack(moltengreenmint,
 						TConstruct.ingotLiquidValue * 9), 100);
 
-		castMolten(moltenGreenMint, config.GreenMintMatID);
+		castmolten(moltengreenmint, config.GreenMintMatID);
 
 		PatternBuilder.instance.registerFullMaterial(new ItemStack(
-				item_GreenMintcane, 1, 0), 2, "GreenMint", new ItemStack(
+				item_greenmintcane, 1, 0), 2, "greenmint", new ItemStack(
 						TinkerTools.toolShard, 1, config.GreenMintMatID), new ItemStack(
 								TinkerTools.toolRod, 1, config.GreenMintMatID), config.GreenMintMatID);
 
@@ -692,8 +826,8 @@ public class TinkersDefense
 		tcInject = new Injector(0);
 		GameRegistry.registerItem(tcInject, "???");
 
-		GameRegistry.addShapelessRecipe(new ItemStack(item_Guidebook), new ItemStack(
-				Items.book), new ItemStack(partArmorplate, 1, -1));
+		//		GameRegistry.addShapelessRecipe(new ItemStack(item_Guidebook), new ItemStack(
+		//				Items.book), new ItemStack(partArmorplate, 1, -1));
 
 		mods.Init();
 
@@ -724,88 +858,88 @@ public class TinkersDefense
 		}
 	}
 
-	public void castMolten(Fluid fluid, int ID)
+	public void castmolten(Fluid fluid, int ID)
 	{
 		// .addCastingRecipe(output, fluid, cast, hardeningDelay)
-		TConstructRegistry.instance.getTableCasting().addCastingRecipe(new ItemStack(
+		TConstructRegistry.getTableCasting().addCastingRecipe(new ItemStack(
 				TinkerTools.toolRod, 1, ID), new FluidStack(fluid,
 						(int) (144 * 0.5D)), TConstructRegistry.getItemStack("toolRodCast"), 50);
-		TConstructRegistry.instance.getTableCasting().addCastingRecipe(new ItemStack(
+		TConstructRegistry.getTableCasting().addCastingRecipe(new ItemStack(
 				TinkerTools.pickaxeHead, 1, ID), new FluidStack(fluid,
 						(int) (144 * 1.0D)), TConstructRegistry.getItemStack("pickaxeHeadCast"), 50);
-		TConstructRegistry.instance.getTableCasting().addCastingRecipe(new ItemStack(
+		TConstructRegistry.getTableCasting().addCastingRecipe(new ItemStack(
 				TinkerTools.shovelHead, 1, ID), new FluidStack(fluid,
 						(int) (144 * 1.0D)), TConstructRegistry.getItemStack("shovelHeadCast"), 50);
-		TConstructRegistry.instance.getTableCasting().addCastingRecipe(new ItemStack(
+		TConstructRegistry.getTableCasting().addCastingRecipe(new ItemStack(
 				TinkerTools.hatchetHead, 1, ID), new FluidStack(fluid,
 						(int) (144 * 1.0D)), TConstructRegistry.getItemStack("hatchetHeadCast"), 50);
-		TConstructRegistry.instance.getTableCasting().addCastingRecipe(new ItemStack(
+		TConstructRegistry.getTableCasting().addCastingRecipe(new ItemStack(
 				TinkerTools.swordBlade, 1, ID), new FluidStack(fluid,
 						(int) (144 * 1.0D)), TConstructRegistry.getItemStack("swordBladeCast"), 50);
-		TConstructRegistry.instance.getTableCasting().addCastingRecipe(new ItemStack(
+		TConstructRegistry.getTableCasting().addCastingRecipe(new ItemStack(
 				TinkerTools.fullGuard, 1, ID), new FluidStack(fluid,
 						(int) (144 * 3.0D)), TConstructRegistry.getItemStack("fullGuardCast"), 50);
-		TConstructRegistry.instance.getTableCasting().addCastingRecipe(new ItemStack(
+		TConstructRegistry.getTableCasting().addCastingRecipe(new ItemStack(
 				TinkerTools.wideGuard, 1, ID), new FluidStack(fluid,
 						(int) (144 * 0.5D)), TConstructRegistry.getItemStack("wideGuardCast"), 50);
-		TConstructRegistry.instance.getTableCasting().addCastingRecipe(new ItemStack(
+		TConstructRegistry.getTableCasting().addCastingRecipe(new ItemStack(
 				TinkerTools.crossbar, 1, ID), new FluidStack(fluid,
 						(int) (144 * 0.5D)), TConstructRegistry.getItemStack("crossbarCast"), 50);
-		TConstructRegistry.instance.getTableCasting().addCastingRecipe(new ItemStack(
+		TConstructRegistry.getTableCasting().addCastingRecipe(new ItemStack(
 				TinkerTools.binding, 1, ID), new FluidStack(fluid,
 						(int) (144 * 0.5D)), TConstructRegistry.getItemStack("bindingCast"), 50);
-		TConstructRegistry.instance.getTableCasting().addCastingRecipe(new ItemStack(
+		TConstructRegistry.getTableCasting().addCastingRecipe(new ItemStack(
 				TinkerTools.handGuard, 1, ID), new FluidStack(fluid,
 						(int) (144 * 0.5D)), TConstructRegistry.getItemStack("handGuardCast"), 50);
-		TConstructRegistry.instance.getTableCasting().addCastingRecipe(new ItemStack(
+		TConstructRegistry.getTableCasting().addCastingRecipe(new ItemStack(
 				TinkerTools.frypanHead, 1, ID), new FluidStack(fluid,
 						(int) (144 * 1.0D)), TConstructRegistry.getItemStack("frypanHeadCast"), 50);
-		TConstructRegistry.instance.getTableCasting().addCastingRecipe(new ItemStack(
+		TConstructRegistry.getTableCasting().addCastingRecipe(new ItemStack(
 				TinkerTools.signHead, 1, ID), new FluidStack(fluid,
 						(int) (144 * 1.0D)), TConstructRegistry.getItemStack("signHeadCast"), 50);
-		TConstructRegistry.instance.getTableCasting().addCastingRecipe(new ItemStack(
+		TConstructRegistry.getTableCasting().addCastingRecipe(new ItemStack(
 				TinkerTools.knifeBlade, 1, ID), new FluidStack(fluid,
 						(int) (144 * 0.5D)), TConstructRegistry.getItemStack("knifeBladeCast"), 50);
-		TConstructRegistry.instance.getTableCasting().addCastingRecipe(new ItemStack(
+		TConstructRegistry.getTableCasting().addCastingRecipe(new ItemStack(
 				TinkerTools.chiselHead, 1, ID), new FluidStack(fluid,
 						(int) (144 * 0.5D)), TConstructRegistry.getItemStack("chiselHeadCast"), 50);
-		TConstructRegistry.instance.getTableCasting().addCastingRecipe(new ItemStack(
+		TConstructRegistry.getTableCasting().addCastingRecipe(new ItemStack(
 				TinkerTools.toughRod, 1, ID), new FluidStack(fluid,
 						(int) (144 * 3.0D)), TConstructRegistry.getItemStack("toughRodCast"), 50);
-		TConstructRegistry.instance.getTableCasting().addCastingRecipe(new ItemStack(
+		TConstructRegistry.getTableCasting().addCastingRecipe(new ItemStack(
 				TinkerTools.toughBinding, 1, ID), new FluidStack(fluid,
 						(int) (144 * 3.0D)), TConstructRegistry.getItemStack("toughBindingCast"), 50);
-		TConstructRegistry.instance.getTableCasting().addCastingRecipe(new ItemStack(
+		TConstructRegistry.getTableCasting().addCastingRecipe(new ItemStack(
 				TinkerTools.largePlate, 1, ID), new FluidStack(fluid,
 						(int) (144 * 8.0D)), TConstructRegistry.getItemStack("largePlateCast"), 50);
-		TConstructRegistry.instance.getTableCasting().addCastingRecipe(new ItemStack(
+		TConstructRegistry.getTableCasting().addCastingRecipe(new ItemStack(
 				TinkerTools.broadAxeHead, 1, ID), new FluidStack(fluid,
 						(int) (144 * 8.0D)), TConstructRegistry.getItemStack("broadAxeHeadCast"), 50);
-		TConstructRegistry.instance.getTableCasting().addCastingRecipe(new ItemStack(
+		TConstructRegistry.getTableCasting().addCastingRecipe(new ItemStack(
 				TinkerTools.scytheBlade, 1, ID), new FluidStack(fluid,
 						(int) (144 * 8.0D)), TConstructRegistry.getItemStack("scytheHeadCast"), 50);
-		TConstructRegistry.instance.getTableCasting().addCastingRecipe(new ItemStack(
+		TConstructRegistry.getTableCasting().addCastingRecipe(new ItemStack(
 				TinkerTools.excavatorHead, 1, ID), new FluidStack(fluid,
 						(int) (144 * 8.0D)), TConstructRegistry.getItemStack("excavatorHeadCast"), 50);
-		TConstructRegistry.instance.getTableCasting().addCastingRecipe(new ItemStack(
+		TConstructRegistry.getTableCasting().addCastingRecipe(new ItemStack(
 				TinkerTools.largeSwordBlade, 1, ID), new FluidStack(fluid,
 						(int) (144 * 8.0D)), TConstructRegistry.getItemStack("largeBladeCast"), 50);
-		TConstructRegistry.instance.getTableCasting().addCastingRecipe(new ItemStack(
+		TConstructRegistry.getTableCasting().addCastingRecipe(new ItemStack(
 				TinkerTools.hammerHead, 1, ID), new FluidStack(fluid,
 						(int) (144 * 8.0D)), TConstructRegistry.getItemStack("hammerHeadCast"), 50);
-		TConstructRegistry.instance.getTableCasting().addCastingRecipe(new ItemStack(
+		TConstructRegistry.getTableCasting().addCastingRecipe(new ItemStack(
 				TinkerTools.arrowhead, 1, ID), new FluidStack(fluid,
 						(int) (144 * 1.0D)), TConstructRegistry.getItemStack("arrowheadCast"), 50);
-		TConstructRegistry.instance.getTableCasting().addCastingRecipe(new ItemStack(
+		TConstructRegistry.getTableCasting().addCastingRecipe(new ItemStack(
 				partArmorplate, 1, ID), new FluidStack(fluid,
 						(int) (144 * 4.0D)), new ItemStack(metalPattern, 1, 2), 50);
-		TConstructRegistry.instance.getTableCasting().addCastingRecipe(new ItemStack(
+		TConstructRegistry.getTableCasting().addCastingRecipe(new ItemStack(
 				partRivet, 1, ID), new FluidStack(fluid, (int) (144 * 0.5D)), new ItemStack(
 						metalPattern, 1, 0), 50);
-		TConstructRegistry.instance.getTableCasting().addCastingRecipe(new ItemStack(
+		TConstructRegistry.getTableCasting().addCastingRecipe(new ItemStack(
 				partClasp, 1, ID), new FluidStack(fluid, (int) (144 * 1.0D)), new ItemStack(
 						metalPattern, 1, 1), 50);
-		TConstructRegistry.instance.getTableCasting().addCastingRecipe(new ItemStack(
+		TConstructRegistry.getTableCasting().addCastingRecipe(new ItemStack(
 				partChainmaille, 1, ID), new FluidStack(fluid,
 						(int) (144 * 4.0D)), new ItemStack(metalPattern, 1, 3), 50);
 	}
diff --git a/src/main/java/lance5057/tDefense/armor/ArmorCore.java b/src/main/java/lance5057/tDefense/armor/ArmorCore.java
index 56645ac..87188f5 100644
--- a/src/main/java/lance5057/tDefense/armor/ArmorCore.java
+++ b/src/main/java/lance5057/tDefense/armor/ArmorCore.java
@@ -4,6 +4,7 @@ import lance5057.tDefense.TDIntegration;
 import lance5057.tDefense.TinkersDefense;
 import lance5057.tDefense.armor.parts.ClothMaterial;
 import lance5057.tDefense.armor.renderers.ArmorRenderer;
+import lance5057.tDefense.core.tools.modifiers.Modifiers;
 import net.minecraft.client.model.ModelBiped;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
@@ -32,14 +33,14 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
-@Optional.InterfaceList({@Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.IRunicArmor", striprefs = true)})
+@Optional.InterfaceList({@Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.IRunicArmor", striprefs = true), @Optional.Interface(modid = "Botania", iface = "vazkii.botania.api.item.IPixieSpawner", striprefs = true)})
 public abstract class ArmorCore extends ToolCore implements ISpecialArmor, IRunicArmor, IPixieSpawner
 {
 	int				slot;
 	public float	reductionPercent	= 0f;
 	protected int	maxReduction		= 100;
 
-	public String[]	renderParts;
+	//public String[]	renderParts;
 
 	//Thaumcraft
 	boolean			Charge				= false;
@@ -208,7 +209,7 @@ public abstract class ArmorCore extends ToolCore implements ISpecialArmor, IRuni
 	public void onArmorTick(World world, EntityPlayer player, ItemStack itemStack)
 	{
 
-		TinkersDefense.mods.AMod.UpdateAll((ToolCore) itemStack.getItem(), itemStack, world, player, itemStack.getTagCompound().getCompoundTag("InfiTool"));
+		Modifiers.AMod.UpdateAll((ToolCore) itemStack.getItem(), itemStack, world, player, itemStack.getTagCompound().getCompoundTag("InfiTool"));
 	}
 
 	@Override
@@ -276,17 +277,17 @@ public abstract class ArmorCore extends ToolCore implements ISpecialArmor, IRuni
 			case 3:
 				renderReturn = extraStrings.get(tags.getInteger("RenderExtra"));
 				break;
-
-			default:
-				if(tags != null && tags.hasKey("Effect" + (pass - getPartAmount())))
-				{
-					final String effect = effectStrings.get(tags.getInteger("Effect" + (pass - getPartAmount())));
-					if(effect != null)
-						return effect.substring(effect.lastIndexOf("/") + 1);
-					else
-						return "";
-
-				}
+				//
+				//			default:
+				//				if(tags != null && tags.hasKey("Effect" + (pass - getPartAmount())))
+				//				{
+				//					final String effect = effectStrings.get(tags.getInteger("Effect" + (pass - getPartAmount())));
+				//					if(effect != null)
+				//						return effect.substring(effect.lastIndexOf("/") + 1);
+				//					else
+				//						return "";
+				//
+				//				}
 		}
 		if(renderReturn != null && renderReturn != "")
 		{
diff --git a/src/main/java/lance5057/tDefense/armor/TDArmorAddon.java b/src/main/java/lance5057/tDefense/armor/TDArmorAddon.java
index a877515..2aca64c 100644
--- a/src/main/java/lance5057/tDefense/armor/TDArmorAddon.java
+++ b/src/main/java/lance5057/tDefense/armor/TDArmorAddon.java
@@ -68,9 +68,9 @@ public class TDArmorAddon
 			{
 				return ToolBuilder.instance.buildTool(new ItemStack(
 						TinkerTools.largePlate, 1, 2), new ItemStack(
-								TinkerTools.toughRod, 1, 2), new ItemStack(
-										TinkersDefense.partArmorplate, 1, 2), new ItemStack(
-												TinkersDefense.partChainmaille, 1, 2), "ArmorTab").getItem();
+						TinkerTools.toughRod, 1, 2), new ItemStack(
+						TinkersDefense.partArmorplate, 1, 2), new ItemStack(
+						TinkersDefense.partChainmaille, 1, 2), "ArmorTab").getItem();
 			}
 
 		};
@@ -139,7 +139,7 @@ public class TDArmorAddon
 	public void init(FMLInitializationEvent e)
 	{
 
-		TConstructRegistry.addToolRecipe(armor_TinkerHelm, TinkerTools.frypanHead, TinkersDefense.partChainmaille, TinkersDefense.partArmorplate, TinkerTools.toughRod);
+		TConstructRegistry.addToolRecipe(armor_TinkerHelm, TinkerTools.frypanHead, TinkerTools.toughRod, TinkersDefense.partArmorplate, TinkersDefense.partChainmaille);
 		TConstructRegistry.addToolRecipe(armor_TinkerBreastplate, TinkerTools.largePlate, TinkerTools.toughRod, TinkersDefense.partArmorplate, TinkersDefense.partChainmaille);
 		TConstructRegistry.addToolRecipe(armor_TinkerGrieves, TinkersDefense.partArmorplate, TinkerTools.toughRod, TinkersDefense.partChainmaille, TinkersDefense.partCloth);
 		TConstructRegistry.addToolRecipe(armor_TinkerSabatons, TinkersDefense.partArmorplate, TinkerTools.toughRod, TinkersDefense.partArmorplate, TinkersDefense.partCloth);
@@ -150,7 +150,7 @@ public class TDArmorAddon
 		TConstructRegistry.addToolRecipe(armor_TinkerHood, TinkersDefense.partCloth, TinkerTools.toolRod, TinkersDefense.partCloth);
 		TConstructRegistry.addToolRecipe(armor_TinkerShoes, TinkersDefense.partCloth, TinkersDefense.partRivet, TinkersDefense.partCloth);
 
-		TConstructRegistry.addToolRecipe(armor_TinkerCoif, TinkersDefense.partChainmaille, TinkersDefense.partCloth, TinkerTools.toughRod);
+		TConstructRegistry.addToolRecipe(armor_TinkerCoif, TinkersDefense.partChainmaille, TinkerTools.toughRod, TinkersDefense.partCloth);
 		TConstructRegistry.addToolRecipe(armor_TinkerHauberk, TinkersDefense.partChainmaille, TinkerTools.largePlate, TinkersDefense.partCloth);
 		TConstructRegistry.addToolRecipe(armor_TinkerChausses, TinkersDefense.partChainmaille, TinkersDefense.partArmorplate, TinkersDefense.partCloth);
 		TConstructRegistry.addToolRecipe(armor_TinkerBoots, TinkersDefense.partChainmaille, TinkersDefense.partCloth, TinkersDefense.partRivet);
diff --git a/src/main/java/lance5057/tDefense/armor/TDHelmet.java b/src/main/java/lance5057/tDefense/armor/TDHelmet.java
deleted file mode 100644
index 89bfb44..0000000
--- a/src/main/java/lance5057/tDefense/armor/TDHelmet.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package lance5057.tDefense.armor;
-
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
-import thaumcraft.api.IGoggles;
-import thaumcraft.api.nodes.IRevealer;
-import WayofTime.alchemicalWizardry.api.alchemy.energy.IAlchemyGoggles;
-import WayofTime.alchemicalWizardry.api.items.interfaces.ILPGauge;
-import cpw.mods.fml.common.Optional;
-
-@Optional.InterfaceList({@Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.IGoggles", striprefs = true), @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.nodes.IRevealer", striprefs = true), @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.IVisDiscountGear", striprefs = true), @Optional.Interface(modid = "Botania", iface = "vazkii.botania.api.mana.IManaDiscountArmor", striprefs = true), @Optional.Interface(modid = "Botania", iface = "vazkii.botania.api.wand.IWandHUD", striprefs = true), @Optional.Interface(modid = "AWWayofTime", iface = "WayofTime.alchemicalWizardry.api.items.interfaces.ILPGauge", striprefs = true), @Optional.Interface(modid = "AWWayofTime", iface = "WayofTime.alchemicalWizardry.api.alchemy.energy.IAlchemyGoggles", striprefs = true)})
-public abstract class TDHelmet extends ArmorCore implements IRevealer, IGoggles, ILPGauge, IAlchemyGoggles
-{
-
-	public TDHelmet(int baseProtection, int slot)
-	{
-		super(baseProtection, slot);
-	}
-
-	@Override
-	@Optional.Method(modid = "Thaumcraft")
-	public boolean showIngamePopups(ItemStack itemstack, EntityLivingBase player)
-	{
-		return itemstack.getTagCompound().getCompoundTag("InfiTool").getBoolean("Revealing");
-	}
-
-	@Override
-	@Optional.Method(modid = "Thaumcraft")
-	public boolean showNodes(ItemStack itemstack, EntityLivingBase player)
-	{
-		return itemstack.getTagCompound().getCompoundTag("InfiTool").getBoolean("Revealing");
-	}
-
-	@Override
-	@Optional.Method(modid = "AWWayofTime")
-	public boolean canSeeLPBar(ItemStack stack)
-	{
-		return stack.getTagCompound().getCompoundTag("InfiTool").getBoolean("Divination");
-	}
-
-	@Override
-	@Optional.Method(modid = "AWWayofTime")
-	public boolean showIngameHUD(World world, ItemStack stack, EntityPlayer player)
-	{
-		return stack.getTagCompound().getCompoundTag("InfiTool").getBoolean("Divination");
-	}
-}
diff --git a/src/main/java/lance5057/tDefense/armor/blocks/GlowstoneCrumbs.java b/src/main/java/lance5057/tDefense/armor/blocks/GlowstoneCrumbs.java
index 3bbe32e..13648c2 100644
--- a/src/main/java/lance5057/tDefense/armor/blocks/GlowstoneCrumbs.java
+++ b/src/main/java/lance5057/tDefense/armor/blocks/GlowstoneCrumbs.java
@@ -1,43 +1,30 @@
 package lance5057.tDefense.armor.blocks;
 
-import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.Random;
-import java.util.Set;
 
 import lance5057.tDefense.Reference;
-import lance5057.tDefense.TinkersDefense;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.init.Blocks;
-import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 import net.minecraft.util.AxisAlignedBB;
-import net.minecraft.util.Direction;
-import net.minecraft.util.IIcon;
-import net.minecraft.world.ChunkPosition;
-import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
-import net.minecraftforge.common.util.ForgeDirection;
 
 public class GlowstoneCrumbs extends Block
 {
 	public GlowstoneCrumbs()
 	{
 		super(Material.ground);
-		this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.0625F, 1.0F);
-		this.setBlockName("glowstonecrumbs");
-		this.setBlockTextureName(Reference.MOD_ID + ":glowstonecrumbs");
-		this.setLightLevel(1f);
+		setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.0625F, 1.0F);
+		setBlockName("glowstonecrumbs");
+		setBlockTextureName(Reference.MOD_ID + ":glowstonecrumbs");
+		setLightLevel(1f);
 	}
 
 	/**
 	 * Returns a bounding box from the pool of bounding boxes (this means this box can change after the pool has been
 	 * cleared to be reused)
 	 */
+	@Override
 	public AxisAlignedBB getCollisionBoundingBoxFromPool(World p_149668_1_, int p_149668_2_, int p_149668_3_, int p_149668_4_)
 	{
 		return null;
@@ -47,6 +34,7 @@ public class GlowstoneCrumbs extends Block
 	 * Is this block (a) opaque and (b) a full 1m cube?  This determines whether or not to render the shared face of two
 	 * adjacent blocks and also whether the player can attach torches, redstone wire, etc to this block.
 	 */
+	@Override
 	public boolean isOpaqueCube()
 	{
 		return false;
@@ -55,6 +43,7 @@ public class GlowstoneCrumbs extends Block
 	/**
 	 * If this block doesn't render as an ordinary block it will return False (examples: signs, buttons, stairs, etc)
 	 */
+	@Override
 	public boolean renderAsNormalBlock()
 	{
 		return false;
@@ -63,11 +52,13 @@ public class GlowstoneCrumbs extends Block
 	/**
 	 * The type of render function that is called for this block
 	 */
+	@Override
 	public int getRenderType()
 	{
 		return 23;
 	}
 
+	@Override
 	public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_)
 	{
 		return null;
@@ -76,27 +67,30 @@ public class GlowstoneCrumbs extends Block
 	/**
 	 * Checks to see if its valid to put this block at the specified coordinates. Args: world, x, y, z
 	 */
+	@Override
 	public boolean canPlaceBlockAt(World p_149742_1_, int p_149742_2_, int p_149742_3_, int p_149742_4_)
 	{
-		return super.canPlaceBlockAt(p_149742_1_, p_149742_2_, p_149742_3_, p_149742_4_) && this.canBlockStay(p_149742_1_, p_149742_2_, p_149742_3_, p_149742_4_);
+		return super.canPlaceBlockAt(p_149742_1_, p_149742_2_, p_149742_3_, p_149742_4_) && canBlockStay(p_149742_1_, p_149742_2_, p_149742_3_, p_149742_4_);
 	}
 
 	/**
 	 * Lets the block know when one of its neighbor changes. Doesn't know which neighbor changed (coordinates passed are
 	 * their own) Args: x, y, z, neighbor Block
 	 */
+	@Override
 	public void onNeighborBlockChange(World p_149695_1_, int p_149695_2_, int p_149695_3_, int p_149695_4_, Block p_149695_5_)
 	{
 		super.onNeighborBlockChange(p_149695_1_, p_149695_2_, p_149695_3_, p_149695_4_, p_149695_5_);
-		this.checkAndDropBlock(p_149695_1_, p_149695_2_, p_149695_3_, p_149695_4_);
+		checkAndDropBlock(p_149695_1_, p_149695_2_, p_149695_3_, p_149695_4_);
 	}
 
 	/**
 	 * Ticks the block if it's been scheduled
 	 */
+	@Override
 	public void updateTick(World p_149674_1_, int p_149674_2_, int p_149674_3_, int p_149674_4_, Random p_149674_5_)
 	{
-		this.checkAndDropBlock(p_149674_1_, p_149674_2_, p_149674_3_, p_149674_4_);
+		checkAndDropBlock(p_149674_1_, p_149674_2_, p_149674_3_, p_149674_4_);
 	}
 
 	/**
@@ -104,7 +98,7 @@ public class GlowstoneCrumbs extends Block
 	 */
 	protected void checkAndDropBlock(World p_149855_1_, int p_149855_2_, int p_149855_3_, int p_149855_4_)
 	{
-		if(!this.canBlockStay(p_149855_1_, p_149855_2_, p_149855_3_, p_149855_4_))
+		if(!canBlockStay(p_149855_1_, p_149855_2_, p_149855_3_, p_149855_4_))
 		{
 			p_149855_1_.setBlock(p_149855_2_, p_149855_3_, p_149855_4_, getBlockById(0), 0, 2);
 		}
@@ -113,6 +107,7 @@ public class GlowstoneCrumbs extends Block
 	/**
 	 * Can this block stay at this position.  Similar to canPlaceBlockAt except gets checked often with plants.
 	 */
+	@Override
 	public boolean canBlockStay(World p_149718_1_, int p_149718_2_, int p_149718_3_, int p_149718_4_)
 	{
 		return p_149718_1_.getBlock(p_149718_2_, p_149718_3_ - 1, p_149718_4_).isNormalCube(p_149718_1_, p_149718_2_, p_149718_3_ - 1, p_149718_4_) && !p_149718_1_.getBlock(p_149718_2_, p_149718_3_ - 1, p_149718_4_).isAir(p_149718_1_, p_149718_2_, p_149718_3_ - 1, p_149718_4_);
diff --git a/src/main/java/lance5057/tDefense/armor/blocks/UnstableBlock.java b/src/main/java/lance5057/tDefense/armor/blocks/UnstableBlock.java
index f6ca02c..adf0c44 100644
--- a/src/main/java/lance5057/tDefense/armor/blocks/UnstableBlock.java
+++ b/src/main/java/lance5057/tDefense/armor/blocks/UnstableBlock.java
@@ -6,7 +6,6 @@ import java.util.Random;
 import lance5057.tDefense.Reference;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
-import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.init.Blocks;
@@ -29,29 +28,31 @@ public class UnstableBlock extends Block
 	public UnstableBlock()
 	{
 		super(Material.rock);
-		this.setBlockName("unstable");
-		this.setBlockTextureName("unstable");
-		this.setTickRandomly(true);
+		setBlockName("unstable");
+		setBlockTextureName("unstable");
+		setTickRandomly(true);
 	}
 
 	/**
 	 * Gets the block's texture. Args: side, meta
 	 */
+	@Override
 	@SideOnly(Side.CLIENT)
 	public IIcon getIcon(int p_149691_1_, int p_149691_2_)
 	{
-		if(p_149691_2_ < 0 || p_149691_2_ >= this.field_150095_b.length)
+		if(p_149691_2_ < 0 || p_149691_2_ >= field_150095_b.length)
 		{
 			p_149691_2_ = 0;
 		}
 
-		return this.field_150095_b[p_149691_2_];
+		return field_150095_b[p_149691_2_];
 	}
 
 	/**
 	 * Determines the damage on the item the block drops. Used in cloth and
 	 * wood.
 	 */
+	@Override
 	public int damageDropped(int p_149692_1_)
 	{
 		return p_149692_1_;
@@ -61,6 +62,7 @@ public class UnstableBlock extends Block
 	 * returns a list of blocks with the same ID, but different meta (eg: wood
 	 * returns 4 blocks)
 	 */
+	@Override
 	@SideOnly(Side.CLIENT)
 	public void getSubBlocks(Item p_149666_1_, CreativeTabs p_149666_2_, List p_149666_3_)
 	{
@@ -68,22 +70,25 @@ public class UnstableBlock extends Block
 		p_149666_3_.add(new ItemStack(p_149666_1_, 1, 1));
 	}
 
+	@Override
 	@SideOnly(Side.CLIENT)
 	public void registerBlockIcons(IIconRegister p_149651_1_)
 	{
-		this.field_150095_b = new IIcon[field_150096_a.length];
+		field_150095_b = new IIcon[field_150096_a.length];
 
-		for(int i = 0; i < this.field_150095_b.length; ++i)
+		for(int i = 0; i < field_150095_b.length; ++i)
 		{
-			this.field_150095_b[i] = p_149651_1_.registerIcon(Reference.MOD_ID + ":" + this.getTextureName() + field_150096_a[i]);
+			field_150095_b[i] = p_149651_1_.registerIcon(Reference.MOD_ID + ":" + getTextureName() + field_150096_a[i]);
 		}
 	}
 
+	@Override
 	@SideOnly(Side.CLIENT)
 	public int getRenderBlockPass()
 	{
 		return 1;
 	}
+
 	@Override
 	public void breakBlock(World par1World, int par2, int par3, int par4, Block p_149749_5_, int meta)
 	{
@@ -103,7 +108,7 @@ public class UnstableBlock extends Block
 	@Override
 	public void updateTick(World par1World, int par2, int par3, int par4, Random par5Random)
 	{
-		int meta = par1World.getBlockMetadata(par2, par3, par4);
+		final int meta = par1World.getBlockMetadata(par2, par3, par4);
 
 		if(meta == 0)
 		{
diff --git a/src/main/java/lance5057/tDefense/armor/blocks/UnstableItemBlock.java b/src/main/java/lance5057/tDefense/armor/blocks/UnstableItemBlock.java
index 04770c4..2461704 100644
--- a/src/main/java/lance5057/tDefense/armor/blocks/UnstableItemBlock.java
+++ b/src/main/java/lance5057/tDefense/armor/blocks/UnstableItemBlock.java
@@ -1,6 +1,5 @@
 package lance5057.tDefense.armor.blocks;
 
-import lance5057.tDefense.armor.TDArmorAddon;
 import net.minecraft.block.Block;
 import net.minecraft.item.ItemBlockWithMetadata;
 import net.minecraft.item.ItemStack;
@@ -16,6 +15,6 @@ public class UnstableItemBlock extends ItemBlockWithMetadata
 	@Override
 	public String getUnlocalizedName(ItemStack stack)
 	{
-		return this.getUnlocalizedName() + "_" + ((UnstableBlock) TDArmorAddon.block_Unstable).types[stack.getItemDamage()];
+		return this.getUnlocalizedName() + "_" + UnstableBlock.types[stack.getItemDamage()];
 	}
 }
diff --git a/src/main/java/lance5057/tDefense/armor/events/ArmorModEvents.java b/src/main/java/lance5057/tDefense/armor/events/ArmorModEvents.java
index a548922..fd15b98 100644
--- a/src/main/java/lance5057/tDefense/armor/events/ArmorModEvents.java
+++ b/src/main/java/lance5057/tDefense/armor/events/ArmorModEvents.java
@@ -2,23 +2,14 @@ package lance5057.tDefense.armor.events;
 
 import lance5057.tDefense.TinkersDefense;
 import lance5057.tDefense.armor.ArmorCore;
-import lance5057.tDefense.armor.items.cloth.TinkersRobe;
-import lance5057.tDefense.armor.items.heavy.TinkersGrieves;
-import lance5057.tDefense.armor.items.light.TinkersChausses;
-import lance5057.tDefense.armor.modifiers.ArmorMods;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.ChatComponentText;
 import net.minecraft.util.DamageSource;
 import net.minecraft.util.MathHelper;
-import net.minecraft.world.World;
 import net.minecraftforge.event.entity.living.LivingHurtEvent;
-import tconstruct.library.tools.ToolCore;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import cpw.mods.fml.common.gameevent.TickEvent;
-import cpw.mods.fml.common.registry.EntityRegistry;
 
 public class ArmorModEvents
 {
@@ -27,55 +18,67 @@ public class ArmorModEvents
 	{
 		int epf = 0;
 
-		if(event.entityLiving instanceof EntityPlayer)
+		if(TinkersDefense.config.debug && event.entityLiving instanceof EntityPlayer)
 		{
-			((EntityPlayer) event.entityLiving).addChatComponentMessage(new ChatComponentText(event.source.getDamageType() + " - Max: " + Double.toString(event.ammount)));
+			((EntityPlayer) event.entityLiving).addChatComponentMessage(new ChatComponentText(
+					event.source.getDamageType() + " - Max: " + Double.toString(event.ammount)));
 		}
 
 		for(int i = 0; i < 4; i++)
 		{
-			ItemStack armor = event.entityLiving.getEquipmentInSlot(i + 1);
+			final ItemStack armor = event.entityLiving.getEquipmentInSlot(i + 1);
 			if(armor != null && armor.getItem() instanceof ArmorCore)
 			{
-				NBTTagCompound tags = armor.getTagCompound().getCompoundTag("InfiTool");
+				final NBTTagCompound tags = armor.getTagCompound().getCompoundTag("InfiTool");
 
 				if(!event.source.isUnblockable())
 				{
 					if(tags.hasKey("Protection"))
+					{
 						epf += (calcModifierDamage(tags.getInteger("Protection"), 1f, event.source));
+					}
 					else if(tags.hasKey("Fire Protection") && event.source.isFireDamage())
+					{
 						epf += (calcModifierDamage(tags.getInteger("Fire Protection"), 2f, event.source));
+					}
 					else if(tags.hasKey("Blast Protection") && event.source.isExplosion())
+					{
 						epf += (calcModifierDamage(tags.getInteger("Blast Protection"), 2f, event.source));
+					}
 					else if(tags.hasKey("Projectile Protection") && event.source.isProjectile())
+					{
 						epf += (calcModifierDamage(tags.getInteger("Projectile Protection"), 2f, event.source));
+					}
 				}
-				else if(tags.hasKey("Featherfall") && event.source.getDamageType() == event.source.fall.getDamageType())
+				else if(tags.hasKey("Featherfall") && event.source.getDamageType() == DamageSource.fall.getDamageType())
+				{
 					epf += (calcModifierDamage(tags.getInteger("Featherfall"), 3f, event.source));
+				}
 			}
 		}
 
 		if(epf > 20)
+		{
 			epf = 20;
+		}
 
-		float adjustedPerc = (float) (1f - (epf * 0.04));
+		final float adjustedPerc = (float) (1f - (epf * 0.04));
 		event.ammount = adjustedPerc * event.ammount;
- 
+
 		if(TinkersDefense.config.debug && event.entityLiving instanceof EntityPlayer)
 		{
-			((EntityPlayer) event.entityLiving).addChatComponentMessage(new ChatComponentText(event.source.getDamageType() + " - Adjusted: " + Double.toString(event.ammount)));
+			((EntityPlayer) event.entityLiving).addChatComponentMessage(new ChatComponentText(
+					event.source.getDamageType() + " - Adjusted: " + Double.toString(event.ammount)));
 		}
 	}
 
 	public int calcModifierDamage(int level, float typeMod, DamageSource source)
 	{
 		if(source.canHarmInCreative())
-		{
 			return 0;
-		}
 		else
 		{
-			float f = (float) (6 + level * level) / 3.0F;
+			final float f = (6 + level * level) / 3.0F;
 			return MathHelper.floor_float(f * typeMod);
 		}
 	}
diff --git a/src/main/java/lance5057/tDefense/armor/events/ArmorRenderEvent.java b/src/main/java/lance5057/tDefense/armor/events/ArmorRenderEvent.java
index adaf76a..535dc35 100644
--- a/src/main/java/lance5057/tDefense/armor/events/ArmorRenderEvent.java
+++ b/src/main/java/lance5057/tDefense/armor/events/ArmorRenderEvent.java
@@ -1,15 +1,14 @@
 package lance5057.tDefense.armor.events;
 
-import tconstruct.armor.ArmorProxyClient;
-import tconstruct.armor.player.ArmorExtended;
-import tconstruct.library.tools.ToolCore;
 import lance5057.tDefense.armor.ArmorCore;
 import net.minecraft.client.model.ModelBiped;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.EnumAction;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.client.event.RenderPlayerEvent;
+import tconstruct.armor.ArmorProxyClient;
+import tconstruct.armor.player.ArmorExtended;
+import tconstruct.library.tools.ToolCore;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -23,22 +22,22 @@ public class ArmorRenderEvent
 	{
 		if(event.entityPlayer != null)
 		{
-			ArmorExtended armorEx = ArmorProxyClient.armorExtended;
+			final ArmorExtended armorEx = ArmorProxyClient.armorExtended;
 
-			ItemStack Armor = event.entityPlayer.inventory.armorItemInSlot(event.slot);
+			final ItemStack Armor = event.entityPlayer.inventory.armorItemInSlot(event.slot);
 
 			if(Armor != null && Armor.getItem() instanceof ArmorCore)
 			{
-				ModelBiped armorModel = Armor.getItem().getArmorModel(event.entityLiving, Armor, event.slot);
+				final ModelBiped armorModel = Armor.getItem().getArmorModel(event.entityLiving, Armor, event.slot);
 
 				TrimArmor(armorModel, event);
 			}
 
-			ItemStack Accessory = armorEx.getStackInSlot(event.slot);
+			final ItemStack Accessory = armorEx.getStackInSlot(event.slot);
 
 			if(Accessory != null && Accessory.getItem() instanceof ToolCore)
 			{
-				ModelBiped accessoryModel = Accessory.getItem().getArmorModel(event.entityLiving, Accessory, event.slot);
+				final ModelBiped accessoryModel = Accessory.getItem().getArmorModel(event.entityLiving, Accessory, event.slot);
 
 				TrimArmor(accessoryModel, event);
 			}
@@ -58,14 +57,14 @@ public class ArmorRenderEvent
 
 			if(event.entityPlayer instanceof EntityPlayer)
 			{
-				ItemStack itemstack = event.entityPlayer.inventory.getCurrentItem();
+				final ItemStack itemstack = event.entityPlayer.inventory.getCurrentItem();
 				armorModel.heldItemRight = 0;
 				armorModel.aimedBow = false;
 				if(itemstack != null)
 				{
 					if(event.entityPlayer.getItemInUseCount() > 0)
 					{
-						EnumAction enumaction = itemstack.getItemUseAction();
+						final EnumAction enumaction = itemstack.getItemUseAction();
 
 						if(enumaction == EnumAction.block)
 						{
@@ -83,10 +82,10 @@ public class ArmorRenderEvent
 				}
 			}
 
-			float yaw = event.entityPlayer.prevRotationYawHead + (event.entityPlayer.rotationYawHead - event.entityPlayer.prevRotationYawHead) * event.partialRenderTick;
-			float yawOffset = event.entityPlayer.prevRenderYawOffset + (event.entityPlayer.renderYawOffset - event.entityPlayer.prevRenderYawOffset) * event.partialRenderTick;
-			float limbs = event.entityPlayer.prevLimbSwingAmount + (event.entityPlayer.limbSwingAmount - event.entityPlayer.prevLimbSwingAmount) * event.partialRenderTick;
-			float limbSwing = event.entityPlayer.limbSwing - event.entityPlayer.limbSwingAmount * (1.0F - event.partialRenderTick);
+			final float yaw = event.entityPlayer.prevRotationYawHead + (event.entityPlayer.rotationYawHead - event.entityPlayer.prevRotationYawHead) * event.partialRenderTick;
+			final float yawOffset = event.entityPlayer.prevRenderYawOffset + (event.entityPlayer.renderYawOffset - event.entityPlayer.prevRenderYawOffset) * event.partialRenderTick;
+			final float limbs = event.entityPlayer.prevLimbSwingAmount + (event.entityPlayer.limbSwingAmount - event.entityPlayer.prevLimbSwingAmount) * event.partialRenderTick;
+			final float limbSwing = event.entityPlayer.limbSwing - event.entityPlayer.limbSwingAmount * (1.0F - event.partialRenderTick);
 
 			armorModel.setRotationAngles(limbSwing, limbs, event.entityPlayer.ticksExisted, yaw - yawOffset, event.entityPlayer.rotationPitch, 0.1f, event.entityPlayer);
 			armorModel.render(event.entityPlayer, limbSwing, limbs, event.entityPlayer.ticksExisted, yaw - yawOffset, event.entityPlayer.rotationPitch, 0.1f);
diff --git a/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersHood.java b/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersHood.java
index ec775a2..7259d48 100644
--- a/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersHood.java
+++ b/src/main/java/lance5057/tDefense/armor/items/cloth/TinkersHood.java
@@ -1,21 +1,27 @@
 package lance5057.tDefense.armor.items.cloth;
 
 import lance5057.tDefense.TinkersDefense;
-import lance5057.tDefense.armor.TDHelmet;
+import lance5057.tDefense.armor.ArmorCore;
 import lance5057.tDefense.armor.renderers.ArmorRenderer;
 import lance5057.tDefense.proxy.ClientProxy;
 import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
 import tconstruct.tools.TinkerTools;
+import thaumcraft.api.IGoggles;
 import thaumcraft.api.IVisDiscountGear;
 import thaumcraft.api.aspects.Aspect;
+import thaumcraft.api.nodes.IRevealer;
 import vazkii.botania.api.mana.IManaDiscountArmor;
+import WayofTime.alchemicalWizardry.api.alchemy.energy.IAlchemyGoggles;
+import WayofTime.alchemicalWizardry.api.items.interfaces.ILPGauge;
 import cpw.mods.fml.common.Optional;
 
-@Optional.InterfaceList({@Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.IVisDiscountGear", striprefs = true), @Optional.Interface(modid = "Botania", iface = "vazkii.botania.api.mana.IManaDiscountArmor", striprefs = true)})
-public class TinkersHood extends TDHelmet implements IVisDiscountGear, IManaDiscountArmor
+@Optional.InterfaceList({@Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.IGoggles", striprefs = true), @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.nodes.IRevealer", striprefs = true), @Optional.Interface(modid = "AWWayofTime", iface = "WayofTime.alchemicalWizardry.api.items.interfaces.ILPGauge", striprefs = true), @Optional.Interface(modid = "AWWayofTime", iface = "WayofTime.alchemicalWizardry.api.alchemy.energy.IAlchemyGoggles", striprefs = true), @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.IVisDiscountGear", striprefs = true), @Optional.Interface(modid = "Botania", iface = "vazkii.botania.api.mana.IManaDiscountArmor", striprefs = true)})
+public class TinkersHood extends ArmorCore implements IRevealer, IGoggles, ILPGauge, IAlchemyGoggles, IVisDiscountGear, IManaDiscountArmor
 {
 	public TinkersHood()
 	{
@@ -145,4 +151,32 @@ public class TinkersHood extends TDHelmet implements IVisDiscountGear, IManaDisc
 		final float i = stack.getTagCompound().getCompoundTag("InfiTool").getInteger("ManaEmbroidery") / 100f;
 		return i;
 	}
+
+	@Optional.Method(modid = "Thaumcraft")
+	@Override
+	public boolean showIngamePopups(ItemStack itemstack, EntityLivingBase player)
+	{
+		return itemstack.getTagCompound().getCompoundTag("InfiTool").getBoolean("Revealing");
+	}
+
+	@Optional.Method(modid = "Thaumcraft")
+	@Override
+	public boolean showNodes(ItemStack itemstack, EntityLivingBase player)
+	{
+		return itemstack.getTagCompound().getCompoundTag("InfiTool").getBoolean("Revealing");
+	}
+
+	@Optional.Method(modid = "AWWayofTime")
+	@Override
+	public boolean canSeeLPBar(ItemStack stack)
+	{
+		return stack.getTagCompound().getCompoundTag("InfiTool").getBoolean("Divination");
+	}
+
+	@Optional.Method(modid = "AWWayofTime")
+	@Override
+	public boolean showIngameHUD(World world, ItemStack stack, EntityPlayer player)
+	{
+		return stack.getTagCompound().getCompoundTag("InfiTool").getBoolean("Divination");
+	}
 }
diff --git a/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersHelm.java b/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersHelm.java
index 143cab0..12fed96 100644
--- a/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersHelm.java
+++ b/src/main/java/lance5057/tDefense/armor/items/heavy/TinkersHelm.java
@@ -1,15 +1,24 @@
 package lance5057.tDefense.armor.items.heavy;
 
 import lance5057.tDefense.TinkersDefense;
-import lance5057.tDefense.armor.TDHelmet;
+import lance5057.tDefense.armor.ArmorCore;
 import lance5057.tDefense.armor.renderers.ArmorRenderer;
 import lance5057.tDefense.proxy.ClientProxy;
 import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
 import tconstruct.tools.TinkerTools;
-
-public class TinkersHelm extends TDHelmet
+import thaumcraft.api.IGoggles;
+import thaumcraft.api.nodes.IRevealer;
+import WayofTime.alchemicalWizardry.api.alchemy.energy.IAlchemyGoggles;
+import WayofTime.alchemicalWizardry.api.items.interfaces.ILPGauge;
+import cpw.mods.fml.common.Optional;
+
+@Optional.InterfaceList({@Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.IGoggles", striprefs = true), @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.nodes.IRevealer", striprefs = true), @Optional.Interface(modid = "AWWayofTime", iface = "WayofTime.alchemicalWizardry.api.items.interfaces.ILPGauge", striprefs = true), @Optional.Interface(modid = "AWWayofTime", iface = "WayofTime.alchemicalWizardry.api.alchemy.energy.IAlchemyGoggles", striprefs = true)})
+public class TinkersHelm extends ArmorCore implements IRevealer, IGoggles, ILPGauge, IAlchemyGoggles
 {
 	public TinkersHelm()
 	{
@@ -28,7 +37,7 @@ public class TinkersHelm extends TDHelmet
 	@Override
 	public Item getHandleItem()
 	{
-		return TinkersDefense.partChainmaille;
+		return TinkerTools.toughRod;
 	}
 
 	@Override
@@ -40,7 +49,7 @@ public class TinkersHelm extends TDHelmet
 	@Override
 	public Item getExtraItem()
 	{
-		return TinkerTools.toughRod;
+		return TinkersDefense.partChainmaille;
 	}
 
 	@Override
@@ -129,4 +138,32 @@ public class TinkersHelm extends TDHelmet
 	{
 		return ClientProxy.helm;
 	}
+
+	@Optional.Method(modid = "Thaumcraft")
+	@Override
+	public boolean showIngamePopups(ItemStack itemstack, EntityLivingBase player)
+	{
+		return itemstack.getTagCompound().getCompoundTag("InfiTool").getBoolean("Revealing");
+	}
+
+	@Optional.Method(modid = "Thaumcraft")
+	@Override
+	public boolean showNodes(ItemStack itemstack, EntityLivingBase player)
+	{
+		return itemstack.getTagCompound().getCompoundTag("InfiTool").getBoolean("Revealing");
+	}
+
+	@Optional.Method(modid = "AWWayofTime")
+	@Override
+	public boolean canSeeLPBar(ItemStack stack)
+	{
+		return stack.getTagCompound().getCompoundTag("InfiTool").getBoolean("Divination");
+	}
+
+	@Optional.Method(modid = "AWWayofTime")
+	@Override
+	public boolean showIngameHUD(World world, ItemStack stack, EntityPlayer player)
+	{
+		return stack.getTagCompound().getCompoundTag("InfiTool").getBoolean("Divination");
+	}
 }
diff --git a/src/main/java/lance5057/tDefense/armor/items/light/TinkersCoif.java b/src/main/java/lance5057/tDefense/armor/items/light/TinkersCoif.java
index 71b0199..5014bf9 100644
--- a/src/main/java/lance5057/tDefense/armor/items/light/TinkersCoif.java
+++ b/src/main/java/lance5057/tDefense/armor/items/light/TinkersCoif.java
@@ -1,7 +1,7 @@
 package lance5057.tDefense.armor.items.light;
 
 import lance5057.tDefense.TinkersDefense;
-import lance5057.tDefense.armor.TDHelmet;
+import lance5057.tDefense.armor.ArmorCore;
 import lance5057.tDefense.armor.renderers.ArmorRenderer;
 import lance5057.tDefense.proxy.ClientProxy;
 import net.minecraft.entity.Entity;
@@ -10,9 +10,16 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.DamageSource;
+import net.minecraft.world.World;
 import tconstruct.tools.TinkerTools;
-
-public class TinkersCoif extends TDHelmet
+import thaumcraft.api.IGoggles;
+import thaumcraft.api.nodes.IRevealer;
+import WayofTime.alchemicalWizardry.api.alchemy.energy.IAlchemyGoggles;
+import WayofTime.alchemicalWizardry.api.items.interfaces.ILPGauge;
+import cpw.mods.fml.common.Optional;
+
+@Optional.InterfaceList({@Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.IGoggles", striprefs = true), @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.nodes.IRevealer", striprefs = true), @Optional.Interface(modid = "AWWayofTime", iface = "WayofTime.alchemicalWizardry.api.items.interfaces.ILPGauge", striprefs = true), @Optional.Interface(modid = "AWWayofTime", iface = "WayofTime.alchemicalWizardry.api.alchemy.energy.IAlchemyGoggles", striprefs = true)})
+public class TinkersCoif extends ArmorCore implements IRevealer, IGoggles, ILPGauge, IAlchemyGoggles
 {
 	public TinkersCoif()
 	{
@@ -31,13 +38,13 @@ public class TinkersCoif extends TDHelmet
 	@Override
 	public Item getHandleItem()
 	{
-		return TinkersDefense.partCloth;
+		return TinkerTools.toughRod;
 	}
 
 	@Override
 	public Item getAccessoryItem()
 	{
-		return TinkerTools.toughRod;
+		return TinkersDefense.partCloth;
 	}
 
 	@Override
@@ -80,9 +87,9 @@ public class TinkersCoif extends TDHelmet
 			case 1:
 				return "_coif_chain_broken";
 			case 2:
-				return "_coif_cloth";
-			case 3:
 				return "_coif_circlet";
+			case 3:
+				return "_coif_cloth";
 			default:
 				return "";
 		}
@@ -139,4 +146,32 @@ public class TinkersCoif extends TDHelmet
 		// TODO Auto-generated method stub
 		return ClientProxy.coif;
 	}
+
+	@Optional.Method(modid = "Thaumcraft")
+	@Override
+	public boolean showIngamePopups(ItemStack itemstack, EntityLivingBase player)
+	{
+		return itemstack.getTagCompound().getCompoundTag("InfiTool").getBoolean("Revealing");
+	}
+
+	@Optional.Method(modid = "Thaumcraft")
+	@Override
+	public boolean showNodes(ItemStack itemstack, EntityLivingBase player)
+	{
+		return itemstack.getTagCompound().getCompoundTag("InfiTool").getBoolean("Revealing");
+	}
+
+	@Optional.Method(modid = "AWWayofTime")
+	@Override
+	public boolean canSeeLPBar(ItemStack stack)
+	{
+		return stack.getTagCompound().getCompoundTag("InfiTool").getBoolean("Divination");
+	}
+
+	@Optional.Method(modid = "AWWayofTime")
+	@Override
+	public boolean showIngameHUD(World world, ItemStack stack, EntityPlayer player)
+	{
+		return stack.getTagCompound().getCompoundTag("InfiTool").getBoolean("Divination");
+	}
 }
diff --git a/src/main/java/lance5057/tDefense/armor/modifiers/ArmorMods.java b/src/main/java/lance5057/tDefense/armor/modifiers/ArmorMods.java
index bbd6ad3..208031f 100644
--- a/src/main/java/lance5057/tDefense/armor/modifiers/ArmorMods.java
+++ b/src/main/java/lance5057/tDefense/armor/modifiers/ArmorMods.java
@@ -79,34 +79,34 @@ public class ArmorMods extends ModifiersBase
 	{
 		GameRegistry.addShapedRecipe(new ItemStack(modItems, 1, 0), new Object[] {"-c-", "ses", "-s-", 'c', new ItemStack(
 				Items.coal, 1, 1), 's', new ItemStack(Blocks.sapling, 1), 'e', new ItemStack(
-				modItems, 1, 1)});
+						modItems, 1, 1)});
 		GameRegistry.addShapedRecipe(new ItemStack(modItems, 1, 1), new Object[] {"gsg", "lil", "gig", 'g', new ItemStack(
 				Items.gold_nugget, 1, 0), 's', new ItemStack(Items.slime_ball,
-				1, 0), 'l', new ItemStack(Items.dye, 1, 4), 'i', new ItemStack(
-				Items.iron_ingot, 1, 0)});
+						1, 0), 'l', new ItemStack(Items.dye, 1, 4), 'i', new ItemStack(
+								Items.iron_ingot, 1, 0)});
 		GameRegistry.addShapedRecipe(new ItemStack(modItems, 1, 2), new Object[] {"-s-", "eie", "-d-", 's', new ItemStack(
 				Items.slime_ball, 1, 0), 'e', new ItemStack(modItems, 1, 1), 'i', new ItemStack(
-				TinkersDefense.partArmorplate, 1, 2), 'd', new ItemStack(
-				Items.dye, 1, 4)});
+						TinkersDefense.partArmorplate, 1, 2), 'd', new ItemStack(
+								Items.dye, 1, 4)});
 		GameRegistry.addShapedRecipe(new ItemStack(modItems, 1, 3), new Object[] {"-s-", "eie", "-d-", 's', new ItemStack(
 				Items.potionitem, 1, 8262), 'e', new ItemStack(
-				Blocks.glass_pane, 1, 0), 'i', new ItemStack(Items.iron_ingot,
-				1, 0), 'd', new ItemStack(Items.dye, 1, 2)});
+						Blocks.glass_pane, 1, 0), 'i', new ItemStack(Items.iron_ingot,
+								1, 0), 'd', new ItemStack(Items.dye, 1, 2)});
 
 		GameRegistry.addShapedRecipe(new ItemStack(modItems, 1, 4), new Object[] {"ggg", "ala", "ggg", 'g', new ItemStack(
 				Blocks.glowstone, 1, 0), 'a', new ItemStack(
-				Items.glowstone_dust, 1, 0), 'l', TConstructRegistry.getItemStack("lavaCrystal")});
+						Items.glowstone_dust, 1, 0), 'l', TConstructRegistry.getItemStack("lavaCrystal")});
 		GameRegistry.addShapedRecipe(new ItemStack(modItems, 1, 5), new Object[] {"lol", "oao", "lol", 'o', new ItemStack(
 				Blocks.obsidian, 1, 0), 'a', TConstructRegistry.getItemStack("ingotArdite"), 'l', TConstructRegistry.getItemStack("lavaCrystal")});
 		GameRegistry.addShapedRecipe(new ItemStack(modItems, 1, 7), new Object[] {"fgf", 'g', new ItemStack(
 				Items.gold_nugget, 1, 0), 'f', new ItemStack(Items.feather, 1,
-				0)});
+						0)});
 		GameRegistry.addShapedRecipe(new ItemStack(modItems, 1, 6), new Object[] {"ili", "lcl", "ili", 'l', new ItemStack(
 				Blocks.lapis_block, 1, 0), 'i', new ItemStack(Blocks.ice, 1, 0), 'c', TConstructRegistry.getItemStack("ingotCobalt")});
 		GameRegistry.addShapedRecipe(new ItemStack(modItems, 1, 8), new Object[] {"-b-", "rlr", "-s-", 'b', new ItemStack(
 				Items.leather_boots, 1, 0), 'l', new ItemStack(Items.leather,
-				1, 0), 'r', new ItemStack(TinkerTools.toolRod, 1, 2), 's', new ItemStack(
-				Items.slime_ball, 1, 0)});
+						1, 0), 'r', new ItemStack(TinkerTools.toolRod, 1, 2), 's', new ItemStack(
+								Items.slime_ball, 1, 0)});
 
 		if(TDIntegration.thaumcraft)
 		{
@@ -164,7 +164,7 @@ public class ArmorMods extends ModifiersBase
 		ModifyBuilder.registerModifier(new modifierProtection(
 				new ItemStack[] {new ItemStack(TinkersDefense.partArmorplate,
 						1, 2)}, TinkersDefense.config.ArmorProtectionID, 1,
-				EnumChatFormatting.DARK_GRAY.toString(), "Protection"));
+						EnumChatFormatting.DARK_GRAY.toString(), "Protection"));
 		ModifyBuilder.registerModifier(new modifierProtection(
 				new ItemStack[] {new ItemStack(Items.magma_cream, 1)},
 				TinkersDefense.config.ArmorFireProtectionID, 1,
diff --git a/src/main/java/lance5057/tDefense/armor/modifiers/Botania/BotaniaArmorMods.java b/src/main/java/lance5057/tDefense/armor/modifiers/Botania/BotaniaArmorMods.java
index d81d05f..a2f9235 100644
--- a/src/main/java/lance5057/tDefense/armor/modifiers/Botania/BotaniaArmorMods.java
+++ b/src/main/java/lance5057/tDefense/armor/modifiers/Botania/BotaniaArmorMods.java
@@ -13,18 +13,27 @@ import tconstruct.library.client.TConstructClientRegistry;
 import tconstruct.library.crafting.ModifyBuilder;
 import tconstruct.library.tools.ToolCore;
 import vazkii.botania.common.item.ModItems;
+import cpw.mods.fml.common.registry.GameRegistry;
 
 public class BotaniaArmorMods extends ModifiersBase
 {
 	public BotaniaArmorMods()
 	{
-		super(null, "modItemsBotaniaArmor");
+		super(new String[] {"elementiumcore"}, "modItemsBotaniaArmor");
 	}
 
 	@Override
 	public void RegisterRecipes()
 	{
+		GameRegistry.addShapedRecipe(new ItemStack(modItems, 1, 0), new Object[] {"sis", "idi", "sis", 'i', new ItemStack(
+				ModItems.manaResource, 1, 7), 's', new ItemStack(
+				ModItems.manaResource, 1, 12), 'd', new ItemStack(
+				ModItems.manaResource, 1, 2)});
 
+		GameRegistry.addShapedRecipe(new ItemStack(modItems, 1, 0), new Object[] {"sis", "idi", "sis", 'i', new ItemStack(
+				ModItems.manaResource, 1, 7), 's', new ItemStack(
+				ModItems.manaResource, 1, 12), 'd', new ItemStack(
+				ModItems.manaResource, 1, 1)});
 	}
 
 	@Override
@@ -36,9 +45,16 @@ public class BotaniaArmorMods extends ModifiersBase
 				1, EnumChatFormatting.AQUA.toString(), "Mana Embroidery",
 				new String[] {"cloth"}, 1, new String[] {}));
 
+		ModifyBuilder.registerModifier(new ModifierIntExclusive(
+				new ItemStack[] {new ItemStack(modItems, 1, 4)},
+				TinkersDefense.config.ArmorPixieCoreModID, "ElementiumCore", 1,
+				EnumChatFormatting.LIGHT_PURPLE.toString(), "Elementium Core",
+				new String[] {"armor"}, 1, new String[] {}));
+
 		for(final ToolCore tool : TConstructRegistry.getToolMapping())
 		{
 			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.ArmorManaDiscountModID, "tinker", "manaembroidery", true);
+			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.ArmorPixieCoreModID, "tinker", "elementiumcore", true);
 
 		}
 	}
diff --git a/src/main/java/lance5057/tDefense/armor/modifiers/modifierProtection.java b/src/main/java/lance5057/tDefense/armor/modifiers/modifierProtection.java
index 986c03e..145764f 100644
--- a/src/main/java/lance5057/tDefense/armor/modifiers/modifierProtection.java
+++ b/src/main/java/lance5057/tDefense/armor/modifiers/modifierProtection.java
@@ -5,9 +5,6 @@ import java.util.List;
 
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import tconstruct.library.crafting.PatternBuilder;
-import tconstruct.library.modifier.ItemModifier;
-import tconstruct.library.tools.AbilityHelper;
 import tconstruct.library.tools.ToolCore;
 import tconstruct.modifiers.tools.ModInteger;
 
@@ -33,8 +30,8 @@ public class modifierProtection extends ModInteger
 	{
 		if(tool.getItem() instanceof ToolCore)
 		{
-			List list = Arrays.asList(((ToolCore) tool.getItem()).getTraits());
-			NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool");
+			final List list = Arrays.asList(((ToolCore) tool.getItem()).getTraits());
+			final NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool");
 
 			if(list.contains("heavyarmor") || list.contains("lightarmor"))
 			{
@@ -45,9 +42,13 @@ public class modifierProtection extends ModInteger
 						if(tags.hasKey(types[i]))
 						{
 							if(types[i] != type)
+							{
 								return false;
+							}
 							if(types[i] == type && tags.getInteger(types[i]) > 5)
+							{
 								return false;
+							}
 						}
 					}
 					return true;
@@ -69,7 +70,7 @@ public class modifierProtection extends ModInteger
 	@Override
 	public void modify(ItemStack[] input, ItemStack tool)
 	{
-		NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool");
+		final NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool");
 		if(tags.hasKey(key))
 		{
 			int increase = tags.getInteger(key);
diff --git a/src/main/java/lance5057/tDefense/armor/parts/Cloth.java b/src/main/java/lance5057/tDefense/armor/parts/Cloth.java
index 021a607..480c153 100644
--- a/src/main/java/lance5057/tDefense/armor/parts/Cloth.java
+++ b/src/main/java/lance5057/tDefense/armor/parts/Cloth.java
@@ -10,19 +10,23 @@ public class Cloth extends CraftingItem implements IToolPart
 	public Cloth()
 	{
 		super(toolMaterialNames, buildTextureNames("_cloth"), "parts/", "tinker", TConstructRegistry.materialTab);
-		this.setHasSubtypes(true);
-		this.setMaxDamage(0);
+		setHasSubtypes(true);
+		setMaxDamage(0);
 	}
 
 	private static String[] buildTextureNames(String textureType)
 	{
-		String[] names = new String[toolMaterialNames.length];
+		final String[] names = new String[toolMaterialNames.length];
 		for(int i = 0; i < toolMaterialNames.length; i++)
 		{
 			if(toolTextureNames[i].equals(""))
+			{
 				names[i] = "";
+			}
 			else
+			{
 				names[i] = toolTextureNames[i] + textureType;
+			}
 		}
 		return names;
 	}
@@ -34,7 +38,9 @@ public class Cloth extends CraftingItem implements IToolPart
 	public int getMaterialID(ItemStack stack)
 	{
 		if(stack.getItemDamage() >= toolMaterialNames.length)
+		{
 			return -1;
+		}
 		return stack.getItemDamage();
 	}
 }
diff --git a/src/main/java/lance5057/tDefense/armor/renderers/ModelSheath.java b/src/main/java/lance5057/tDefense/armor/renderers/ModelSheath.java
index 9841c80..3a35160 100644
--- a/src/main/java/lance5057/tDefense/armor/renderers/ModelSheath.java
+++ b/src/main/java/lance5057/tDefense/armor/renderers/ModelSheath.java
@@ -1,16 +1,11 @@
 package lance5057.tDefense.armor.renderers;
 
-import lance5057.tDefense.TinkersDefense;
 import lance5057.tDefense.armor.ArmorCore;
-import net.minecraft.client.model.ModelBiped;
 import net.minecraft.client.model.ModelRenderer;
 import net.minecraft.entity.Entity;
-import net.minecraft.util.ResourceLocation;
 
 import org.lwjgl.opengl.GL11;
 
-import cpw.mods.fml.client.FMLClientHandler;
-
 /**
  * ModelBiped - Either Mojang or a mod author
  * Created using Tabula 4.1.1
@@ -27,20 +22,20 @@ public class ModelSheath extends ArmorRenderer
 	{
 		super(0.5f, 0, 64, 64);
 
-		this.textureWidth = 64;
-		this.textureHeight = 64;
+		textureWidth = 64;
+		textureHeight = 64;
 
-		this.belt = new ModelRenderer(this, 16, 32);
-		this.belt.setRotationPoint(-4.5F, 0.0F, 0.5F);
-		this.belt.addBox(0.0F, 0.0F, -3.0F, 1, 12, 5, 0.0F);
-		this.setRotateAngle(belt, 0.0F, 0.0F, -0.7853981633974483F);
-		this.bipedBody.addChild(belt);
+		belt = new ModelRenderer(this, 16, 32);
+		belt.setRotationPoint(-4.5F, 0.0F, 0.5F);
+		belt.addBox(0.0F, 0.0F, -3.0F, 1, 12, 5, 0.0F);
+		setRotateAngle(belt, 0.0F, 0.0F, -0.7853981633974483F);
+		bipedBody.addChild(belt);
 
-		this.sheath = new ModelRenderer(this, 0, 32);
-		this.sheath.setRotationPoint(0f, 0f, 0f);
-		this.sheath.addBox(-5.0F, 0.0F, 2.0F, 5, 16, 2, -0.4F);
-		this.setRotateAngle(sheath, 0.0F, 0.0F, -0.45F);
-		this.bipedBody.addChild(sheath);
+		sheath = new ModelRenderer(this, 0, 32);
+		sheath.setRotationPoint(0f, 0f, 0f);
+		sheath.addBox(-5.0F, 0.0F, 2.0F, 5, 16, 2, -0.4F);
+		setRotateAngle(sheath, 0.0F, 0.0F, -0.45F);
+		bipedBody.addChild(sheath);
 	}
 
 	@Override
@@ -50,13 +45,13 @@ public class ModelSheath extends ArmorRenderer
 
 		for(int i = 0; i < 10; i++)
 		{
-			String texture = ((ArmorCore) this.stack.getItem()).getTexture(i, stack);
+			final String texture = ((ArmorCore) stack.getItem()).getTexture(i, stack);
 			if(texture != "")
 			{
 
 				GL11.glPushMatrix();
 
-				((ArmorCore) this.stack.getItem()).renderArmor(entity, f, f1, f2, f3, f4, f5, colors, stack, i);
+				((ArmorCore) stack.getItem()).renderArmor(entity, f, f1, f2, f3, f4, f5, colors, stack, i);
 				super.render(entity, f, f1, f2, f3, f4, f5);
 
 				GL11.glPopMatrix();
diff --git a/src/main/java/lance5057/tDefense/armor/renderers/ModelTinkersGauntlets.java b/src/main/java/lance5057/tDefense/armor/renderers/ModelTinkersGauntlets.java
index d40b416..b64c0d9 100644
--- a/src/main/java/lance5057/tDefense/armor/renderers/ModelTinkersGauntlets.java
+++ b/src/main/java/lance5057/tDefense/armor/renderers/ModelTinkersGauntlets.java
@@ -40,147 +40,172 @@ public class ModelTinkersGauntlets extends ArmorRenderer
 		textureWidth = 64;
 		textureHeight = 64;
 
-		KnuckleSpikesL = new ModelRenderer(this, 56, 40);
+		KnuckleSpikesL = new ModelRenderer(this, "Knuckle Spikes Left");
+		KnuckleSpikesL.setTextureOffset(56, 40);
 		KnuckleSpikesL.setRotationPoint(0.0F, 0.0F, 0.0F);
 		KnuckleSpikesL.addBox(3.0F, 6.0F, -0.5F, 4, 8, 0, 0.0F);
 		setRotateAngle(KnuckleSpikesL, 0.0F, 0.3490658503988659F, 0.0F);
 		bipedLeftArm.addChild(KnuckleSpikesL);
 
-		KnuckleSpikesBackL = new ModelRenderer(this, 56, 40);
+		KnuckleSpikesBackL = new ModelRenderer(this, "Knuckle Spikes Back Left");
+		KnuckleSpikesBackL.setTextureOffset(56, 40);
 		KnuckleSpikesBackL.setRotationPoint(0.0F, 0.0F, 0.0F);
 		KnuckleSpikesBackL.addBox(3.0F, 6.0F, 0.5F, 4, 8, 0, 0.0F);
 		setRotateAngle(KnuckleSpikesBackL, 0.0F, -0.3490658503988659F, 0.0F);
 		bipedLeftArm.addChild(KnuckleSpikesBackL);
 
-		KnuckleL = new ModelRenderer(this, 0, 41);
+		KnuckleL = new ModelRenderer(this, "Knuckle Left");
+		KnuckleL.setTextureOffset(0, 41);
 		KnuckleL.setRotationPoint(0.0F, 0.0F, 0.0F);
 		KnuckleL.addBox(0.1F, 6.8F, -2.0F, 3, 3, 4, 0.4F);
 		bipedLeftArm.addChild(KnuckleL);
 
-		ArmSpikesR = new ModelRenderer(this, 56, 32);
+		ArmSpikesR = new ModelRenderer(this, "Arm Spikes Right");
+		ArmSpikesR.setTextureOffset(56, 32);
 		ArmSpikesR.mirror = true;
 		ArmSpikesR.setRotationPoint(0.0F, 0.0F, 0.0F);
 		ArmSpikesR.addBox(-7.5F, 1.0F, 0.5F, 4, 8, 0, 0.0F);
 		setRotateAngle(ArmSpikesR, 0.0F, -0.3490658503988659F, 0.0F);
 		bipedRightArm.addChild(ArmSpikesR);
 
-		RebraceL = new ModelRenderer(this, 14, 40);
+		RebraceL = new ModelRenderer(this, "Rebrace Left");
+		RebraceL.setTextureOffset(14, 40);
 		RebraceL.setRotationPoint(0.0F, 0.0F, 0.0F);
 		RebraceL.addBox(-1.1F, 3.0F, -2.0F, 3, 5, 4, 0.2F);
 		bipedLeftArm.addChild(RebraceL);
 
-		BoltL = new ModelRenderer(this, 16, 32);
+		BoltL = new ModelRenderer(this, "Bolt Left");
+		BoltL.setTextureOffset(16, 32);
 		BoltL.setRotationPoint(0.0F, 0.0F, 0.0F);
 		BoltL.addBox(-5.8F, 3.7F, -3.0F, 2, 2, 6, -0.3F);
 		setRotateAngle(BoltL, 0.0F, 0.0F, -0.7853981633974483F);
 		bipedLeftArm.addChild(BoltL);
 
-		KnuckleSpikesBackR = new ModelRenderer(this, 56, 40);
+		KnuckleSpikesBackR = new ModelRenderer(this,
+				"Knuckle Spikes Back Right");
+		KnuckleSpikesBackR.setTextureOffset(56, 40);
 		KnuckleSpikesBackR.mirror = true;
 		KnuckleSpikesBackR.setRotationPoint(0.0F, 0.0F, 0.0F);
 		KnuckleSpikesBackR.addBox(-7.0F, 6.0F, 0.5F, 4, 8, 0, 0.0F);
 		setRotateAngle(KnuckleSpikesBackR, 0.0F, 0.3490658503988659F, 0.0F);
 		bipedRightArm.addChild(KnuckleSpikesBackR);
 
-		GloveR = new ModelRenderer(this, 0, 32);
+		GloveR = new ModelRenderer(this, "Glove Right");
+		GloveR.setTextureOffset(0, 32);
 		GloveR.mirror = true;
 		GloveR.setRotationPoint(0.0F, 0.0F, 0.0F);
 		GloveR.addBox(-3.0F, 5.0F, -2.0F, 4, 5, 4, 0.1F);
 		bipedRightArm.addChild(GloveR);
 
-		BoltR = new ModelRenderer(this, 16, 32);
+		BoltR = new ModelRenderer(this, "Bolt Right");
+		BoltR.setTextureOffset(16, 32);
 		BoltR.mirror = true;
 		BoltR.setRotationPoint(0.0F, 0.0F, 0.0F);
 		BoltR.addBox(3.8F, 3.7F, -3.0F, 2, 2, 6, -0.3F);
 		setRotateAngle(BoltR, 0.0F, 0.0F, 0.7853981633974483F);
 		bipedRightArm.addChild(BoltR);
 
-		KnuckleR = new ModelRenderer(this, 0, 41);
+		KnuckleR = new ModelRenderer(this, "Knuckle Right");
+		KnuckleR.setTextureOffset(0, 41);
 		KnuckleR.mirror = true;
 		KnuckleR.setRotationPoint(0.0F, 0.0F, 0.0F);
 		KnuckleR.addBox(-2.9F, 6.8F, -2.0F, 3, 3, 4, 0.4F);
 		bipedRightArm.addChild(KnuckleR);
 
-		KnuckleSpikesR = new ModelRenderer(this, 56, 40);
+		KnuckleSpikesR = new ModelRenderer(this, "Knuckle Spikes Right");
+		KnuckleSpikesR.setTextureOffset(56, 40);
 		KnuckleSpikesR.mirror = true;
 		KnuckleSpikesR.setRotationPoint(0.0F, 0.0F, 0.0F);
 		KnuckleSpikesR.addBox(-7.0F, 6.0F, -0.5F, 4, 8, 0, 0.0F);
 		setRotateAngle(KnuckleSpikesR, 0.0F, -0.3490658503988659F, 0.0F);
 		bipedRightArm.addChild(KnuckleSpikesR);
 
-		KnuckleSpikesMidL = new ModelRenderer(this, 54, 48);
+		KnuckleSpikesMidL = new ModelRenderer(this, "Knuckle Spikes Mid Left");
+		KnuckleSpikesMidL.setTextureOffset(54, 48);
 		KnuckleSpikesMidL.setRotationPoint(0.0F, 0.0F, 0.0F);
 		KnuckleSpikesMidL.addBox(3.0F, 1.0F, 0.0F, 5, 13, 0, 0.0F);
 		bipedLeftArm.addChild(KnuckleSpikesMidL);
 
-		ArmSpikesBackL = new ModelRenderer(this, 56, 32);
+		ArmSpikesBackL = new ModelRenderer(this, "Arm Spikes Back Left");
+		ArmSpikesBackL.setTextureOffset(56, 32);
 		ArmSpikesBackL.setRotationPoint(0.0F, 0.0F, 0.0F);
 		ArmSpikesBackL.addBox(3.5F, 1.0F, -0.5F, 4, 8, 0, 0.0F);
 		setRotateAngle(ArmSpikesBackL, 0.0F, -0.3490658503988659F, 0.0F);
 		bipedLeftArm.addChild(ArmSpikesBackL);
 
-		ArmSpikesBackR = new ModelRenderer(this, 56, 32);
+		ArmSpikesBackR = new ModelRenderer(this, "Arm Spikes Back Right");
+		ArmSpikesBackR.setTextureOffset(56, 32);
 		ArmSpikesBackR.mirror = true;
 		ArmSpikesBackR.setRotationPoint(0.0F, 0.0F, 0.0F);
 		ArmSpikesBackR.addBox(-7.5F, 1.0F, -0.5F, 4, 8, 0, 0.0F);
 		setRotateAngle(ArmSpikesBackR, 0.0F, 0.3490658503988659F, 0.0F);
 		bipedRightArm.addChild(ArmSpikesBackR);
 
-		VambraceR = new ModelRenderer(this, 0, 56);
+		VambraceR = new ModelRenderer(this, "Vambrace Right");
+		VambraceR.setTextureOffset(0, 56);
 		VambraceR.mirror = true;
 		VambraceR.setRotationPoint(0.0F, 0.0F, 0.0F);
 		VambraceR.addBox(-3.6F, 2.8F, -2.0F, 3, 4, 4, 0.3F);
 		setRotateAngle(VambraceR, 0.0F, 0.0F, -0.08726646259971647F);
 		bipedRightArm.addChild(VambraceR);
 
-		GemR = new ModelRenderer(this, 0, 48);
+		GemR = new ModelRenderer(this, "Gem Right");
+		GemR.setTextureOffset(0, 48);
 		GemR.mirror = true;
 		GemR.setRotationPoint(0.0F, 0.0F, 0.0F);
 		GemR.addBox(-4.2F, 5.0F, -2.0F, 2, 4, 4, -0.3F);
 		bipedRightArm.addChild(GemR);
 
-		RebraceR = new ModelRenderer(this, 14, 40);
+		RebraceR = new ModelRenderer(this, "Rebrace Right");
+		RebraceR.setTextureOffset(14, 40);
 		RebraceR.mirror = true;
 		RebraceR.setRotationPoint(0.0F, 0.0F, 0.0F);
 		RebraceR.addBox(-1.9F, 3.0F, -2.0F, 3, 5, 4, 0.2F);
 		bipedRightArm.addChild(RebraceR);
 
-		SettingR = new ModelRenderer(this, 12, 49);
+		SettingR = new ModelRenderer(this, "Setting Right");
+		SettingR.setTextureOffset(12, 49);
 		SettingR.mirror = true;
 		SettingR.setRotationPoint(0.0F, 0.0F, 0.0F);
 		SettingR.addBox(-3.7F, 5.0F, -2.0F, 1, 4, 4, 0.0F);
 		bipedRightArm.addChild(SettingR);
 
-		GloveL = new ModelRenderer(this, 0, 32);
+		GloveL = new ModelRenderer(this, "Glove Left");
+		GloveL.setTextureOffset(0, 32);
 		GloveL.setRotationPoint(0.0F, 0.0F, 0.0F);
 		GloveL.addBox(-1.0F, 5.0F, -2.0F, 4, 5, 4, 0.1F);
 		bipedLeftArm.addChild(GloveL);
 
-		GemL = new ModelRenderer(this, 0, 48);
+		GemL = new ModelRenderer(this, "Gem Left");
+		GemL.setTextureOffset(0, 48);
 		GemL.mirror = true;
 		GemL.setRotationPoint(0.0F, 0.0F, 0.0F);
 		GemL.addBox(2.4F, 5.0F, -2.0F, 2, 4, 4, -0.3F);
 		bipedLeftArm.addChild(GemL);
 
-		VambraceL = new ModelRenderer(this, 0, 56);
+		VambraceL = new ModelRenderer(this, "Vambrace Left");
+		VambraceL.setTextureOffset(0, 56);
 		VambraceL.setRotationPoint(0.0F, 0.0F, 0.0F);
 		VambraceL.addBox(0.8F, 2.8F, -2.0F, 3, 4, 4, 0.3F);
 		setRotateAngle(VambraceL, 0.0F, 0.0F, 0.08726646259971647F);
 		bipedLeftArm.addChild(VambraceL);
 
-		KnuckleSpikesMidR = new ModelRenderer(this, 54, 48);
+		KnuckleSpikesMidR = new ModelRenderer(this, "Knuckle Spikes Mid Right");
+		KnuckleSpikesMidR.setTextureOffset(54, 48);
 		KnuckleSpikesMidR.mirror = true;
 		KnuckleSpikesMidR.setRotationPoint(0.0F, 0.0F, 0.0F);
 		KnuckleSpikesMidR.addBox(-8.0F, 1.0F, 0.0F, 5, 13, 0, 0.0F);
 		bipedRightArm.addChild(KnuckleSpikesMidR);
 
-		SettingL = new ModelRenderer(this, 12, 49);
+		SettingL = new ModelRenderer(this, "Setting Left");
+		SettingL.setTextureOffset(12, 49);
 		SettingL.mirror = true;
 		SettingL.setRotationPoint(0.0F, 0.0F, 0.0F);
 		SettingL.addBox(2.9F, 5.0F, -2.0F, 1, 4, 4, 0.0F);
 		bipedLeftArm.addChild(SettingL);
 
-		ArmSpikesL = new ModelRenderer(this, 56, 32);
+		ArmSpikesL = new ModelRenderer(this, "Arm Spikes Left");
+		ArmSpikesL.setTextureOffset(56, 32);
 		ArmSpikesL.setRotationPoint(0.0F, 0.0F, 0.0F);
 		ArmSpikesL.addBox(3.5F, 1.0F, 0.5F, 4, 8, 0, 0.0F);
 		setRotateAngle(ArmSpikesL, 0.0F, 0.3490658503988659F, 0.0F);
@@ -200,6 +225,8 @@ public class ModelTinkersGauntlets extends ArmorRenderer
 		KnuckleSpikesR.isHidden = true;
 		SettingL.isHidden = true;
 		SettingR.isHidden = true;
+
+		init();
 	}
 
 	/**
diff --git a/src/main/java/lance5057/tDefense/armor/renderers/ModelTinkersTabard.java b/src/main/java/lance5057/tDefense/armor/renderers/ModelTinkersTabard.java
index fe92f2b..2bce53e 100644
--- a/src/main/java/lance5057/tDefense/armor/renderers/ModelTinkersTabard.java
+++ b/src/main/java/lance5057/tDefense/armor/renderers/ModelTinkersTabard.java
@@ -1,58 +1,56 @@
 package lance5057.tDefense.armor.renderers;
 
 import lance5057.tDefense.armor.ArmorCore;
-
-import org.lwjgl.opengl.GL11;
-
-import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;
 import net.minecraft.entity.Entity;
 
+import org.lwjgl.opengl.GL11;
+
 /**
  * ModelBiped - Either Mojang or a mod author
  * Created using Tabula 4.1.1
  */
-public class ModelTinkersTabard  extends ArmorRenderer
+public class ModelTinkersTabard extends ArmorRenderer
 {
-    public ModelRenderer Tabard;
-    public ModelRenderer TabardBottomF;
-    public ModelRenderer TabardBottomB;
+	public ModelRenderer	Tabard;
+	public ModelRenderer	TabardBottomF;
+	public ModelRenderer	TabardBottomB;
+
+	public ModelTinkersTabard()
+	{
+		super(0.5f, 0, 64, 64);
+
+		textureWidth = 64;
+		textureHeight = 64;
+
+		Tabard = new ModelRenderer(this, 0, 32);
+		Tabard.setRotationPoint(0.0F, 0.0F, 0.0F);
+		Tabard.addBox(-4.0F, 0.0F, -2.5F, 8, 12, 5, 0.1F);
+
+		TabardBottomF = new ModelRenderer(this, 26, 32);
+		TabardBottomF.setRotationPoint(0.0F, 12.0F, 0.0F);
+		TabardBottomF.addBox(-4.0F, 0.2F, -2.5F, 8, 8, 1, 0.1F);
+		TabardBottomB = new ModelRenderer(this, 26, 32);
+		TabardBottomB.mirror = true;
 
-    public ModelTinkersTabard() 
-    {
-    	super(0.5f, 0, 64, 64);
-    	
-        this.textureWidth = 64;
-        this.textureHeight = 64;
-        
-        this.Tabard = new ModelRenderer(this, 0, 32);
-        this.Tabard.setRotationPoint(0.0F, 0.0F, 0.0F);
-        this.Tabard.addBox(-4.0F, 0.0F, -2.5F, 8, 12, 5, 0.1F);
-        
-        this.TabardBottomF = new ModelRenderer(this, 26, 32);
-        this.TabardBottomF.setRotationPoint(0.0F, 12.0F, 0.0F);
-        this.TabardBottomF.addBox(-4.0F, 0.2F, -2.5F, 8, 8, 1, 0.1F);
-        this.TabardBottomB = new ModelRenderer(this, 26, 32);
-        this.TabardBottomB.mirror = true;
-        
-        this.TabardBottomB.setRotationPoint(0.0F, 12.0F, 0.0F);
-        this.TabardBottomB.addBox(-4.0F, 0.2F, 1.5F, 8, 8, 1, 0.1F);
-    }
+		TabardBottomB.setRotationPoint(0.0F, 12.0F, 0.0F);
+		TabardBottomB.addBox(-4.0F, 0.2F, 1.5F, 8, 8, 1, 0.1F);
+	}
 
-    @Override
-    public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) 
-    { 
+	@Override
+	public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5)
+	{
 		GL11.glPushMatrix();
 
 		for(int i = 0; i < 10; i++)
 		{
-			String texture = ((ArmorCore) this.stack.getItem()).getTexture(i, stack);
+			final String texture = ((ArmorCore) stack.getItem()).getTexture(i, stack);
 			if(texture != "")
 			{
 
 				GL11.glPushMatrix();
 
-				((ArmorCore) this.stack.getItem()).renderArmor(entity, f, f1, f2, f3, f4, f5, colors, stack, i);
+				((ArmorCore) stack.getItem()).renderArmor(entity, f, f1, f2, f3, f4, f5, colors, stack, i);
 				super.render(entity, f, f1, f2, f3, f4, f5);
 
 				GL11.glPopMatrix();
@@ -60,14 +58,15 @@ public class ModelTinkersTabard  extends ArmorRenderer
 		}
 
 		GL11.glPopMatrix();
-    }
+	}
 
-    /**
-     * This is a helper function from Tabula to set the rotation of model parts
-     */
-    public void setRotateAngle(ModelRenderer modelRenderer, float x, float y, float z) {
-        modelRenderer.rotateAngleX = x;
-        modelRenderer.rotateAngleY = y;
-        modelRenderer.rotateAngleZ = z;
-    }
+	/**
+	 * This is a helper function from Tabula to set the rotation of model parts
+	 */
+	public void setRotateAngle(ModelRenderer modelRenderer, float x, float y, float z)
+	{
+		modelRenderer.rotateAngleX = x;
+		modelRenderer.rotateAngleY = y;
+		modelRenderer.rotateAngleZ = z;
+	}
 }
diff --git a/src/main/java/lance5057/tDefense/armor/renderers/cloth/ModelTinkersHood.java b/src/main/java/lance5057/tDefense/armor/renderers/cloth/ModelTinkersHood.java
index 0fd14bd..f97f7ba 100644
--- a/src/main/java/lance5057/tDefense/armor/renderers/cloth/ModelTinkersHood.java
+++ b/src/main/java/lance5057/tDefense/armor/renderers/cloth/ModelTinkersHood.java
@@ -23,17 +23,19 @@ public class ModelTinkersHood extends ArmorRenderer
 	public ModelRenderer	Tip_2;
 	public ModelRenderer	ScarfExtra;
 	public ModelRenderer	ScarfExtra_1;
+	public ModelRenderer	BandExtra;
+	public ModelRenderer	BandExtra_1;
 
 	public ModelTinkersHood()
 	{
-		super(0.1f, 0, 128, 64);
+		super(0.2f, 0, 128, 64);
 
 		textureWidth = 128;
 		textureHeight = 64;
 
 		bipedHeadwear = new ModelRenderer(this, "Headwear");
 		bipedHeadwear.setTextureOffset(32, 0);
-		bipedHeadwear.addBox(-4.0F, -8.0F, -4.0F, 8, 8, 8, 0.1f + 0.5F);
+		bipedHeadwear.addBox(-4.0F, -8.0F, -4.0F, 8, 8, 8, 0.2f + 0.5F);
 		bipedHeadwear.setRotationPoint(0.0F, 0.0F + 0, 0.0F);
 
 		Flop = new ModelRenderer(this, "Flop");
@@ -90,7 +92,7 @@ public class ModelTinkersHood extends ArmorRenderer
 		bipedHead.addChild(HatTopTall);
 
 		Rim = new ModelRenderer(this, "Rim");
-		Rim.setTextureOffset(64, 20);
+		Rim.setTextureOffset(65, 20);
 		Rim.setRotationPoint(0.0F, 0.0F, 0.0F);
 		Rim.addBox(-6.0F, -5.5F, -6.0F, 12, 1, 12, 0.1F);
 		bipedHead.addChild(Rim);
@@ -105,9 +107,23 @@ public class ModelTinkersHood extends ArmorRenderer
 		Band = new ModelRenderer(this, "Band");
 		Band.setTextureOffset(64, 9);
 		Band.setRotationPoint(0.0F, 0.0F, 0.0F);
-		Band.addBox(-4.5F, -6.7F, -4.5F, 9, 2, 9, 0.2F);
+		Band.addBox(-4.5F, -7F, -4.5F, 9, 3, 9, -0.3F);
 		bipedHead.addChild(Band);
 
+		BandExtra = new ModelRenderer(this, "BandExtra");
+		BandExtra.setTextureOffset(44, 32);
+		BandExtra.setRotationPoint(0.0F, 0.0F, 0.0F);
+		BandExtra.addBox(0.2F, -6.0F, 3.4F, 3, 5, 1, -0.3F);
+		setRotateAngle(BandExtra, 0.0F, 0.0F, -0.17453292519943295F);
+		bipedHead.addChild(BandExtra);
+
+		BandExtra_1 = new ModelRenderer(this, "BandExtra 1");
+		BandExtra_1.setTextureOffset(36, 32);
+		BandExtra_1.setRotationPoint(0.0F, 0.0F, 0.0F);
+		BandExtra_1.addBox(-3.2F, -6.0F, 3.4F, 3, 7, 1, -0.3F);
+		setRotateAngle(BandExtra_1, 0.0F, 0.0F, 0.17453292519943295F);
+		bipedHead.addChild(BandExtra_1);
+
 		Tip = new ModelRenderer(this, "Tip");
 		Tip.setTextureOffset(0, 44);
 		Tip.setRotationPoint(0.0F, 0.0F, 0.0F);
diff --git a/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersGrieves.java b/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersGrieves.java
index 534f917..9eccca3 100644
--- a/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersGrieves.java
+++ b/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersGrieves.java
@@ -188,6 +188,17 @@ public class ModelTinkersGrieves extends ArmorRenderer
 		setRotateAngle(CenterBackR, 0.08726646259971647F, 0.0F, 0.0F);
 		bipedRightLeg.addChild(CenterBackR);
 
+		SecBeltL.isHidden = true;
+		SecBeltR.isHidden = true;
+		CenterBackL.isHidden = true;
+		CenterBackR.isHidden = true;
+		CenterFrontL.isHidden = true;
+		CenterFrontR.isHidden = true;
+		LeftBackL.isHidden = true;
+		LeftFrontL.isHidden = true;
+		RightBackL.isHidden = true;
+		RightFrontL.isHidden = true;
+
 		init();
 	}
 
diff --git a/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersHelm.java b/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersHelm.java
index 8e35b7c..0238b75 100644
--- a/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersHelm.java
+++ b/src/main/java/lance5057/tDefense/armor/renderers/heavy/ModelTinkersHelm.java
@@ -204,6 +204,22 @@ public class ModelTinkersHelm extends ArmorRenderer
 		HornL_2.addChild(HornTipL_2);
 		HornR_2.addChild(HornTipR_2);
 
+		HornL.isHidden = true;
+		HornR.isHidden = true;
+		HornL_1.isHidden = true;
+		HornL_2.isHidden = true;
+		HornR_1.isHidden = true;
+		HornR_2.isHidden = true;
+		FeatherBase.isHidden = true;
+		FeatherRod.isHidden = true;
+		Feathers.isHidden = true;
+		Spike1.isHidden = true;
+		Spike2.isHidden = true;
+		SpikeBase.isHidden = true;
+		WingL.isHidden = true;
+		WingR.isHidden = true;
+		Helm2.isHidden = true;
+
 		init();
 	}
 
diff --git a/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersBoots.java b/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersBoots.java
index 3294e83..f700e93 100644
--- a/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersBoots.java
+++ b/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersBoots.java
@@ -25,10 +25,21 @@ public class ModelTinkersBoots extends ArmorRenderer
 		textureWidth = 64;
 		textureHeight = 64;
 
+		bipedRightLeg = new ModelRenderer(this, "Right Leg");
+		bipedRightLeg.setTextureOffset(0, 16);
+		bipedRightLeg.addBox(-2.0F, 0.0F, -2.0F, 4, 12, 4, 0.05f);
+		bipedRightLeg.setRotationPoint(-1.9F, 12.0F + 0, 0.0F);
+
+		bipedLeftLeg = new ModelRenderer(this, "Left Leg");
+		bipedLeftLeg.setTextureOffset(0, 16);
+		bipedLeftLeg.mirror = true;
+		bipedLeftLeg.addBox(-2.0F, 0.0F, -2.0F, 4, 12, 4, 0.05f);
+		bipedLeftLeg.setRotationPoint(1.9F, 12.0F + 0, 0.0F);
+
 		FootR = new ModelRenderer(this, "FootR");
 		FootR.setTextureOffset(0, 41);
 		FootR.setRotationPoint(0f, 0f, 0f);
-		FootR.addBox(-2.0F, 10.0F, -3.0F, 4, 2, 1, 0.0F);
+		FootR.addBox(-2.0F, 10.0F, -3.0F, 4, 2, 1, 0.1F);
 		bipedRightLeg.addChild(FootR);
 
 		BootTopR = new ModelRenderer(this, "BootTopR");
@@ -61,7 +72,7 @@ public class ModelTinkersBoots extends ArmorRenderer
 		FootL.setTextureOffset(0, 41);
 		FootL.mirror = true;
 		FootL.setRotationPoint(0f, 0f, 0f);
-		FootL.addBox(-2.0F, 10.0F, -3.0F, 4, 2, 1, 0.0F);
+		FootL.addBox(-2.0F, 10.0F, -3.0F, 4, 2, 1, 0.1F);
 		bipedLeftLeg.addChild(FootL);
 
 		LegGuardL = new ModelRenderer(this, "LegGuardL");
@@ -82,6 +93,8 @@ public class ModelTinkersBoots extends ArmorRenderer
 		BootTopR.isHidden = true;
 		FootTipL.isHidden = true;
 		FootTipR.isHidden = true;
+		LegGuardL.isHidden = true;
+		LegGuardR.isHidden = true;
 
 		init();
 	}
diff --git a/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersChausses.java b/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersChausses.java
index b667ef2..f2eb795 100644
--- a/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersChausses.java
+++ b/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersChausses.java
@@ -40,7 +40,7 @@ public class ModelTinkersChausses extends ArmorRenderer
 		bipedLeftLeg.setRotationPoint(1.9F, 12.0F + 0, 0.0F);
 
 		HipGuardR = new ModelRenderer(this, "Hip Guard Right");
-		HipGuardR.setTextureOffset(0, 49);
+		HipGuardR.setTextureOffset(10, 37);
 		HipGuardR.setRotationPoint(0f, 0f, 0f);
 		HipGuardR.addBox(-2.5F, 0.0F, -2.6F, 4, 6, 5, 0.1F);
 		setRotateAngle(HipGuardR, 0.0F, 0.0F, 0.17453292519943295F);
@@ -55,19 +55,19 @@ public class ModelTinkersChausses extends ArmorRenderer
 		FrontR = new ModelRenderer(this, "Front Right");
 		FrontR.setTextureOffset(0, 40);
 		FrontR.setRotationPoint(1.9f, 0f, -0.1f);
-		FrontR.addBox(-2.0F, 0.0F, -2.4F, 4, 7, 1, 0.0F);
+		FrontR.addBox(-2.0F, 0.0F, -2.6F, 4, 7, 1, 0.0F);
 		setRotateAngle(FrontR, -0.1F, 0.0F, 0.0f);
 		bipedRightLeg.addChild(FrontR);
 
 		FrontL = new ModelRenderer(this, "Front Left");
 		FrontL.setTextureOffset(0, 40);
 		FrontL.setRotationPoint(-1.9f, 0f, -0.1f);
-		FrontL.addBox(-2.0F, 0.0F, -2.4F, 4, 7, 1, 0.0F);
+		FrontL.addBox(-2.0F, 0.0F, -2.6F, 4, 7, 1, 0.0F);
 		setRotateAngle(FrontL, -0.1F, 0.0F, 0.0f);
 		bipedLeftLeg.addChild(FrontL);
 
 		HipGuardL_1 = new ModelRenderer(this, "Hip Guard Left 2");
-		HipGuardL_1.setTextureOffset(10, 37);
+		HipGuardL_1.setTextureOffset(0, 49);
 		HipGuardL_1.mirror = true;
 		HipGuardL_1.setRotationPoint(0f, 0f, 0f);
 		HipGuardL_1.addBox(-1.5F, 0.0F, -2.6F, 4, 10, 5, 0.0F);
@@ -90,7 +90,7 @@ public class ModelTinkersChausses extends ArmorRenderer
 		bipedLeftLeg.addChild(BeltL);
 
 		HipGuardR_1 = new ModelRenderer(this, "Hip Guard Right 2");
-		HipGuardR_1.setTextureOffset(10, 37);
+		HipGuardR_1.setTextureOffset(0, 49);
 		HipGuardR_1.setRotationPoint(0f, 0f, 0f);
 		HipGuardR_1.addBox(-2.5F, 0.0F, -2.6F, 4, 10, 5, 0.0F);
 		setRotateAngle(HipGuardR_1, 0.0F, 0.0F, 0.08726646259971647F);
@@ -99,24 +99,31 @@ public class ModelTinkersChausses extends ArmorRenderer
 		BackR = new ModelRenderer(this, "Back Right");
 		BackR.setTextureOffset(0, 40);
 		BackR.setRotationPoint(1.9f, 0f, 0f);
-		BackR.addBox(-2.0F, 0.0F, 1.2F, 4, 7, 1, 0.0F);
+		BackR.addBox(-2.0F, 0.0F, 1.5F, 4, 7, 1, 0.0F);
 		setRotateAngle(BackR, 0.1F, 0.0F, 0.0f);
 		bipedRightLeg.addChild(BackR);
 
 		BackL = new ModelRenderer(this, "Back Light");
 		BackL.setTextureOffset(0, 40);
 		BackL.setRotationPoint(-1.9f, 0f, 0f);
-		BackL.addBox(-2.0F, 0.0F, 1.2F, 4, 7, 1, 0.0F);
+		BackL.addBox(-2.0F, 0.0F, 1.5F, 4, 7, 1, 0.0F);
 		setRotateAngle(BackL, 0.1F, 0.0F, 0.0f);
 		bipedLeftLeg.addChild(BackL);
 
 		HipGuardL = new ModelRenderer(this, "Hip Guard Left");
-		HipGuardL.setTextureOffset(0, 48);
+		HipGuardL.setTextureOffset(10, 37);
 		HipGuardL.mirror = true;
 		HipGuardL.setRotationPoint(0f, 0f, 0f);
 		HipGuardL.addBox(-1.5F, 0.0F, -2.6F, 4, 6, 5, 0.1F);
 		setRotateAngle(HipGuardL, 0.0F, 0.0F, -0.17453292519943295F);
 		bipedLeftLeg.addChild(HipGuardL);
+
+		BeltL.isHidden = true;
+		BeltR.isHidden = true;
+		HipGuardL_1.isHidden = true;
+		HipGuardR_1.isHidden = true;
+
+		init();
 	}
 
 	/**
diff --git a/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersCoif.java b/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersCoif.java
index 44a64d7..7496f00 100644
--- a/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersCoif.java
+++ b/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersCoif.java
@@ -75,9 +75,16 @@ public class ModelTinkersCoif extends ArmorRenderer
 		Coif = new ModelRenderer(this, "Coif");
 		Coif.setTextureOffset(0, 32);
 		Coif.setRotationPoint(0.0F, 0.0F, 0.0F);
-		Coif.addBox(-4.0F, 1.0F, -4.0F, 8, 3, 8, 0.5F);
+		Coif.addBox(-4.0F, 1.0F, -4.0F, 8, 3, 8, 0.6F);
 		bipedHead.addChild(Coif);
 
+		Mask.isHidden = true;
+		Mohawk.isHidden = true;
+		MohawkL.isHidden = true;
+		MohawkR.isHidden = true;
+		WingL.isHidden = true;
+		WingR.isHidden = true;
+
 		init();
 	}
 
diff --git a/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersHauberk.java b/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersHauberk.java
index d68c816..68e92aa 100644
--- a/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersHauberk.java
+++ b/src/main/java/lance5057/tDefense/armor/renderers/light/ModelTinkersHauberk.java
@@ -34,6 +34,22 @@ public class ModelTinkersHauberk extends ArmorRenderer
 		textureWidth = 64;
 		textureHeight = 64;
 
+		bipedBody = new ModelRenderer(this, "Body");
+		bipedBody.setTextureOffset(16, 16);
+		bipedBody.addBox(-4.0F, 0.0F, -2.0F, 8, 12, 4, 0.05f);
+		bipedBody.setRotationPoint(0.0F, 0.0F + 0, 0.0F);
+
+		bipedRightArm = new ModelRenderer(this, "Right Arm");
+		bipedRightArm.setTextureOffset(40, 16);
+		bipedRightArm.addBox(-3.0F, -2.0F, -2.0F, 4, 12, 4, 0.05f);
+		bipedRightArm.setRotationPoint(-5.0F, 2.0F + 0, 0.0F);
+
+		bipedLeftArm = new ModelRenderer(this, "Left Arm");
+		bipedLeftArm.setTextureOffset(40, 16);
+		bipedLeftArm.mirror = true;
+		bipedLeftArm.addBox(-1.0F, -2.0F, -2.0F, 4, 12, 4, 0.05f);
+		bipedLeftArm.setRotationPoint(5.0F, 2.0F + 0, 0.0F);
+
 		ChestBelt_1 = new ModelRenderer(this, "ChestBelt_1");
 		ChestBelt_1.setTextureOffset(0, 57);
 		ChestBelt_1.setRotationPoint(0.0F, 0.0F, 0.0F);
@@ -157,6 +173,16 @@ public class ModelTinkersHauberk extends ArmorRenderer
 		ChestBelt.addBox(-4.5F, 3.0F, -2.5F, 9, 2, 5, -0.19F);
 		bipedBody.addChild(ChestBelt);
 
+		//ChestBelt.isHidden = true;
+		ChestBelt_1.isHidden = true;
+		ChestBelt_2.isHidden = true;
+		ChestBeltL.isHidden = true;
+		ChestBeltL_1.isHidden = true;
+		ChestBeltR.isHidden = true;
+		ChestBeltR_1.isHidden = true;
+		PauldronFlairL.isHidden = true;
+		PauldronFlairR.isHidden = true;
+
 		init();
 	}
 
diff --git a/src/main/java/lance5057/tDefense/baubles/models/Renderer_JewelersBench.java b/src/main/java/lance5057/tDefense/baubles/models/Renderer_JewelersBench.java
index c2985c5..8f5608c 100644
--- a/src/main/java/lance5057/tDefense/baubles/models/Renderer_JewelersBench.java
+++ b/src/main/java/lance5057/tDefense/baubles/models/Renderer_JewelersBench.java
@@ -24,7 +24,7 @@ public class Renderer_JewelersBench extends TileEntitySpecialRenderer
 		GL11.glTranslatef((float) x + 0.5F, (float) y + 1.5F, (float) z + 0.5F);
 
 		final ResourceLocation textures = (new ResourceLocation(
-				"tinkersdefense:textures/blocks/JewelersBench.png"));
+				"tinkersdefense:textures/blocks/jewelersbench.png"));
 
 		Minecraft.getMinecraft().renderEngine.bindTexture(textures);
 
diff --git a/src/main/java/lance5057/tDefense/core/TD_Patterns.java b/src/main/java/lance5057/tDefense/core/TD_Patterns.java
index af9d735..0f31dc2 100644
--- a/src/main/java/lance5057/tDefense/core/TD_Patterns.java
+++ b/src/main/java/lance5057/tDefense/core/TD_Patterns.java
@@ -16,14 +16,16 @@ public class TD_Patterns extends Pattern
 	{
 		super(patternName, getPatternNames(patternName, patternType), "patterns/");
 
-		this.setUnlocalizedName(Reference.prefix(name));
+		setUnlocalizedName(Reference.prefix(name));
 	}
 
 	public static String[] getPatternNames(String[] patternName, String partType)
 	{
-		String[] names = new String[patternName.length];
+		final String[] names = new String[patternName.length];
 		for(int i = 0; i < patternName.length; i++)
+		{
 			names[i] = partType + patternName[i];
+		}
 		return names;
 	}
 
diff --git a/src/main/java/lance5057/tDefense/core/blocks/crestMount/Container_CrestMount.java b/src/main/java/lance5057/tDefense/core/blocks/crestMount/Container_CrestMount.java
index e9e4550..91c076a 100644
--- a/src/main/java/lance5057/tDefense/core/blocks/crestMount/Container_CrestMount.java
+++ b/src/main/java/lance5057/tDefense/core/blocks/crestMount/Container_CrestMount.java
@@ -25,7 +25,8 @@ public class Container_CrestMount extends Container
 		{
 			for(int x = 0; x < 9; x++)
 			{
-				addSlotToContainer(new Slot(inventoryPlayer, x + y * 9 + 9, 8 + 18 * x, 84 + y * 18));
+				addSlotToContainer(new Slot(inventoryPlayer, x + y * 9 + 9,
+						8 + 18 * x, 84 + y * 18));
 			}
 		}
 	}
diff --git a/src/main/java/lance5057/tDefense/core/blocks/crestMount/CrestMount.java b/src/main/java/lance5057/tDefense/core/blocks/crestMount/CrestMount.java
index f366b2d..507bef4 100644
--- a/src/main/java/lance5057/tDefense/core/blocks/crestMount/CrestMount.java
+++ b/src/main/java/lance5057/tDefense/core/blocks/crestMount/CrestMount.java
@@ -27,7 +27,7 @@ public class CrestMount extends BlockContainer
 	public CrestMount()
 	{
 		super(Material.iron);
-		this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
+		setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
 	}
 
 	@Override
@@ -40,11 +40,9 @@ public class CrestMount extends BlockContainer
 	@Override
 	public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int metadata, float what, float these, float are)
 	{
-		TileEntity tileEntity = world.getTileEntity(x, y, z);
+		final TileEntity tileEntity = world.getTileEntity(x, y, z);
 		if(tileEntity == null || player.isSneaking())
-		{
 			return false;
-		}
 		//code to open gui explained later
 		player.openGui(TinkersDefense.instance, TinkersDefense.GUI_CREST_INV, player.worldObj, x, y, z);
 		return true;
@@ -59,33 +57,33 @@ public class CrestMount extends BlockContainer
 
 	private void dropItems(World world, int x, int y, int z)
 	{
-		Random rand = new Random();
+		final Random rand = new Random();
 
-		TileEntity tileEntity = world.getTileEntity(x, y, z);
+		final TileEntity tileEntity = world.getTileEntity(x, y, z);
 		if(!(tileEntity instanceof IInventory))
-		{
 			return;
-		}
-		IInventory inventory = (IInventory) tileEntity;
+		final IInventory inventory = (IInventory) tileEntity;
 
 		for(int i = 0; i < inventory.getSizeInventory(); i++)
 		{
-			ItemStack item = inventory.getStackInSlot(i);
+			final ItemStack item = inventory.getStackInSlot(i);
 
 			if(item != null && item.stackSize > 0)
 			{
-				float rx = rand.nextFloat() * 0.8F + 0.1F;
-				float ry = rand.nextFloat() * 0.8F + 0.1F;
-				float rz = rand.nextFloat() * 0.8F + 0.1F;
+				final float rx = rand.nextFloat() * 0.8F + 0.1F;
+				final float ry = rand.nextFloat() * 0.8F + 0.1F;
+				final float rz = rand.nextFloat() * 0.8F + 0.1F;
 
-				EntityItem entityItem = new EntityItem(world, x + rx, y + ry, z + rz, new ItemStack(item.getItem(), item.stackSize, item.getItemDamage()));
+				final EntityItem entityItem = new EntityItem(world, x + rx,
+						y + ry, z + rz, new ItemStack(item.getItem(),
+								item.stackSize, item.getItemDamage()));
 
 				if(item.hasTagCompound())
 				{
 					entityItem.getEntityItem().setTagCompound((NBTTagCompound) item.getTagCompound().copy());
 				}
 
-				float factor = 0.05F;
+				final float factor = 0.05F;
 				entityItem.motionX = rand.nextGaussian() * factor;
 				entityItem.motionY = rand.nextGaussian() * factor + 0.2F;
 				entityItem.motionZ = rand.nextGaussian() * factor;
@@ -110,6 +108,7 @@ public class CrestMount extends BlockContainer
 	}
 
 	//It's not a normal block, so you need this too.
+	@Override
 	public boolean renderAsNormalBlock()
 	{
 		return false;
@@ -120,13 +119,13 @@ public class CrestMount extends BlockContainer
 	@Override
 	public void registerBlockIcons(IIconRegister icon)
 	{
-		this.blockIcon = icon.registerIcon("tinkersdefense:Item_CrestMount");
+		blockIcon = icon.registerIcon("tinkersdefense:item_crestmount");
 	}
 
 	@Override
 	public TileEntity createNewTileEntity(World w, int md)
 	{
-		TileEntity_CrestMount te = new TileEntity_CrestMount();
+		final TileEntity_CrestMount te = new TileEntity_CrestMount();
 		return te;
 	}
 
diff --git a/src/main/java/lance5057/tDefense/core/blocks/crestMount/Gui_CrestMount.java b/src/main/java/lance5057/tDefense/core/blocks/crestMount/Gui_CrestMount.java
index ae2aafd..1cb2a2f 100644
--- a/src/main/java/lance5057/tDefense/core/blocks/crestMount/Gui_CrestMount.java
+++ b/src/main/java/lance5057/tDefense/core/blocks/crestMount/Gui_CrestMount.java
@@ -11,17 +11,16 @@ import org.lwjgl.opengl.GL11;
 
 public class Gui_CrestMount extends GuiContainer
 {
-	private float							xSize_lo;
-	private float							ySize_lo;
-
-	private static final ResourceLocation	iconLocation	= new ResourceLocation("tinkersdefense", "textures/gui/crest_mount.png");
+	private static final ResourceLocation	iconLocation	= new ResourceLocation(
+			"tinkersdefense",
+			"textures/gui/crest_mount.png");
 
 	private final TileEntity_CrestMount		inventory;
 
 	public Gui_CrestMount(InventoryPlayer invPlayer, TileEntity_CrestMount te_crest)
 	{
 		super(new Container_CrestMount(invPlayer, te_crest));
-		this.inventory = te_crest;
+		inventory = te_crest;
 
 	}
 
@@ -29,11 +28,15 @@ public class Gui_CrestMount extends GuiContainer
 	public void initGui()
 	{
 		super.initGui();
-		this.buttonList.add(new GuiButton(1, this.guiLeft + 61, this.guiTop + 8, 18, 18, "Flip"));
-		this.buttonList.add(new GuiButton(3, this.guiLeft + 79, this.guiTop + 8, 18, 18, "Flip"));
-		this.buttonList.add(new GuiButton(2, this.guiLeft + 97, this.guiTop + 8, 18, 18, "Flip"));
+		buttonList.add(new GuiButton(1, guiLeft + 61,
+				guiTop + 8, 18, 18, "Flip"));
+		buttonList.add(new GuiButton(3, guiLeft + 79,
+				guiTop + 8, 18, 18, "Flip"));
+		buttonList.add(new GuiButton(2, guiLeft + 97,
+				guiTop + 8, 18, 18, "Flip"));
 
-		this.buttonList.add(new GuiButton(4, this.guiLeft + 79, this.guiTop + 63, 18, 18, "Flip"));
+		buttonList.add(new GuiButton(4, guiLeft + 79,
+				guiTop + 63, 18, 18, "Flip"));
 	}
 
 	@Override
@@ -44,33 +47,40 @@ public class Gui_CrestMount extends GuiContainer
 			if(button.id == i)
 			{
 				if(inventory.flip[i - 1] == false)
+				{
 					inventory.flip[i - 1] = true;
+				}
 				else
+				{
 					inventory.flip[i - 1] = false;
+				}
 
-				TinkersDefense.INSTANCE.sendToServer(new Message_CrestMount(inventory.xCoord, inventory.yCoord, inventory.zCoord, inventory.flip));
+				TinkersDefense.INSTANCE.sendToServer(new Message_CrestMount(
+						inventory.xCoord, inventory.yCoord, inventory.zCoord,
+						inventory.flip));
 			}
 		}
 	}
 
+	@Override
 	public void drawScreen(int par1, int par2, float par3)
 	{
 		super.drawScreen(par1, par2, par3);
-		this.xSize_lo = (float) par1;
-		this.ySize_lo = (float) par2;
 	}
 
+	@Override
 	protected void drawGuiContainerForegroundLayer(int par1, int par2)
 	{
 
 	}
 
+	@Override
 	protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3)
 	{
 		GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
-		this.mc.getTextureManager().bindTexture(iconLocation);
-		int k = (this.width - this.xSize) / 2;
-		int l = (this.height - this.ySize) / 2;
-		this.drawTexturedModalRect(k, l, 0, 0, this.xSize, this.ySize);
+		mc.getTextureManager().bindTexture(iconLocation);
+		final int k = (width - xSize) / 2;
+		final int l = (height - ySize) / 2;
+		drawTexturedModalRect(k, l, 0, 0, xSize, ySize);
 	}
 }
diff --git a/src/main/java/lance5057/tDefense/core/blocks/crestMount/ModelCrestMount.java b/src/main/java/lance5057/tDefense/core/blocks/crestMount/ModelCrestMount.java
index 82310dd..5b816ae 100644
--- a/src/main/java/lance5057/tDefense/core/blocks/crestMount/ModelCrestMount.java
+++ b/src/main/java/lance5057/tDefense/core/blocks/crestMount/ModelCrestMount.java
@@ -66,11 +66,17 @@ public class ModelCrestMount extends ModelBase
 		super.render(entity, f, f1, f2, f3, f4, f5);
 		setRotationAngles(f, f1, f2, f3, f4, f5, entity);
 		if(shield)
+		{
 			ShieldMount.render(f5);
+		}
 		if(left)
+		{
 			SwordMount1.render(f5);
+		}
 		if(right)
+		{
 			SwordMount2.render(f5);
+		}
 
 		Base.render(f5);
 		//SwordMount3.render(f5);
@@ -83,6 +89,7 @@ public class ModelCrestMount extends ModelBase
 		model.rotateAngleZ = z;
 	}
 
+	@Override
 	public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity)
 	{
 		super.setRotationAngles(f, f1, f2, f3, f4, f5, entity);
diff --git a/src/main/java/lance5057/tDefense/core/blocks/crestMount/Renderer_CrestMount.java b/src/main/java/lance5057/tDefense/core/blocks/crestMount/Renderer_CrestMount.java
index 33a8f39..67bbcda 100644
--- a/src/main/java/lance5057/tDefense/core/blocks/crestMount/Renderer_CrestMount.java
+++ b/src/main/java/lance5057/tDefense/core/blocks/crestMount/Renderer_CrestMount.java
@@ -24,35 +24,42 @@ public class Renderer_CrestMount extends TileEntitySpecialRenderer
 
 	public Renderer_CrestMount()
 	{
-		this.model = new ModelCrestMount();
+		model = new ModelCrestMount();
 	}
 
 	@Override
 	public void renderTileEntityAt(TileEntity te, double x, double y, double z, float scale)
 	{
-		TileEntity_CrestMount tileEntity = (TileEntity_CrestMount) te;
+		final TileEntity_CrestMount tileEntity = (TileEntity_CrestMount) te;
 
 		boolean left = false, right = false, shield = false;
 
-		if(tileEntity.getStackInSlot(0) != null)
-			right = true;
 		if(tileEntity.getStackInSlot(1) != null)
+		{
+			right = true;
+		}
+		if(tileEntity.getStackInSlot(0) != null)
+		{
 			left = true;
+		}
 		if(tileEntity.getStackInSlot(3) != null)
+		{
 			shield = true;
+		}
 
 		GL11.glPushMatrix();
 
 		//Render Crest Mount
 		GL11.glTranslatef((float) x + 0.5F, (float) y + 1.5F, (float) z + 0.5F);
 
-		ResourceLocation textures = (new ResourceLocation("tinkersdefense:textures/blocks/CrestMount.png"));
+		final ResourceLocation textures = (new ResourceLocation(
+				"tinkersdefense:textures/blocks/crestmount.png"));
 
 		Minecraft.getMinecraft().renderEngine.bindTexture(textures);
 
 		GL11.glPushMatrix();
 
-		int meta = te.getBlockMetadata();
+		final int meta = te.getBlockMetadata();
 		float rotation = 0;
 		switch(meta)
 		{
@@ -75,31 +82,34 @@ public class Renderer_CrestMount extends TileEntitySpecialRenderer
 		GL11.glRotatef(90F, 0.5F, 0.0F, 0.0F);
 		GL11.glTranslatef(0, -1, -1);
 
-		this.model.render((Entity) null, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F, left, right, shield);
+		model.render((Entity) null, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F, left, right, shield);
 		GL11.glPopMatrix();
 
 		//Render Inventory            
 
 		//right slot
-		int slot = 0;
+		int slot = 1;
 		if(tileEntity.getStackInSlot(slot) != null)
 		{
 			if((entItem == null) || entItem.getEntityItem().getItem() != tileEntity.getStackInSlot(slot).getItem())
-				entItem = new EntityItem(tileEntity.getWorldObj(), 0, 0, 0, tileEntity.getStackInSlot(slot));
+			{
+				entItem = new EntityItem(tileEntity.getWorldObj(), 0, 0, 0,
+						tileEntity.getStackInSlot(slot));
+			}
 			GL11.glPushMatrix();
-			this.entItem.hoverStart = 0.0F;
+			entItem.hoverStart = 0.0F;
 			RenderItem.renderInFrame = true;
 			GL11.glScalef(2f, 2f, 2f);
 			GL11.glRotatef(90, 0, 0, -1);
 			GL11.glRotatef(rotation, -1.0F, 0.0F, 0.0F);
 			//GL11.glTranslatef(0.4f/*up - down*/, -0.3f/*left - right*/, 0.22f);
-			if(tileEntity.flip[0] == true)
+			if(tileEntity.flip[1] == true)
 			{
 				GL11.glRotatef(180, 0, 0, 1);
 				GL11.glTranslatef(-0.8f, 0.2f, 0);
 			}
 
-			if(tileEntity.getStackInSlot(0).getItem() instanceof ToolCore)
+			if(tileEntity.getStackInSlot(1).getItem() instanceof ToolCore)
 			{
 				GL11.glRotatef(90F, 0.0F, 0.0F, 1.0F);
 				GL11.glTranslatef(-0.505f, -0.32f, 0);
@@ -111,25 +121,28 @@ public class Renderer_CrestMount extends TileEntitySpecialRenderer
 		}
 
 		//left slot
-		slot = 1;
+		slot = 0;
 		if(tileEntity.getStackInSlot(slot) != null)
 		{
 			if((entItem2 == null) || entItem2.getEntityItem().getItem() != tileEntity.getStackInSlot(slot).getItem())
-				entItem2 = new EntityItem(tileEntity.getWorldObj(), x, y, z, tileEntity.getStackInSlot(slot));
+			{
+				entItem2 = new EntityItem(tileEntity.getWorldObj(), x, y, z,
+						tileEntity.getStackInSlot(slot));
+			}
 			GL11.glPushMatrix();
-			this.entItem2.hoverStart = 0.0F;
+			entItem2.hoverStart = 0.0F;
 			RenderItem.renderInFrame = true;
 			//GL11.glTranslatef((float)te.xCoord + 0.5F, (float)te.yCoord + 1.02F, (float)te.zCoord + 0.3F);
 			GL11.glScalef(2f, 2f, 2f);
 			GL11.glRotatef(180, 0, 0, 1);
 			GL11.glRotatef(rotation, 0.0F, -1.0F, 0.0F);
-			if(tileEntity.flip[1] == true)
+			if(tileEntity.flip[0] == true)
 			{
 				GL11.glRotatef(180, 0, 0, 1);
 				GL11.glTranslatef(0.2f, -0.8f, 0);
 			}
 
-			if(tileEntity.getStackInSlot(1).getItem() instanceof ToolCore)
+			if(tileEntity.getStackInSlot(0).getItem() instanceof ToolCore)
 			{
 				GL11.glRotatef(90F, 0.0F, 0.0F, 1.0F);
 				GL11.glTranslatef(0.5f, -0.325f, 0);
@@ -145,15 +158,22 @@ public class Renderer_CrestMount extends TileEntitySpecialRenderer
 		if(tileEntity.getStackInSlot(slot) != null)
 		{
 			if((entItem3 == null) || entItem3.getEntityItem().getItem() != tileEntity.getStackInSlot(slot).getItem())
-				entItem3 = new EntityItem(tileEntity.getWorldObj(), x, y, z, tileEntity.getStackInSlot(slot));
+			{
+				entItem3 = new EntityItem(tileEntity.getWorldObj(), x, y, z,
+						tileEntity.getStackInSlot(slot));
+			}
 			GL11.glPushMatrix();
-			this.entItem3.hoverStart = 0.0F;
+			entItem3.hoverStart = 0.0F;
 			RenderItem.renderInFrame = true;
 			GL11.glScalef(2f, 2f, 2f);
 			if(rotation == 90)
+			{
 				GL11.glTranslatef(0.3f, 0, 0.0f);
+			}
 			if(rotation == -90)
+			{
 				GL11.glTranslatef(-0.3f, 0, 0.0f);
+			}
 			GL11.glRotatef(225, 0, 0, 1);
 			GL11.glRotatef(rotation, 1F, 1F, 0F);
 			if(tileEntity.flip[2] == true)
@@ -178,9 +198,12 @@ public class Renderer_CrestMount extends TileEntitySpecialRenderer
 		if(tileEntity.getStackInSlot(slot) != null)
 		{
 			if((entItem4 == null) || entItem4.getEntityItem().getItem() != tileEntity.getStackInSlot(slot).getItem())
-				entItem4 = new EntityItem(tileEntity.getWorldObj(), x, y, z, tileEntity.getStackInSlot(slot));
+			{
+				entItem4 = new EntityItem(tileEntity.getWorldObj(), x, y, z,
+						tileEntity.getStackInSlot(slot));
+			}
 			GL11.glPushMatrix();
-			this.entItem4.hoverStart = 0.0F;
+			entItem4.hoverStart = 0.0F;
 			RenderItem.renderInFrame = true;
 			GL11.glScalef(2f, 2f, 2f);
 			GL11.glRotatef(180, 0.0F, 1.0F, 0.0F);
diff --git a/src/main/java/lance5057/tDefense/core/blocks/crestMount/TileEntity_CrestMount.java b/src/main/java/lance5057/tDefense/core/blocks/crestMount/TileEntity_CrestMount.java
index 4ed3630..33a293d 100644
--- a/src/main/java/lance5057/tDefense/core/blocks/crestMount/TileEntity_CrestMount.java
+++ b/src/main/java/lance5057/tDefense/core/blocks/crestMount/TileEntity_CrestMount.java
@@ -42,7 +42,7 @@ public class TileEntity_CrestMount extends TileEntity implements IInventory
 	@Override
 	public Packet getDescriptionPacket()
 	{
-		NBTTagCompound tag = new NBTTagCompound();
+		final NBTTagCompound tag = new NBTTagCompound();
 		writeToNBT(tag);
 		return new S35PacketUpdateTileEntity(xCoord, yCoord, zCoord, 0, tag);
 	}
@@ -85,7 +85,7 @@ public class TileEntity_CrestMount extends TileEntity implements IInventory
 				setInventorySlotContents(slot, null);
 			}
 
-			this.markDirty();
+			markDirty();
 		}
 		return stack;
 	}
@@ -93,7 +93,7 @@ public class TileEntity_CrestMount extends TileEntity implements IInventory
 	@Override
 	public ItemStack getStackInSlotOnClosing(int slot)
 	{
-		ItemStack stack = getStackInSlot(slot);
+		final ItemStack stack = getStackInSlot(slot);
 
 		if(stack != null)
 		{
@@ -105,14 +105,14 @@ public class TileEntity_CrestMount extends TileEntity implements IInventory
 	@Override
 	public void setInventorySlotContents(int slot, ItemStack itemstack)
 	{
-		this.inventory[slot] = itemstack;
+		inventory[slot] = itemstack;
 
-		if(itemstack != null && itemstack.stackSize > this.getInventoryStackLimit())
+		if(itemstack != null && itemstack.stackSize > getInventoryStackLimit())
 		{
-			itemstack.stackSize = this.getInventoryStackLimit();
+			itemstack.stackSize = getInventoryStackLimit();
 		}
 
-		this.markDirty();
+		markDirty();
 	}
 
 	@Override
@@ -187,11 +187,11 @@ public class TileEntity_CrestMount extends TileEntity implements IInventory
 
 	public void readInventoryFromNBT(NBTTagCompound tags)
 	{
-		NBTTagList nbttaglist = tags.getTagList("Items", Constants.NBT.TAG_COMPOUND);
+		final NBTTagList nbttaglist = tags.getTagList("Items", Constants.NBT.TAG_COMPOUND);
 		for(int iter = 0; iter < nbttaglist.tagCount(); iter++)
 		{
-			NBTTagCompound tagList = (NBTTagCompound) nbttaglist.getCompoundTagAt(iter);
-			byte slotID = tagList.getByte("Slot");
+			final NBTTagCompound tagList = nbttaglist.getCompoundTagAt(iter);
+			final byte slotID = tagList.getByte("Slot");
 			if(slotID >= 0 && slotID < inventory.length)
 			{
 				inventory[slotID] = ItemStack.loadItemStackFromNBT(tagList);
@@ -201,12 +201,12 @@ public class TileEntity_CrestMount extends TileEntity implements IInventory
 
 	public void writeInventoryToNBT(NBTTagCompound tags)
 	{
-		NBTTagList nbttaglist = new NBTTagList();
+		final NBTTagList nbttaglist = new NBTTagList();
 		for(int iter = 0; iter < inventory.length; iter++)
 		{
 			if(inventory[iter] != null)
 			{
-				NBTTagCompound tagList = new NBTTagCompound();
+				final NBTTagCompound tagList = new NBTTagCompound();
 				tagList.setByte("Slot", (byte) iter);
 				inventory[iter].writeToNBT(tagList);
 				nbttaglist.appendTag(tagList);
diff --git a/src/main/java/lance5057/tDefense/core/blocks/ore/TD_Ore.java b/src/main/java/lance5057/tDefense/core/blocks/ore/TD_Ore.java
index 9219cb6..0778857 100644
--- a/src/main/java/lance5057/tDefense/core/blocks/ore/TD_Ore.java
+++ b/src/main/java/lance5057/tDefense/core/blocks/ore/TD_Ore.java
@@ -15,12 +15,12 @@ public class TD_Ore extends Block
 	public TD_Ore(Material mat, String name, Item drop)
 	{
 		super(mat);
-		this.setBlockName(name + "ore");
-		this.setBlockTextureName(Reference.MOD_ID + ":" + name + "ore");
-		this.setCreativeTab(TinkersDefense.tabName);
-		this.setStepSound(soundTypeStone);
-		this.setHardness(10.0f);
-		this.setResistance(20.0f);
+		setBlockName(name + "ore");
+		setBlockTextureName(Reference.MOD_ID + ":" + name + "ore");
+		setCreativeTab(TinkersDefense.tabName);
+		setStepSound(soundTypeStone);
+		setHardness(10.0f);
+		setResistance(20.0f);
 		setHarvestLevel("pickaxe", 2);
 
 		drops = drop;
@@ -35,7 +35,7 @@ public class TD_Ore extends Block
 	@Override
 	public int quantityDropped(int meta, int fortune, Random random)
 	{
-		int rand = random.nextInt(fortune + 1) + 1;
+		final int rand = random.nextInt(fortune + 1) + 1;
 		return rand;
 	}
 }
diff --git a/src/main/java/lance5057/tDefense/core/entity/EntityHookshotHook.java b/src/main/java/lance5057/tDefense/core/entity/EntityHookshotHook.java
index bf24e82..3c24863 100644
--- a/src/main/java/lance5057/tDefense/core/entity/EntityHookshotHook.java
+++ b/src/main/java/lance5057/tDefense/core/entity/EntityHookshotHook.java
@@ -65,7 +65,9 @@ public class EntityHookshotHook extends EntityThrowable
 			final Block block = worldObj.getBlock(Op.blockX, Op.blockY, Op.blockZ);
 
 			if(!block.getMaterial().blocksMovement())
+			{
 				return;
+			}
 			if(ticksExisted < getChainLength())
 			{
 				dataWatcher.updateObject(DATA_ARRIVED, (byte) 1);
@@ -98,7 +100,9 @@ public class EntityHookshotHook extends EntityThrowable
 	{
 		final String name = dataWatcher.getWatchableObjectString(DATA_PLAYER);
 		if(name == "")
+		{
 			return null;
+		}
 		return worldObj.getPlayerEntityByName(name);
 	}
 
diff --git a/src/main/java/lance5057/tDefense/core/gui/GuiTDGuideBook.java b/src/main/java/lance5057/tDefense/core/gui/GuiTDGuideBook.java
index d5c5fee..638bebf 100644
--- a/src/main/java/lance5057/tDefense/core/gui/GuiTDGuideBook.java
+++ b/src/main/java/lance5057/tDefense/core/gui/GuiTDGuideBook.java
@@ -158,6 +158,7 @@ public class GuiTDGuideBook extends GuiScreen
 			default:
 				((GuiButton) buttonList.get(chapter + 3)).enabled = true;
 				chapter = button.id - 3;
+				page = 0;
 				((GuiButton) buttonList.get(chapter + 3)).enabled = false;
 				break;
 		}
@@ -412,8 +413,6 @@ public class GuiTDGuideBook extends GuiScreen
 			GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
 			RenderHelper.enableGUIStandardItemLighting();
 			gui.mc.getTextureManager().bindTexture(guiLocation2);
-			final IRecipe recipe;
-
 			gui.drawTexturedModalRect(w / 2 + 7, h / 2 - 48, 157, 57, 99, 40);
 
 			itemRender.renderItemAndEffectIntoGUI(fontRendererObj, gui.mc.getTextureManager(), new ItemStack(
@@ -437,9 +436,9 @@ public class GuiTDGuideBook extends GuiScreen
 						TCRecipe.get(3), 1, TCItemCycle.get(3)), w / 2 + 11, h / 2 - 37);
 				itemRender.renderItemAndEffectIntoGUI(fontRendererObj, gui.mc.getTextureManager(), ToolBuilder.instance.buildTool(new ItemStack(
 						TCRecipe.get(0), 1, TCItemCycle.get(0)), new ItemStack(
-						TCRecipe.get(1), 1, TCItemCycle.get(1)), new ItemStack(
-						TCRecipe.get(2), 1, TCItemCycle.get(2)), new ItemStack(
-						TCRecipe.get(3), 1, TCItemCycle.get(3)), "Result"), w / 2 + 87, h / 2 - 37);
+								TCRecipe.get(1), 1, TCItemCycle.get(1)), new ItemStack(
+										TCRecipe.get(2), 1, TCItemCycle.get(2)), new ItemStack(
+												TCRecipe.get(3), 1, TCItemCycle.get(3)), "Result"), w / 2 + 87, h / 2 - 37);
 			}
 
 			GL11.glEnable(GL11.GL_BLEND);
@@ -454,8 +453,8 @@ public class GuiTDGuideBook extends GuiScreen
 		int spaceIndex = 0;
 		while(str.length() > index)
 		{
-			endIndex = index + 22;
-			if(index + 22 > str.length())
+			endIndex = index + 20;
+			if(index + 20 > str.length())
 			{
 				endIndex = str.length();
 			}
diff --git a/src/main/java/lance5057/tDefense/core/items/GuideBook.java b/src/main/java/lance5057/tDefense/core/items/GuideBook.java
index 215b8a1..ec591c6 100644
--- a/src/main/java/lance5057/tDefense/core/items/GuideBook.java
+++ b/src/main/java/lance5057/tDefense/core/items/GuideBook.java
@@ -11,15 +11,16 @@ public class GuideBook extends Item
 {
 	public GuideBook()
 	{
-		this.setCreativeTab(TinkersDefense.tabName);
-		this.setMaxStackSize(1);
-		this.setUnlocalizedName("guidebook");
-		this.setTextureName(Reference.MOD_ID + ":tdbook");
+		setCreativeTab(TinkersDefense.tabName);
+		setMaxStackSize(1);
+		setUnlocalizedName("guidebook");
+		setTextureName(Reference.MOD_ID + ":tdbook");
 	}
-	
+
+	@Override
 	public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player)
-    {
-		player.openGui(TinkersDefense.instance, TinkersDefense.GUI_GUIDEBOOK, player.worldObj, (int)player.posX, (int)player.posY, (int)player.posZ);
-        return stack;
-    }
+	{
+		player.openGui(TinkersDefense.instance, TinkersDefense.GUI_GUIDEBOOK, player.worldObj, (int) player.posX, (int) player.posY, (int) player.posZ);
+		return stack;
+	}
 }
diff --git a/src/main/java/lance5057/tDefense/core/items/MetaModifierItem.java b/src/main/java/lance5057/tDefense/core/items/MetaModifierItem.java
index 0bd5f11..7f11e02 100644
--- a/src/main/java/lance5057/tDefense/core/items/MetaModifierItem.java
+++ b/src/main/java/lance5057/tDefense/core/items/MetaModifierItem.java
@@ -31,7 +31,7 @@ public class MetaModifierItem extends Item
 	{
 		for(int i = 0; i < metaAmount; i++)
 		{
-			icons[i] = reg.registerIcon(Reference.MOD_ID + ":item_" + names[i]);
+			icons[i] = reg.registerIcon(Reference.MOD_ID + ":item_" + names[i].toLowerCase());
 		}
 	}
 
diff --git a/src/main/java/lance5057/tDefense/core/items/RawGem.java b/src/main/java/lance5057/tDefense/core/items/RawGem.java
index ed08b32..41565aa 100644
--- a/src/main/java/lance5057/tDefense/core/items/RawGem.java
+++ b/src/main/java/lance5057/tDefense/core/items/RawGem.java
@@ -8,9 +8,9 @@ public class RawGem extends Item
 {
 	public RawGem(String name)
 	{
-		this.setCreativeTab(TinkersDefense.tabName);
-		this.setMaxStackSize(64);
-		this.setUnlocalizedName("raw" + name);
-		this.setTextureName(Reference.MOD_ID + ":raw" + name);
+		setCreativeTab(TinkersDefense.tabName);
+		setMaxStackSize(64);
+		setUnlocalizedName("raw" + name);
+		setTextureName(Reference.MOD_ID + ":raw" + name);
 	}
 }
diff --git a/src/main/java/lance5057/tDefense/core/liquids/MoltenFluid.java b/src/main/java/lance5057/tDefense/core/liquids/MoltenFluid.java
index c3600da..48ab09f 100644
--- a/src/main/java/lance5057/tDefense/core/liquids/MoltenFluid.java
+++ b/src/main/java/lance5057/tDefense/core/liquids/MoltenFluid.java
@@ -12,8 +12,8 @@ public class MoltenFluid extends BlockFluidClassic
 {
 	private IIcon	stillIcon;
 	private IIcon	flowingIcon;
-	private String	stillIconTexture;
-	private String	flowIconTexture;
+	private final String	stillIconTexture;
+	private final String	flowIconTexture;
 
 	public MoltenFluid(Fluid fluid, String name)
 	{
@@ -29,20 +29,20 @@ public class MoltenFluid extends BlockFluidClassic
 	@SideOnly(Side.CLIENT)
 	public void func_149651_a(IIconRegister icon)
 	{
-		this.stillIcon = icon.registerIcon(this.stillIconTexture);
-		this.flowingIcon = icon.registerIcon(this.flowIconTexture);
+		stillIcon = icon.registerIcon(stillIconTexture);
+		flowingIcon = icon.registerIcon(flowIconTexture);
 
-		getFluid().setIcons(this.stillIcon, this.flowingIcon);
+		getFluid().setIcons(stillIcon, flowingIcon);
 	}
 
 	public IIcon getStillIcon()
 	{
-		return this.stillIcon;
+		return stillIcon;
 	}
 
 	public IIcon getFlowingIcon()
 	{
-		return this.flowingIcon;
+		return flowingIcon;
 	}
 
 	@SideOnly(Side.CLIENT)
@@ -50,8 +50,8 @@ public class MoltenFluid extends BlockFluidClassic
 	{
 		if(side <= 1)
 		{
-			return this.stillIcon;
+			return stillIcon;
 		}
-		return this.flowingIcon;
+		return flowingIcon;
 	}
 }
diff --git a/src/main/java/lance5057/tDefense/core/network/Handler_CrestMount.java b/src/main/java/lance5057/tDefense/core/network/Handler_CrestMount.java
index 3781788..ac4e5a2 100644
--- a/src/main/java/lance5057/tDefense/core/network/Handler_CrestMount.java
+++ b/src/main/java/lance5057/tDefense/core/network/Handler_CrestMount.java
@@ -11,7 +11,7 @@ public class Handler_CrestMount implements IMessageHandler<Message_CrestMount, I
 	@Override
 	public IMessage onMessage(Message_CrestMount message, MessageContext ctx)
 	{
-		TileEntity te = ctx.getServerHandler().playerEntity.worldObj.getTileEntity(message.x, message.y, message.z);
+		final TileEntity te = ctx.getServerHandler().playerEntity.worldObj.getTileEntity(message.x, message.y, message.z);
 		if(te instanceof TileEntity_CrestMount)
 		{
 			((TileEntity_CrestMount) te).flip = message.flip;
diff --git a/src/main/java/lance5057/tDefense/core/network/Handler_FinishingAnvil.java b/src/main/java/lance5057/tDefense/core/network/Handler_FinishingAnvil.java
index 703f40e..561f326 100644
--- a/src/main/java/lance5057/tDefense/core/network/Handler_FinishingAnvil.java
+++ b/src/main/java/lance5057/tDefense/core/network/Handler_FinishingAnvil.java
@@ -11,7 +11,7 @@ public class Handler_FinishingAnvil implements IMessageHandler<Message_Finishing
 	@Override
 	public IMessage onMessage(Message_FinishingAnvil message, MessageContext ctx)
 	{
-		TileEntity te = ctx.getServerHandler().playerEntity.worldObj.getTileEntity(message.x, message.y, message.z);
+		final TileEntity te = ctx.getServerHandler().playerEntity.worldObj.getTileEntity(message.x, message.y, message.z);
 		if(te instanceof TileEntity_FinishingAnvil)
 		{
 			//((TileEntity_FinishingAnvil) te).flip = message.flip;
diff --git a/src/main/java/lance5057/tDefense/core/network/Message_CrestMount.java b/src/main/java/lance5057/tDefense/core/network/Message_CrestMount.java
index a537775..390e638 100644
--- a/src/main/java/lance5057/tDefense/core/network/Message_CrestMount.java
+++ b/src/main/java/lance5057/tDefense/core/network/Message_CrestMount.java
@@ -26,12 +26,12 @@ public class Message_CrestMount implements IMessage
 	@Override
 	public void fromBytes(ByteBuf buf)
 	{
-		this.x = buf.readInt();
-		this.y = buf.readInt();
-		this.z = buf.readInt();
+		x = buf.readInt();
+		y = buf.readInt();
+		z = buf.readInt();
 		for(int i = 0; i < flip.length; i++)
 		{
-			this.flip[i] = buf.readBoolean();
+			flip[i] = buf.readBoolean();
 		}
 	}
 
@@ -41,9 +41,9 @@ public class Message_CrestMount implements IMessage
 		buf.writeInt(x);
 		buf.writeInt(y);
 		buf.writeInt(z);
-		for(int i = 0; i < flip.length; i++)
+		for(final boolean element : flip)
 		{
-			buf.writeBoolean(flip[i]);
+			buf.writeBoolean(element);
 		}
 	}
 
diff --git a/src/main/java/lance5057/tDefense/core/network/Message_FinishingAnvil.java b/src/main/java/lance5057/tDefense/core/network/Message_FinishingAnvil.java
index 207c67f..c9a6124 100644
--- a/src/main/java/lance5057/tDefense/core/network/Message_FinishingAnvil.java
+++ b/src/main/java/lance5057/tDefense/core/network/Message_FinishingAnvil.java
@@ -29,11 +29,11 @@ public class Message_FinishingAnvil implements IMessage
 	@Override
 	public void fromBytes(ByteBuf buf)
 	{
-		this.x = buf.readInt();
-		this.y = buf.readInt();
-		this.z = buf.readInt();
+		x = buf.readInt();
+		y = buf.readInt();
+		z = buf.readInt();
 
-		this.item = bbu.readItemStack(buf);
+		item = ByteBufUtils.readItemStack(buf);
 	}
 
 	@Override
@@ -43,7 +43,7 @@ public class Message_FinishingAnvil implements IMessage
 		buf.writeInt(y);
 		buf.writeInt(z);
 
-		bbu.writeItemStack(buf, item);
+		ByteBufUtils.writeItemStack(buf, item);
 	}
 
 }
diff --git a/src/main/java/lance5057/tDefense/core/renderer/HookRenderer.java b/src/main/java/lance5057/tDefense/core/renderer/HookRenderer.java
index 04ea899..bb25c76 100644
--- a/src/main/java/lance5057/tDefense/core/renderer/HookRenderer.java
+++ b/src/main/java/lance5057/tDefense/core/renderer/HookRenderer.java
@@ -15,9 +15,9 @@ import org.lwjgl.opengl.GL12;
 public class HookRenderer extends Render
 {
 	ResourceLocation	head	= new ResourceLocation(
-										"tinkersdefense:textures/entity/swordhead.png");
+			"tinkersdefense:textures/entity/swordhead.png");
 	ResourceLocation	chain	= new ResourceLocation(
-										"tinkersdefense:textures/entity/chain.png");
+			"tinkersdefense:textures/entity/chain.png");
 
 	public HookRenderer()
 	{
@@ -85,7 +85,7 @@ public class HookRenderer extends Render
 		bindTexture(chain);
 		GL11.glShadeModel(GL11.GL_SMOOTH);
 		final float f9 = 0.0F - (f8) * 0.1F;
-		final float f10 = MathHelper.sqrt_float(f4 * f4 + f5 * f5 + f6 * f6) / 32.0F - (p_76986_1_.ticksExisted + p_76986_9_) * 0.01F;
+		MathHelper.sqrt_float(f4 * f4 + f5 * f5 + f6 * f6);
 
 		GL11.glScalef(0.5f, 0.5f, 1);
 		for(int j = 0; j < 2; j++)
@@ -98,7 +98,6 @@ public class HookRenderer extends Render
 
 				final float f11 = MathHelper.sin(i % b0 * (float) Math.PI * 2.0F / b0) * 0.75F;
 				final float f12 = MathHelper.cos(i % b0 * (float) Math.PI * 2.0F / b0) * 0.75F;
-				final float f13 = i % b0 * 1.0F / b0;
 				tessellator.addVertexWithUV(f11, f12, 0.0D, 0, 0);
 				tessellator.addVertexWithUV(f11, f12, f8, 0, f9);
 				tessellator.addVertexWithUV(f11, f12, 0.0D, 1, 0);
diff --git a/src/main/java/lance5057/tDefense/core/renderer/MoreFlexibleToolRenderer.java b/src/main/java/lance5057/tDefense/core/renderer/MoreFlexibleToolRenderer.java
index e1fe841..0412731 100644
--- a/src/main/java/lance5057/tDefense/core/renderer/MoreFlexibleToolRenderer.java
+++ b/src/main/java/lance5057/tDefense/core/renderer/MoreFlexibleToolRenderer.java
@@ -39,7 +39,9 @@ public class MoreFlexibleToolRenderer extends FlexibleToolRenderer
 	public boolean handleRenderType(ItemStack item, ItemRenderType type)
 	{
 		if(!item.hasTagCompound())
+		{
 			return false;
+		}
 
 		switch(type)
 		{
@@ -76,7 +78,9 @@ public class MoreFlexibleToolRenderer extends FlexibleToolRenderer
 	public void renderItem(ItemRenderType type, ItemStack item, Object... data)
 	{
 		if(item == null || item.getItem() == null || !(item.getItem() instanceof ToolCore))
+		{
 			return;
+		}
 
 		Entity ent = null;
 		if(data.length > 1)
diff --git a/src/main/java/lance5057/tDefense/core/tools/HeaterShield.java b/src/main/java/lance5057/tDefense/core/tools/HeaterShield.java
index ad70bfd..06bcd34 100644
--- a/src/main/java/lance5057/tDefense/core/tools/HeaterShield.java
+++ b/src/main/java/lance5057/tDefense/core/tools/HeaterShield.java
@@ -1,19 +1,11 @@
 package lance5057.tDefense.core.tools;
 
-import java.util.List;
-
 import lance5057.tDefense.TinkersDefense;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
 import tconstruct.tools.TinkerTools;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 
 public class HeaterShield extends Shield
 {
@@ -22,7 +14,7 @@ public class HeaterShield extends Shield
 	public HeaterShield()
 	{
 		super(0);
-		this.setUnlocalizedName("heatershield");
+		setUnlocalizedName("heatershield");
 	}
 
 	@Override
diff --git a/src/main/java/lance5057/tDefense/core/tools/ModifierSoul.java b/src/main/java/lance5057/tDefense/core/tools/ModifierSoul.java
index b4d03ac..e561c44 100644
--- a/src/main/java/lance5057/tDefense/core/tools/ModifierSoul.java
+++ b/src/main/java/lance5057/tDefense/core/tools/ModifierSoul.java
@@ -1,12 +1,13 @@
 package lance5057.tDefense.core.tools;
 
+import lance5057.tDefense.core.tools.modifiers.ModifierBoolExclusive;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import lance5057.tDefense.core.tools.modifiers.ModifierBoolExclusive;
 
 public class ModifierSoul extends ModifierBoolExclusive
 {
-	String name;
+	String	name;
+
 	public ModifierSoul(ItemStack[] items, int effect, String tag, String c, String tip, String[] exclusive, int modsNeeded, String[] excludeMods, String name)
 	{
 		super(items, effect, tag, c, tip, exclusive, modsNeeded, excludeMods);
@@ -16,7 +17,7 @@ public class ModifierSoul extends ModifierBoolExclusive
 	@Override
 	public void modify(ItemStack[] input, ItemStack tool)
 	{
-		NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool");
+		final NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool");
 
 		tags.setBoolean(key, true);
 		tags.setString("Soul", name);
diff --git a/src/main/java/lance5057/tDefense/core/tools/Shears.java b/src/main/java/lance5057/tDefense/core/tools/Shears.java
index 046acdc..9bf9e36 100644
--- a/src/main/java/lance5057/tDefense/core/tools/Shears.java
+++ b/src/main/java/lance5057/tDefense/core/tools/Shears.java
@@ -91,9 +91,13 @@ public class Shears extends ToolCore
 	public boolean onBlockDestroyed(ItemStack p_150894_1_, World p_150894_2_, Block p_150894_3_, int p_150894_4_, int p_150894_5_, int p_150894_6_, EntityLivingBase p_150894_7_)
 	{
 		if(p_150894_3_.getMaterial() != Material.leaves && p_150894_3_ != Blocks.web && p_150894_3_ != Blocks.tallgrass && p_150894_3_ != Blocks.vine && p_150894_3_ != Blocks.tripwire && !(p_150894_3_ instanceof IShearable))
+		{
 			return super.onBlockDestroyed(p_150894_1_, p_150894_2_, p_150894_3_, p_150894_4_, p_150894_5_, p_150894_6_, p_150894_7_);
+		}
 		else
+		{
 			return true;
+		}
 	}
 
 	@Override
@@ -115,7 +119,9 @@ public class Shears extends ToolCore
 	public boolean itemInteractionForEntity(ItemStack itemstack, EntityPlayer player, EntityLivingBase entity)
 	{
 		if(entity.worldObj.isRemote)
+		{
 			return false;
+		}
 		if(entity instanceof IShearable)
 		{
 			final IShearable target = (IShearable) entity;
@@ -154,7 +160,9 @@ public class Shears extends ToolCore
 	public boolean onBlockStartBreak(ItemStack itemstack, int x, int y, int z, EntityPlayer player)
 	{
 		if(player.worldObj.isRemote)
+		{
 			return false;
+		}
 		final Block block = player.worldObj.getBlock(x, y, z);
 		if(block instanceof IShearable)
 		{
diff --git a/src/main/java/lance5057/tDefense/core/tools/Shield.java b/src/main/java/lance5057/tDefense/core/tools/Shield.java
index 030a62f..2f20e67 100644
--- a/src/main/java/lance5057/tDefense/core/tools/Shield.java
+++ b/src/main/java/lance5057/tDefense/core/tools/Shield.java
@@ -97,10 +97,12 @@ public class Shield extends ToolCore implements IShield, ISheathed, IArrowCatche
 	@Override
 	public boolean canHarvestBlock(Block block, ItemStack is)
 	{
-		for(int i = 0; i < web.length; i++)
+		for(final Material element : web)
 		{
-			if(block.getMaterial() == web[i])
+			if(block.getMaterial() == element)
+			{
 				return true;
+			}
 		}
 		return super.canHarvestBlock(block, is);
 	}
@@ -146,9 +148,13 @@ public class Shield extends ToolCore implements IShield, ISheathed, IArrowCatche
 	public int getArrowCount(ItemStack stack)
 	{
 		if(stack.hasTagCompound() && stack.getTagCompound().hasKey("arrows"))
+		{
 			return stack.getTagCompound().getShort("arrows");
+		}
 		else
+		{
 			return 0;
+		}
 	}
 
 	@Override
diff --git a/src/main/java/lance5057/tDefense/core/tools/TinkerWrench.java b/src/main/java/lance5057/tDefense/core/tools/TinkerWrench.java
index da288be..9fb8589 100644
--- a/src/main/java/lance5057/tDefense/core/tools/TinkerWrench.java
+++ b/src/main/java/lance5057/tDefense/core/tools/TinkerWrench.java
@@ -117,7 +117,9 @@ public class TinkerWrench extends ToolCore implements IToolWrench, IToolHammer
 		final NBTTagCompound tags = player.inventory.getCurrentItem().getTagCompound().getCompoundTag("InfiTool");
 
 		if(!tags.getBoolean("Broken"))
+		{
 			return true;
+		}
 		return false;
 	}
 
diff --git a/src/main/java/lance5057/tDefense/core/tools/TinkerZweihander.java b/src/main/java/lance5057/tDefense/core/tools/TinkerZweihander.java
index 7f99f22..b7f68bc 100644
--- a/src/main/java/lance5057/tDefense/core/tools/TinkerZweihander.java
+++ b/src/main/java/lance5057/tDefense/core/tools/TinkerZweihander.java
@@ -11,6 +11,7 @@ import net.minecraft.potion.Potion;
 import net.minecraft.potion.PotionEffect;
 import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.world.World;
+import tconstruct.library.tools.AbilityHelper;
 import tconstruct.library.tools.Weapon;
 import tconstruct.tools.TinkerTools;
 import cpw.mods.fml.common.Optional;
@@ -50,6 +51,19 @@ public class TinkerZweihander extends Weapon
 	}
 
 	@Override
+	public boolean onLeftClickEntity(ItemStack stack, EntityPlayer player, Entity entity)
+	{
+		if(AbilityHelper.onLeftClickEntity(stack, player, entity, this))
+		{
+			if(entity.riddenByEntity != null || entity.ridingEntity != null)
+			{
+				player.attackTargetEntityWithCurrentItem(entity);
+			}
+		}
+		return true;
+	}
+
+	@Override
 	public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player)
 	{
 		if(!player.isPotionActive(Potion.moveSlowdown))
@@ -86,12 +100,6 @@ public class TinkerZweihander extends Weapon
 	}
 
 	@Override
-	public float getDamageModifier()
-	{
-		return 1.4f;
-	}
-
-	@Override
 	public int getPartAmount()
 	{
 		return 4;
diff --git a/src/main/java/lance5057/tDefense/core/tools/TinkersHookshot.java b/src/main/java/lance5057/tDefense/core/tools/TinkersHookshot.java
index b0b3ef0..061aa51 100644
--- a/src/main/java/lance5057/tDefense/core/tools/TinkersHookshot.java
+++ b/src/main/java/lance5057/tDefense/core/tools/TinkersHookshot.java
@@ -87,16 +87,16 @@ public class TinkersHookshot extends ToolCore
 		final Item accessory = getAccessoryItem();
 		final ItemStack accessoryStack = accessory != null ? new ItemStack(
 				getAccessoryItem(), 1, id) : null;
-		final Item extra = getExtraItem();
-		final ItemStack extraStack = extra != null ? new ItemStack(extra, 1, id) : null;
-		final ItemStack tool = ToolBuilder.instance.buildTool(new ItemStack(
-				getHeadItem(), 1, id), new ItemStack(getHandleItem(), 1, id), accessoryStack, extraStack, name);
-		if(tool != null)
-		{
-			tool.getTagCompound().getCompoundTag("InfiTool").setBoolean("Built", true);
-			tool.getTagCompound().getCompoundTag("InfiTool").setInteger("ChainLength", 10);
-			list.add(tool);
-		}
+				final Item extra = getExtraItem();
+				final ItemStack extraStack = extra != null ? new ItemStack(extra, 1, id) : null;
+				final ItemStack tool = ToolBuilder.instance.buildTool(new ItemStack(
+						getHeadItem(), 1, id), new ItemStack(getHandleItem(), 1, id), accessoryStack, extraStack, name);
+				if(tool != null)
+				{
+					tool.getTagCompound().getCompoundTag("InfiTool").setBoolean("Built", true);
+					tool.getTagCompound().getCompoundTag("InfiTool").setInteger("ChainLength", 10);
+					list.add(tool);
+				}
 	}
 
 	@Override
diff --git a/src/main/java/lance5057/tDefense/core/tools/modifiers/BloodMagic/BloodMagicMods.java b/src/main/java/lance5057/tDefense/core/tools/modifiers/BloodMagic/BloodMagicMods.java
index 1d1d284..25bc332 100644
--- a/src/main/java/lance5057/tDefense/core/tools/modifiers/BloodMagic/BloodMagicMods.java
+++ b/src/main/java/lance5057/tDefense/core/tools/modifiers/BloodMagic/BloodMagicMods.java
@@ -68,9 +68,9 @@ public class BloodMagicMods extends ModifiersBase
 		ModifyBuilder.registerModifier(new ModifierBoolExclusive(
 				new ItemStack[] {new ItemStack(ModItems.apprenticeBloodOrb, 1), new ItemStack(
 						ModItems.sacrificialDagger, 1)},
-				TinkersDefense.config.SuppingModID, "Supping",
-				EnumChatFormatting.DARK_RED.toString(), "Supping",
-				new String[] {"weapon"}, 1, new String[] {"Scabbing"}));
+						TinkersDefense.config.SuppingModID, "Supping",
+						EnumChatFormatting.DARK_RED.toString(), "Supping",
+						new String[] {"weapon"}, 1, new String[] {"Scabbing"}));
 
 		for(final ToolCore tool : TConstructRegistry.getToolMapping())
 		{
diff --git a/src/main/java/lance5057/tDefense/core/tools/modifiers/Botania/BotaniaMods.java b/src/main/java/lance5057/tDefense/core/tools/modifiers/Botania/BotaniaMods.java
index eda2388..c0f1bfc 100644
--- a/src/main/java/lance5057/tDefense/core/tools/modifiers/Botania/BotaniaMods.java
+++ b/src/main/java/lance5057/tDefense/core/tools/modifiers/Botania/BotaniaMods.java
@@ -3,7 +3,6 @@ package lance5057.tDefense.core.tools.modifiers.Botania;
 import lance5057.tDefense.TDIntegration;
 import lance5057.tDefense.TinkersDefense;
 import lance5057.tDefense.core.tools.modifiers.ModifierBoolExclusive;
-import lance5057.tDefense.core.tools.modifiers.ModifierIntExclusive;
 import lance5057.tDefense.core.tools.modifiers.ModifiersBase;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
@@ -39,7 +38,7 @@ public class BotaniaMods extends ModifiersBase
 {
 	public BotaniaMods()
 	{
-		super(new String[] {"corpseIvyGraft", "corpseIvy", "terraCore", "manaCore", "elementiumcore"}, "modItemsBotania");
+		super(new String[] {"corpseIvyGraft", "corpseIvy", "terraCore", "manaCore"}, "modItemsBotania");
 	}
 
 	@Override
@@ -49,8 +48,8 @@ public class BotaniaMods extends ModifiersBase
 				new ItemStack(modItems, 1, 0),
 				new Object[] {"fsf", "oio", "fgf", 'f', ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_BELLETHORN), 'i', new ItemStack(
 						ModItems.keepIvy, 1, 0), 's', LibOreDict.MANA_STRING, 'g', new ItemStack(
-								TinkerTools.craftedSoil, 1, 3), 'o', new ItemStack(
-										ModItems.fertilizer, 1, 1)}));
+						TinkerTools.craftedSoil, 1, 3), 'o', new ItemStack(
+						ModItems.fertilizer, 1, 1)}));
 
 		GameRegistry.addShapedRecipe(new ItemStack(modItems, 1, 2), new Object[] {"sis", "idi", "sis", 'i', new ItemStack(
 				ModItems.manaResource, 1, 4), 's', new ItemStack(
@@ -70,15 +69,6 @@ public class BotaniaMods extends ModifiersBase
 		BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(modItems, 1, 1), new ItemStack(
 				modItems, 1, 0), 100000);
 
-		GameRegistry.addShapedRecipe(new ItemStack(modItems, 4, 0), new Object[] {"sis", "idi", "sis", 'i', new ItemStack(
-				ModItems.manaResource, 1, 7), 's', new ItemStack(
-				ModItems.manaResource, 1, 12), 'd', new ItemStack(
-				ModItems.manaResource, 1, 2)});
-
-		GameRegistry.addShapedRecipe(new ItemStack(modItems, 4, 0), new Object[] {"sis", "idi", "sis", 'i', new ItemStack(
-				ModItems.manaResource, 1, 7), 's', new ItemStack(
-				ModItems.manaResource, 1, 12), 'd', new ItemStack(
-				ModItems.manaResource, 1, 1)});
 	}
 
 	@Override
@@ -102,18 +92,11 @@ public class BotaniaMods extends ModifiersBase
 				EnumChatFormatting.AQUA.toString(), "ManaCore",
 				new String[] {}, 1, new String[] {"CorpseIvy"}));
 
-		ModifyBuilder.registerModifier(new ModifierIntExclusive(
-				new ItemStack[] {new ItemStack(modItems, 1, 4)},
-				TinkersDefense.config.ArmorPixieCoreModID, "ElementiumCore", 1,
-				EnumChatFormatting.LIGHT_PURPLE.toString(), "Elementium Core",
-				new String[] {"armor", "weapon"}, 1, new String[] {}));
-
 		for(final ToolCore tool : TConstructRegistry.getToolMapping())
 		{
 			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.CorpseIvyModID, "tinker", "corpseivy", true);
 			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.TerraCoreModID, "tinker", "terracore", true);
 			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.ManaRepairModID, "tinker", "manacore", true);
-			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.ArmorPixieCoreModID, "tinker", "elementiumcore", true);
 
 		}
 	}
diff --git a/src/main/java/lance5057/tDefense/core/tools/modifiers/ModifierBoolExclusive.java b/src/main/java/lance5057/tDefense/core/tools/modifiers/ModifierBoolExclusive.java
index b785daf..62a63ce 100644
--- a/src/main/java/lance5057/tDefense/core/tools/modifiers/ModifierBoolExclusive.java
+++ b/src/main/java/lance5057/tDefense/core/tools/modifiers/ModifierBoolExclusive.java
@@ -40,9 +40,9 @@ public class ModifierBoolExclusive extends ModBoolean
 
 		if(exclusive.length > 0)
 		{
-			for(int i = 0; i < exclusive.length; i++)
+			for(final String element : exclusive)
 			{
-				if(list.contains(exclusive[i]))
+				if(list.contains(element))
 				{
 					isExclusive = true;
 				}
@@ -55,9 +55,9 @@ public class ModifierBoolExclusive extends ModBoolean
 
 		if(modExclusions != null)
 		{
-			for(int i = 0; i < modExclusions.length; i++)
+			for(final String modExclusion : modExclusions)
 			{
-				if(tags.hasKey(modExclusions[i]))
+				if(tags.hasKey(modExclusion))
 				{
 					hasModRejection = true;
 				}
diff --git a/src/main/java/lance5057/tDefense/core/tools/modifiers/ModifierIntExclusive.java b/src/main/java/lance5057/tDefense/core/tools/modifiers/ModifierIntExclusive.java
index 2db9f6b..4b9b9a3 100644
--- a/src/main/java/lance5057/tDefense/core/tools/modifiers/ModifierIntExclusive.java
+++ b/src/main/java/lance5057/tDefense/core/tools/modifiers/ModifierIntExclusive.java
@@ -27,7 +27,7 @@ public class ModifierIntExclusive extends ModInteger
 		initialIncrease = secondaryIncrease = increase;
 		color = c;
 		tooltipName = tip;
-		this.modExclusions = excludeMods;
+		modExclusions = excludeMods;
 	}
 
 	public ModifierIntExclusive(ItemStack[] items, int effect, String dataKey, int increase, String c, String tip, String[] exclusive, int modsNeeded, int max)
@@ -44,27 +44,22 @@ public class ModifierIntExclusive extends ModInteger
 	@Override
 	protected boolean canModify(ItemStack tool, ItemStack[] input)
 	{
-		List list = Arrays.asList(((ToolCore) tool.getItem()).getTraits());
-		NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool");
+		final List list = Arrays.asList(((ToolCore) tool.getItem()).getTraits());
+		final NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool");
 
-		boolean isExclusive = false;
-		boolean hasModRejection = false;
-
-		for(int i = 0; i < exclusive.length; i++)
+		for(final String element : exclusive)
 		{
-			if(list.contains(exclusive[i]))
+			if(list.contains(element))
 			{
-				isExclusive = true;
 			}
 		}
 
 		if(modExclusions != null)
 		{
-			for(int i = 0; i < modExclusions.length; i++)
+			for(final String modExclusion : modExclusions)
 			{
-				if(tags.hasKey(modExclusions[i]))
+				if(tags.hasKey(modExclusion))
 				{
-					hasModRejection = true;
 				}
 			}
 		}
@@ -75,7 +70,7 @@ public class ModifierIntExclusive extends ModInteger
 	@Override
 	public void modify(ItemStack[] input, ItemStack tool)
 	{
-		NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool");
+		final NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool");
 		if(tags.hasKey(key))
 		{
 			int increase = tags.getInteger(key);
diff --git a/src/main/java/lance5057/tDefense/core/tools/modifiers/ModifierSoulHandler.java b/src/main/java/lance5057/tDefense/core/tools/modifiers/ModifierSoulHandler.java
index 895675b..eda54f1 100644
--- a/src/main/java/lance5057/tDefense/core/tools/modifiers/ModifierSoulHandler.java
+++ b/src/main/java/lance5057/tDefense/core/tools/modifiers/ModifierSoulHandler.java
@@ -258,9 +258,13 @@ public class ModifierSoulHandler
 	{
 		final int lines = getAmountOfLines("soul." + name + "." + type + ".");
 		if(lines > 0)
+		{
 			return StatCollector.translateToLocal("soul." + name + "." + type + "." + world.rand.nextInt(lines));
+		}
 		if(TinkersDefense.config.debug)
+		{
 			return "Error: No lines (" + type + " chat)";
+		}
 		return "";
 	}
 
@@ -315,8 +319,8 @@ public class ModifierSoulHandler
 	@SubscribeEvent
 	public void ModifySoulEvent(ModifyEvent event)
 	{
-		if(event.modifier.stacks != null && !event.modifier.stacks.isEmpty() && event.modifier.stacks.get(0) != null && ((ItemStack) event.modifier.stacks.get(0)).areItemStacksEqual((ItemStack) event.modifier.stacks.get(0), new ItemStack(
-				TinkersDefense.mods.TMod.modItems, 1, 3)))
+		if(event.modifier.stacks != null && !event.modifier.stacks.isEmpty() && event.modifier.stacks.get(0) != null && ItemStack.areItemStacksEqual((ItemStack) event.modifier.stacks.get(0), new ItemStack(
+				Modifiers.TMod.modItems, 1, 3)))
 		{
 			newlymade = true;
 
diff --git a/src/main/java/lance5057/tDefense/core/tools/modifiers/TDefense/TDMods.java b/src/main/java/lance5057/tDefense/core/tools/modifiers/TDefense/TDMods.java
index 9ed2d6c..eb23077 100644
--- a/src/main/java/lance5057/tDefense/core/tools/modifiers/TDefense/TDMods.java
+++ b/src/main/java/lance5057/tDefense/core/tools/modifiers/TDefense/TDMods.java
@@ -11,6 +11,7 @@ import lance5057.tDefense.core.tools.modifiers.ModifierIntExclusive;
 import lance5057.tDefense.core.tools.modifiers.ModifiersBase;
 import lance5057.tDefense.core.tools.modifiers.modLapisShears;
 import lance5057.tDefense.core.tools.modifiers.ActiveToolMods.TDefenseActiveToolMod;
+import lance5057.tDefense.proxy.CommonProxy;
 import mods.battlegear2.api.PlayerEventChild.ShieldBlockEvent;
 import mods.battlegear2.api.core.IBattlePlayer;
 import net.minecraft.entity.Entity;
@@ -69,22 +70,22 @@ public class TDMods extends ModifiersBase
 
 		GameRegistry.addShapedRecipe(new ItemStack(modItems, 1, 2), new Object[] {"-1-", "1d1", "-1-", 'd', new ItemStack(
 				Items.enchanted_book, 1, OreDictionary.WILDCARD_VALUE), '1', new ItemStack(
-						Items.experience_bottle, 1, 0)});
+				Items.experience_bottle, 1, 0)});
 
 		GameRegistry.addShapelessRecipe(new ItemStack(modItems, 1, 12), new ItemStack(
 				Items.enchanted_book, 1, OreDictionary.WILDCARD_VALUE));
 
 		GameRegistry.addShapedRecipe(new ItemStack(modItems, 1, 4), new Object[] {"fcf", "sps", "fcf", 'f', new ItemStack(
 				Items.feather, 1, -1), 'c', new ItemStack(
-						TinkersDefense.partCloth, 1, OreDictionary.WILDCARD_VALUE), 's', new ItemStack(
-								Items.string, 1, -1), 'p', new ItemStack(modItems, 1, 12)});
+				TinkersDefense.partCloth, 1, OreDictionary.WILDCARD_VALUE), 's', new ItemStack(
+				Items.string, 1, -1), 'p', new ItemStack(modItems, 1, 12)});
 
 		GameRegistry.addShapedRecipe(new ItemStack(modItems, 1, 5), new Object[] {"gng", "spc", "gbg", 'g', new ItemStack(
 				Blocks.glass_pane, 1, -1), 'c', new ItemStack(
-						TinkersDefense.partCloth, 1, OreDictionary.WILDCARD_VALUE), 's', new ItemStack(
-								Blocks.sand, 1, OreDictionary.WILDCARD_VALUE), 'p', new ItemStack(
-										modItems, 1, 12), 'n', new ItemStack(Items.nether_star, 1, 0), 'b', new ItemStack(
-												Blocks.gold_block, 1, 12)});
+				TinkersDefense.partCloth, 1, OreDictionary.WILDCARD_VALUE), 's', new ItemStack(
+				Blocks.sand, 1, OreDictionary.WILDCARD_VALUE), 'p', new ItemStack(
+				modItems, 1, 12), 'n', new ItemStack(Items.nether_star, 1, 0), 'b', new ItemStack(
+				Blocks.gold_block, 1, 12)});
 
 		GameRegistry.addShapedRecipe(new ItemStack(modItems, 1, 6), new Object[] {"-r-", "-p-", "---", 'r', new ItemStack(
 				modItems, 1, 0), 'p', new ItemStack(modItems, 1, 12)});
@@ -99,7 +100,7 @@ public class TDMods extends ModifiersBase
 
 		GameRegistry.addShapedRecipe(new ItemStack(modItems, 1, 9), new Object[] {"brb", "apa", "ara", 'b', TConstructRegistry.getItemStack("necroticBone"), 'r', new ItemStack(
 				TinkerTools.toughRod, 1, 7), 'a', new ItemStack(
-						TinkerWeaponry.arrowhead, 1, 11), 'p', new ItemStack(modItems,
+				TinkerWeaponry.arrowhead, 1, 11), 'p', new ItemStack(modItems,
 				1, 12)});
 
 		GameRegistry.addShapedRecipe(new ItemStack(modItems, 1, 10), new Object[] {"PfP", "tpt", "PfP", 'P', new ItemStack(
@@ -124,7 +125,8 @@ public class TDMods extends ModifiersBase
 		//Weapons
 		//TO-DO
 		ModifyBuilder.registerModifier(new ModifierIntExclusive(
-				new ItemStack[] {new ItemStack(Blocks.iron_block, 1, 0)},
+				new ItemStack[] {new ItemStack(
+						Blocks.heavy_weighted_pressure_plate, 1, 0)},
 				TinkersDefense.config.DazeID, "Daze", 1,
 				EnumChatFormatting.GRAY.toString(), "Daze",
 				new String[] {"weapon"}, 1, null));
@@ -151,7 +153,7 @@ public class TDMods extends ModifiersBase
 				modItems, 1, 4), 1);
 		RegisterCrestModifier(TinkersDefense.config.CrestMirrorsID, "Mirrors", EnumChatFormatting.DARK_AQUA.toString(), new ItemStack(
 				modItems, 1, 5), 1);
-		RegisterCrestModifier(TinkersDefense.config.CrestLegendsID, "Legends", EnumChatFormatting.GOLD.toString(), new ItemStack(
+		RegisterLegendModifier(TinkersDefense.config.CrestLegendsID, "Legends", EnumChatFormatting.GOLD.toString(), new ItemStack(
 				modItems, 1, 6), 1);
 		//		RegisterCrestModifier(TinkersDefense.config.CrestBladesID, "Blades", 1, EnumChatFormatting.GRAY.toString(), new ItemStack(
 		//				modItems, 1, 7), 1);
@@ -195,7 +197,7 @@ public class TDMods extends ModifiersBase
 			//			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.CrestLightID, "tinker", "light", true);
 
 			//TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.JokeInsultID, "tinker", "insult", true);
-			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.JokePyrotechID, "tinker", "pyrotech", true);
+			//TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.JokePyrotechID, "tinker", "pyrotech", true);
 			//TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.JokeCompensateID, "tinker", "compensate", true);
 
 			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.SoulBoundID, "tinker", "soulbound", true);
@@ -236,10 +238,26 @@ public class TDMods extends ModifiersBase
 		}
 	}
 
+	public void RegisterLegendModifier(int[] effect, String tag, String color, ItemStack item, int mods)
+	{
+
+		for(int i = 0; i < TinkersDefense.colors.length; i++)
+		{
+			final ItemStack[] items = {item, new ItemStack(Items.dye, 1, i)};
+			ModifyBuilder.registerModifier(new ModifierBoolExclusive(items,
+					effect[i], tag.toLowerCase(), color, "Crest of " + tag,
+					new String[] {"heatershield"}, mods, null));
+			for(final ToolCore tool : TConstructRegistry.getToolMapping())
+			{
+				TConstructClientRegistry.addEffectRenderMapping(tool, effect[i], "tinker", TinkersDefense.colors[i] + "_" + tag.toLowerCase(), true);
+			}
+		}
+	}
+
 	@Override
 	public void UpdateAll(ToolCore tool, ItemStack stack, World world, Entity entity, NBTTagCompound tags)
 	{
-		if(tags.hasKey("Mirrors"))
+		if(tags.hasKey("mirrors"))
 		{
 			UpdateMirrors(tool, stack, world, entity);
 		}
@@ -249,9 +267,9 @@ public class TDMods extends ModifiersBase
 		}
 		if(world.isRemote && tags.hasKey("Ensouled") && tags.hasKey("Soul"))
 		{
-			if(TinkersDefense.proxy.SoulHandler != null)
+			if(CommonProxy.SoulHandler != null)
 			{
-				TinkersDefense.proxy.SoulHandler.Update(stack);
+				CommonProxy.SoulHandler.Update(stack);
 			}
 		}
 	}
@@ -308,7 +326,7 @@ public class TDMods extends ModifiersBase
 		{
 			final EntityPlayer player = (EntityPlayer) event.source.getSourceOfDamage();
 			final ItemStack itemstack = player.getCurrentEquippedItem();
-			if(itemstack != null)
+			if(itemstack != null && itemstack.getItem() instanceof ToolCore)
 			{
 				final NBTTagCompound tags = itemstack.getTagCompound().getCompoundTag("InfiTool");
 
diff --git a/src/main/java/lance5057/tDefense/core/tools/modifiers/Thaumcraft/ThaumcraftMods.java b/src/main/java/lance5057/tDefense/core/tools/modifiers/Thaumcraft/ThaumcraftMods.java
index a18e691..75b477c 100644
--- a/src/main/java/lance5057/tDefense/core/tools/modifiers/Thaumcraft/ThaumcraftMods.java
+++ b/src/main/java/lance5057/tDefense/core/tools/modifiers/Thaumcraft/ThaumcraftMods.java
@@ -1,9 +1,7 @@
 package lance5057.tDefense.core.tools.modifiers.Thaumcraft;
 
-import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
-import cpw.mods.fml.common.FMLLog;
 import lance5057.tDefense.TinkersDefense;
 import lance5057.tDefense.core.tools.modifiers.ModifiersBase;
 import net.minecraft.entity.Entity;
@@ -19,7 +17,7 @@ import tconstruct.library.tools.ToolCore;
 import thaumcraft.api.ItemApi;
 import thaumcraft.api.aspects.Aspect;
 import thaumcraft.api.aspects.AspectList;
-import thaumcraft.api.internal.DummyInternalMethodHandler;
+import cpw.mods.fml.common.FMLLog;
 
 public class ThaumcraftMods extends ModifiersBase
 {
@@ -43,9 +41,12 @@ public class ThaumcraftMods extends ModifiersBase
 	@Override
 	public void RegisterModifiers()
 	{
-		ModifyBuilder.registerModifier(new modifierRepairVis(new ItemStack[] {ItemApi.getItem("itemWandCap", 0)}, TinkersDefense.config.CapsModID, "Caps", EnumChatFormatting.GOLD.toString(), "Caps"));
-		
-		for(ToolCore tool : TConstructRegistry.getToolMapping())
+		ModifyBuilder.registerModifier(new modifierRepairVis(
+				new ItemStack[] {ItemApi.getItem("itemWandCap", 0)},
+				TinkersDefense.config.CapsModID, "Caps",
+				EnumChatFormatting.GOLD.toString(), "Caps"));
+
+		for(final ToolCore tool : TConstructRegistry.getToolMapping())
 		{
 			TConstructClientRegistry.addEffectRenderMapping(tool, TinkersDefense.config.CapsModID, "tinker", "cap", true);
 		}
@@ -57,7 +58,9 @@ public class ThaumcraftMods extends ModifiersBase
 		if(!world.isRemote)
 		{
 			if(tags.hasKey("Caps"))
+			{
 				UpdateRepairVis(tool, stack, world, entity, tags);
+			}
 		}
 	}
 
@@ -67,7 +70,7 @@ public class ThaumcraftMods extends ModifiersBase
 	{
 		if(tags.getInteger("Damage") > 0)
 		{
-			AspectList cost = new AspectList();
+			final AspectList cost = new AspectList();
 			cost.add(Aspect.AIR, (int) (10 * tags.getFloat("Caps")));
 			cost.add(Aspect.WATER, (int) (30 * tags.getFloat("Caps")));
 			cost.add(Aspect.FIRE, (int) (10 * tags.getFloat("Caps")));
@@ -82,9 +85,9 @@ public class ThaumcraftMods extends ModifiersBase
 				{
 					consumeVisFromInventory = Class.forName("thaumcraft.common.items.wands.WandManager").getMethod("consumeVisFromInventory", EntityPlayer.class, AspectList.class);
 				}
-				success = (Boolean) consumeVisFromInventory.invoke(null, (EntityPlayer) entity, cost);
+				success = (Boolean) consumeVisFromInventory.invoke(null, entity, cost);
 			}
-			catch(Exception ex)
+			catch(final Exception ex)
 			{
 				FMLLog.warning("Thaumcraft is missing, you shouldn't see this, please report");
 			}
@@ -93,9 +96,13 @@ public class ThaumcraftMods extends ModifiersBase
 				if(success)
 				{
 					if(tags.getInteger("Damage") >= 4)
+					{
 						tags.setInteger("Damage", tags.getInteger("Damage") - 4);
+					}
 					else
+					{
 						tags.setInteger("Damage", 0);
+					}
 				}
 			}
 		}
diff --git a/src/main/java/lance5057/tDefense/core/tools/modifiers/Thaumcraft/modifierRepairVis.java b/src/main/java/lance5057/tDefense/core/tools/modifiers/Thaumcraft/modifierRepairVis.java
index 13c14d4..ddea547 100644
--- a/src/main/java/lance5057/tDefense/core/tools/modifiers/Thaumcraft/modifierRepairVis.java
+++ b/src/main/java/lance5057/tDefense/core/tools/modifiers/Thaumcraft/modifierRepairVis.java
@@ -1,13 +1,9 @@
 package lance5057.tDefense.core.tools.modifiers.Thaumcraft;
 
-import java.util.ArrayList;
-import java.util.Iterator;
-
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import tconstruct.modifiers.tools.ModBoolean;
 import thaumcraft.api.wands.WandCap;
-import thaumcraft.common.items.wands.ItemWandCap;
 
 public class modifierRepairVis extends ModBoolean
 {
@@ -26,14 +22,14 @@ public class modifierRepairVis extends ModBoolean
 	public boolean matches(ItemStack[] recipe, ItemStack input)
 	{
 		cap = null;
-		for(int i = 0; i < recipe.length; i++)
+		for(final ItemStack element : recipe)
 		{
-			if(recipe[i] != null)
+			if(element != null)
 			{
-				for(WandCap cp : WandCap.caps.values())
+				for(final WandCap cp : WandCap.caps.values())
 				{
-					ItemStack test = cp.getItem();
-					if(recipe[i].getItem() == test.getItem() && recipe[i].getItemDamage() == test.getItemDamage())
+					final ItemStack test = cp.getItem();
+					if(element.getItem() == test.getItem() && element.getItemDamage() == test.getItemDamage())
 					{
 						cap = cp;
 						break;
@@ -43,23 +39,27 @@ public class modifierRepairVis extends ModBoolean
 		}
 
 		if(!canModify(input, recipe))
+		{
 			return false;
+		}
 		if(cap == null)
+		{
 			return false;
+		}
 		return true;
 	}
 
 	@Override
 	protected boolean canModify(ItemStack tool, ItemStack[] input)
 	{
-		NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool");
+		final NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool");
 		return tags.getInteger("Modifiers") > 0 && !tags.getBoolean(key) && cap != null; //Will fail if the modifier is false or the tag doesn't exist
 	}
 
 	@Override
 	public void modify(ItemStack[] input, ItemStack tool)
 	{
-		NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool");
+		final NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool");
 
 		tags.setFloat(key, cap.getBaseCostModifier());
 
@@ -67,7 +67,7 @@ public class modifierRepairVis extends ModBoolean
 		modifiers -= 1;
 		tags.setInteger("Modifiers", modifiers);
 
-		String mat = cap.getTag().substring(0, 1).toUpperCase() + cap.getTag().substring(1) + " ";
+		final String mat = cap.getTag().substring(0, 1).toUpperCase() + cap.getTag().substring(1) + " ";
 		addToolTip(tool, color + mat + tooltipName, color + mat + tooltipName + " (" + (int) (cap.getBaseCostModifier() * 100) + "%)");
 	}
 }
diff --git a/src/main/java/lance5057/tDefense/core/tools/modifiers/modLapisShears.java b/src/main/java/lance5057/tDefense/core/tools/modifiers/modLapisShears.java
index a12690d..8261b4c 100644
--- a/src/main/java/lance5057/tDefense/core/tools/modifiers/modLapisShears.java
+++ b/src/main/java/lance5057/tDefense/core/tools/modifiers/modLapisShears.java
@@ -41,7 +41,6 @@ public class modLapisShears extends ModLapis
 		tags.setIntArray(key, keyPair);
 		final ToolCore toolcore = (ToolCore) tool.getItem();
 		final String[] types = toolcore.getTraits();
-		final boolean weapon = false;
 		boolean harvest = false;
 		for(final String s : types)
 		{
diff --git a/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/Container_FinishingAnvil.java b/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/Container_FinishingAnvil.java
index f137076..c10f3b2 100644
--- a/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/Container_FinishingAnvil.java
+++ b/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/Container_FinishingAnvil.java
@@ -21,7 +21,8 @@ public class Container_FinishingAnvil extends Container
 		{
 			for(int x = 0; x < 9; x++)
 			{
-				addSlotToContainer(new Slot(inventoryPlayer, x + y * 9 + 9, 8 + 18 * x, 84 + y * 18));
+				addSlotToContainer(new Slot(inventoryPlayer, x + y * 9 + 9,
+						8 + 18 * x, 84 + y * 18));
 			}
 		}
 	}
diff --git a/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/FinishingAnvil.java b/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/FinishingAnvil.java
index e12586a..c94648b 100644
--- a/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/FinishingAnvil.java
+++ b/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/FinishingAnvil.java
@@ -27,7 +27,7 @@ public class FinishingAnvil extends BlockContainer
 	public FinishingAnvil()
 	{
 		super(Material.iron);
-		this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
+		setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
 	}
 
 	@Override
@@ -40,11 +40,9 @@ public class FinishingAnvil extends BlockContainer
 	@Override
 	public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int metadata, float what, float these, float are)
 	{
-		TileEntity tileEntity = world.getTileEntity(x, y, z);
+		final TileEntity tileEntity = world.getTileEntity(x, y, z);
 		if(tileEntity == null || player.isSneaking())
-		{
 			return false;
-		}
 		//code to open gui explained later
 		player.openGui(TinkersDefense.instance, TinkersDefense.GUI_ANVIL_INV, player.worldObj, x, y, z);
 		return true;
@@ -59,33 +57,33 @@ public class FinishingAnvil extends BlockContainer
 
 	private void dropItems(World world, int x, int y, int z)
 	{
-		Random rand = new Random();
+		final Random rand = new Random();
 
-		TileEntity tileEntity = world.getTileEntity(x, y, z);
+		final TileEntity tileEntity = world.getTileEntity(x, y, z);
 		if(!(tileEntity instanceof IInventory))
-		{
 			return;
-		}
-		IInventory inventory = (IInventory) tileEntity;
+		final IInventory inventory = (IInventory) tileEntity;
 
 		for(int i = 0; i < inventory.getSizeInventory(); i++)
 		{
-			ItemStack item = inventory.getStackInSlot(i);
+			final ItemStack item = inventory.getStackInSlot(i);
 
 			if(item != null && item.stackSize > 0)
 			{
-				float rx = rand.nextFloat() * 0.8F + 0.1F;
-				float ry = rand.nextFloat() * 0.8F + 0.1F;
-				float rz = rand.nextFloat() * 0.8F + 0.1F;
+				final float rx = rand.nextFloat() * 0.8F + 0.1F;
+				final float ry = rand.nextFloat() * 0.8F + 0.1F;
+				final float rz = rand.nextFloat() * 0.8F + 0.1F;
 
-				EntityItem entityItem = new EntityItem(world, x + rx, y + ry, z + rz, new ItemStack(item.getItem(), item.stackSize, item.getItemDamage()));
+				final EntityItem entityItem = new EntityItem(world, x + rx,
+						y + ry, z + rz, new ItemStack(item.getItem(),
+								item.stackSize, item.getItemDamage()));
 
 				if(item.hasTagCompound())
 				{
 					entityItem.getEntityItem().setTagCompound((NBTTagCompound) item.getTagCompound().copy());
 				}
 
-				float factor = 0.05F;
+				final float factor = 0.05F;
 				entityItem.motionX = rand.nextGaussian() * factor;
 				entityItem.motionY = rand.nextGaussian() * factor + 0.2F;
 				entityItem.motionZ = rand.nextGaussian() * factor;
@@ -110,6 +108,7 @@ public class FinishingAnvil extends BlockContainer
 	}
 
 	//It's not a normal block, so you need this too.
+	@Override
 	public boolean renderAsNormalBlock()
 	{
 		return false;
@@ -120,13 +119,13 @@ public class FinishingAnvil extends BlockContainer
 	@Override
 	public void registerBlockIcons(IIconRegister icon)
 	{
-		this.blockIcon = icon.registerIcon("tinkersdefense:WIP");
+		blockIcon = icon.registerIcon("tinkersdefense:item_armoranvil");
 	}
 
 	@Override
 	public TileEntity createNewTileEntity(World w, int md)
 	{
-		TileEntity_FinishingAnvil te = new TileEntity_FinishingAnvil();
+		final TileEntity_FinishingAnvil te = new TileEntity_FinishingAnvil();
 		return te;
 	}
 
diff --git a/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/Gui_FinishingAnvil.java b/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/Gui_FinishingAnvil.java
index 0395b61..ea56f5a 100644
--- a/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/Gui_FinishingAnvil.java
+++ b/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/Gui_FinishingAnvil.java
@@ -9,7 +9,7 @@ import lance5057.tDefense.armor.renderers.ArmorRenderer;
 import lance5057.tDefense.core.network.Message_FinishingAnvil;
 import lance5057.tDefense.finishingAnvil.utilities.Injector;
 import lance5057.tDefense.finishingAnvil.utilities.ToolCoreTip;
-import net.minecraft.client.entity.AbstractClientPlayer;
+import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.ScaledResolution;
 import net.minecraft.client.gui.inventory.GuiContainer;
@@ -17,7 +17,6 @@ import net.minecraft.client.model.ModelBiped;
 import net.minecraft.client.model.ModelRenderer;
 import net.minecraft.client.renderer.RenderHelper;
 import net.minecraft.client.renderer.entity.RenderItem;
-import net.minecraft.client.renderer.texture.ITextureObject;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -34,35 +33,34 @@ import cpw.mods.fml.client.config.GuiButtonExt;
 
 public class Gui_FinishingAnvil extends GuiContainer
 {
-	private float							xSize_lo;
-	private float							ySize_lo;
-
 	private ItemStack						bigCopy;
+	NBTTagCompound							bigCopyTags;
+	private final RenderItem				bigRender		= new RenderItem_FinishingAnvil(
+			this,
+			3.5f,
+			3.5f, 1.0f);
+
+	private ItemStack						rightCopy1, rightCopy2, rightCopy3;
+	NBTTagCompound							rightCopyTags1, rightCopyTags2,
+	rightCopyTags3;
+	private final RenderItem				normalRender	= new RenderItem_FinishingAnvil(
+			this, 1.0f,
+			1.0f, 1.0f);
+
 	//private Boolean							isNull			= true;
 	private ItemStack						editItem;
-	private final RenderItem				bigRender		= new RenderItem_FinishingAnvil(
-																	this);
 
 	public final TileEntity_FinishingAnvil	inventory;
 	private ResourceLocation				forGui;
 
 	private int								leftButtonPosX	= 0;
-	private final int						leftButtonPosY	= 0;
-	private int								xLIcon_one, yLIcon_one;
-	private int								xLIcon_two, yLIcon_two;
-	private int								xLIcon_three, yLIcon_three;
 	private int								leftSelect		= 0;
 
-	private int								rightButtonPosX	= 0;
-	private int								rightButtonPosY	= 0;
-	private int								xRIcon_one, yRIcon_one;
-	private int								xRIcon_two, yRIcon_two;
-	private int								xRIcon_three, yRIcon_three;
+	private int								rightButtonPos	= 0;
+	private final int						rightSelect		= 0;
 
 	String[]								renders;
 
-	NBTTagCompound							tags;
-
 	boolean									renderFlat		= true;
 	boolean									renderBiped		= true;
 	int										rotation		= 0;
@@ -70,8 +68,8 @@ public class Gui_FinishingAnvil extends GuiContainer
 	InventoryPlayer							player;
 
 	private static final ResourceLocation	iconLocation	= new ResourceLocation(
-																	"tinkersdefense",
-																	"textures/gui/finishinganvil.png");
+			"tinkersdefense",
+			"textures/gui/finishinganvil.png");
 
 	public Gui_FinishingAnvil(InventoryPlayer invPlayer, TileEntity_FinishingAnvil te)
 	{
@@ -92,20 +90,20 @@ public class Gui_FinishingAnvil extends GuiContainer
 	{
 		super.initGui();
 		buttonList.add(new GuiButtonExt(1, guiLeft + 25, guiTop + 11, 10, 10,
-				"⇑"));
+				""));
 		buttonList.add(new GuiButtonExt(2, guiLeft + 25, guiTop + 61, 10, 10,
-				"⇓"));
+				""));
 		buttonList.add(new GuiButtonExt(3, guiLeft + 38, guiTop + 53, 18, 18,
-				"✓"));
+				""));
 
 		buttonList.add(new GuiButtonExt(4, guiLeft + 5, guiTop + 11, 20, 20, ""));
 		buttonList.add(new GuiButtonExt(5, guiLeft + 5, guiTop + 31, 20, 20, ""));
 		buttonList.add(new GuiButtonExt(6, guiLeft + 5, guiTop + 51, 20, 20, ""));
 
 		buttonList.add(new GuiButtonExt(7, guiLeft + 141, guiTop + 11, 10, 10,
-				"⇑"));
+				""));
 		buttonList.add(new GuiButtonExt(8, guiLeft + 141, guiTop + 61, 10, 10,
-				"⇓"));
+				""));
 
 		buttonList.add(new GuiButtonExt(9, guiLeft + 151, guiTop + 11, 20, 20,
 				""));
@@ -115,7 +113,7 @@ public class Gui_FinishingAnvil extends GuiContainer
 				""));
 
 		buttonList.add(new GuiButtonExt(12, guiLeft + 38, guiTop + 11, 18, 18,
-				"∅"));
+				""));
 		buttonList.add(new GuiButtonExt(13, guiLeft + 120, guiTop + 11, 18, 18,
 				"3D"));
 		buttonList.add(new GuiButtonExt(14, guiLeft + 120, guiTop + 53, 18, 18,
@@ -130,7 +128,7 @@ public class Gui_FinishingAnvil extends GuiContainer
 	@Override
 	protected void actionPerformed(GuiButton button)
 	{
-		if(tags != null)
+		if(bigCopy != null && bigCopyTags != null)
 		{
 			switch(button.id)
 			{
@@ -155,27 +153,26 @@ public class Gui_FinishingAnvil extends GuiContainer
 
 				case 4:
 					leftSelect = 0 + leftButtonPosX;
-					rightButtonPosY = 0 + (leftButtonPosX * 3);
+					rightButtonPos = 0;
+					setRenders();
 					break;
 				case 5:
 					leftSelect = 1 + leftButtonPosX;
-					rightButtonPosY = 3 + (leftButtonPosX * 3);
+					rightButtonPos = 0;
+					setRenders();
 					break;
 				case 6:
 					leftSelect = 2 + leftButtonPosX;
-					rightButtonPosY = 6 + (leftButtonPosX * 3);
+					rightButtonPos = 0;
+					setRenders();
 					break;
 
 				case 7:
-					if(rightButtonPosX > 0)
+					if(rightButtonPos > 0)
 					{
-						rightButtonPosX--;
-					}
-					else if(rightButtonPosY > (0 + leftSelect * 4))
-					{
-						rightButtonPosY--;
-						rightButtonPosX = 15;
+						rightButtonPos--;
 					}
+					setRenders();
 					break;
 
 				case 13:
@@ -220,55 +217,53 @@ public class Gui_FinishingAnvil extends GuiContainer
 		switch(id)
 		{
 			case 9:
-				if(tags.hasKey("Render" + renders[leftSelect]))
+				if(bigCopyTags.hasKey("Render" + renders[leftSelect]))
 				{
-					tags.setInteger("Render" + renders[leftSelect], bigCopy.getTagCompound().getCompoundTag("InfiTool").getInteger(renders[leftSelect]) + ((rightButtonPosX + ((rightButtonPosY % 3) * 16)) * TinkersDefense.config.MaterialIndex));
-					if(rightButtonPosX > 0)
+					bigCopyTags.setInteger("Render" + renders[leftSelect], bigCopy.getTagCompound().getCompoundTag("InfiTool").getInteger(renders[leftSelect]) + (rightButtonPos * TinkersDefense.config.MaterialIndex));
+					if(rightButtonPos > 0)
 					{
-						tags.setInteger(renders[leftSelect] + "Color", TConstructRegistry.getMaterial(tags.getInteger(renders[leftSelect])).primaryColor());
+						bigCopyTags.setInteger(renders[leftSelect] + "Color", TConstructRegistry.getMaterial(bigCopyTags.getInteger(renders[leftSelect])).primaryColor());
 					}
 					else
 					{
-						tags.removeTag(renders[leftSelect] + "Color");
+						bigCopyTags.removeTag(renders[leftSelect] + "Color");
 					}
 				}
 				break;
 
 			case 10:
-				if(tags.hasKey("Render" + renders[leftSelect]))
+				if(bigCopyTags.hasKey("Render" + renders[leftSelect]))
 				{
-					tags.setInteger("Render" + renders[leftSelect], bigCopy.getTagCompound().getCompoundTag("InfiTool").getInteger(renders[leftSelect]) + ((rightButtonPosX + 1 + ((rightButtonPosY % 3) * 16)) * TinkersDefense.config.MaterialIndex));
-					tags.setInteger(renders[leftSelect] + "Color", TConstructRegistry.getMaterial(tags.getInteger(renders[leftSelect])).primaryColor());
+					bigCopyTags.setInteger("Render" + renders[leftSelect], bigCopy.getTagCompound().getCompoundTag("InfiTool").getInteger(renders[leftSelect]) + ((rightButtonPos + 1) * TinkersDefense.config.MaterialIndex));
+					bigCopyTags.setInteger(renders[leftSelect] + "Color", TConstructRegistry.getMaterial(bigCopyTags.getInteger(renders[leftSelect])).primaryColor());
 				}
 				break;
 
 			case 11:
-				if(tags.hasKey("Render" + renders[leftSelect]))
+				if(bigCopyTags.hasKey("Render" + renders[leftSelect]))
 				{
-					tags.setInteger("Render" + renders[leftSelect], bigCopy.getTagCompound().getCompoundTag("InfiTool").getInteger(renders[leftSelect]) + ((rightButtonPosX + 2 + ((rightButtonPosY % 3) * 16)) * TinkersDefense.config.MaterialIndex));
-					tags.setInteger(renders[leftSelect] + "Color", TConstructRegistry.getMaterial(tags.getInteger(renders[leftSelect])).primaryColor());
+					bigCopyTags.setInteger("Render" + renders[leftSelect], bigCopy.getTagCompound().getCompoundTag("InfiTool").getInteger(renders[leftSelect]) + ((rightButtonPos + 2) * TinkersDefense.config.MaterialIndex));
+					bigCopyTags.setInteger(renders[leftSelect] + "Color", TConstructRegistry.getMaterial(bigCopyTags.getInteger(renders[leftSelect])).primaryColor());
 				}
 				break;
 
 			case 12:
-				tags.setInteger("RenderHead", bigCopy.getTagCompound().getCompoundTag("InfiTool").getInteger(renders[0]));
-				tags.setInteger("RenderAccessory", bigCopy.getTagCompound().getCompoundTag("InfiTool").getInteger(renders[1]));
-				tags.setInteger("RenderHandle", bigCopy.getTagCompound().getCompoundTag("InfiTool").getInteger(renders[2]));
-				tags.setInteger("RenderExtra", bigCopy.getTagCompound().getCompoundTag("InfiTool").getInteger(renders[3]));
-
-				tags.removeTag(renders[0] + "Color");
-				tags.removeTag(renders[1] + "Color");
-				tags.removeTag(renders[2] + "Color");
-				tags.removeTag(renders[3] + "Color");
+				bigCopyTags.setInteger("RenderHead", bigCopy.getTagCompound().getCompoundTag("InfiTool").getInteger(renders[0]));
+				bigCopyTags.setInteger("RenderAccessory", bigCopy.getTagCompound().getCompoundTag("InfiTool").getInteger(renders[1]));
+				bigCopyTags.setInteger("RenderHandle", bigCopy.getTagCompound().getCompoundTag("InfiTool").getInteger(renders[2]));
+				bigCopyTags.setInteger("RenderExtra", bigCopy.getTagCompound().getCompoundTag("InfiTool").getInteger(renders[3]));
+
+				bigCopyTags.removeTag(renders[0] + "Color");
+				bigCopyTags.removeTag(renders[1] + "Color");
+				bigCopyTags.removeTag(renders[2] + "Color");
+				bigCopyTags.removeTag(renders[3] + "Color");
+
+				setRenders();
 				break;
 
 			case 8:
-				rightButtonPosX++;
-				if(rightButtonPosX >= 16)
-				{
-					rightButtonPosY++;
-					rightButtonPosX = 0;
-				}
+				rightButtonPos++;
+				setRenders();
 				break;
 
 		}
@@ -276,40 +271,32 @@ public class Gui_FinishingAnvil extends GuiContainer
 
 	public void doArmorEdit(int id)
 	{
-		final NBTTagCompound aTags = bigCopy.getTagCompound().getCompoundTag("ArmorRenderer");
+		NBTTagCompound aTags = bigCopy.getTagCompound().getCompoundTag("ArmorRenderer");
 		final ArmorCore armor = (ArmorCore) bigCopy.getItem();
 		final List<ModelRenderer> boxes = armor.getRenderer().boxList;
 
 		switch(id)
 		{
 			case 9:
-				aTags.setBoolean(boxes.get(rightButtonPosX + 9).boxName, !aTags.getBoolean(boxes.get(rightButtonPosX + (rightButtonPosY % 3) + 9).boxName));
+				aTags.setBoolean(boxes.get(rightButtonPos + 9).boxName, !aTags.getBoolean(boxes.get(rightButtonPos + 9).boxName));
 				break;
 
 			case 10:
-				aTags.setBoolean(boxes.get(rightButtonPosX + 1 + 9).boxName, !aTags.getBoolean(boxes.get(rightButtonPosX + 1 + (rightButtonPosY % 3) + 9).boxName));
+				aTags.setBoolean(boxes.get(rightButtonPos + 1 + 9).boxName, !aTags.getBoolean(boxes.get(rightButtonPos + 1 + 9).boxName));
 				break;
 
 			case 11:
-				aTags.setBoolean(boxes.get(rightButtonPosX + 2 + 9).boxName, !aTags.getBoolean(boxes.get(rightButtonPosX + 2 + (rightButtonPosY % 3) + 9).boxName));
+				aTags.setBoolean(boxes.get(rightButtonPos + 2 + 9).boxName, !aTags.getBoolean(boxes.get(rightButtonPos + 2 + 9).boxName));
 				break;
 
 			case 12:
-				tags.setInteger("RenderHead", bigCopy.getTagCompound().getCompoundTag("InfiTool").getInteger(renders[0]));
-				tags.setInteger("RenderAccessory", bigCopy.getTagCompound().getCompoundTag("InfiTool").getInteger(renders[1]));
-				tags.setInteger("RenderHandle", bigCopy.getTagCompound().getCompoundTag("InfiTool").getInteger(renders[2]));
-				tags.setInteger("RenderExtra", bigCopy.getTagCompound().getCompoundTag("InfiTool").getInteger(renders[3]));
-
-				tags.removeTag(renders[0] + "Color");
-				tags.removeTag(renders[1] + "Color");
-				tags.removeTag(renders[2] + "Color");
-				tags.removeTag(renders[3] + "Color");
+				aTags = armor.getRenderer().defaultTags;
 				break;
 
 			case 8:
-				if(rightButtonPosX < boxes.size() - 12)
+				if(rightButtonPos < boxes.size() - 12)
 				{
-					rightButtonPosX++;
+					rightButtonPos++;
 				}
 				break;
 
@@ -320,17 +307,20 @@ public class Gui_FinishingAnvil extends GuiContainer
 	public void drawScreen(int x, int y, float par3)
 	{
 
-		if(inventory.getStackInSlot(0) != null)
+		if(inventory.getStackInSlot(0) != null && inventory.getStackInSlot(0).getItem() instanceof ToolCore)
 		{
 			if(bigCopy == null)
 			{
+				rightButtonPos = 0;
+				leftButtonPosX = 0;
 				bigCopy = inventory.getStackInSlot(0).copy();
 				if(bigCopy.hasTagCompound() && bigCopy.getTagCompound().hasKey("InfiTool"))
 				{
-					tags = bigCopy.getTagCompound().getCompoundTag("InfiTool");
+					bigCopyTags = bigCopy.getTagCompound().getCompoundTag("InfiTool");
 				}
+				setRenders();
 			}
-			else if(inventory.getStackInSlot(0).getItem() != bigCopy.getItem() || inventory.getStackInSlot(0).getItemDamage() != bigCopy.getItemDamage())
+			else if(bigCopy != null && inventory.getStackInSlot(0).getItem() != bigCopy.getItem() || inventory.getStackInSlot(0).getItemDamage() != bigCopy.getItemDamage())
 			{
 				bigCopy = null;
 			}
@@ -342,95 +332,52 @@ public class Gui_FinishingAnvil extends GuiContainer
 
 		super.drawScreen(x, y, par3);
 		drawTooltip(x, y);
-		xSize_lo = x;
-		ySize_lo = y;
 	}
 
 	@Override
 	protected void drawGuiContainerForegroundLayer(int par1, int par2)
 	{
+
 		mc.getTextureManager().bindTexture(iconLocation);
 
+		GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+
+		drawTexturedModalRect(144, 14, 5, 167, 5, 3);
+		drawTexturedModalRect(144, 64, 0, 167, 5, 3);
+		drawTexturedModalRect(39, 54, 32, 176, 16, 16);
+		drawTexturedModalRect(39, 12, 48, 176, 16, 16);
+		drawTexturedModalRect(28, 14, 5, 167, 5, 3);
+		drawTexturedModalRect(28, 64, 0, 167, 5, 3);
 		drawTexturedModalRect(121, 54, 16, 176, 16, 16);
 
-		xLIcon_one = 0;
-		yLIcon_one = 176;
-		xLIcon_two = 0;
-		yLIcon_two = 176;
-		xLIcon_three = 0;
-		yLIcon_three = 176;
-
-		xRIcon_one = 0;
-		yRIcon_one = 176;
-		xRIcon_two = 0;
-		yRIcon_two = 176;
-		xRIcon_three = 0;
-		yRIcon_three = 176;
-
-		if(inventory.getStackInSlot(0) != null)
+		if(bigCopy != null)
 		{
-			editItem = inventory.getStackInSlot(0);
-			if(editItem.getItem() instanceof ToolCore)
-			{
-				//this.drawTexturedModelRectFromIcon(this.guiLeft+4, this.guiTop+14, 
-				//		((ToolCore)this.inventorySlots.inventorySlots.get(0)).getHeadItem(), 16, 16);
-
-				GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
-				forGui = new ResourceLocation(
-						"tinkersdefense",
-						"textures/gui/" + ((ToolCore) editItem.getItem()).getDefaultFolder() + ".png");
-				xLIcon_one = 32;
-				yLIcon_one = 0;
-				xLIcon_two = 48;
-				yLIcon_two = 0;
-				xLIcon_three = 64;
-				yLIcon_three = 0;
-
-				xRIcon_one = 0;
-				yRIcon_one = 32;
-				xRIcon_two = 16;
-				yRIcon_two = 32;
-				xRIcon_three = 32;
-				yRIcon_three = 32;
-			}
-		}
 
-		if(forGui != null && bigCopy != null)
-		{
 			if(!(bigCopy.getItem() instanceof ArmorCore))
 			{
-				mc.getTextureManager().bindTexture(forGui);
-
-				if(inventory.getStackInSlot(0) != null)
+				if(renderFlat)
 				{
-					//			int leftMax = leftSelect;
-					//			if(leftMax > 2)
-					//				leftMax = 2;
-					drawTexturedModalRect(7, 13 + ((leftSelect - leftButtonPosX) * 20), 16, 0, 16, 16);
-				}
-
-				drawTexturedModalRect(7, 13, xLIcon_one + (leftButtonPosX * 16), yLIcon_one + 0, 16, 16);
-				drawTexturedModalRect(7, 33, xLIcon_two + (leftButtonPosX * 16), yLIcon_two + 0, 16, 16);
-				drawTexturedModalRect(7, 53, xLIcon_three + (leftButtonPosX * 16), yLIcon_three + 0, 16, 16);
+					if(leftSelect > 2)
+					{
+						drawTexturedModalRect(7, 13, 16, 192, 16, 16);
+						drawTexturedModalRect(7, 33, 32, 192, 16, 16);
+						drawTexturedModalRect(7, 53, 48, 192, 16, 16);
+					}
+					else
+					{
+						drawTexturedModalRect(7, 13, 0, 192, 16, 16);
+						drawTexturedModalRect(7, 33, 16, 192, 16, 16);
+						drawTexturedModalRect(7, 53, 32, 192, 16, 16);
+					}
 
-				drawTexturedModalRect(153, 13, xRIcon_one + (rightButtonPosX * 16), yRIcon_one + (rightButtonPosY * 16), 16, 16);
+					((GuiButtonExt) buttonList.get(14)).enabled = false;
+					((GuiButtonExt) buttonList.get(15)).enabled = false;
+					((GuiButtonExt) buttonList.get(12)).displayString = "3D";
 
-				if(rightButtonPosX + 1 < 16)
-				{
-					drawTexturedModalRect(153, 33, xRIcon_two + (rightButtonPosX * 16), yRIcon_two + (rightButtonPosY * 16), 16, 16);
-				}
-				else
-				{
-					drawTexturedModalRect(153, 33, xRIcon_two + ((rightButtonPosX - 16) * 16), yRIcon_two + ((rightButtonPosY + 1) * 16), 16, 16);
-				}
+					normalRender.renderItemAndEffectIntoGUI(fontRendererObj, mc.getTextureManager(), rightCopy1, 153, 13);
+					normalRender.renderItemAndEffectIntoGUI(fontRendererObj, mc.getTextureManager(), rightCopy2, 153, 33);
+					normalRender.renderItemAndEffectIntoGUI(fontRendererObj, mc.getTextureManager(), rightCopy3, 153, 53);
 
-				if(rightButtonPosX + 2 < 16)
-				{
-					drawTexturedModalRect(153, 53, xRIcon_three + (rightButtonPosX * 16), yRIcon_three + (rightButtonPosY * 16), 16, 16);
-				}
-				else
-				{
-					drawTexturedModalRect(153, 53, xRIcon_three + ((rightButtonPosX - 16) * 16), yRIcon_three + ((rightButtonPosY + 1) * 16), 16, 16);
 				}
 			}
 			else
@@ -443,37 +390,32 @@ public class Gui_FinishingAnvil extends GuiContainer
 				drawTexturedModalRect(7, 33, 0, 176, 16, 16);
 				drawTexturedModalRect(7, 53, 0, 176, 16, 16);
 
-				//drawTexturedModalRect(153, 13, xRIcon_one + (rightButtonPosX * 16), yRIcon_one + (rightButtonPosY * 16), 16, 16);
+				//drawTexturedModalRect(153, 13, xRIcon_one + (rightButtonPos * 16), yRIcon_one + (rightButtonPosY * 16), 16, 16);
 
-				drawTexturedModalRect(153, 13, 64 + ((aTags.getBoolean(boxes.get(rightButtonPosX + 9).boxName) ? 0 : 1) * 16), 176, 16, 16);
-				drawTexturedModalRect(153, 33, 64 + ((aTags.getBoolean(boxes.get(rightButtonPosX + 1 + 9).boxName) ? 0 : 1) * 16), 176, 16, 16);
-				drawTexturedModalRect(153, 53, 64 + ((aTags.getBoolean(boxes.get(rightButtonPosX + 2 + 9).boxName) ? 0 : 1) * 16), 176, 16, 16);
+				drawTexturedModalRect(153, 13, 64 + ((aTags.getBoolean(boxes.get(rightButtonPos + 9).boxName) ? 0 : 1) * 16), 176, 16, 16);
+				drawTexturedModalRect(153, 33, 64 + ((aTags.getBoolean(boxes.get(rightButtonPos + 1 + 9).boxName) ? 0 : 1) * 16), 176, 16, 16);
+				drawTexturedModalRect(153, 53, 64 + ((aTags.getBoolean(boxes.get(rightButtonPos + 2 + 9).boxName) ? 0 : 1) * 16), 176, 16, 16);
+
+			}
 
+			if(renderFlat)
+			{
+				bigRender.renderItemAndEffectIntoGUI(fontRendererObj, mc.getTextureManager(), bigCopy, 17, 4);
 			}
+
 		}
-		GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+
 	}
 
 	@Override
 	protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3)
 	{
-
 		mc.getTextureManager().bindTexture(iconLocation);
 		final int k = ((width - xSize) / 2);
 		final int l = (height - ySize) / 2;
 		drawTexturedModalRect(k, l, 0, 0, xSize + 80, ySize);
 
-		if(renderFlat)
-		{
-			((GuiButtonExt) buttonList.get(14)).enabled = false;
-			((GuiButtonExt) buttonList.get(15)).enabled = false;
-			((GuiButtonExt) buttonList.get(12)).displayString = "3D";
-
-			final ScaledResolution scaledresolution = new ScaledResolution(mc,
-					mc.displayWidth, mc.displayHeight);
-			bigRender.renderItemAndEffectIntoGUI(fontRendererObj, mc.getTextureManager(), bigCopy, (int) (((scaledresolution.getScaledWidth() - 58) / 2) / 3.4), (int) (((scaledresolution.getScaledHeight() - 136) / 2) / 3.4));
-		}
-		else
+		if(!renderFlat)
 		{
 			if(bigCopy != null && bigCopy.getItem() instanceof ArmorCore)
 			{
@@ -487,8 +429,6 @@ public class Gui_FinishingAnvil extends GuiContainer
 				final ArmorRenderer renderer = (ArmorRenderer) armor.getArmorModel(null, bigCopy, 0);
 				renderer.isChild = false;
 
-				final float yaw = player.player.prevRotationYawHead + (player.player.rotationYawHead - player.player.prevRotationYawHead);
-				final float yawOffset = player.player.prevRenderYawOffset + (player.player.renderYawOffset - player.player.prevRenderYawOffset);
 				final float limbs = player.player.prevLimbSwingAmount + (player.player.limbSwingAmount - player.player.prevLimbSwingAmount);
 				final float limbSwing = player.player.limbSwing - player.player.limbSwingAmount * (1.0F);
 
@@ -525,16 +465,17 @@ public class Gui_FinishingAnvil extends GuiContainer
 					final ModelBiped biped = new ModelBiped(0f);
 					//biped.bipedHeadwear.isHidden = true;
 					//biped.bipedHead.isHidden = true;
-					ResourceLocation rc = AbstractClientPlayer.getLocationSkin(player.player.getDisplayName());
-					;
+					final ResourceLocation rc = new ResourceLocation(
+							Minecraft.getMinecraft().thePlayer.getLocationSkin().toString());
+
 					FMLClientHandler.instance().getClient().renderEngine.bindTexture(rc);
-					final ITextureObject tex = FMLClientHandler.instance().getClient().getTextureManager().getTexture(rc);
-					if(tex.getGlTextureId() == 1)
-					{
-						rc = new ResourceLocation(
-								"minecraft:textures/entity/steve.png");
-						FMLClientHandler.instance().getClient().renderEngine.bindTexture(rc);
-					}
+					//					final ITextureObject tex = FMLClientHandler.instance().getClient().getTextureManager().getTexture(rc);
+					//					if(tex.getGlTextureId() == 1)
+					//					{
+					//						rc = new ResourceLocation(
+					//								"minecraft:textures/entity/steve.png");
+					//						FMLClientHandler.instance().getClient().renderEngine.bindTexture(rc);
+					//					}
 
 					biped.isChild = false;
 					biped.render(player.player, limbSwing, limbs, player.player.ticksExisted, 0, 0, 0.0625f);
@@ -556,6 +497,7 @@ public class Gui_FinishingAnvil extends GuiContainer
 				renderFlat = true;
 			}
 		}
+
 	}
 
 	protected void drawTooltip(int x, int y)
@@ -572,7 +514,8 @@ public class Gui_FinishingAnvil extends GuiContainer
 				if(bigCopy != null && bigCopy.getItem() instanceof ToolCore)
 				{
 					final ToolCore tool = (ToolCore) bigCopy.getItem();
-					final ToolCoreTip tt = ((Injector) TinkersDefense.tcInject).tools.get(tool.getToolName());
+					final String toolName = tool.getUnlocalizedName().toLowerCase().substring(tool.getUnlocalizedName().lastIndexOf('.') + 1, tool.getUnlocalizedName().length());
+					final ToolCoreTip tt = ((Injector) TinkersDefense.tcInject).tools.get(toolName);
 					final List<String> list = new ArrayList();
 
 					if(tt != null)
@@ -582,25 +525,25 @@ public class Gui_FinishingAnvil extends GuiContainer
 							case 0:
 								list.add(tt.getPart(1 + leftButtonPosX));
 								break;
-							case 1:
+							case 2:
 								list.add(tt.getPart(3 + leftButtonPosX));
 								break;
-							case 2:
+							case 1:
 								list.add(tt.getPart(2 + leftButtonPosX));
 								break;
 
 							case 3:
-								list.add(tt.getPartName(leftSelect + 1, (rightButtonPosX + ((rightButtonPosY % 3) * 16))));
+								list.add(tt.getPartName(leftSelect + 1, (rightButtonPos)));
 								break;
 							case 4:
-								list.add(tt.getPartName(leftSelect + 1, (rightButtonPosX + 1 + ((rightButtonPosY % 3) * 16))));
+								list.add(tt.getPartName(leftSelect + 1, (rightButtonPos + 1)));
 								break;
 							case 5:
-								list.add(tt.getPartName(leftSelect + 1, (rightButtonPosX + 2 + ((rightButtonPosY % 3) * 16))));
+								list.add(tt.getPartName(leftSelect + 1, (rightButtonPos + 2)));
 								break;
 						}
 
-						if(list.get(0).contains("Metallurgy"))
+						if(list.get(0).contains("m5"))
 						{
 							list.add(" -by Shadowclaimer");
 						}
@@ -608,7 +551,7 @@ public class Gui_FinishingAnvil extends GuiContainer
 					}
 					else if(bigCopy.getItem() instanceof ArmorCore)
 					{
-						final NBTTagCompound aTags = bigCopy.getTagCompound().getCompoundTag("ArmorRenderer");
+						bigCopy.getTagCompound().getCompoundTag("ArmorRenderer");
 						final ArmorCore armor = (ArmorCore) bigCopy.getItem();
 						final List<ModelRenderer> boxes = armor.getRenderer().boxList;
 
@@ -620,13 +563,13 @@ public class Gui_FinishingAnvil extends GuiContainer
 								break;
 
 							case 3:
-								list.add(boxes.get(rightButtonPosX + 9).boxName);
+								list.add(boxes.get(rightButtonPos + 9).boxName);
 								break;
 							case 4:
-								list.add(boxes.get(rightButtonPosX + 1 + 9).boxName);
+								list.add(boxes.get(rightButtonPos + 1 + 9).boxName);
 								break;
 							case 5:
-								list.add(boxes.get(rightButtonPosX + 2 + 9).boxName);
+								list.add(boxes.get(rightButtonPos + 2 + 9).boxName);
 								break;
 						}
 						func_146283_a(list, x, y);
@@ -640,4 +583,25 @@ public class Gui_FinishingAnvil extends GuiContainer
 			}
 		}
 	}
+
+	void setRenders()
+	{
+		rightCopy1 = bigCopy.copy();
+		rightCopyTags1 = (NBTTagCompound) bigCopyTags.copy();
+		rightCopyTags1.setInteger("Render" + renders[leftSelect], bigCopy.getTagCompound().getCompoundTag("InfiTool").getInteger(renders[leftSelect]) + ((rightButtonPos) * TinkersDefense.config.MaterialIndex));
+		rightCopyTags1.setInteger(renders[leftSelect] + "Color", TConstructRegistry.getMaterial(bigCopyTags.getInteger(renders[leftSelect])).primaryColor());
+		rightCopy1.getTagCompound().setTag("InfiTool", rightCopyTags1);
+
+		rightCopy2 = bigCopy.copy();
+		rightCopyTags2 = (NBTTagCompound) bigCopyTags.copy();
+		rightCopyTags2.setInteger("Render" + renders[leftSelect], bigCopy.getTagCompound().getCompoundTag("InfiTool").getInteger(renders[leftSelect]) + ((rightButtonPos + 1) * TinkersDefense.config.MaterialIndex));
+		rightCopyTags2.setInteger(renders[leftSelect] + "Color", TConstructRegistry.getMaterial(bigCopyTags.getInteger(renders[leftSelect])).primaryColor());
+		rightCopy2.getTagCompound().setTag("InfiTool", rightCopyTags2);
+
+		rightCopy3 = bigCopy.copy();
+		rightCopyTags3 = (NBTTagCompound) bigCopyTags.copy();
+		rightCopyTags3.setInteger("Render" + renders[leftSelect], bigCopy.getTagCompound().getCompoundTag("InfiTool").getInteger(renders[leftSelect]) + ((rightButtonPos + 2) * TinkersDefense.config.MaterialIndex));
+		rightCopyTags3.setInteger(renders[leftSelect] + "Color", TConstructRegistry.getMaterial(bigCopyTags.getInteger(renders[leftSelect])).primaryColor());
+		rightCopy3.getTagCompound().setTag("InfiTool", rightCopyTags3);
+	}
 }
diff --git a/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/ModelFinishingAnvil.java b/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/ModelFinishingAnvil.java
index cf7253a..843b6c9 100644
--- a/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/ModelFinishingAnvil.java
+++ b/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/ModelFinishingAnvil.java
@@ -19,38 +19,38 @@ public class ModelFinishingAnvil extends ModelBase
 
 	public ModelFinishingAnvil()
 	{
-		this.textureWidth = 64;
-		this.textureHeight = 64;
-		this.AnvilTop = new ModelRenderer(this, 0, 22);
-		this.AnvilTop.setRotationPoint(-4.0F, 6.0F, -6.0F);
-		this.AnvilTop.addBox(0.0F, 0.0F, 0.0F, 8, 6, 12, 0.0F);
-		this.HammerHead = new ModelRenderer(this, 15, 21);
-		this.HammerHead.setRotationPoint(-1.3F, 4.0F, 0.0F);
-		this.HammerHead.addBox(0.0F, 0.0F, 0.0F, 3, 2, 2, 0.0F);
-		this.setRotateAngle(HammerHead, 0.091106186954104F, -0.5462880558742251F, 0.0F);
-		this.AnvilStem = new ModelRenderer(this, 10, 32);
-		this.AnvilStem.setRotationPoint(-2.0F, 12.0F, -3.0F);
-		this.AnvilStem.addBox(0.0F, 0.0F, 0.0F, 4, 2, 6, 0.0F);
-		this.HammerHandle = new ModelRenderer(this, 17, 47);
-		this.HammerHandle.setRotationPoint(1.0F, 0.5F, -6.0F);
-		this.HammerHandle.addBox(0.0F, 0.0F, 0.0F, 1, 1, 6, 0.0F);
-		this.AnvilBase = new ModelRenderer(this, 2, 28);
-		this.AnvilBase.setRotationPoint(-4.0F, 14.0F, -5.0F);
-		this.AnvilBase.addBox(0.0F, 0.0F, 0.0F, 8, 2, 10, 0.0F);
-		this.Log = new ModelRenderer(this, 0, 40);
-		this.Log.setRotationPoint(-8.0F, 16.0F, -8.0F);
-		this.Log.addBox(0.0F, 0.0F, 0.0F, 16, 8, 16, 0.0F);
-		this.HammerHead.addChild(this.HammerHandle);
+		textureWidth = 64;
+		textureHeight = 64;
+		AnvilTop = new ModelRenderer(this, 0, 22);
+		AnvilTop.setRotationPoint(-4.0F, 6.0F, -6.0F);
+		AnvilTop.addBox(0.0F, 0.0F, 0.0F, 8, 6, 12, 0.0F);
+		HammerHead = new ModelRenderer(this, 15, 21);
+		HammerHead.setRotationPoint(-1.3F, 4.0F, 0.0F);
+		HammerHead.addBox(0.0F, 0.0F, 0.0F, 3, 2, 2, 0.0F);
+		setRotateAngle(HammerHead, 0.091106186954104F, -0.5462880558742251F, 0.0F);
+		AnvilStem = new ModelRenderer(this, 10, 32);
+		AnvilStem.setRotationPoint(-2.0F, 12.0F, -3.0F);
+		AnvilStem.addBox(0.0F, 0.0F, 0.0F, 4, 2, 6, 0.0F);
+		HammerHandle = new ModelRenderer(this, 17, 47);
+		HammerHandle.setRotationPoint(1.0F, 0.5F, -6.0F);
+		HammerHandle.addBox(0.0F, 0.0F, 0.0F, 1, 1, 6, 0.0F);
+		AnvilBase = new ModelRenderer(this, 2, 28);
+		AnvilBase.setRotationPoint(-4.0F, 14.0F, -5.0F);
+		AnvilBase.addBox(0.0F, 0.0F, 0.0F, 8, 2, 10, 0.0F);
+		Log = new ModelRenderer(this, 0, 40);
+		Log.setRotationPoint(-8.0F, 16.0F, -8.0F);
+		Log.addBox(0.0F, 0.0F, 0.0F, 16, 8, 16, 0.0F);
+		HammerHead.addChild(HammerHandle);
 	}
 
 	@Override
 	public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5)
 	{
-		this.AnvilTop.render(f5);
-		this.HammerHead.render(f5);
-		this.AnvilStem.render(f5);
-		this.AnvilBase.render(f5);
-		this.Log.render(f5);
+		AnvilTop.render(f5);
+		HammerHead.render(f5);
+		AnvilStem.render(f5);
+		AnvilBase.render(f5);
+		Log.render(f5);
 	}
 
 	/**
diff --git a/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/RenderItem_FinishingAnvil.java b/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/RenderItem_FinishingAnvil.java
index edbd414..834b583 100644
--- a/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/RenderItem_FinishingAnvil.java
+++ b/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/RenderItem_FinishingAnvil.java
@@ -11,31 +11,35 @@ import org.lwjgl.opengl.GL11;
 
 public class RenderItem_FinishingAnvil extends RenderItem
 {
-	private Gui_FinishingAnvil	anvilGui;
+	private final Gui_FinishingAnvil	anvilGui;
+	float								sx;
+	float								sy;
+	float								sz;
 
-	RenderItem_FinishingAnvil(Gui_FinishingAnvil gui)
+	RenderItem_FinishingAnvil(Gui_FinishingAnvil gui, float sx, float sy, float sz)
 	{
 		super();
 		anvilGui = gui;
+		this.sx = sx;
+		this.sy = sy;
+		this.sz = sz;
 	}
 
 	@Override
 	public void renderItemAndEffectIntoGUI(FontRenderer fontRenderer, TextureManager textureManager, ItemStack itemStack, int x, int y)
 	{
 		if(itemStack == null)
-		{
 			return;
-		}
 
 		RenderHelper.enableGUIStandardItemLighting();
 
-		Slot slot = anvilGui.inventorySlots.getSlotFromInventory(anvilGui.inventory, 0);
+		final Slot slot = anvilGui.inventorySlots.getSlotFromInventory(anvilGui.inventory, 0);
 
 		if(slot.getStack() != null)
 		{
 			GL11.glPushMatrix();
 
-			GL11.glScalef(3.438f, 3.43f, 1.0f);
+			GL11.glScalef(sx, sy, sz);
 			super.renderItemAndEffectIntoGUI(fontRenderer, textureManager, itemStack, x, y);
 
 			GL11.glPopMatrix();
diff --git a/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/Renderer_FinishingAnvil.java b/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/Renderer_FinishingAnvil.java
index db95e9f..c3013e4 100644
--- a/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/Renderer_FinishingAnvil.java
+++ b/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/Renderer_FinishingAnvil.java
@@ -14,7 +14,7 @@ public class Renderer_FinishingAnvil extends TileEntitySpecialRenderer
 
 	public Renderer_FinishingAnvil()
 	{
-		this.model = new ModelFinishingAnvil();
+		model = new ModelFinishingAnvil();
 	}
 
 	@Override
@@ -25,17 +25,18 @@ public class Renderer_FinishingAnvil extends TileEntitySpecialRenderer
 
 		GL11.glTranslatef((float) x + 0.5F, (float) y + 1.5F, (float) z + 0.5F);
 
-		ResourceLocation textures = (new ResourceLocation("tinkersdefense:textures/blocks/ArmorAnvil.png"));
+		final ResourceLocation textures = (new ResourceLocation(
+				"tinkersdefense:textures/blocks/armoranvil.png"));
 
 		Minecraft.getMinecraft().renderEngine.bindTexture(textures);
 
 		GL11.glPushMatrix();
 
-		int meta = te.getBlockMetadata();
+		te.getBlockMetadata();
 
 		GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F);
 
-		this.model.render((Entity) null, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F);
+		model.render((Entity) null, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F);
 		GL11.glPopMatrix();
 		GL11.glPopMatrix();
 
diff --git a/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/TileEntity_FinishingAnvil.java b/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/TileEntity_FinishingAnvil.java
index 3e68d51..e0567bb 100644
--- a/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/TileEntity_FinishingAnvil.java
+++ b/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/TileEntity_FinishingAnvil.java
@@ -33,7 +33,7 @@ public class TileEntity_FinishingAnvil extends TileEntity implements IInventory
 	@Override
 	public Packet getDescriptionPacket()
 	{
-		NBTTagCompound tag = new NBTTagCompound();
+		final NBTTagCompound tag = new NBTTagCompound();
 		writeToNBT(tag);
 		return new S35PacketUpdateTileEntity(xCoord, yCoord, zCoord, 0, tag);
 	}
@@ -76,7 +76,7 @@ public class TileEntity_FinishingAnvil extends TileEntity implements IInventory
 				setInventorySlotContents(slot, null);
 			}
 
-			this.markDirty();
+			markDirty();
 		}
 		return stack;
 	}
@@ -84,7 +84,7 @@ public class TileEntity_FinishingAnvil extends TileEntity implements IInventory
 	@Override
 	public ItemStack getStackInSlotOnClosing(int slot)
 	{
-		ItemStack stack = getStackInSlot(slot);
+		final ItemStack stack = getStackInSlot(slot);
 
 		if(stack != null)
 		{
@@ -96,14 +96,14 @@ public class TileEntity_FinishingAnvil extends TileEntity implements IInventory
 	@Override
 	public void setInventorySlotContents(int slot, ItemStack itemstack)
 	{
-		this.inventory[slot] = itemstack;
+		inventory[slot] = itemstack;
 
-		if(itemstack != null && itemstack.stackSize > this.getInventoryStackLimit())
+		if(itemstack != null && itemstack.stackSize > getInventoryStackLimit())
 		{
-			itemstack.stackSize = this.getInventoryStackLimit();
+			itemstack.stackSize = getInventoryStackLimit();
 		}
 
-		this.markDirty();
+		markDirty();
 	}
 
 	@Override
@@ -164,11 +164,11 @@ public class TileEntity_FinishingAnvil extends TileEntity implements IInventory
 
 	public void readInventoryFromNBT(NBTTagCompound tags)
 	{
-		NBTTagList nbttaglist = tags.getTagList("Items", Constants.NBT.TAG_COMPOUND);
+		final NBTTagList nbttaglist = tags.getTagList("Items", Constants.NBT.TAG_COMPOUND);
 		for(int iter = 0; iter < nbttaglist.tagCount(); iter++)
 		{
-			NBTTagCompound tagList = (NBTTagCompound) nbttaglist.getCompoundTagAt(iter);
-			byte slotID = tagList.getByte("Slot");
+			final NBTTagCompound tagList = nbttaglist.getCompoundTagAt(iter);
+			final byte slotID = tagList.getByte("Slot");
 			if(slotID >= 0 && slotID < inventory.length)
 			{
 				inventory[slotID] = ItemStack.loadItemStackFromNBT(tagList);
@@ -178,12 +178,12 @@ public class TileEntity_FinishingAnvil extends TileEntity implements IInventory
 
 	public void writeInventoryToNBT(NBTTagCompound tags)
 	{
-		NBTTagList nbttaglist = new NBTTagList();
+		final NBTTagList nbttaglist = new NBTTagList();
 		for(int iter = 0; iter < inventory.length; iter++)
 		{
 			if(inventory[iter] != null)
 			{
-				NBTTagCompound tagList = new NBTTagCompound();
+				final NBTTagCompound tagList = new NBTTagCompound();
 				tagList.setByte("Slot", (byte) iter);
 				inventory[iter].writeToNBT(tagList);
 				nbttaglist.appendTag(tagList);
diff --git a/src/main/java/lance5057/tDefense/finishingAnvil/utilities/FileGetter.java b/src/main/java/lance5057/tDefense/finishingAnvil/utilities/FileGetter.java
new file mode 100644
index 0000000..9221376
--- /dev/null
+++ b/src/main/java/lance5057/tDefense/finishingAnvil/utilities/FileGetter.java
@@ -0,0 +1,21 @@
+package lance5057.tDefense.finishingAnvil.utilities;
+
+import java.nio.file.FileVisitResult;
+import java.nio.file.Path;
+import java.nio.file.SimpleFileVisitor;
+import java.nio.file.attribute.BasicFileAttributes;
+import java.util.ArrayList;
+import java.util.List;
+
+public class FileGetter extends SimpleFileVisitor<Path>
+{
+	final public List<String>	filenames	= new ArrayList<String>();
+
+	@Override
+	public FileVisitResult visitFile(Path file,
+			BasicFileAttributes attr)
+	{
+		filenames.add(file.getFileName().toString());
+		return FileVisitResult.CONTINUE;
+	}
+}
diff --git a/src/main/java/lance5057/tDefense/finishingAnvil/utilities/Injector.java b/src/main/java/lance5057/tDefense/finishingAnvil/utilities/Injector.java
index 375b2e5..2b754f0 100644
--- a/src/main/java/lance5057/tDefense/finishingAnvil/utilities/Injector.java
+++ b/src/main/java/lance5057/tDefense/finishingAnvil/utilities/Injector.java
@@ -1,14 +1,23 @@
 package lance5057.tDefense.finishingAnvil.utilities;
 
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.nio.file.FileSystem;
+import java.nio.file.FileSystems;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 import lance5057.tDefense.TinkersDefense;
+import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.item.Item;
 import net.minecraft.util.IIcon;
+import net.minecraft.util.ResourceLocation;
 import tconstruct.library.TConstructRegistry;
 import tconstruct.library.crafting.PatternBuilder;
 import tconstruct.library.crafting.PatternBuilder.MaterialSet;
@@ -28,12 +37,53 @@ public class Injector extends ToolCore
 		super(0);
 	}
 
-	protected void loadHeads(IIconRegister iconRegister)
+	protected void loadHeads(IIconRegister iconRegister) throws IOException, URISyntaxException
 	{
 
+		//		final URL jarFile =
+		//				TinkersDefense.class.getResource("assets/tinkersdefense/textures/items/");
+
 		final int toolLength = TConstructRegistry.tools.size();
 		for(int i = 0; i < toolLength; i++)
 		{
+			final String toolName = TConstructRegistry.tools.get(i).getUnlocalizedName().toLowerCase().substring(TConstructRegistry.tools.get(i).getUnlocalizedName().lastIndexOf('.') + 1, TConstructRegistry.tools.get(i).getUnlocalizedName().length());
+			final String path = "/assets/tinkersdefense/textures/items/" + toolName + "/";
+
+			final ResourceLocation loc = new ResourceLocation(
+					"tinkersdefense:textures/items/");
+			//final InputStream in = Minecraft.getMinecraft().getResourceManager().getResource(loc).getInputStream();
+			//final List<String> filenames = new ArrayList<String>();
+			//final File files = new File(Minecraft.getMinecraft().mcDataDir.getPath() + "/mods/tinkersdefense-1.3.6.jar");
+
+			final Path zipfile = Paths.get(Minecraft.getMinecraft().mcDataDir.getPath() + "/mods/tinkersdefense-1.3.6.jar");
+			final FileSystem fs = FileSystems.newFileSystem(zipfile, Minecraft.class.getClassLoader());
+
+			final Path root = fs.getPath(path);
+			//final Iterable<FileStore> files = fs.getFileStores();
+			final FileGetter fileget = new FileGetter();
+
+			Files.walkFileTree(root, fileget);
+
+			//IDE
+			//final File files = new File(url.toURI());
+
+			if(TinkersDefense.config.debug)
+			{
+				for(final String file : fileget.filenames)
+				{
+					System.out.println(file);
+				}
+			}
+			setup(TConstructRegistry.tools.get(i), toolName, fileget.filenames, iconRegister);
+		}
+	}
+
+	//}
+	//}
+
+	private void setup(ToolCore tool, String name, List<String> filenames, IIconRegister iconRegister)
+	{
+		{
 			heads.clear();
 			accessories.clear();
 			handles.clear();
@@ -48,45 +98,116 @@ public class Injector extends ToolCore
 			extraStrings.clear();
 			extraIcons.clear();
 
-			final ToolCore tool = TConstructRegistry.tools.get(i);
-
 			final IIcon origHead = tool.headIcons.get(-1);
 			final IIcon origAccessory = tool.accessoryIcons.get(-1);
 			final IIcon origHandle = tool.handleIcons.get(-1);
 			final IIcon origExtra = tool.extraIcons.get(-1);
 
-			if(tool.getToolName().equals("Battleaxe"))
-			{
-				BattleAxe();
-			}
-			if(tool.getToolName().equals("Arrow"))
-			{
-				Arrow();
-			}
-			if(tool.getToolName().equals("Broadsword"))
-			{
-				Broadsword();
-			}
-			if(tool.getToolName().equals("Battlesign"))
-			{
-				Battlesign();
-			}
-			if(tool.getToolName().equals("Hatchet"))
-			{
-				Axe();
-			}
-			if(tool.getToolName().equals("Mattock"))
-			{
-				Mattock();
-			}
-			if(tool.getToolName().equals("Longbow"))
-			{
-				Longbow();
-			}
-			if(tool.getToolName().equals("HeaterShield"))
+			final ToolCoreTip tt = new ToolCoreTip();
+
+			tt.accessory = "Accessory";
+			tt.head = "Head";
+			tt.handle = "Handle";
+			tt.extra = "Extra";
+
+			tt.headTT.add("Standard");
+			tt.accessoryTT.add("Standard");
+			tt.handleTT.add("Standard");
+			tt.extraTT.add("Standard");
+
+			for(int i = 0; i < filenames.size(); i++)
 			{
-				HeaterShield();
+				final String filename = filenames.get(i);
+
+				if(filename.contains("head"))
+				{
+					String formatted = filename.substring(0, filename.indexOf(".png"));
+					heads.add(formatted);
+					formatted = formatted.substring(1, formatted.length());
+					formatted = formatted.replace('_', ' ');
+					tt.headTT.add(formatted);
+				}
+
+				if(filename.contains("accessory"))
+				{
+					String formatted = filename.substring(0, filename.indexOf(".png"));
+					accessories.add(formatted);
+					formatted = formatted.substring(1, formatted.length());
+					formatted.replace("_", " ");
+					tt.accessoryTT.add(formatted);
+				}
+
+				if(filename.contains("handle"))
+				{
+					String formatted = filename.substring(0, filename.indexOf(".png"));
+					handles.add(formatted);
+					formatted = formatted.substring(1, formatted.length());
+					formatted.replace("_", " ");
+					tt.handleTT.add(formatted);
+				}
+
+				if(filename.contains("extra"))
+				{
+					String formatted = filename.substring(0, filename.indexOf(".png"));
+					extras.add(formatted);
+					formatted = formatted.substring(1, formatted.length());
+					formatted.replace("_", " ");
+					tt.extraTT.add(formatted);
+				}
 			}
+			//			tt.headTT.add("Magic Backhead");
+			//			tt.headTT.add("Scythe Backhead");
+			//
+			//			extras.add("_magic_extra");
+			//			extras.add("_scythe_extra");
+			//			extras.add("_halbard_extra");
+			//			extras.add("_ornate_extra");
+			//
+			//			tt.extraTT.add("Halbard Head");
+			//			tt.extraTT.add("Magic Head");
+			//			tt.extraTT.add("Scythe Head");
+			//			tt.extraTT.add("Ornate Head");
+			//
+			//			accessories.add("_magic_accessory");
+			//			accessories.add("_halbard_accessory");
+			//			accessories.add("_knob_accessory");
+
+			//Metallurgy 5
+
+			tools.put(name, tt);
+
+			//			if(tool.getToolName().equals("Battleaxe"))
+			//			{
+			//				BattleAxe();
+			//			}
+			//			if(tool.getToolName().equals("Arrow"))
+			//			{
+			//				Arrow();
+			//			}
+			//			if(tool.getToolName().equals("Broadsword"))
+			//			{
+			//				Broadsword();
+			//			}
+			//			if(tool.getToolName().equals("Battlesign"))
+			//			{
+			//				Battlesign();
+			//			}
+			//			if(tool.getToolName().equals("Hatchet"))
+			//			{
+			//				Axe();
+			//			}
+			//			if(tool.getToolName().equals("Mattock"))
+			//			{
+			//				Mattock();
+			//			}
+			//			if(tool.getToolName().equals("Longbow"))
+			//			{
+			//				Longbow();
+			//			}
+			//			if(tool.getToolName().equals("HeaterShield"))
+			//			{
+			//				HeaterShield();
+			//			}
 			setupIcons(tool, iconRegister, heads, headStrings, headIcons);
 			setupIcons(tool, iconRegister, accessories, accessoryStrings, accessoryIcons);
 			setupIcons(tool, iconRegister, handles, handleStrings, handleIcons);
@@ -114,7 +235,18 @@ public class Injector extends ToolCore
 	@Override
 	public void registerIcons(IIconRegister iconRegister)
 	{
-		loadHeads(iconRegister);
+		try
+		{
+			loadHeads(iconRegister);
+		}
+		catch(final IOException e)
+		{
+			System.out.print("No Finishing Anvil for you");
+		}
+		catch(final URISyntaxException e)
+		{
+			System.out.print("No Finishing Anvil for you");
+		}
 	}
 
 	@Override
diff --git a/src/main/java/lance5057/tDefense/finishingAnvil/utilities/ToolCoreTip.java b/src/main/java/lance5057/tDefense/finishingAnvil/utilities/ToolCoreTip.java
index 7da31f0..e93a11d 100644
--- a/src/main/java/lance5057/tDefense/finishingAnvil/utilities/ToolCoreTip.java
+++ b/src/main/java/lance5057/tDefense/finishingAnvil/utilities/ToolCoreTip.java
@@ -25,9 +25,9 @@ public class ToolCoreTip
 		{
 			case 1:
 				return head;
-			case 2:
-				return handle;
 			case 3:
+				return handle;
+			case 2:
 				return accessory;
 			case 4:
 				return extra;
@@ -41,16 +41,16 @@ public class ToolCoreTip
 		switch(partId)
 		{
 			case 1:
-				if(headTT.size() > 0 && headTT.size() >= id - 1 && headTT.get(id) != null)
+				if(headTT.size() > 0 && headTT.size() - 1 >= id && headTT.get(id) != null)
 					return headTT.get(id);
-			case 2:
-				if(handleTT.size() > 0 && handleTT.size() >= id - 1 && handleTT.get(id) != null)
-					return handleTT.get(id);
 			case 3:
-				if(accessoryTT.size() > 0 && accessoryTT.size() >= id - 1 && accessoryTT.get(id) != null)
+				if(handleTT.size() > 0 && handleTT.size() - 1 >= id && handleTT.get(id) != null)
+					return handleTT.get(id);
+			case 2:
+				if(accessoryTT.size() > 0 && accessoryTT.size() - 1 >= id && accessoryTT.get(id) != null)
 					return accessoryTT.get(id);
 			case 4:
-				if(extraTT.size() > 0 && extraTT.size() >= id - 1 && extraTT.get(id) != null)
+				if(extraTT.size() > 0 && extraTT.size() - 1 >= id && extraTT.get(id) != null)
 					return extraTT.get(id);
 			default:
 				return "";
diff --git a/src/main/java/lance5057/tDefense/proxy/ClientProxy.java b/src/main/java/lance5057/tDefense/proxy/ClientProxy.java
index 2fd44ac..9234dc0 100644
--- a/src/main/java/lance5057/tDefense/proxy/ClientProxy.java
+++ b/src/main/java/lance5057/tDefense/proxy/ClientProxy.java
@@ -99,5 +99,15 @@ public class ClientProxy extends CommonProxy
 		ClientRegistry.bindTileEntitySpecialRenderer(TileEntity_CrestMount.class, new Renderer_CrestMount());
 		ClientRegistry.bindTileEntitySpecialRenderer(TileEntity_FinishingAnvil.class, new Renderer_FinishingAnvil());
 		ClientRegistry.bindTileEntitySpecialRenderer(TileEntity_JewelersBench.class, new Renderer_JewelersBench());
+
+		//		MinecraftForgeClient.registerItemRenderer(new ItemBlock(
+		//				TinkersDefense.block_ArmorAnvil), new CustomModelItemRenderer(
+		//				new Renderer_FinishingAnvil(), new TileEntity_FinishingAnvil()));
+		//		MinecraftForgeClient.registerItemRenderer(new ItemBlock(
+		//				TinkersDefense.block_CrestMount), new CustomModelItemRenderer(
+		//				new Renderer_CrestMount(), new TileEntity_CrestMount()));
+		//		MinecraftForgeClient.registerItemRenderer(new ItemBlock(
+		//				TinkersDefense.block_JewelersBench), new CustomModelItemRenderer(
+		//				new Renderer_JewelersBench(), new TileEntity_JewelersBench()));
 	}
 }
diff --git a/src/main/java/lance5057/tDefense/proxy/CommonProxy.java b/src/main/java/lance5057/tDefense/proxy/CommonProxy.java
index 0caa0e0..643b068 100644
--- a/src/main/java/lance5057/tDefense/proxy/CommonProxy.java
+++ b/src/main/java/lance5057/tDefense/proxy/CommonProxy.java
@@ -4,7 +4,6 @@ import lance5057.tDefense.TinkersDefense;
 import lance5057.tDefense.core.blocks.crestMount.Container_CrestMount;
 import lance5057.tDefense.core.blocks.crestMount.Gui_CrestMount;
 import lance5057.tDefense.core.blocks.crestMount.TileEntity_CrestMount;
-import lance5057.tDefense.core.gui.GuiTDGuideBook;
 import lance5057.tDefense.core.tools.modifiers.ModifierSoulHandler;
 import lance5057.tDefense.finishingAnvil.blocks.finishingAnvil.Container_FinishingAnvil;
 import lance5057.tDefense.finishingAnvil.blocks.finishingAnvil.Gui_FinishingAnvil;
@@ -65,8 +64,6 @@ public class CommonProxy implements IGuiHandler
 		if(ID == TinkersDefense.GUI_ANVIL_INV)
 			return new Gui_FinishingAnvil(player.inventory,
 					(TileEntity_FinishingAnvil) world.getTileEntity(x, y, z));
-		if(ID == TinkersDefense.GUI_GUIDEBOOK)
-			return new GuiTDGuideBook();
 		return null;
 	}
 }