diff --git a/src/main/java/resonantinduction/electrical/battery/ItemBlockBattery.java b/src/main/java/resonantinduction/electrical/battery/ItemBlockBattery.java
index 76892088..3c41c4b9 100644
--- a/src/main/java/resonantinduction/electrical/battery/ItemBlockBattery.java
+++ b/src/main/java/resonantinduction/electrical/battery/ItemBlockBattery.java
@@ -21,141 +21,148 @@ import calclavia.lib.utility.LanguageUtility;
 @UniversalClass
 public class ItemBlockBattery extends ItemBlock implements IEnergyItem, IVoltageItem
 {
-	public ItemBlockBattery(int id)
-	{
-		super(id);
-		this.setMaxStackSize(1);
-		this.setMaxDamage(100);
-		this.setNoRepair();
-	}
+    public ItemBlockBattery(int id)
+    {
+        super(id);
+        this.setMaxStackSize(1);
+        this.setMaxDamage(100);
+        this.setNoRepair();
+    }
 
-	@Override
-	public void addInformation(ItemStack itemStack, EntityPlayer entityPlayer, List list, boolean par4)
-	{
-		String color = "";
-		long joules = this.getEnergy(itemStack);
+    @SuppressWarnings("unchecked")
+    @Override
+    public void addInformation(ItemStack itemStack, EntityPlayer entityPlayer, List list, boolean par4)
+    {
+        String color = "";
+        long joules = this.getEnergy(itemStack);
 
-		if (joules <= this.getEnergyCapacity(itemStack) / 3)
-		{
-			color = "\u00a74";
-		}
-		else if (joules > this.getEnergyCapacity(itemStack) * 2 / 3)
-		{
-			color = "\u00a72";
-		}
-		else
-		{
-			color = "\u00a76";
-		}
+        if (joules <= this.getEnergyCapacity(itemStack) / 3)
+        {
+            color = "\u00a74";
+        }
+        else if (joules > this.getEnergyCapacity(itemStack) * 2 / 3)
+        {
+            color = "\u00a72";
+        }
+        else
+        {
+            color = "\u00a76";
+        }
+        itemStack.getItemDamageForDisplay();
+        list.add(LanguageUtility.getLocal("tooltip.battery.energy").replace("%0", color).replace("%1", EnumColor.GREY.toString()).replace("%v0", UnitDisplay.getDisplayShort(joules, Unit.JOULES)).replace("%v1", UnitDisplay.getDisplayShort(this.getEnergyCapacity(itemStack), Unit.JOULES)));
+    }
 
-		list.add(LanguageUtility.getLocal("tooltip.battery.energy").replace("%0", color).replace("%1", EnumColor.GREY.toString()).replace("%v0", UnitDisplay.getDisplayShort(joules, Unit.JOULES)).replace("%v1", UnitDisplay.getDisplayShort(this.getEnergyCapacity(itemStack), Unit.JOULES)));
-	}
+    @Override
+    public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ, int metadata)
+    {
+        boolean place = super.placeBlockAt(stack, player, world, x, y, z, side, hitX, hitY, hitZ, metadata);
 
-	@Override
-	public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ, int metadata)
-	{
-		boolean place = super.placeBlockAt(stack, player, world, x, y, z, side, hitX, hitY, hitZ, metadata);
+        if (place)
+        {
+            TileBattery tileEntity = (TileBattery) world.getBlockTileEntity(x, y, z);
+            tileEntity.setEnergy(null, this.getEnergy(stack));
+        }
 
-		if (place)
-		{
-			TileBattery tileEntity = (TileBattery) world.getBlockTileEntity(x, y, z);
-			tileEntity.setEnergy(null, this.getEnergy(stack));
-		}
+        return place;
+    }
 
-		return place;
-	}
+    /** Makes sure the item is uncharged when it is crafted and not charged. Change this if you do
+     * not want this to happen! */
+    @Override
+    public void onCreated(ItemStack itemStack, World par2World, EntityPlayer par3EntityPlayer)
+    {
+        this.setEnergy(itemStack, 0);
+    }
 
-	/**
-	 * Makes sure the item is uncharged when it is crafted and not charged. Change this if you do
-	 * not want this to happen!
-	 */
-	@Override
-	public void onCreated(ItemStack itemStack, World par2World, EntityPlayer par3EntityPlayer)
-	{
-		this.setEnergy(itemStack, 0);
-	}
+    @Override
+    public long recharge(ItemStack itemStack, long energy, boolean doReceive)
+    {
+        long rejectedElectricity = Math.max((this.getEnergy(itemStack) + energy) - this.getEnergyCapacity(itemStack), 0);
+        long energyToReceive = Math.min(energy - rejectedElectricity, getTransferRate(itemStack));
 
-	@Override
-	public long recharge(ItemStack itemStack, long energy, boolean doReceive)
-	{
-		long rejectedElectricity = Math.max((this.getEnergy(itemStack) + energy) - this.getEnergyCapacity(itemStack), 0);
-		long energyToReceive = Math.min(energy - rejectedElectricity, getTransferRate(itemStack));
+        if (doReceive)
+        {
+            this.setEnergy(itemStack, this.getEnergy(itemStack) + energyToReceive);
+        }
 
-		if (doReceive)
-		{
-			this.setEnergy(itemStack, this.getEnergy(itemStack) + energyToReceive);
-		}
+        return energyToReceive;
+    }
 
-		return energyToReceive;
-	}
+    @Override
+    public long discharge(ItemStack itemStack, long energy, boolean doTransfer)
+    {
+        long energyToExtract = Math.min(Math.min(this.getEnergy(itemStack), energy), getTransferRate(itemStack));
 
-	@Override
-	public long discharge(ItemStack itemStack, long energy, boolean doTransfer)
-	{
-		long energyToExtract = Math.min(Math.min(this.getEnergy(itemStack), energy), getTransferRate(itemStack));
+        if (doTransfer)
+        {
+            this.setEnergy(itemStack, this.getEnergy(itemStack) - energyToExtract);
+        }
 
-		if (doTransfer)
-		{
-			this.setEnergy(itemStack, this.getEnergy(itemStack) - energyToExtract);
-		}
+        return energyToExtract;
+    }
 
-		return energyToExtract;
-	}
+    @Override
+    public long getVoltage(ItemStack itemStack)
+    {
+        return UniversalElectricity.DEFAULT_VOLTAGE;
+    }
 
-	@Override
-	public long getVoltage(ItemStack itemStack)
-	{
-		return UniversalElectricity.DEFAULT_VOLTAGE;
-	}
+    @Override
+    public void setEnergy(ItemStack itemStack, long joules)
+    {
+        if (itemStack.getTagCompound() == null)
+        {
+            itemStack.setTagCompound(new NBTTagCompound());
+        }
 
-	@Override
-	public void setEnergy(ItemStack itemStack, long joules)
-	{
-		if (itemStack.getTagCompound() == null)
-		{
-			itemStack.setTagCompound(new NBTTagCompound());
-		}
+        long electricityStored = Math.max(Math.min(joules, this.getEnergyCapacity(itemStack)), 0);
+        itemStack.getTagCompound().setLong("electricity", electricityStored);
+    }
 
-		long electricityStored = Math.max(Math.min(joules, this.getEnergyCapacity(itemStack)), 0);
-		itemStack.getTagCompound().setLong("electricity", electricityStored);
-		itemStack.setItemDamage((int) (100 - ((double) electricityStored / (double) getEnergyCapacity(itemStack)) * 100));
-	}
+    public long getTransfer(ItemStack itemStack)
+    {
+        return this.getEnergyCapacity(itemStack) - this.getEnergy(itemStack);
+    }
 
-	public long getTransfer(ItemStack itemStack)
-	{
-		return this.getEnergyCapacity(itemStack) - this.getEnergy(itemStack);
-	}
+    /** Gets the energy stored in the item. Energy is stored using item NBT */
+    @Override
+    public long getEnergy(ItemStack itemStack)
+    {
+        if (itemStack.getTagCompound() == null)
+        {
+            itemStack.setTagCompound(new NBTTagCompound());
+        }
 
-	/** Gets the energy stored in the item. Energy is stored using item NBT */
-	@Override
-	public long getEnergy(ItemStack itemStack)
-	{
-		if (itemStack.getTagCompound() == null)
-		{
-			itemStack.setTagCompound(new NBTTagCompound());
-		}
+        long energyStored = itemStack.getTagCompound().getLong("electricity");
+        return energyStored;
+    }
 
-		long energyStored = itemStack.getTagCompound().getLong("electricity");
-		itemStack.setItemDamage((int) (100 - ((double) energyStored / (double) getEnergyCapacity(itemStack)) * 100));
-		return energyStored;
-	}
+    @Override
+    public int getDisplayDamage(ItemStack stack)
+    {
+        return (int) (100 - ((double) this.getEnergy(stack) / (double) getEnergyCapacity(stack)) * 100);
+    }
 
-	@Override
-	public long getEnergyCapacity(ItemStack theItem)
-	{
-		return TileBattery.getEnergyForTier(theItem.getItemDamage());
-	}
+    @Override
+    public long getEnergyCapacity(ItemStack theItem)
+    {
+        return TileBattery.getEnergyForTier(theItem.getItemDamage() + 1);
+    }
 
-	public long getTransferRate(ItemStack itemStack)
-	{
-		return this.getEnergyCapacity(itemStack) / 100;
-	}
+    public long getTransferRate(ItemStack itemStack)
+    {
+        return this.getEnergyCapacity(itemStack) / 100;
+    }
 
-	@Override
-	public void getSubItems(int par1, CreativeTabs par2CreativeTabs, List par3List)
-	{
-		par3List.add(CompatibilityModule.getItemWithCharge(new ItemStack(this), 0));
-		par3List.add(CompatibilityModule.getItemWithCharge(new ItemStack(this), this.getEnergyCapacity(new ItemStack(this))));
-	}
+    @SuppressWarnings("unchecked")
+    @Override
+    public void getSubItems(int par1, CreativeTabs par2CreativeTabs, List par3List)
+    {
+        par3List.add(new ItemStack(this, 1, 0));
+        par3List.add(CompatibilityModule.getItemWithCharge(new ItemStack(this, 1, 0), this.getEnergyCapacity(new ItemStack(this, 1, 0))));
+        par3List.add(new ItemStack(this, 1, 1));
+        par3List.add(CompatibilityModule.getItemWithCharge(new ItemStack(this, 1, 1), this.getEnergyCapacity(new ItemStack(this, 1, 1))));
+
+    }
 
 }