diff --git a/api/buildcraft/api/mj/MjAPILegacy.java b/api/buildcraft/api/mj/MjAPILegacy.java
index e5a07e35..9d125399 100644
--- a/api/buildcraft/api/mj/MjAPILegacy.java
+++ b/api/buildcraft/api/mj/MjAPILegacy.java
@@ -1,7 +1,16 @@
+/**
+ * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
+ * http://www.mod-buildcraft.com
+ *
+ * BuildCraft is distributed under the terms of the Minecraft Mod Public
+ * License 1.0, or MMPL. Please check the contents of the license located in
+ * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ */
 package buildcraft.api.mj;
 
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
+
 import net.minecraftforge.common.util.ForgeDirection;
 
 import buildcraft.api.power.IPowerReceptor;
diff --git a/api/buildcraft/api/power/PowerHandler.java b/api/buildcraft/api/power/PowerHandler.java
index a3a076cc..ee983df5 100644
--- a/api/buildcraft/api/power/PowerHandler.java
+++ b/api/buildcraft/api/power/PowerHandler.java
@@ -9,6 +9,7 @@
 package buildcraft.api.power;
 
 import net.minecraft.nbt.NBTTagCompound;
+
 import net.minecraftforge.common.util.ForgeDirection;
 
 import buildcraft.api.core.SafeTimeTracker;
@@ -188,24 +189,29 @@ public final class PowerHandler {
 	/**
 	 * Setup your PowerHandler's settings.
 	 *
-	 * @param minEnergyReceived  This is the minimum about of power that will be
-	 *                           accepted by the PowerHandler. This should generally be greater than the
-	 *                           activationEnergy if you plan to use the doWork() callback. Anything
-	 *                           greater than 1 will prevent Redstone Engines from powering this Provider.
-	 * @param maxEnergyReceivedI The maximum amount of power accepted by the
-	 *                           PowerHandler. This should generally be less than 500. Too low and larger
-	 *                           engines will overheat while trying to power the machine. Too high, and
-	 *                           the engines will never warm up. Greater values also place greater strain
-	 *                           on the power net.
-	 * @param activationEnergy   If the stored energy is greater than this value,
-	 *                           the doWork() callback is called (once per tick).
-	 * @param maxStoredEnergy    The maximum amount of power this PowerHandler can
-	 *                           store. Values tend to range between 100 and 5000. With 1000 and 1500
-	 *                           being common.
+	 * @param minEnergyReceived
+	 *            This is the minimum about of power that will be accepted by
+	 *            the PowerHandler. This should generally be greater than the
+	 *            activationEnergy if you plan to use the doWork() callback.
+	 *            Anything greater than 1 will prevent Redstone Engines from
+	 *            powering this Provider.
+	 * @param maxEnergyReceived
+	 *            The maximum amount of power accepted by the PowerHandler. This
+	 *            should generally be less than 500. Too low and larger engines
+	 *            will overheat while trying to power the machine. Too high, and
+	 *            the engines will never warm up. Greater values also place
+	 *            greater strain on the power net.
+	 * @param activationEnergy
+	 *            If the stored energy is greater than this value, the doWork()
+	 *            callback is called (once per tick).
+	 * @param maxStoredEnergy
+	 *            The maximum amount of power this PowerHandler can store.
+	 *            Values tend to range between 100 and 5000. With 1000 and 1500
+	 *            being common.
 	 */
-	public void configure(double minEnergyReceived, double maxEnergyReceivedI, double activationEnergy,
+	public void configure(double minEnergyReceived, double maxEnergyReceived, double activationEnergy,
 						  double maxStoredEnergy) {
-		double localMaxEnergyReceived = maxEnergyReceivedI;
+		double localMaxEnergyReceived = maxEnergyReceived;
 
 		if (minEnergyReceived > localMaxEnergyReceived) {
 			localMaxEnergyReceived = minEnergyReceived;
@@ -496,7 +502,7 @@ public final class PowerHandler {
 		}
 	}
 
-	private class AnonymousBattery {
+	private static class AnonymousBattery {
 		@MjBattery
 		public double mjStored;
 	}
diff --git a/common/buildcraft/energy/BlockEnergyConverter.java b/common/buildcraft/energy/BlockEnergyConverter.java
index 1231b950..e0eca004 100644
--- a/common/buildcraft/energy/BlockEnergyConverter.java
+++ b/common/buildcraft/energy/BlockEnergyConverter.java
@@ -1,3 +1,11 @@
+/**
+ * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
+ * http://www.mod-buildcraft.com
+ *
+ * BuildCraft is distributed under the terms of the Minecraft Mod Public
+ * License 1.0, or MMPL. Please check the contents of the license located in
+ * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ */
 package buildcraft.energy;
 
 import net.minecraft.block.material.Material;
diff --git a/common/buildcraft/energy/ItemEnergyConverter.java b/common/buildcraft/energy/ItemEnergyConverter.java
index 488e0666..1ad83ecc 100644
--- a/common/buildcraft/energy/ItemEnergyConverter.java
+++ b/common/buildcraft/energy/ItemEnergyConverter.java
@@ -1,6 +1,13 @@
+/**
+ * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
+ * http://www.mod-buildcraft.com
+ *
+ * BuildCraft is distributed under the terms of the Minecraft Mod Public
+ * License 1.0, or MMPL. Please check the contents of the license located in
+ * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ */
 package buildcraft.energy;
 
-import java.util.Arrays;
 import java.util.List;
 
 import net.minecraft.block.Block;
@@ -8,8 +15,6 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 
-import buildcraft.core.utils.StringUtils;
-
 public class ItemEnergyConverter extends ItemBlock {
 	public ItemEnergyConverter(Block block) {
 		super(block);
@@ -20,6 +25,7 @@ public class ItemEnergyConverter extends ItemBlock {
 		super.addInformation(itemStack, player, list, adv);
 		list.add(TileEnergyConverter.getLocalizedModeName(itemStack));
 		list.add("");
-		list.addAll(Arrays.asList(StringUtils.localize("tile.energyConverter.tooltip").split("\\|")));
+		// This is a bit too big in the tooltip at this stage.
+		// list.addAll(Arrays.asList(StringUtils.localize("tile.energyConverter.tooltip").split("\\|")));
 	}
 }
diff --git a/common/buildcraft/energy/TileEnergyConverter.java b/common/buildcraft/energy/TileEnergyConverter.java
index b0dec49d..3962630e 100644
--- a/common/buildcraft/energy/TileEnergyConverter.java
+++ b/common/buildcraft/energy/TileEnergyConverter.java
@@ -1,3 +1,11 @@
+/**
+ * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
+ * http://www.mod-buildcraft.com
+ *
+ * BuildCraft is distributed under the terms of the Minecraft Mod Public
+ * License 1.0, or MMPL. Please check the contents of the license located in
+ * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ */
 package buildcraft.energy;
 
 import net.minecraft.entity.player.EntityPlayer;
@@ -6,6 +14,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ChatComponentText;
+
 import net.minecraftforge.common.util.ForgeDirection;
 
 import buildcraft.api.core.NetworkData;