diff --git a/lava-collector b/lava-collector
index 472c296..00c3690 100644
--- a/lava-collector
+++ b/lava-collector
@@ -21,11 +21,11 @@ local function findFirstItem(target)
 end
 
 local function findFirstEmptyBucket()
-    findFirstItem("minecraft:bucket")
+    return findFirstItem("minecraft:bucket")
 end
 
 local function findFirstLavaBucket()
-    findFirstItem("minecraft:lava_bucket")
+    return findFirstItem("minecraft:lava_bucket")
 end
 
 local function returnToBase()
@@ -50,7 +50,8 @@ end
 ForwardCounter = 0
 
 while true do
-    if turtle.getFuelLevel() < 1000 then
+    if turtle.getFuelLevel() < ForwardCounter then
+        print('not enough fuel to return. trying to refuel')
         if not refuel() then
             print('refulling failed. probably the end of the lava lake. returning to base')
             returnToBase()
@@ -58,15 +59,12 @@ while true do
         end
     end
 
-    local bucket = findFirstEmptyBucket()
-
-    if bucket == nil then
+    if findFirstEmptyBucket() == nil then
         print('could not find any empty buckets. returning and refilling')
         returnToBase()
         despositRefill()
 
     else
-        turtle.select(bucket)
         -- try to fill it
         turtle.placeDown()
         if compareItemName("minecraft:bucket") then