diff --git a/src/main/java/com/hbm/inventory/container/ContainerBase.java b/src/main/java/com/hbm/inventory/container/ContainerBase.java
index 340b0ddf5..76802fab2 100644
--- a/src/main/java/com/hbm/inventory/container/ContainerBase.java
+++ b/src/main/java/com/hbm/inventory/container/ContainerBase.java
@@ -52,6 +52,7 @@ public class ContainerBase extends Container {
         return var3;
     }
 
+    /**Used to quickly set up the player inventory*/
     public void playerInv(InventoryPlayer invPlayer, int playerInvX, int playerInvY, int playerHotbarY){
         for(int i = 0; i < 3; i++) {
             for(int j = 0; j < 9; j++) {
@@ -64,4 +65,17 @@ public class ContainerBase extends Container {
         }
     }
 
+    // I'm gonna make a farken helper function for this shit, why was it done the old way for 9 whole ass years?
+    //- Mellow, 1884
+    /**Used to add several conventional inventory slots at a time
+     * @param inv the inventory to add the slots to
+     * @param from the slot index to start from*/
+    public void addSlots(IInventory inv, int from, int x, int y, int rows, int cols) {
+        int slotSize = 18;
+        for(int row = 0; row < rows; row++) {
+            for(int col = 0; col < cols; col++) {
+                this.addSlotToContainer(new Slot(inv, col + row * cols + from, x + col * slotSize, y + row * slotSize));
+            }
+        }
+    }
 }
diff --git a/src/main/java/com/hbm/inventory/container/ContainerCraneExtractor.java b/src/main/java/com/hbm/inventory/container/ContainerCraneExtractor.java
index d598cc4db..0865ba1cc 100644
--- a/src/main/java/com/hbm/inventory/container/ContainerCraneExtractor.java
+++ b/src/main/java/com/hbm/inventory/container/ContainerCraneExtractor.java
@@ -25,14 +25,16 @@ public class ContainerCraneExtractor extends ContainerBase {
 				this.addSlotToContainer(new SlotPattern(extractor, j + i * 3, 71 + j * 18, 17 + i * 18));
 			}
 		}
-		
+		/*
 		//buffer
 		for(int i = 0; i < 3; i++) {
 			for(int j = 0; j < 3; j++) {
 				this.addSlotToContainer(new Slot(extractor, 9 + j + i * 3, 8 + j * 18, 17 + i * 18));
 			}
-		}
-		
+		}*/
+		addSlots(extractor,9,8,17,3,3);
+
+
 		//upgrades
 		this.addSlotToContainer(new SlotUpgrade(extractor, 18, 152, 23));
 		this.addSlotToContainer(new SlotUpgrade(extractor, 19, 152, 47));
diff --git a/src/main/java/com/hbm/inventory/container/ContainerCraneGrabber.java b/src/main/java/com/hbm/inventory/container/ContainerCraneGrabber.java
index c1e144430..52af87123 100644
--- a/src/main/java/com/hbm/inventory/container/ContainerCraneGrabber.java
+++ b/src/main/java/com/hbm/inventory/container/ContainerCraneGrabber.java
@@ -31,15 +31,6 @@ public class ContainerCraneGrabber extends ContainerBase {
 		this.addSlotToContainer(new SlotUpgrade(grabber, 9, 121, 23));
 		this.addSlotToContainer(new SlotUpgrade(grabber, 10, 121, 47));
 
-		for(int i = 0; i < 3; i++) {
-			for(int j = 0; j < 9; j++) {
-				this.addSlotToContainer(new Slot(invPlayer, j + i * 9 + 9, 8 + j * 18, 103 + i * 18));
-			}
-		}
-
-		for(int i = 0; i < 9; i++) {
-			this.addSlotToContainer(new Slot(invPlayer, i, 8 + i * 18, 161));
-		}
 		playerInv(invPlayer, 8, 103, 161);
 	}
 
diff --git a/src/main/java/com/hbm/inventory/fluid/Fluids.java b/src/main/java/com/hbm/inventory/fluid/Fluids.java
index 97e4d45d1..5c57e8e45 100644
--- a/src/main/java/com/hbm/inventory/fluid/Fluids.java
+++ b/src/main/java/com/hbm/inventory/fluid/Fluids.java
@@ -549,6 +549,7 @@ public class Fluids {
 		//bug meth
 		metaOrder.add(PHEROMONE);
 		metaOrder.add(PHEROMONE_M);
+		metaOrder.add(SLOP);
 		
 		//ANY INTERNAL RENAMING MUST BE REFLECTED HERE - DON'T FORGET TO CHANGE: LANG FILES + TYPE'S STRING ID + NAME OF TANK/GUI TEXTURE FILES!
 		// V