diff --git a/buildcraft_resources/assets/buildcraftcore/tablet/11.pf2 b/buildcraft_resources/assets/buildcraftcore/tablet/11.pf2
index 8333e384..4f1be885 100644
Binary files a/buildcraft_resources/assets/buildcraftcore/tablet/11.pf2 and b/buildcraft_resources/assets/buildcraftcore/tablet/11.pf2 differ
diff --git a/buildcraft_resources/assets/buildcraftcore/tablet/13.pf2 b/buildcraft_resources/assets/buildcraftcore/tablet/13.pf2
deleted file mode 100644
index b039354d..00000000
Binary files a/buildcraft_resources/assets/buildcraftcore/tablet/13.pf2 and /dev/null differ
diff --git a/buildcraft_resources/assets/buildcraftcore/tablet/16.pf2 b/buildcraft_resources/assets/buildcraftcore/tablet/16.pf2
index 2b911164..67d23f6e 100644
Binary files a/buildcraft_resources/assets/buildcraftcore/tablet/16.pf2 and b/buildcraft_resources/assets/buildcraftcore/tablet/16.pf2 differ
diff --git a/buildcraft_resources/changelog/7.0.1 b/buildcraft_resources/changelog/7.0.1
index ee6232a1..f278edd4 100644
--- a/buildcraft_resources/changelog/7.0.1
+++ b/buildcraft_resources/changelog/7.0.1
@@ -1,10 +1,17 @@
-Eveyrthing from BuildCraft 6.4.6, and:
+Eveyrthing from BuildCraft 6.4.6-6.4.11, and:
 
 Additions:
 * Modularization is actually released this time, after some bugfixes.
-* Facade recipes are now available without Silicon (asie)
+* Pipe Plugs do not require an assembly table anymore (asie)
 * Laser beams now need heat-up time to become blue (asie)
 * Comparator suppport for BuildCraft tanks (asie)
+* Facade recipes are now available without Silicon (also as a config option) (asie)
+* Zone planner Map Location import support (asie)
+* New Load/Unload area for robots with a separate action (hea3ven)
+* Massive improvements to robots, too many to list! (hea3ven)
+* Robots now shutdown and fall, can be dropped to item with a wrench (hea3ven)
+* Weighted item and fluid sorting in diamond pipes! (asie)
+* Work on in-game config GUIs (asie)
 
 Improvements:
 * [#2599] Stripes pipes don't move forward when using a non-item pipe (asie)
diff --git a/common/buildcraft/BuildCraftFactory.java b/common/buildcraft/BuildCraftFactory.java
index 7e1a6d84..36868035 100644
--- a/common/buildcraft/BuildCraftFactory.java
+++ b/common/buildcraft/BuildCraftFactory.java
@@ -190,6 +190,8 @@ public class BuildCraftFactory extends BuildCraftMod {
 		BuildCraftCore.mainConfigManager.get("general.miningDepth").setMinValue(2).setMaxValue(256);
 		BuildCraftCore.mainConfigManager.register("general.pumpDimensionControl", DefaultProps.PUMP_DIMENSION_LIST, plc, ConfigManager.RestartRequirement.NONE);
 
+		reloadConfig(ConfigManager.RestartRequirement.GAME);
+
 		miningWellBlock = (BlockMiningWell) CompatHooks.INSTANCE.getBlock(BlockMiningWell.class);
 		CoreProxy.proxy.registerBlock(miningWellBlock.setBlockName("miningWellBlock"));
 
diff --git a/common/buildcraft/factory/TilePump.java b/common/buildcraft/factory/TilePump.java
index 9039988a..b477017a 100644
--- a/common/buildcraft/factory/TilePump.java
+++ b/common/buildcraft/factory/TilePump.java
@@ -418,6 +418,16 @@ public class TilePump extends TileBuildCraft implements IHasWork, IFluidHandler,
 		destroy();
 	}
 
+	public void onChunkUnload() {
+		super.onChunkUnload();
+
+		if (tube != null) {
+			// Remove the entity to stop it from piling up.
+			CoreProxy.proxy.removeEntity(tube);
+			tube = null;
+		}
+	}
+
 	@Override
 	public void validate() {
 		super.validate();
diff --git a/common/buildcraft/robotics/RobotRegistry.java b/common/buildcraft/robotics/RobotRegistry.java
index 461e7899..69f042fe 100755
--- a/common/buildcraft/robotics/RobotRegistry.java
+++ b/common/buildcraft/robotics/RobotRegistry.java
@@ -268,7 +268,9 @@ public class RobotRegistry extends WorldSavedData implements IRobotRegistry {
 					station.robotTaking().setMainStation(null);
 				}
 			} else if (station.robotIdTaking() != EntityRobotBase.NULL_ROBOT_ID) {
-				stationsTakenByRobot.get(station.robotIdTaking()).remove(index);
+				if (stationsTakenByRobot.get(station.robotIdTaking()) != null) {
+					stationsTakenByRobot.get(station.robotIdTaking()).remove(index);
+				}
 			}
 
 			stations.remove(index);