diff --git a/src/resonantinduction/contractor/TileEntityEMContractor.java b/src/resonantinduction/contractor/TileEntityEMContractor.java
index 800bd2dd..cf4298bf 100644
--- a/src/resonantinduction/contractor/TileEntityEMContractor.java
+++ b/src/resonantinduction/contractor/TileEntityEMContractor.java
@@ -157,7 +157,7 @@ public class TileEntityEMContractor extends TileEntityAdvanced implements IPacke
 
 							if (TileEntityEMContractor.canBePath(this.worldObj, result))
 							{
-
+								// TODO: RENDER BEAMS ONLY ON CHANGE. SAVE CALCULATIONS!
 								if (i - 1 >= 0)
 								{
 									Vector3 prevResult = this.pathfinder.results.get(i - 1).clone();
diff --git a/src/resonantinduction/render/RenderMultimeter.java b/src/resonantinduction/render/RenderMultimeter.java
index b9b6fd67..c33de27c 100644
--- a/src/resonantinduction/render/RenderMultimeter.java
+++ b/src/resonantinduction/render/RenderMultimeter.java
@@ -11,6 +11,8 @@ import org.lwjgl.opengl.GL11;
 import resonantinduction.ResonantInduction;
 import resonantinduction.model.ModelMultimeter;
 import resonantinduction.multimeter.TileEntityMultimeter;
+import universalelectricity.core.electricity.ElectricityDisplay;
+import universalelectricity.core.electricity.ElectricityDisplay.ElectricUnit;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
@@ -121,7 +123,7 @@ public class RenderMultimeter extends TileEntitySpecialRenderer
 
 		FontRenderer fontRenderer = this.getFontRenderer();
 
-		String joules = Math.round(tileEntity.getDetectedEnergy()) + " J";
+		String joules = ElectricityDisplay.getDisplayShort(tileEntity.getDetectedEnergy(), ElectricUnit.JOULES);
 
 		int stringWidth = Math.max(fontRenderer.getStringWidth(joules), 0);
 		// maxWidth += 8;
diff --git a/src/resonantinduction/tesla/TileEntityTesla.java b/src/resonantinduction/tesla/TileEntityTesla.java
index 99a22aa7..62877c58 100644
--- a/src/resonantinduction/tesla/TileEntityTesla.java
+++ b/src/resonantinduction/tesla/TileEntityTesla.java
@@ -6,6 +6,7 @@ package resonantinduction.tesla;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.EnumSet;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -224,7 +225,7 @@ public class TileEntityTesla extends TileEntityUniversalElectrical implements IT
 			 * @author Calclavia
 			 */
 			TileEntity tileEntity = this.worldObj.getBlockTileEntity(this.xCoord, this.yCoord - 1, this.zCoord);
-			
+
 			if (tileEntity instanceof TileEntityFurnace && this.getRequest(ForgeDirection.DOWN) > 0)
 			{
 				TileEntityFurnace furnaceTile = (TileEntityFurnace) tileEntity;
@@ -573,14 +574,20 @@ public class TileEntityTesla extends TileEntityUniversalElectrical implements IT
 		{
 			return this.getEnergyStored();
 		}
-		
+
 		return 0;
 	}
 
 	@Override
 	public float getMaxEnergyStored()
 	{
-		return 20;
+		return TRANSFER_CAP;
+	}
+
+	@Override
+	public EnumSet<ForgeDirection> getOutputDirections()
+	{
+		return EnumSet.allOf(ForgeDirection.class);
 	}
 
 }