diff --git a/src/main/java/resonantinduction/mechanical/fluid/pump/LiquidPathFinder.java b/src/main/java/resonantinduction/mechanical/fluid/pump/LiquidPathFinder.java
index 4c5f6431..2bad33cd 100644
--- a/src/main/java/resonantinduction/mechanical/fluid/pump/LiquidPathFinder.java
+++ b/src/main/java/resonantinduction/mechanical/fluid/pump/LiquidPathFinder.java
@@ -39,7 +39,7 @@ public class LiquidPathFinder
 	private int resultRun = resultLimit;
 	private int runs = 0;
 	/** Start location of the pathfinder used for range calculations */
-	private Vector3 Start;
+	private Vector3 start;
 	/** Range to limit the search to */
 	private double range;
 	/** List of forgeDirection to use that are shuffled to prevent strait lines */
@@ -145,7 +145,7 @@ public class LiquidPathFinder
 	{
 		this.runs++;
 		Vector3 vec = origin.clone().translate(direction);
-		double distance = vec.toVector2().distance(this.Start.toVector2());
+		double distance = vec.toVector2().distance(this.start.toVector2());
 
 		if (distance <= this.range && isValidNode(vec))
 		{
@@ -220,7 +220,7 @@ public class LiquidPathFinder
 	/** Called to execute the pathfinding operation. */
 	public LiquidPathFinder start(final Vector3 startNode, int runCount, final boolean fill)
 	{
-		this.Start = startNode;
+		this.start = startNode;
 		this.fill = fill;
 		this.runs = 0;
 		this.resultsFound = 0;
@@ -228,7 +228,7 @@ public class LiquidPathFinder
 		this.find(ForgeDirection.UNKNOWN, startNode);
 
 		this.refresh();
-		this.sortBlockList(Start, results, fill);
+		this.sortBlockList(start, results, fill);
 		return this;
 	}
 
@@ -294,36 +294,19 @@ public class LiquidPathFinder
 			// The highest and furthest fluid block for drain. Closest fluid block for fill.
 			Vector3 bestFluid = null;
 
-			for (Vector3 checkPos : set)
+			if (fill)
 			{
-				if (bestFluid == null)
+				bestFluid = start;
+			}
+			else
+			{
+				for (Vector3 checkPos : set)
 				{
-					bestFluid = checkPos;
-				}
-
-				if (fill)
-				{
-					/**
-					 * We're filling, so we want the closest lowest block first.
-					 */
-					if (prioritizeHighest)
-					{
-						if (checkPos.y < bestFluid.y)
-						{
-							bestFluid = checkPos;
-						}
-						else if (checkPos.y == bestFluid.y && start.distance(checkPos) < start.distance(bestFluid))
-						{
-							bestFluid = checkPos;
-						}
-					}
-					else if (start.distance(checkPos) < start.distance(bestFluid))
+					if (bestFluid == null)
 					{
 						bestFluid = checkPos;
 					}
-				}
-				else
-				{
+
 					/**
 					 * We're draining, so we want the highest furthest block first.
 					 */
@@ -346,17 +329,17 @@ public class LiquidPathFinder
 			}
 
 			final Vector3 optimalFluid = bestFluid;
-
 			Collections.sort(sortedResults, new Comparator<Vector3>()
 			{
 				@Override
 				public int compare(Vector3 vecA, Vector3 vecB)
 				{
-					return Double.compare(vecA.distance(optimalFluid), vecB.distance(optimalFluid));
+					if (vecA.equals(vecB))
+						return 0;
+
+					return vecA.distance(optimalFluid) < vecB.distance(optimalFluid) ? -1 : 1;
 				}
 			});
-
-			Collections.reverse(sortedResults);
 		}
 		catch (Exception e)
 		{
diff --git a/src/main/java/resonantinduction/mechanical/fluid/pump/TileGrate.java b/src/main/java/resonantinduction/mechanical/fluid/pump/TileGrate.java
index 82e8d571..870ec436 100644
--- a/src/main/java/resonantinduction/mechanical/fluid/pump/TileGrate.java
+++ b/src/main/java/resonantinduction/mechanical/fluid/pump/TileGrate.java
@@ -132,7 +132,8 @@ public class TileGrate extends TileAdvanced implements IFluidHandler, IDrain
 			}
 
 			/* Sort results out into two groups and clear the rest out of the result list */
-			Iterator<Vector3> it = this.getFillFinder().refresh().results.iterator();
+			Iterator<Vector3> it = getFillList().iterator();
+
 			while (it.hasNext())
 			{
 				Vector3 vec = it.next();
diff --git a/src/main/java/resonantinduction/mechanical/fluid/pump/TilePump.java b/src/main/java/resonantinduction/mechanical/fluid/pump/TilePump.java
index c83d5773..6c8b45ae 100644
--- a/src/main/java/resonantinduction/mechanical/fluid/pump/TilePump.java
+++ b/src/main/java/resonantinduction/mechanical/fluid/pump/TilePump.java
@@ -131,10 +131,6 @@ public class TilePump extends TileMachine implements IReadOut, ITileConnector, I
                 }
                 return;// TODO check why return is here
             }
-            else
-            {
-                drainList = ((IDrain) drain).getDrainList();
-            }
         }
 
         if (drainList == null)