diff --git a/electrical/src/main/scala/resonantinduction/electrical/laser/gun/ItemMiningLaser.java b/electrical/src/main/scala/resonantinduction/electrical/laser/gun/ItemMiningLaser.java
index 48e69c9a..a6efc81a 100644
--- a/electrical/src/main/scala/resonantinduction/electrical/laser/gun/ItemMiningLaser.java
+++ b/electrical/src/main/scala/resonantinduction/electrical/laser/gun/ItemMiningLaser.java
@@ -2,15 +2,12 @@ package resonantinduction.electrical.laser.gun;
 
 import java.awt.Color;
 import java.util.HashMap;
-import java.util.List;
 
 import net.minecraft.block.Block;
-import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.EnumAction;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.DamageSource;
 import net.minecraft.util.EnumMovingObjectType;
 import net.minecraft.util.MathHelper;
@@ -21,13 +18,10 @@ import net.minecraftforge.common.ForgeDirection;
 import net.minecraftforge.common.MinecraftForge;
 import resonantinduction.core.ResonantInduction;
 import resonantinduction.core.prefab.items.ItemEnergyTool;
-import universalelectricity.api.UniversalClass;
 import universalelectricity.api.vector.IVector3;
 import universalelectricity.api.vector.Vector3;
 import calclavia.api.resonantinduction.electrical.LaserEvent;
 import calclavia.lib.type.Pair;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 
 /** Stream laser mining tool, When held down it will slowly mine away at the block in front of it.
  * 
@@ -93,7 +87,7 @@ public class ItemMiningLaser extends ItemEnergyTool
         //TODO increase break time longer the laser has been running
         //TODO match hardness of block for break time
         //TODO add audio 
-        if ((player.capabilities.isCreativeMode || discharge(stack, joulesPerTick, false) > joulesPerTick) && count > 5)
+        if ((player.capabilities.isCreativeMode || discharge(stack, joulesPerTick, false) > joulesPerTick) && count > 20)
         {
             if(!player.capabilities.isCreativeMode)
                 discharge(stack, joulesPerTick, true);
diff --git a/src/main/scala/resonantinduction/core/prefab/items/ItemEnergyTool.java b/src/main/scala/resonantinduction/core/prefab/items/ItemEnergyTool.java
index f19c342f..1d037a89 100644
--- a/src/main/scala/resonantinduction/core/prefab/items/ItemEnergyTool.java
+++ b/src/main/scala/resonantinduction/core/prefab/items/ItemEnergyTool.java
@@ -118,7 +118,7 @@ public class ItemEnergyTool extends ItemTool implements IEnergyItem, IVoltageIte
         itemStack.getTagCompound().setLong("electricity", electricityStored);
     }
 
-    public long getTransfer(ItemStack itemStack)
+    public long getEnergySpace(ItemStack itemStack)
     {
         return this.getEnergyCapacity(itemStack) - this.getEnergy(itemStack);
     }
diff --git a/src/main/scala/resonantinduction/core/prefab/items/ItemTool.java b/src/main/scala/resonantinduction/core/prefab/items/ItemTool.java
index d77e1064..7d3cdfb5 100644
--- a/src/main/scala/resonantinduction/core/prefab/items/ItemTool.java
+++ b/src/main/scala/resonantinduction/core/prefab/items/ItemTool.java
@@ -7,7 +7,6 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
-import calclavia.components.tool.ToolMode;
 import calclavia.lib.utility.LanguageUtility;
 import calclavia.lib.utility.nbt.NBTUtility;
 import cpw.mods.fml.relauncher.Side;
@@ -69,7 +68,7 @@ public class ItemTool extends Item
                 setMode(itemStack, (getMode(itemStack) + 1) % toolModes.length);
                 String modeKey = toolModes[getMode(itemStack)];
                 if (!world.isRemote && modeKey != null && !modeKey.isEmpty())
-                {                    
+                {
                     player.addChatMessage(LanguageUtility.getLocal("tool.mode.set") + LanguageUtility.getLocal(modeKey));
                 }