diff --git a/barrel.lua b/barrel.lua
index 6873f7d..9cfe929 100644
--- a/barrel.lua
+++ b/barrel.lua
@@ -217,6 +217,10 @@ minetest.register_abm({
 		local npos = {x=pos.x, y=pos.y + 1, z=pos.z}
 		local pnet = bitumen.pipes.get_net(npos)
 		
+		if not pnet then
+			return
+		end
+		
 		local bpos = {x=pos.x, y=pos.y - 1, z=pos.z}
 		local bmeta = minetest.env:get_meta(bpos)
 		
@@ -235,10 +239,10 @@ minetest.register_abm({
 		end
 		
 		local cap = math.max(max_fill - fill, 0)
-		print("cap: "..cap)
+-- 		print("cap: "..cap)
 		local to_take = math.min(10, math.min(cap, pnet.buffer))
 		if to_take == 0 then
-			print("barrel full")
+-- 			print("barrel full")
 			return
 		end
 		
diff --git a/pipes.lua b/pipes.lua
index d1a7545..6a20467 100644
--- a/pipes.lua
+++ b/pipes.lua
@@ -613,7 +613,7 @@ minetest.register_abm({
 			--print("cap: ".. cap .." avail: ".. avail .. " out: "..out) 
 			pnet.buffer = pnet.buffer - out
 			minetest.set_node_level(pos, blevel + out)
-		elseif bnode.name == "air" then
+		elseif bnode.name == "air" or bnode.name == "bitumen:vapor_1" or bnode.name == "bitumen:vapor_2" then
 			local out = math.min(64, math.max(0, avail))
 			pnet.buffer = pnet.buffer - out
 			minetest.set_node(pos, {name = pnet.fluid})
diff --git a/pump.lua b/pump.lua
index f102c3b..7aee309 100644
--- a/pump.lua
+++ b/pump.lua
@@ -165,10 +165,10 @@ minetest.register_abm({
 		
 		local taken, fluid = bitumen.pipes.take_fluid(frontpos, to_take)
 		local pushed = bitumen.pipes.push_fluid(backpos, fluid, taken, lift)
-	--	print("bitumen pumped " ..taken .. " > "..pushed)
+-- 		print("bitumen pumped " ..taken .. " > "..pushed)
 		
 		if pushed < taken then
-			print("bitumen pump leaked ".. (taken - pushed))
+			print("bitumen pump leaked ".. (taken - pushed) .. " at " ..pos.x..","..pos.y..","..pos.z)
 		end
 		
 		--print("")
diff --git a/refinery.lua b/refinery.lua
index 4efa5cd..58da75b 100644
--- a/refinery.lua
+++ b/refinery.lua
@@ -166,7 +166,7 @@ bitumen.register_burner({"bitumen:distillation_column_boiler_on"}, {
 	finish_cook = function(pos) 
 		--print("y1 ".. pos.y)
 		local input = bitumen.pipes.take_fluid(pos, 64)
-		---print("crude taken: ".. input)
+		print(pos.x .. " crude taken: ".. input)
 		if input <= 0 then
 			return
 		end