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 ea137ee0..0e40e6f2 100644
--- a/electrical/src/main/scala/resonantinduction/electrical/laser/gun/ItemMiningLaser.java
+++ b/electrical/src/main/scala/resonantinduction/electrical/laser/gun/ItemMiningLaser.java
@@ -53,9 +53,13 @@ public class ItemMiningLaser extends ItemEnergyTool
     /** Used to track energy used while the player uses the laser rather then direct editing the nbt */
     HashMap<EntityPlayer, Long> energyUsedMap = new HashMap<EntityPlayer, Long>();
 
+    public static final int MODE_REMOVE = 0, MODE_SMELT = 1, MODE_DAMAGE = 2;
+    
     public ItemMiningLaser(int id)
     {
         super(id);
+        hasModes = true;
+        toolModes = new String[] { "laser.toolmode.remove", "laser.toolmode.smelt", "laser.toolmode.damage" };
     }
 
     @Override
@@ -125,13 +129,13 @@ public class ItemMiningLaser extends ItemEnergyTool
                                 if (b != null && b.getBlockHardness(player.worldObj, hit.blockX, hit.blockY, hit.blockZ) > -1)
                                 {
                                     time = lastHit.right() + 1;
-                                    if (time >= breakTime)
+                                    if (time >= breakTime && this.getMode(stack) == MODE_REMOVE)
                                     {
                                         LaserEvent.onBlockMinedByLaser(player.worldObj, player, new Vector3(hit));
                                         mined = true;
                                         miningMap.remove(player);
                                     }
-                                    else
+                                    else if(this.getMode(stack) == MODE_REMOVE || this.getMode(stack) == MODE_SMELT)
                                     {
                                         //TODO get the actual hit side from the angle of the ray trace
                                         LaserEvent.onLaserHitBlock(player.worldObj, player, new Vector3(hit), ForgeDirection.UP);
@@ -165,7 +169,7 @@ public class ItemMiningLaser extends ItemEnergyTool
     {
         if (!player.isSneaking())
         {
-            player.setItemInUse(itemStack, this.getMaxItemUseDuration(itemStack));          
+            player.setItemInUse(itemStack, this.getMaxItemUseDuration(itemStack));
         }
         return super.onItemRightClick(itemStack, world, player);
     }
diff --git a/src/main/scala/resonantinduction/core/prefab/items/ItemTool.java b/src/main/scala/resonantinduction/core/prefab/items/ItemTool.java
index 312b1f5e..1b2a140d 100644
--- a/src/main/scala/resonantinduction/core/prefab/items/ItemTool.java
+++ b/src/main/scala/resonantinduction/core/prefab/items/ItemTool.java
@@ -69,7 +69,7 @@ public class ItemTool extends Item
                 String modeKey = toolModes[getMode(itemStack)];
                 if (!world.isRemote && modeKey != null && !modeKey.isEmpty())
                 {
-                    player.addChatMessage(LanguageUtility.getLocal("tool.mode.set") + LanguageUtility.getLocal(modeKey));
+                    player.addChatMessage(LanguageUtility.getLocal("tool.mode.set") + " " + LanguageUtility.getLocal(modeKey));
                 }
 
             }