diff --git a/src/main/java/emt/item/ItemElectricScribingTools.java b/src/main/java/emt/item/ItemElectricScribingTools.java
index fd87f3a..68c2e38 100644
--- a/src/main/java/emt/item/ItemElectricScribingTools.java
+++ b/src/main/java/emt/item/ItemElectricScribingTools.java
@@ -3,11 +3,14 @@ package emt.item;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import emt.EMT;
+import emt.util.EMTTextHelper;
 import ic2.api.item.ElectricItem;
 import ic2.api.item.IElectricItem;
 import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.StatCollector;
 import thaumcraft.api.IScribeTools;
 import thaumcraft.common.items.ItemInkwell;
 
@@ -23,6 +26,12 @@ public class ItemElectricScribingTools extends ItemInkwell implements IElectricI
         this.setMaxStackSize(1);
     }
 
+    @SuppressWarnings("unchecked")
+    @Override
+    public void addInformation(ItemStack stack, EntityPlayer par2EntityPlayer, List list, boolean par4) {
+        list.add(StatCollector.translateToLocal("ic2.item.tooltip.PowerTier") + " " + getTier(new ItemStack(this)));
+    }
+
     @Override
     public boolean canProvideEnergy(ItemStack itemStack) {
         return false;
diff --git a/src/main/java/emt/item/armor/boots/ItemElectricBootsTraveller.java b/src/main/java/emt/item/armor/boots/ItemElectricBootsTraveller.java
index 9aea737..1a1888b 100644
--- a/src/main/java/emt/item/armor/boots/ItemElectricBootsTraveller.java
+++ b/src/main/java/emt/item/armor/boots/ItemElectricBootsTraveller.java
@@ -18,6 +18,7 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemArmor;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.DamageSource;
+import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
 import net.minecraftforge.common.ISpecialArmor;
 import net.minecraftforge.common.MinecraftForge;
@@ -100,9 +101,11 @@ public class ItemElectricBootsTraveller extends ItemArmor implements IRunicArmor
         return 0.15D;
     }
 
+    @SuppressWarnings("unchecked")
     @Override
     public void addInformation(ItemStack stack, EntityPlayer par2EntityPlayer, List list, boolean par4) {
-        list.add(EMTTextHelper.PURPLE + EMTTextHelper.localize("tooltip.EMT.visDiscount") + ": " + String.valueOf(visDiscount) + "%");
+        list.add(StatCollector.translateToLocal("ic2.item.tooltip.PowerTier") + " " + getTier(new ItemStack(this)));
+        list.add(EMTTextHelper.PURPLE + EMTTextHelper.localize("tooltip.EMT.visDiscount") + ": " + visDiscount + "%");
     }
 
     @Override
diff --git a/src/main/java/emt/item/armor/chestplate/ItemInfusedQuantumChestplate.java b/src/main/java/emt/item/armor/chestplate/ItemInfusedQuantumChestplate.java
index b3277cc..3b040c9 100644
--- a/src/main/java/emt/item/armor/chestplate/ItemInfusedQuantumChestplate.java
+++ b/src/main/java/emt/item/armor/chestplate/ItemInfusedQuantumChestplate.java
@@ -391,12 +391,10 @@ public class ItemInfusedQuantumChestplate extends ItemArmorElectric implements I
         return new ModelSpecialArmor(1, 0);
     }
 
+    @SuppressWarnings("unchecked")
     @Override
     public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) {
-        try {
-            list.add(StatCollector.translateToLocal("ic2.item.tooltip.PowerTier") + " " + tier);
-        } catch (NullPointerException e) {
-        }
+        list.add(StatCollector.translateToLocal("ic2.item.tooltip.PowerTier") + " " + getTier(new ItemStack(this)));
     }
 
     public boolean useJetpack(EntityPlayer player, boolean hoverMode, ItemStack stack) {
diff --git a/src/main/java/emt/item/armor/goggles/ItemElectricGoggles.java b/src/main/java/emt/item/armor/goggles/ItemElectricGoggles.java
index ecd4605..eba72d2 100644
--- a/src/main/java/emt/item/armor/goggles/ItemElectricGoggles.java
+++ b/src/main/java/emt/item/armor/goggles/ItemElectricGoggles.java
@@ -17,6 +17,7 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemArmor;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.DamageSource;
+import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
 import net.minecraftforge.common.ISpecialArmor;
 import thaumcraft.api.IGoggles;
@@ -132,10 +133,11 @@ public class ItemElectricGoggles extends ItemArmor implements IRunicArmor, IElec
         }
     }
 
-    @SuppressWarnings({"unchecked", "rawtypes"})
+    @SuppressWarnings("unchecked")
     @Override
     public void addInformation(ItemStack stack, EntityPlayer par2EntityPlayer, List list, boolean par4) {
-        list.add(EMTTextHelper.PURPLE + EMTTextHelper.localize("tooltip.EMT.visDiscount") + ": " + String.valueOf(visDiscount) + "%");
+        list.add(StatCollector.translateToLocal("ic2.item.tooltip.PowerTier") + " " + getTier(new ItemStack(this)));
+        list.add(EMTTextHelper.PURPLE + EMTTextHelper.localize("tooltip.EMT.visDiscount") + ": " + visDiscount + "%");
     }
 
     @Override
diff --git a/src/main/java/emt/item/armor/goggles/ItemQuantumGoggles.java b/src/main/java/emt/item/armor/goggles/ItemQuantumGoggles.java
index 601cabe..623c0d8 100644
--- a/src/main/java/emt/item/armor/goggles/ItemQuantumGoggles.java
+++ b/src/main/java/emt/item/armor/goggles/ItemQuantumGoggles.java
@@ -30,7 +30,7 @@ public class ItemQuantumGoggles extends ItemNanoGoggles {
         this.setMaxStackSize(1);
         maxCharge = 10000000;
         tier = 4;
-        visDiscount = 8;
+        visDiscount = 7;
         transferLimit = 12000;
         energyPerDamage = 20000;
 
diff --git a/src/main/java/emt/item/armor/goggles/ItemSolarHelmetRevealing.java b/src/main/java/emt/item/armor/goggles/ItemSolarHelmetRevealing.java
index 17a4627..b9ca412 100644
--- a/src/main/java/emt/item/armor/goggles/ItemSolarHelmetRevealing.java
+++ b/src/main/java/emt/item/armor/goggles/ItemSolarHelmetRevealing.java
@@ -37,7 +37,7 @@ public class ItemSolarHelmetRevealing extends ItemQuantumGoggles {
         this.genDay = 65536;
         this.genNight = 4096;
         maxCharge = 20000000;
-        visDiscount = 7;
+        visDiscount = 8;
         tier = 4;
         transferLimit = 18000;
         energyPerDamage = 20000;
diff --git a/src/main/java/emt/item/armor/wings/ItemNanoWing.java b/src/main/java/emt/item/armor/wings/ItemNanoWing.java
index 78802a7..7a33f61 100644
--- a/src/main/java/emt/item/armor/wings/ItemNanoWing.java
+++ b/src/main/java/emt/item/armor/wings/ItemNanoWing.java
@@ -15,6 +15,7 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.DamageSource;
+import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
 import net.minecraftforge.common.ISpecialArmor;
 
@@ -128,6 +129,12 @@ public class ItemNanoWing extends ItemThaumiumReinforcedWing implements IElectri
         ElectricItem.manager.discharge(stack, damage * getEnergyPerDamage(), 0x7fffffff, true, false, false);
     }
 
+    @SuppressWarnings("unchecked")
+    @Override
+    public void addInformation(ItemStack stack, EntityPlayer par2EntityPlayer, List list, boolean par4) {
+        list.add(StatCollector.translateToLocal("ic2.item.tooltip.PowerTier") + " " + getTier(new ItemStack(this)));
+    }
+
     public double getDamageAbsorptionRatio() {
         return 0.9D;
     }
diff --git a/src/main/java/emt/item/armor/wings/ItemThaumiumReinforcedWing.java b/src/main/java/emt/item/armor/wings/ItemThaumiumReinforcedWing.java
index 55515ff..b8426ae 100644
--- a/src/main/java/emt/item/armor/wings/ItemThaumiumReinforcedWing.java
+++ b/src/main/java/emt/item/armor/wings/ItemThaumiumReinforcedWing.java
@@ -48,9 +48,10 @@ public class ItemThaumiumReinforcedWing extends ItemFeatherWing implements IVisD
         return EMT.TEXTURE_PATH + ":textures/models/thaumiumwing.png";
     }
 
+    @SuppressWarnings("unchecked")
     @Override
     public void addInformation(ItemStack stack, EntityPlayer par2EntityPlayer, List list, boolean par4) {
-        list.add(EMTTextHelper.PURPLE + EMTTextHelper.localize("tooltip.EMT.visDiscount") + ": " + String.valueOf(visDiscount) + "%");
+        list.add(EMTTextHelper.PURPLE + EMTTextHelper.localize("tooltip.EMT.visDiscount") + ": " + visDiscount + "%");
     }
 
     @Override
diff --git a/src/main/java/emt/item/tool/ItemElectricHoeGrowth.java b/src/main/java/emt/item/tool/ItemElectricHoeGrowth.java
index 21ed426..aaaea8f 100644
--- a/src/main/java/emt/item/tool/ItemElectricHoeGrowth.java
+++ b/src/main/java/emt/item/tool/ItemElectricHoeGrowth.java
@@ -13,6 +13,7 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemHoe;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
+import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
 import thaumcraft.common.Thaumcraft;
 import thaumcraft.common.blocks.BlockCustomPlant;
@@ -108,6 +109,12 @@ public class ItemElectricHoeGrowth extends ItemHoe implements IElectricItem {
         return did;
     }
 
+    @SuppressWarnings("unchecked")
+    @Override
+    public void addInformation(ItemStack stack, EntityPlayer par2EntityPlayer, List list, boolean par4) {
+        list.add(StatCollector.translateToLocal("ic2.item.tooltip.PowerTier") + " " + getTier(new ItemStack(this)));
+    }
+
     /* IC2 API METHODS */
 
     @Override
diff --git a/src/main/java/emt/item/tool/ItemElectricThorHammer.java b/src/main/java/emt/item/tool/ItemElectricThorHammer.java
index a29c1a2..e000ed4 100644
--- a/src/main/java/emt/item/tool/ItemElectricThorHammer.java
+++ b/src/main/java/emt/item/tool/ItemElectricThorHammer.java
@@ -19,6 +19,7 @@ import net.minecraft.item.ItemSword;
 import net.minecraft.potion.Potion;
 import net.minecraft.potion.PotionEffect;
 import net.minecraft.util.DamageSource;
+import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
 
 import java.util.List;
@@ -42,7 +43,7 @@ public class ItemElectricThorHammer extends ItemSword implements IElectricItem {
         this.itemIcon = iconRegister.registerIcon(EMT.TEXTURE_PATH + ":hammer/electricthorhammer");
     }
 
-    @SuppressWarnings({"rawtypes", "unchecked"})
+    @SuppressWarnings("unchecked")
     @SideOnly(Side.CLIENT)
     public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) {
         ItemStack itemStack = new ItemStack(this, 1);
@@ -64,9 +65,10 @@ public class ItemElectricThorHammer extends ItemSword implements IElectricItem {
         return false;
     }
 
-    @SuppressWarnings({"rawtypes", "unchecked"})
+    @SuppressWarnings("unchecked")
     @Override
     public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) {
+        list.add(StatCollector.translateToLocal("ic2.item.tooltip.PowerTier") + " " + getTier(new ItemStack(this)));
         list.add(EMTTextHelper.localize("tooltip.EMT.hammer.electric").replace("%player%", player.getCommandSenderName()));
     }
 
diff --git a/src/main/java/emt/item/tool/chainsaw/ItemDiamondChainsaw.java b/src/main/java/emt/item/tool/chainsaw/ItemDiamondChainsaw.java
index 97de93b..a3585fc 100644
--- a/src/main/java/emt/item/tool/chainsaw/ItemDiamondChainsaw.java
+++ b/src/main/java/emt/item/tool/chainsaw/ItemDiamondChainsaw.java
@@ -26,6 +26,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.stats.StatList;
 import net.minecraft.util.DamageSource;
+import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
 import net.minecraftforge.common.IShearable;
 import net.minecraftforge.event.ForgeEventFactory;
@@ -247,6 +248,12 @@ public class ItemDiamondChainsaw extends ItemAxe implements IElectricItem {
         return EMTConfigHandler.enchanting;
     }
 
+    @SuppressWarnings("unchecked")
+    @Override
+    public void addInformation(ItemStack stack, EntityPlayer par2EntityPlayer, List list, boolean par4) {
+        list.add(StatCollector.translateToLocal("ic2.item.tooltip.PowerTier") + " " + getTier(new ItemStack(this)));
+    }
+
     /* IC2 API METHODS */
 
     @Override
diff --git a/src/main/java/emt/item/tool/drill/ItemThaumiumDrill.java b/src/main/java/emt/item/tool/drill/ItemThaumiumDrill.java
index eb02a74..52417f9 100644
--- a/src/main/java/emt/item/tool/drill/ItemThaumiumDrill.java
+++ b/src/main/java/emt/item/tool/drill/ItemThaumiumDrill.java
@@ -10,10 +10,12 @@ import net.minecraft.block.Block;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemPickaxe;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
 
 import java.util.List;
@@ -109,6 +111,12 @@ public class ItemThaumiumDrill extends ItemPickaxe implements IElectricItem {
         return EMTConfigHandler.enchanting;
     }
 
+    @SuppressWarnings("unchecked")
+    @Override
+    public void addInformation(ItemStack stack, EntityPlayer par2EntityPlayer, List list, boolean par4) {
+        list.add(StatCollector.translateToLocal("ic2.item.tooltip.PowerTier") + " " + getTier(new ItemStack(this)));
+    }
+
     @Override
     public boolean canProvideEnergy(ItemStack itemStack) {
         return false;
diff --git a/src/main/java/emt/item/tool/omnitool/ItemOmnitoolIron.java b/src/main/java/emt/item/tool/omnitool/ItemOmnitoolIron.java
index ce9388b..d1dfb3e 100644
--- a/src/main/java/emt/item/tool/omnitool/ItemOmnitoolIron.java
+++ b/src/main/java/emt/item/tool/omnitool/ItemOmnitoolIron.java
@@ -17,6 +17,7 @@ import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemPickaxe;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.DamageSource;
+import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
 import net.minecraftforge.event.ForgeEventFactory;
 
@@ -145,6 +146,12 @@ public class ItemOmnitoolIron extends ItemPickaxe implements IElectricItem {
         return EMTConfigHandler.enchanting;
     }
 
+    @SuppressWarnings("unchecked")
+    @Override
+    public void addInformation(ItemStack stack, EntityPlayer par2EntityPlayer, List list, boolean par4) {
+        list.add(StatCollector.translateToLocal("ic2.item.tooltip.PowerTier") + " " + getTier(new ItemStack(this)));
+    }
+
     /* IC2 API METHODS */
 
     @Override