diff --git a/src/main/java/com/hbm/tileentity/TileMappings.java b/src/main/java/com/hbm/tileentity/TileMappings.java
index 3a52058d6..3e6c9cc6d 100644
--- a/src/main/java/com/hbm/tileentity/TileMappings.java
+++ b/src/main/java/com/hbm/tileentity/TileMappings.java
@@ -397,6 +397,8 @@ public class TileMappings {
 		put(TileEntityDroneCrate.class, "tileentity_drone_crate");
 		put(TileEntityDroneWaypointRequest.class, "tileentity_drone_waypoint_request");
 		put(TileEntityDroneDock.class, "tileentity_drone_dock");
+		put(TileEntityDroneProvider.class, "tileentity_drone_provider");
+		put(TileEntityDroneRequester.class, "tileentity_drone_requester");
 	}
 	
 	private static void put(Class<? extends TileEntity> clazz, String... names) {
diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityITER.java b/src/main/java/com/hbm/tileentity/machine/TileEntityITER.java
index 9802070ac..f7a078115 100644
--- a/src/main/java/com/hbm/tileentity/machine/TileEntityITER.java
+++ b/src/main/java/com/hbm/tileentity/machine/TileEntityITER.java
@@ -544,7 +544,7 @@ public class TileEntityITER extends TileEntityMachineBase implements IEnergyUser
 					int b = layout[ly][x][z];
 					
 					switch(b) {
-					case 1: worldObj.setBlock(xCoord - width + x, yCoord + y - 2, zCoord - width + z, ModBlocks.fusion_conductor); break;
+					case 1: worldObj.setBlock(xCoord - width + x, yCoord + y - 2, zCoord - width + z, ModBlocks.fusion_conductor, 1, 3); break;
 					case 2: worldObj.setBlock(xCoord - width + x, yCoord + y - 2, zCoord - width + z, ModBlocks.fusion_center); break;
 					case 3: worldObj.setBlock(xCoord - width + x, yCoord + y - 2, zCoord - width + z, ModBlocks.fusion_motor); break;
 					case 4: worldObj.setBlock(xCoord - width + x, yCoord + y - 2, zCoord - width + z, ModBlocks.reinforced_glass); break;
diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineAssemblerBase.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineAssemblerBase.java
index b4bcd8648..836b03f1d 100644
--- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineAssemblerBase.java
+++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineAssemblerBase.java
@@ -17,6 +17,7 @@ import api.hbm.energy.IEnergyUser;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.ISidedInventory;
 import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 
 public abstract class TileEntityMachineAssemblerBase extends TileEntityMachineBase implements IEnergyUser, IGUIProvider {
@@ -286,6 +287,24 @@ public abstract class TileEntityMachineAssemblerBase extends TileEntityMachineBa
 			}
 		}
 	}
+	
+	@Override
+	public void readFromNBT(NBTTagCompound nbt) {
+		super.readFromNBT(nbt);
+		
+		this.power = nbt.getLong("power");
+		if(nbt.hasKey("progress")) this.progress = nbt.getIntArray("progress");
+		if(nbt.hasKey("maxProgress")) this.maxProgress = nbt.getIntArray("maxProgress");
+	}
+	
+	@Override
+	public void writeToNBT(NBTTagCompound nbt) {
+		super.writeToNBT(nbt);
+		
+		nbt.setLong("power", power);
+		nbt.setIntArray("progress", progress);
+		nbt.setIntArray("maxProgress", maxProgress);
+	}
 
 	@Override
 	public long getPower() {