diff --git a/archaic/src/main/java/resonantinduction/archaic/firebox/BlockFirebox.java b/archaic/src/main/java/resonantinduction/archaic/firebox/BlockFirebox.java
index 4cac760d..2eefd8ae 100644
--- a/archaic/src/main/java/resonantinduction/archaic/firebox/BlockFirebox.java
+++ b/archaic/src/main/java/resonantinduction/archaic/firebox/BlockFirebox.java
@@ -15,6 +15,7 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import resonantinduction.core.Reference;
 import calclavia.lib.prefab.block.BlockTile;
+import calclavia.lib.utility.FluidUtility;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
@@ -74,6 +75,12 @@ public class BlockFirebox extends BlockTile
 		if (tileEntity instanceof TileFirebox)
 		{
 			TileFirebox tile = (TileFirebox) tileEntity;
+
+			if (FluidUtility.playerActivatedFluidItem(world, x, y, z, player, side))
+			{
+				return true;
+			}
+
 			return interactCurrentItem(tile, 0, player);
 		}
 
@@ -83,6 +90,9 @@ public class BlockFirebox extends BlockTile
 	@Override
 	public Icon getBlockTexture(IBlockAccess access, int x, int y, int z, int side)
 	{
+		if (side == 0)
+			return blockIcon;
+
 		boolean isElectric = access.getBlockMetadata(x, y, z) == 1;
 		boolean isBurning = false;
 		TileEntity tile = access.getBlockTileEntity(x, y, z);
@@ -104,6 +114,9 @@ public class BlockFirebox extends BlockTile
 	@SideOnly(Side.CLIENT)
 	public Icon getIcon(int side, int meta)
 	{
+		if (side == 0)
+			return blockIcon;
+
 		boolean isElectric = meta == 1;
 		boolean isBurning = false;
 
diff --git a/archaic/src/main/java/resonantinduction/archaic/firebox/TileFirebox.java b/archaic/src/main/java/resonantinduction/archaic/firebox/TileFirebox.java
index af921d3f..1c1bc5d9 100644
--- a/archaic/src/main/java/resonantinduction/archaic/firebox/TileFirebox.java
+++ b/archaic/src/main/java/resonantinduction/archaic/firebox/TileFirebox.java
@@ -270,7 +270,7 @@ public class TileFirebox extends TileElectricalInventory implements IPacketRecei
 	@Override
 	public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain)
 	{
-		if (resource == null || !resource.isFluidEqual(tank.getFluid()))
+		if (resource == null || resource.getFluid() == FluidRegistry.LAVA)
 		{
 			return null;
 		}
diff --git a/mechanical/src/main/java/resonantinduction/mechanical/energy/network/PartMechanical.java b/mechanical/src/main/java/resonantinduction/mechanical/energy/network/PartMechanical.java
index 33f07d33..5e842415 100644
--- a/mechanical/src/main/java/resonantinduction/mechanical/energy/network/PartMechanical.java
+++ b/mechanical/src/main/java/resonantinduction/mechanical/energy/network/PartMechanical.java
@@ -26,7 +26,6 @@ import codechicken.multipart.TMultiPart;
  */
 public abstract class PartMechanical extends JCuboidPart implements JNormalOcclusion, TFacePart, IMechanical
 {
-
 	private IMechanicalNetwork network;
 
 	/** The mechanical connections this connector has made */
diff --git a/mechanical/src/main/java/resonantinduction/mechanical/fluid/pipe/PartPipe.java b/mechanical/src/main/java/resonantinduction/mechanical/fluid/pipe/PartPipe.java
index 54a21626..1d7eb50d 100644
--- a/mechanical/src/main/java/resonantinduction/mechanical/fluid/pipe/PartPipe.java
+++ b/mechanical/src/main/java/resonantinduction/mechanical/fluid/pipe/PartPipe.java
@@ -198,7 +198,7 @@ public class PartPipe extends PartFramedConnection<EnumPipeMaterial, IFluidPipe,
 	@Override
 	protected boolean canConnectTo(TileEntity tile, ForgeDirection dir)
 	{
-		return tile instanceof IFluidHandler && (((IFluidHandler) tile).canFill(dir.getOpposite(), null) || ((IFluidHandler) tile).canDrain(dir.getOpposite(), null));
+		return tile instanceof IFluidHandler;// && (((IFluidHandler) tile).canFill(dir.getOpposite(), null) || ((IFluidHandler) tile).canDrain(dir.getOpposite(), null));
 	}
 
 	@Override
diff --git a/mechanical/src/main/java/resonantinduction/mechanical/fluid/transport/TilePump.java b/mechanical/src/main/java/resonantinduction/mechanical/fluid/transport/TilePump.java
index 61109fdd..8a490d23 100644
--- a/mechanical/src/main/java/resonantinduction/mechanical/fluid/transport/TilePump.java
+++ b/mechanical/src/main/java/resonantinduction/mechanical/fluid/transport/TilePump.java
@@ -14,7 +14,7 @@ import calclavia.lib.prefab.tile.IRotatable;
 
 public class TilePump extends TileMechanical implements IFluidHandler, IRotatable, IPressure
 {
-	private final long maximumPower = 10000;
+	private final long maximumPower = 100000;
 
 	@Override
 	public void updateEntity()