diff --git a/api.lua b/api.lua
index 726bed9..33a7407 100644
--- a/api.lua
+++ b/api.lua
@@ -30,8 +30,8 @@ local function force_detach(player)
 	local attached_to = player:get_attach()
 	if attached_to and attached_to:get_luaentity() then
 		local entity = attached_to:get_luaentity()
-		if entity.driver then
-			if entity ~= nil then entity.driver = nil end
+		if entity ~= nil and entity.driver then
+			entity.driver = nil
 		end
 		player:set_detach()
 	end
@@ -48,9 +48,9 @@ function vehicles.object_attach(entity, player, attach_at, visible, eye_offset)
 	player:set_attach(entity.object, "", attach_at, {x=0, y=0, z=0})
 	-- this is to hide the player when the attaching doesn't work properly
 	if not visible then
-	player:set_properties({visual_size = {x=0, y=0}})
+		player:set_properties({visual_size = {x=0, y=0}})
 	else
-	player:set_properties({visual_size = {x=1, y=1}})
+		player:set_properties({visual_size = {x=1, y=1}})
 	end
 	player:set_eye_offset(eye_offset, {x=eye_offset.x, y=eye_offset.y+1, z=-40})
 	default.player_attached[player:get_player_name()] = true
@@ -74,26 +74,6 @@ function vehicles.object_detach(entity, player, offset)
 		player:setpos(pos)
 	end)
 end
--------------------------------------------------------------------------------
-
-
-minetest.register_on_leaveplayer(function(player)
-	force_detach(player)
-end)
-
-minetest.register_on_shutdown(function()
-    local players = minetest.get_connected_players()
-	for i = 1,#players do
-		force_detach(players[i])
-	end
-end)
-
-minetest.register_on_dieplayer(function(player)
-	force_detach(player)
-	return true
-end)
-
--------------------------------------------------------------------------------
 
 --mixed code(from this mod and lib_mount)
 
@@ -173,16 +153,20 @@ function vehicles.object_drive(entity, dtime, def)
 	--respond to controls
 	--check for water
 	local function is_water(node)
-		return node == "default:river_water_source" or node == "default:water_source" or node == "default:river_water_flowing" or node == "default:water_flowing"
+		return node == "default:river_water_source"
+			or node == "default:water_source"
+			or node == "default:river_water_flowing"
+			or node == "default:water_flowing"
 	end
 	entity.on_water = is_water(node)
-	entity.in_water = is_water(minetest.get_node({x=pos.x, y=pos.y+1, z=pos.z}).name) or is_water(node_under.name)
+	entity.in_water = is_water(minetest.get_node({x=pos.x, y=pos.y+1, z=pos.z}).name)
+		or is_water(node_under.name)
 
 	local function is_watercraft_and_in_water()
-		entity.object:setvelocity({x=velo.x*0.9, y=velo.y+1, z=velo.z*0.9})
+		entity.object:setvelocity({x=velo.x*0.9, y=math.min(2, velo.y+0.5), z=velo.z*0.9})
 	end
 	local function is_watercraft_and_not_on_water()
-		entity.object:setvelocity({x=velo.x*decell,y=velo.y-1,z=velo.z*decell})
+		entity.object:setvelocity(vec_stop)
 	end
 	local function not_watercraft_and_on_or_in_water()
 		entity.object:setvelocity({x=velo.x*0.9, y=-1, z=velo.z*0.9})
@@ -192,12 +176,12 @@ function vehicles.object_drive(entity, dtime, def)
 		--apply water effects
 		if is_watercraft and entity.in_water then
 			is_watercraft_and_in_water()
-		elseif is_watercraft and entity.on_water == false then
+		elseif is_watercraft and not entity.on_water then
 			is_watercraft_and_not_on_water()
 		elseif (entity.on_water or entity.in_water) and not is_watercraft then
 			not_watercraft_and_on_or_in_water()
 		else
-		--stop
+			--stop
 			entity.object:setvelocity(vec_stop)
 			--animation
 			if moving_anim ~= nil and entity.moving and not hovering then
@@ -211,7 +195,7 @@ function vehicles.object_drive(entity, dtime, def)
 		local dir = entity.driver:get_look_dir()
 		local vec_backward = {x=-dir.x*speed/4,y=velo.y+1*-2,z=-dir.z*speed/4}
 		local yaw = entity.driver:get_look_yaw()
-		
+
 		--dummy variables
 		local vec_rise = {}
 		local vec_forward_simple = {}
@@ -232,24 +216,21 @@ function vehicles.object_drive(entity, dtime, def)
 
 		--timer
 		local absolute_speed = math.sqrt(math.pow(velo.x, 2)+math.pow(velo.z, 2))
-		--decell = (absolute_speed/100)+((def.decell)-(speed/100))
 		local anim_speed = (math.floor(absolute_speed*1.5)/1)+animation_speed
 		if absolute_speed <= speed and ctrl.up then
-		vtimer = vtimer + 1*dtime
+			vtimer = vtimer + 1*dtime
 		end
 		if not ctrl.up then
-		vtimer = 0
+			vtimer = 0
 		end
 
 		--boost reset
 		if boost and not entity.boost then
 			minetest.after(boost_charge, function()
-			entity.boost = true
+				entity.boost = true
 			end)
 		end
 
-		--minetest.chat_send_all("decell:"..decell.." speed"..absolute_speed)
-
 		--death_node
 		if death_node ~= nil and node == death_node then
 			if entity.driver then
@@ -261,7 +242,9 @@ function vehicles.object_drive(entity, dtime, def)
 		end
 
 		--place node
-		if place_node ~= nil and node == "air" or place_node ~= nil and node == "default:snow" or place_node ~= nil and minetest.get_item_group(node, "flora") ~= 0 then
+		if place_node ~= nil and node == "air" or
+			place_node ~= nil and node == "default:snow" or
+			place_node ~= nil and minetest.get_item_group(node, "flora") ~= 0 then
 			if place_trigger == nil and math.random(1, place_chance) == 1 then
 				minetest.set_node(pos, {name=place_node})
 			end
@@ -273,14 +256,14 @@ function vehicles.object_drive(entity, dtime, def)
 
 		--destroy node
 		if destroy_node ~= nil and node == destroy_node then
-				minetest.dig_node(pos)
-				local item = minetest.get_node_drops(destroy_node)
-				if item[1] ~= nil then
+			minetest.dig_node(pos)
+			local item = minetest.get_node_drops(destroy_node)
+			if item[1] ~= nil then
 				minetest.add_item(pos, item[1])
-				end
-				if item[2] ~= nil then
-					minetest.add_item(pos, item[1])
-				end
+			end
+			if item[2] ~= nil then
+				minetest.add_item(pos, item[1])
+			end
 		end
 
 		local turning_factor = 2
@@ -296,7 +279,7 @@ function vehicles.object_drive(entity, dtime, def)
 				velo3 = velo
 			end
 			local effect_pos = {x=pos.x-dir.x*2, y=pos.y, z=pos.z-dir.z*2}
-					minetest.add_particlespawner(
+			minetest.add_particlespawner(
 				4, --amount
 				0.5, --time
 				{x=effect_pos.x, y=effect_pos.y, z=effect_pos.z}, --minpos
@@ -322,14 +305,13 @@ function vehicles.object_drive(entity, dtime, def)
 		--face the right way
 		local target_yaw = yaw+math.pi+math.pi/2+extra_yaw
 		local entity_yaw = entity.object:getyaw()
-		local change_yaw = (((target_yaw-entity_yaw+math.pi)%(math.pi*2))-math.pi)/(turning_factor*absolute_speed+1)
+		local change_yaw = (((target_yaw-entity_yaw+math.pi)%(math.pi*2))-math.pi)/
+			(turning_factor*absolute_speed+1)
 		if entity_yaw ~= target_yaw and not uses_arrow_keys then
 			entity.object:setyaw(entity_yaw+change_yaw)
 			dir.x = -math.sin(entity_yaw)
 			dir.z = math.cos(entity_yaw)
 		else
-			--minetest.chat_send_all("yaw:"..entity_yaw)
-			--minetest.chat_send_all("dirx: "..dir.x.." dirz:"..dir.z)
 			if ctrl.left then
 				entity.object:setyaw(entity_yaw+(math.pi/360)*absolute_speed/2)
 			end
@@ -343,12 +325,12 @@ function vehicles.object_drive(entity, dtime, def)
 		--apply water effects
 		if is_watercraft and entity.in_water then
 			is_watercraft_and_in_water()
-		elseif is_watercraft and entity.on_water == false then
+		elseif is_watercraft and not entity.on_water then
 			is_watercraft_and_not_on_water()
 		elseif (entity.on_water or entity.in_water) and not is_watercraft then
 			not_watercraft_and_on_or_in_water()
 
-		--brakes
+			--brakes
 		elseif ctrl.jump and brakes and not ctrl.up then
 			local velo2 = nil
 			if velo2 == nil then
@@ -356,7 +338,7 @@ function vehicles.object_drive(entity, dtime, def)
 			end
 			local effect_pos = {x=pos.x-dir.x*2, y=pos.y, z=pos.z-dir.z*2}
 			entity.object:setvelocity({x=velo2.x*(0.95), y=velo.y, z=velo2.z*(0.95)})
-					minetest.add_particlespawner(
+			minetest.add_particlespawner(
 				4, --amount
 				0.5, --time
 				{x=effect_pos.x, y=effect_pos.y, z=effect_pos.z}, --minpos
@@ -373,170 +355,159 @@ function vehicles.object_drive(entity, dtime, def)
 				braking_effect --texture
 			)
 			if vtimer >= 0.5 then
-			vtimer = vtimer-vtimer/10
+				vtimer = vtimer-vtimer/10
 			end
-		--[[elseif ctrl.jump and ctrl.up and brakes then
-			local velo3 = nil
-			if velo3 == nil then
-				velo3 = velo
-			end
-			local effect_pos = {x=pos.x-dir.x*2, y=pos.y, z=pos.z-dir.z*2}
-			entity.object:setvelocity({x=velo.x*(decell), y=velo.y, z=velo.z*(decell)})
-					minetest.add_particlespawner(
-				4, --amount
-				0.5, --time
-				{x=effect_pos.x, y=effect_pos.y, z=effect_pos.z}, --minpos
-				{x=effect_pos.x, y=effect_pos.y, z=effect_pos.z}, --maxpos
-				{x=0, y=0, z=0}, --minvel
-				{x=-velo3.x, y=0.4, z=-velo3.z}, --maxvel
-				{x=-0,y=-0,z=-0}, --minacc
-				{x=0,y=0,z=0}, --maxacc
-				0.5, --minexptime
-				1, --maxexptime
-				10, --minsize
-				15, --maxsize
-				false, --collisiondetection
-				"vehicles_dust.png" --texture
-			)
-			if timer >= 0.5 then
-			timer = timer-timer/25
-			end]]
 
-		--boost
+			--boost
 		elseif ctrl.up and not shoots2 and ctrl.aux1 and entity.boost then
-			entity.object:setvelocity({x=dir.x*(speed*0.2)*math.log(vtimer+0.5)+8*dir.x,y=velo.y-gravity/2,z=dir.z*(speed*0.2)*math.log(vtimer+0.5)+8*dir.z})
+			entity.object:setvelocity({
+				x=dir.x*(speed*0.2)*math.log(vtimer+0.5)+8*dir.x,
+				y=velo.y-gravity/2,
+				z=dir.z*(speed*0.2)*math.log(vtimer+0.5)+8*dir.z})
 			if boost_effect ~= nil then
-			local effect_pos = {x=pos.x-dir.x*2, y=pos.y, z=pos.z-dir.z*2}
+				local effect_pos = {x=pos.x-dir.x*2, y=pos.y, z=pos.z-dir.z*2}
 				minetest.add_particlespawner(
-				10, --amount
-				0.25, --time
-				{x=effect_pos.x, y=effect_pos.y+0.2, z=effect_pos.z}, --minpos
-				{x=effect_pos.x, y=effect_pos.y+0.2, z=effect_pos.z}, --maxpos
-				{x=-velo.x, y=-velo.y, z=-velo.z}, --minvel
-				{x=-velo.x, y=-velo.y, z=-velo.z}, --maxvel
-				{x=-0,y=-0,z=-0}, --minacc
-				{x=0,y=1,z=0}, --maxacc
-				0.02, --minexptime
-				0.02, --maxexptime
-				20, --minsize
-				20, --maxsize
-				false, --collisiondetection
-				boost_effect --texture
+					10, --amount
+					0.25, --time
+					{x=effect_pos.x, y=effect_pos.y+0.2, z=effect_pos.z}, --minpos
+					{x=effect_pos.x, y=effect_pos.y+0.2, z=effect_pos.z}, --maxpos
+					{x=-velo.x, y=-velo.y, z=-velo.z}, --minvel
+					{x=-velo.x, y=-velo.y, z=-velo.z}, --maxvel
+					{x=-0,y=-0,z=-0}, --minacc
+					{x=0,y=1,z=0}, --maxacc
+					0.02, --minexptime
+					0.02, --maxexptime
+					20, --minsize
+					20, --maxsize
+					false, --collisiondetection
+					boost_effect --texture
 				)
 			end
-				minetest.after(boost_duration, function()
+			minetest.after(boost_duration, function()
 				entity.boost = false
-				end)
-		--animation
-		if moving_anim ~= nil and not entity.moving and not hovering then
-			entity.object:set_animation(move_anim, anim_speed, 0)
-			entity.moving = true
-		end
-		--rise
+			end)
+			--animation
+			if moving_anim ~= nil and not entity.moving and not hovering then
+				entity.object:set_animation(move_anim, anim_speed, 0)
+				entity.moving = true
+			end
+			--rise
 		elseif ctrl.jump and fly and fly_mode == "rise" then
 			entity.object:setvelocity(vec_rise)
 			--lib_mount animation
-		if moving_anim ~= nil and not entity.moving then
-			entity.object:set_animation(moving_anim, anim_speed, 0)
-			entity.moving = true
-		end
-		--hover in place
+			if moving_anim ~= nil and not entity.moving then
+				entity.object:set_animation(moving_anim, anim_speed, 0)
+				entity.moving = true
+			end
+			--hover in place
 		elseif ctrl.jump and ctrl.up and fly and fly_mode == "hold" then
 			entity.object:setvelocity({x=dir.x*speed, y=0, z=dir.z*speed})
-		--move forward
+			--move forward
 		elseif ctrl.up and not fixed then
 			if not fly and not is_watercraft then
-			entity.object:setvelocity({x=(dir.x*(speed*0.2)*math.log(vtimer+0.5)+4*dir.x)/(braking*(0.1)+1),y=velo.y-0.5,z=(dir.z*(speed*0.2)*math.log(vtimer+0.5)+4*dir.z)/(braking*(0.1)+1)})
+				entity.object:setvelocity({
+					x=(dir.x*(speed*0.2)*math.log(vtimer+0.5)+4*dir.x)/(braking*(0.1)+1),
+					y=velo.y-0.5,
+					z=(dir.z*(speed*0.2)*math.log(vtimer+0.5)+4*dir.z)/(braking*(0.1)+1)})
 			elseif not fly then
-			entity.object:setvelocity({x=dir.x*(speed*0.2)*math.log(vtimer+0.5)+4*dir.x,y=0,z=dir.z*(speed*0.2)*math.log(vtimer+0.5)+4*dir.z})
+				entity.object:setvelocity({
+					x=dir.x*(speed*0.2)*math.log(vtimer+0.5)+4*dir.x,
+					y=0,
+					z=dir.z*(speed*0.2)*math.log(vtimer+0.5)+4*dir.z})
 			else
-			entity.object:setvelocity({x=dir.x*(speed*0.2)*math.log(vtimer+0.5)+4*dir.x,y=dir.y*(speed*0.2)*math.log(vtimer+0.5)+4*dir.y+1,z=dir.z*(speed*0.2)*math.log(vtimer+0.5)+4*dir.z})
+				entity.object:setvelocity({
+					x=dir.x*(speed*0.2)*math.log(vtimer+0.5)+4*dir.x,
+					y=dir.y*(speed*0.2)*math.log(vtimer+0.5)+4*dir.y+1,
+					z=dir.z*(speed*0.2)*math.log(vtimer+0.5)+4*dir.z})
 			end
-		--animation
-		if moving_anim ~= nil and not entity.moving and not hovering then
-			entity.object:set_animation(moving_anim, anim_speed, 0)
-			entity.moving = true
-		end
-		--move backward
+			--animation
+			if moving_anim ~= nil and not entity.moving and not hovering then
+				entity.object:set_animation(moving_anim, anim_speed, 0)
+				entity.moving = true
+			end
+			--move backward
 		elseif ctrl.down and not fixed and not fly then
 			if not is_watercraft then
 				if brakes and absolute_speed > 5 then
 					local velo2 = nil
-			if velo2 == nil then
-				velo2 = velo
-			end
-			local effect_pos = {x=pos.x-dir.x*2, y=pos.y, z=pos.z-dir.z*2}
-			entity.object:setvelocity({x=velo2.x*(0.95), y=velo.y, z=velo2.z*(0.95)})
+					if velo2 == nil then
+						velo2 = velo
+					end
+					local effect_pos = {x=pos.x-dir.x*2, y=pos.y, z=pos.z-dir.z*2}
+					entity.object:setvelocity({x=velo2.x*(0.95), y=velo.y, z=velo2.z*(0.95)})
 					minetest.add_particlespawner(
-				4, --amount
-				0.5, --time
-				{x=effect_pos.x, y=effect_pos.y, z=effect_pos.z}, --minpos
-				{x=effect_pos.x, y=effect_pos.y, z=effect_pos.z}, --maxpos
-				{x=0, y=0.1, z=0}, --minvel
-				{x=-velo2.x, y=0.4, z=-velo2.z}, --maxvel
-				{x=-0,y=-0,z=-0}, --minacc
-				{x=0,y=0,z=0}, --maxacc
-				0.5, --minexptime
-				1, --maxexptime
-				10, --minsize
-				15, --maxsize
-				false, --collisiondetection
-				braking_effect --texture
-			)
-			if vtimer >= 0.5 then
-			vtimer = vtimer-vtimer/10
-			end
+						4, --amount
+						0.5, --time
+						{x=effect_pos.x, y=effect_pos.y, z=effect_pos.z}, --minpos
+						{x=effect_pos.x, y=effect_pos.y, z=effect_pos.z}, --maxpos
+						{x=0, y=0.1, z=0}, --minvel
+						{x=-velo2.x, y=0.4, z=-velo2.z}, --maxvel
+						{x=-0,y=-0,z=-0}, --minacc
+						{x=0,y=0,z=0}, --maxacc
+						0.5, --minexptime
+						1, --maxexptime
+						10, --minsize
+						15, --maxsize
+						false, --collisiondetection
+						braking_effect --texture
+					)
+					if vtimer >= 0.5 then
+						vtimer = vtimer-vtimer/10
+					end
 				else
-				entity.object:setvelocity({x=-dir.x*(speed/4)*accell,y=velo.y-0.5,z=-dir.z*(speed/4)*accell})
+					entity.object:setvelocity({
+						x=-dir.x*(speed/4)*accell,
+						y=velo.y-0.5,
+						z=-dir.z*(speed/4)*accell})
 				end
 			else
 				if brakes and absolute_speed > 5 then
 					local velo2 = nil
-			if velo2 == nil then
-				velo2 = velo
-			end
-			local effect_pos = {x=pos.x-dir.x*2, y=pos.y, z=pos.z-dir.z*2}
-			entity.object:setvelocity({x=velo2.x*(0.95), y=velo.y, z=velo2.z*(0.95)})
+					if velo2 == nil then
+						velo2 = velo
+					end
+					local effect_pos = {x=pos.x-dir.x*2, y=pos.y, z=pos.z-dir.z*2}
+					entity.object:setvelocity({x=velo2.x*(0.95), y=velo.y, z=velo2.z*(0.95)})
 					minetest.add_particlespawner(
-				4, --amount
-				0.5, --time
-				{x=effect_pos.x, y=effect_pos.y, z=effect_pos.z}, --minpos
-				{x=effect_pos.x, y=effect_pos.y, z=effect_pos.z}, --maxpos
-				{x=0, y=0.1, z=0}, --minvel
-				{x=-velo2.x, y=0.4, z=-velo2.z}, --maxvel
-				{x=-0,y=-0,z=-0}, --minacc
-				{x=0,y=0,z=0}, --maxacc
-				0.5, --minexptime
-				1, --maxexptime
-				10, --minsize
-				15, --maxsize
-				false, --collisiondetection
-				braking_effect --texture
-			)
-			if vtimer >= 0.5 then
-			vtimer = vtimer-vtimer/10
-			end
+						4, --amount
+						0.5, --time
+						{x=effect_pos.x, y=effect_pos.y, z=effect_pos.z}, --minpos
+						{x=effect_pos.x, y=effect_pos.y, z=effect_pos.z}, --maxpos
+						{x=0, y=0.1, z=0}, --minvel
+						{x=-velo2.x, y=0.4, z=-velo2.z}, --maxvel
+						{x=-0,y=-0,z=-0}, --minacc
+						{x=0,y=0,z=0}, --maxacc
+						0.5, --minexptime
+						1, --maxexptime
+						10, --minsize
+						15, --maxsize
+						false, --collisiondetection
+						braking_effect --texture
+					)
+					if vtimer >= 0.5 then
+						vtimer = vtimer-vtimer/10
+					end
 				else
-			entity.object:setvelocity({x=-dir.x*(speed/4)*accell,y=0,z=-dir.z*(speed/4)*accell})
+					entity.object:setvelocity({x=-dir.x*(speed/4)*accell,y=0,z=-dir.z*(speed/4)*accell})
+				end
 			end
+			--animation
+			if moving_anim ~= nil and not entity.moving and not hovering then
+				entity.object:set_animation(moving_anim, anim_speed, 0)
+				entity.moving = true
 			end
-		--animation
-		if moving_anim ~= nil and not entity.moving and not hovering then
-			entity.object:set_animation(moving_anim, anim_speed, 0)
-			entity.moving = true
-		end
-		--stop
+			--stop
 		elseif not ctrl.down or ctrl.up then
 			entity.object:setvelocity({x=velo.x*decell,y=velo.y-gravity,z=velo.z*decell})
-		--animation
-		if moving_anim ~= nil and entity.moving and not hovering then
-			entity.object:set_animation(stand_anim, anim_speed, 0)
-			entity.moving = false
-		end
+			--animation
+			if moving_anim ~= nil and entity.moving and not hovering then
+				entity.object:set_animation(stand_anim, anim_speed, 0)
+				entity.moving = false
+			end
 		end
 		--shoot weapons
 		if ctrl.sneak and shoots and entity.loaded then
-				if inv:contains_item("main", arrow.."_item") or infinite_arrow then
+			if inv:contains_item("main", arrow.."_item") or infinite_arrow then
 				local remov = inv:remove_item("main", arrow.."_item")
 				entity.loaded = false
 				local obj = minetest.env:add_entity({x=pos.x+0+dir.x*2,y=pos.y+shoot_y+dir.y,z=pos.z+0+dir.z*2}, arrow)
@@ -548,19 +519,19 @@ function vehicles.object_drive(entity, dtime, def)
 				object.vehicle = entity.object
 				--lib_mount animation
 				if shoot_anim ~= nil and entity.object:get_animation().range ~= shoot_anim then
-				entity.object:set_animation(shoot_anim, anim_speed, 0)
+					entity.object:set_animation(shoot_anim, anim_speed, 0)
 				end
 				minetest.after(reload_time, function()
-				entity.loaded = true
-				if stand_anim ~= nil and shoot_anim ~= nil then
-				entity.object:set_animation(stand_anim, anim_speed, 0)
-				end
+					entity.loaded = true
+					if stand_anim ~= nil and shoot_anim ~= nil then
+						entity.object:set_animation(stand_anim, anim_speed, 0)
+					end
 				end)
-				end
+			end
 		end
 
 		if ctrl.aux1 and shoots2 and entity.loaded2 then
-				if inv:contains_item("main", arrow2.."_item") or infinite_arrow2 then
+			if inv:contains_item("main", arrow2.."_item") or infinite_arrow2 then
 				local remov = inv:remove_item("main", arrow2.."_item")
 				entity.loaded2 = false
 				local obj = minetest.env:add_entity({x=pos.x+0+dir.x*2,y=pos.y+shoot_y2+dir.y,z=pos.z+0+dir.z*2}, arrow2)
@@ -572,159 +543,179 @@ function vehicles.object_drive(entity, dtime, def)
 				object.vehicle = entity.object
 				--lib_mount animation
 				if shoot_anim2 ~= nil and entity.object:get_animation().range ~= shoot_anim2 then
-				entity.object:set_animation(shoot_anim2, anim_speed, 0)
+					entity.object:set_animation(shoot_anim2, anim_speed, 0)
 				end
 				minetest.after(reload_time2, function()
-				entity.loaded2 = true
-				if stand_anim ~= nil and shoot_anim2 ~= nil then
-				entity.object:set_animation(stand_anim, anim_speed, 0)
-				end
+					entity.loaded2 = true
+					if stand_anim ~= nil and shoot_anim2 ~= nil then
+						entity.object:set_animation(stand_anim, anim_speed, 0)
+					end
 				end)
-				end
+			end
 		end
 		--jump(hover) without moving forward
 		if jump == "hover" and ctrl.jump and not entity.jumpcharge then
 			if not ctrl.up then
-			local vec_hover = {x=velo.x+0,y=hover_speed,z=velo.z+0}
-			entity.object:setvelocity(vec_hover)
+				local vec_hover = {x=velo.x+0,y=hover_speed,z=velo.z+0}
+				entity.object:setvelocity(vec_hover)
 			else
-			entity.object:setvelocity({x=dir.x*(speed*0.2)*math.log(vtimer+0.5)+4*dir.x,y=hover_speed,z=dir.z*(speed*0.2)*math.log(vtimer+0.5)+4*dir.z})
+				entity.object:setvelocity({
+					x=dir.x*(speed*0.2)*math.log(vtimer+0.5)+4*dir.x,
+					y=hover_speed,
+					z=dir.z*(speed*0.2)*math.log(vtimer+0.5)+4*dir.z})
 			end
 			hovering = true
 			if jump_anim ~= nil and entity.object:get_animation().range ~= jump_anim and hovering then
 				entity.object:set_animation(jump_anim, anim_speed, 0)
 			end
 			minetest.after(5, function()
-			entity.jumpcharge =  true
+				entity.jumpcharge =  true
 			end)
 			minetest.after(10, function()
-			entity.jumpcharge =  false
-			hovering = false
+				entity.jumpcharge =  false
+				hovering = false
 			end)
 		end
 		--jump (jump) without moving forward
 		if jump == "jump" and ctrl.jump and not entity.jumpcharge then
 			if not ctrl.up then
-			local vec_jump = {x=velo.x+0,y=jump_speed,z=velo.z+0}
-			entity.object:setvelocity(vec_jump)
+				local vec_jump = {x=velo.x+0,y=jump_speed,z=velo.z+0}
+				entity.object:setvelocity(vec_jump)
 			else
-			entity.object:setvelocity({x=dir.x*speed/4*math.atan(0.5*vtimer-2)+8*dir.x,y=jump_speed,z=dir.z*speed/4*math.atan(0.5*vtimer-2)+8*dir.z})
+				entity.object:setvelocity({
+					x=dir.x*speed/4*math.atan(0.5*vtimer-2)+8*dir.x,
+					y=jump_speed,
+					z=dir.z*speed/4*math.atan(0.5*vtimer-2)+8*dir.z})
 			end
 			hovering = true
 			if jump_anim ~= nil and entity.object:get_animation().range ~= jump_anim and hovering then
 				entity.object:set_animation(jump_anim, anim_speed, 0)
 			end
 			minetest.after(0.5, function()
-			entity.jumpcharge =  true
+				entity.jumpcharge =  true
 			end)
 			minetest.after(1, function()
-			entity.jumpcharge =  false
-			hovering = false
+				entity.jumpcharge =  false
+				hovering = false
 			end)
 		end
 
 		--play sound
 		if entity.sound_ready then
-		minetest.sound_play(driving_sound, 
-			{to_player=entity.driver:get_player_name(), gain = 4, max_hear_distance = 3, loop = false})
-		entity.sound_ready = false
-		minetest.after(sound_duration, function()
-		entity.sound_ready = true
-		end)
+			minetest.sound_play(driving_sound,
+				{to_player=entity.driver:get_player_name(),
+					gain = 4,
+					max_hear_distance = 3,
+					loop = false})
+			entity.sound_ready = false
+			minetest.after(sound_duration, function()
+				entity.sound_ready = true
+			end)
 		end
 
 	end
 
 end
 
-function vehicles.object_glide(entity, dtime, speed, decell, gravity, moving_anim, stand_anim)
-	local ctrl = entity.driver:get_player_control()
-	local dir = entity.driver:get_look_dir()
-	local velo = entity.object:getvelocity()
+function vehicles.object_glide(self, dtime, speed, decell, gravity, moving_anim, stand_anim)
+	if self.driver == nil or self.driver:get_player_name() == "" then
+		self.object:remove()
+		return
+	else
+		local b1, b2 = pcall(function() return self.driver:get_attach():get_luaentity() == self end)
+		if not (b1 and b2) then
+			pcall(force_detach, self.driver)
+			self.object:remove()
+			return
+		end
+	end
+	local ctrl = self.driver:get_player_control()
+	local dir = self.driver:get_look_dir()
+	local velo = self.object:getvelocity()
 	local vec_glide = {x=dir.x*speed*decell, y=velo.y, z=dir.z*speed*decell}
-	local yaw = entity.driver:get_look_yaw()
+	local yaw = self.driver:get_look_yaw()
 	if not ctrl.sneak then
-		entity.object:setyaw(yaw+math.pi+math.pi/2)
-		entity.object:setvelocity(vec_glide)
-		entity.object:setacceleration({x=0, y=gravity, z=0})
+		self.object:setyaw(yaw+math.pi+math.pi/2)
+		self.object:setvelocity(vec_glide)
+		self.object:setacceleration({x=0, y=gravity, z=0})
 	end
 	if ctrl.sneak then
-			local vec = {x=0,y=gravity*15,z=0}
-			local yaw = entity.driver:get_look_yaw()
-			entity.object:setyaw(yaw+math.pi+math.pi/2)
-			entity.object:setvelocity(vec)
+		local vec = {x=0,y=gravity*15,z=0}
+		local yaw = self.driver:get_look_yaw()
+		self.object:setyaw(yaw+math.pi+math.pi/2)
+		self.object:setvelocity(vec)
 	end
 	if velo.y == 0 then
-		local pos = entity.object:getpos()
+		local pos = self.object:getpos()
 		for dx=-1,1 do
-						for dy=-1,1 do
-							for dz=-1,1 do
-								local p = {x=pos.x+dx, y=pos.y-1, z=pos.z+dz}
-								local t = {x=pos.x+dx, y=pos.y+dy, z=pos.z+dz}
-								local n = minetest.env:get_node(p).name
-								if n ~= "massdestruct:parachute" and n ~= "air" then
-									local pos = entity.object:getpos()
-									entity.object:remove()
-									return
-								end
-							end
-						end
+			for dy=-1,1 do
+				for dz=-1,1 do
+					local p = {x=pos.x+dx, y=pos.y-1, z=pos.z+dz}
+					local t = {x=pos.x+dx, y=pos.y+dy, z=pos.z+dz}
+					local n = minetest.env:get_node(p).name
+					if n ~= "massdestruct:parachute" and n ~= "air" then
+						local pos = self.object:getpos()
+						self.object:remove()
+						return
 					end
-	 end
+				end
+			end
+		end
+	end
 end
 
 function vehicles.register_spawner(vehicle, desc, texture, is_boat)
-minetest.register_craftitem(vehicle.."_spawner", {
-	description = desc,
-	inventory_image = texture,
-	liquids_pointable = is_boat,
-	wield_scale = {x = 1.5, y = 1.5, z = 1},
-	on_place = function(item, placer, pointed_thing)
+	minetest.register_craftitem(vehicle.."_spawner", {
+		description = desc,
+		inventory_image = texture,
+		liquids_pointable = is_boat,
+		wield_scale = {x = 1.5, y = 1.5, z = 1},
+		on_place = function(item, placer, pointed_thing)
 			local dir = placer:get_look_dir()
 			local playerpos = placer:getpos()
 			local creative_mode = creative and creative.is_enabled_for and creative.is_enabled_for(placer:get_player_name())
 			if pointed_thing.type == "node" and not is_boat then
-			local obj = minetest.env:add_entity(pointed_thing.above, vehicle)
-			local object = obj:get_luaentity()
-			object.owner = placer
-			if not creative_mode then
-			item:take_item()
-			return item
-			end
+				local obj = minetest.env:add_entity(pointed_thing.above, vehicle)
+				local object = obj:get_luaentity()
+				object.owner = placer
+				if not creative_mode then
+					item:take_item()
+					return item
+				end
 			elseif pointed_thing.type == "node" and minetest.get_item_group(pointed_thing.name, "water") then
-			local obj = minetest.env:add_entity(pointed_thing.under, vehicle)
-			obj:setvelocity({x=0, y=-1, z=0})
-			local object = obj:get_luaentity()
-			object.owner = placer
-			if not creative_mode then
-			item:take_item()
-			return item
+				local obj = minetest.env:add_entity(pointed_thing.under, vehicle)
+				obj:setvelocity({x=0, y=-1, z=0})
+				local object = obj:get_luaentity()
+				object.owner = placer
+				if not creative_mode then
+					item:take_item()
+					return item
+				end
 			end
-			end
-	end,
-})
+		end,
+	})
 end
 
 function vehicles.explodinate(ent, radius)
 	local pos = ent.object:getpos()
 	minetest.add_particlespawner({
-			amount = 90,
-			time = 4,
-			minpos = {x=pos.x-0.6, y=pos.y, z=pos.z-0.6},
-			maxpos = {x=pos.x+0.6, y=pos.y+1, z=pos.z+0.6},
-			minvel = {x=-0.1, y=3.5, z=-0.1},
-			maxvel = {x=0.1, y=4.5, z=0.1},
-			minacc = {x=-1.3, y=-0.7, z=-1.3},
-			maxacc = {x=1.3, y=-0.7, z=1.3},
-			minexptime = 2,
-			maxexptime = 3,
-			minsize = 15,
-			maxsize = 25,
-			collisiondetection = false,
-			texture = "vehicles_explosion.png"
-		})
+		amount = 90,
+		time = 4,
+		minpos = {x=pos.x-0.6, y=pos.y, z=pos.z-0.6},
+		maxpos = {x=pos.x+0.6, y=pos.y+1, z=pos.z+0.6},
+		minvel = {x=-0.1, y=3.5, z=-0.1},
+		maxvel = {x=0.1, y=4.5, z=0.1},
+		minacc = {x=-1.3, y=-0.7, z=-1.3},
+		maxacc = {x=1.3, y=-0.7, z=1.3},
+		minexptime = 2,
+		maxexptime = 3,
+		minsize = 15,
+		maxsize = 25,
+		collisiondetection = false,
+		texture = "vehicles_explosion.png"
+	})
 	minetest.after(1, function()
-	minetest.add_particlespawner({
+		minetest.add_particlespawner({
 			amount = 30,
 			time = 4,
 			minpos = {x=pos.x-1, y=pos.y+2, z=pos.z-1},
@@ -740,19 +731,19 @@ function vehicles.explodinate(ent, radius)
 			collisiondetection = false,
 			texture = "vehicles_explosion.png"
 		})
-		end)
+	end)
 end
 
 function vehicles.on_punch(self, puncher)
 	local hp = self.object:get_hp()
 	if hp == 0 then
 		if self.driver then
-		vehicles.object_detach(self, self.driver, {x=1, y=0, z=1})
+			vehicles.object_detach(self, self.driver, {x=1, y=0, z=1})
 		end
 		vehicles.explodinate(self, 5)
 	end
 	if not self.driver then
-	return end
+		return end
 	local creative_mode = creative and creative.is_enabled_for and creative.is_enabled_for(self.driver:get_player_name())
 	if self.driver == puncher and (hp == self.hp_max-5 or hp == self.hp_max or creative_mode) then
 		local name = self.object:get_luaentity().name
@@ -764,6 +755,15 @@ function vehicles.on_punch(self, puncher)
 end
 
 function vehicles.on_step(self, dtime, def, have_driver, no_driver)
+	if self.driver == nil or self.driver:get_player_name() == "" then
+		self.driver = nil
+	else
+		local b1, b2 = pcall(function() return self.driver:get_attach():get_luaentity() == self end)
+		if not (b1 and b2) then
+			pcall(force_detach, self.driver)
+			self.driver = nil
+		end
+	end
 	vehicles.object_drive(self, dtime, def)
 	if self.driver then
 		if have_driver ~= nil then
diff --git a/init.lua b/init.lua
index df50e74..2410acd 100644
--- a/init.lua
+++ b/init.lua
@@ -4,20 +4,6 @@ vehicles = {}
 
 dofile(minetest.get_modpath("vehicles").."/api.lua")
 
---very laggy and buggy flight
--- minetest.register_globalstep(function(dtime)
-	-- for _, player in ipairs(minetest.get_connected_players()) do
-		-- local dir = player:get_look_dir();
-		-- local pos = player:getpos();
-		-- local ctrl = player:get_player_control();
-		-- local pos1 = {x=pos.x+dir.x*1,y=pos.y+dir.y*1,z=pos.z+dir.z*1}
-		-- if ctrl.up == true then
-		-- player:moveto(pos1, false)
-		-- else
-		-- end
-	-- end
--- end)
-
 local step = 1.1
 
 local enable_built_in = true
@@ -32,74 +18,70 @@ minetest.register_entity("vehicles:missile", {
 	damage = 2,
 	collisionbox = {-1, -0.5, -1, 1, 0.5, 1},
 	on_rightclick = function(self, clicker)
-		clicker:set_attach(self.object, "", {x=0,y=0,z=0}, {x=0,y=1,z=0}) 
+		clicker:set_attach(self.object, "", {x=0,y=0,z=0}, {x=0,y=1,z=0})
 	end,
 	on_step = function(self, obj, pos)
 		minetest.after(10, function()
 			self.object:remove()
 		end)
 		local player = self.launcher
-		if player == nil then
-			self.object:remove()
-			return
-		end
-		local dir = player:get_look_dir();
-		if dir == nil then
+		if player == nil or player:get_player_name() == "" then
 			self.object:remove()
 			return
 		end
+		local dir = player:get_look_dir()
 		local vec = {x=dir.x*16,y=dir.y*16,z=dir.z*16}
-		local yaw = player:get_look_yaw();
+		local yaw = player:get_look_yaw()
 		self.object:setyaw(yaw+math.pi/2)
 		self.object:setvelocity(vec)
 		local pos = self.object:getpos()
 		local vec = self.object:getvelocity()
 		minetest.add_particlespawner({
-		amount = 1,
-		time = 0.5,
-		minpos = {x=pos.x-0.2, y=pos.y, z=pos.z-0.2},
-		maxpos = {x=pos.x+0.2, y=pos.y, z=pos.z+0.2},
-		minvel = {x=-vec.x/2, y=-vec.y/2, z=-vec.z/2},
-		maxvel = {x=-vec.x, y=-vec.y, z=-vec.z},
-		minacc = {x=0, y=-1, z=0},
-		maxacc = {x=0, y=-1, z=0},
-		minexptime = 0.2,
-		maxexptime = 0.6,
-		minsize = 3,
-		maxsize = 4,
-		collisiondetection = false,
-		texture = "vehicles_smoke.png",
-	})
-		local objs = minetest.get_objects_inside_radius({x=pos.x,y=pos.y,z=pos.z}, 2)	
-			for k, obj in pairs(objs) do
-				if obj:get_luaentity() ~= nil then
-					if obj:get_luaentity().name ~= "vehicles:missile" and obj ~= self.vehicle and obj ~= self.launcher and obj:get_luaentity().name ~= "__builtin:item" then
-						obj:punch(self.object, 1.0, {
-							full_punch_interval=1.0,
-							damage_groups={fleshy=12},
-						}, nil)
+			amount = 1,
+			time = 0.5,
+			minpos = {x=pos.x-0.2, y=pos.y, z=pos.z-0.2},
+			maxpos = {x=pos.x+0.2, y=pos.y, z=pos.z+0.2},
+			minvel = {x=-vec.x/2, y=-vec.y/2, z=-vec.z/2},
+			maxvel = {x=-vec.x, y=-vec.y, z=-vec.z},
+			minacc = {x=0, y=-1, z=0},
+			maxacc = {x=0, y=-1, z=0},
+			minexptime = 0.2,
+			maxexptime = 0.6,
+			minsize = 3,
+			maxsize = 4,
+			collisiondetection = false,
+			texture = "vehicles_smoke.png",
+		})
+		local objs = minetest.get_objects_inside_radius({x=pos.x,y=pos.y,z=pos.z}, 2)
+		for k, obj in pairs(objs) do
+			if obj:get_luaentity() ~= nil then
+				if obj:get_luaentity().name ~= "vehicles:missile" and obj ~= self.vehicle and obj ~= self.launcher and obj:get_luaentity().name ~= "__builtin:item" then
+					obj:punch(self.object, 1.0, {
+						full_punch_interval=1.0,
+						damage_groups={fleshy=12},
+					}, nil)
+					local pos = self.object:getpos()
+					tnt.boom(pos, {damage_radius=5,radius=5,ignore_protection=false})
+					self.object:remove()
+				end
+			end
+		end
+
+		for dx=-1,1 do
+			for dy=-1,1 do
+				for dz=-1,1 do
+					local p = {x=pos.x+dx, y=pos.y, z=pos.z+dz}
+					local t = {x=pos.x+dx, y=pos.y+dy, z=pos.z+dz}
+					local n = minetest.env:get_node(p).name
+					if n ~= "vehicles:missile" and n ~= "vehicles:jet" and n ~= "air" then
 						local pos = self.object:getpos()
 						tnt.boom(pos, {damage_radius=5,radius=5,ignore_protection=false})
 						self.object:remove()
+						return
 					end
 				end
 			end
-			
-					for dx=-1,1 do
-						for dy=-1,1 do
-							for dz=-1,1 do
-								local p = {x=pos.x+dx, y=pos.y, z=pos.z+dz}
-								local t = {x=pos.x+dx, y=pos.y+dy, z=pos.z+dz}
-								local n = minetest.env:get_node(p).name
-								if n ~= "vehicles:missile" and n ~= "vehicles:jet" and n ~= "air" then
-									local pos = self.object:getpos()
-									tnt.boom(pos, {damage_radius=5,radius=5,ignore_protection=false})
-									self.object:remove()
-									return
-								end
-							end
-						end
-					end
+		end
 	end,
 })
 
@@ -137,65 +119,65 @@ minetest.register_entity("vehicles:missile_2", {
 		end
 		local pos = self.object:getpos()
 		minetest.add_particlespawner({
-		amount = 2,
-		time = 0.5,
-		minpos = {x=pos.x-0.2, y=pos.y, z=pos.z-0.2},
-		maxpos = {x=pos.x+0.2, y=pos.y, z=pos.z+0.2},
-		minvel = {x=-velo.x/2, y=-velo.y/2, z=-velo.z/2},
-		maxvel = {x=-velo.x, y=-velo.y, z=-velo.z},
-		minacc = {x=0, y=-1, z=0},
-		maxacc = {x=0, y=-1, z=0},
-		minexptime = 0.2,
-		maxexptime = 0.6,
-		minsize = 3,
-		maxsize = 4,
-		collisiondetection = false,
-		texture = "vehicles_smoke.png",
-	})
-		local objs = minetest.get_objects_inside_radius({x=pos.x,y=pos.y,z=pos.z}, 2)	
-			for k, obj in pairs(objs) do
-				if obj:get_luaentity() ~= nil then
-					if obj:get_luaentity().name ~= "vehicles:missile_2" and obj ~= self.vehicle and obj:get_luaentity().name ~= "__builtin:item" then
-						obj:punch(self.launcher, 1.0, {
-							full_punch_interval=1.0,
-							damage_groups={fleshy=12},
-						}, nil)
+			amount = 2,
+			time = 0.5,
+			minpos = {x=pos.x-0.2, y=pos.y, z=pos.z-0.2},
+			maxpos = {x=pos.x+0.2, y=pos.y, z=pos.z+0.2},
+			minvel = {x=-velo.x/2, y=-velo.y/2, z=-velo.z/2},
+			maxvel = {x=-velo.x, y=-velo.y, z=-velo.z},
+			minacc = {x=0, y=-1, z=0},
+			maxacc = {x=0, y=-1, z=0},
+			minexptime = 0.2,
+			maxexptime = 0.6,
+			minsize = 3,
+			maxsize = 4,
+			collisiondetection = false,
+			texture = "vehicles_smoke.png",
+		})
+		local objs = minetest.get_objects_inside_radius({x=pos.x,y=pos.y,z=pos.z}, 2)
+		for k, obj in pairs(objs) do
+			if obj:get_luaentity() ~= nil then
+				if obj:get_luaentity().name ~= "vehicles:missile_2" and obj ~= self.vehicle and obj:get_luaentity().name ~= "__builtin:item" then
+					obj:punch(self.launcher, 1.0, {
+						full_punch_interval=1.0,
+						damage_groups={fleshy=12},
+					}, nil)
+					self.object:remove()
+				end
+			end
+		end
+
+		for dx=-1,1 do
+			for dy=-1,1 do
+				for dz=-1,1 do
+					local p = {x=pos.x+dx, y=pos.y, z=pos.z+dz}
+					local t = {x=pos.x+dx, y=pos.y+dy, z=pos.z+dz}
+					local n = minetest.env:get_node(p).name
+					if n ~= "vehicles:missile_2" and n ~= "vehicles:tank" and n ~= "vehicles:jet" and n ~= "air" then
+						local pos = self.object:getpos()
+						minetest.add_particlespawner({
+							amount = 30,
+							time = 0.5,
+							minpos = {x=pos.x-0.5, y=pos.y-0.5, z=pos.z-0.5},
+							maxpos = {x=pos.x+0.5, y=pos.y+0.5, z=pos.z+0.5},
+							minvel = {x=-1, y=-1, z=-1},
+							maxvel = {x=1, y=1, z=1},
+							minacc = {x=0, y=0.2, z=0},
+							maxacc = {x=0, y=0.6, z=0},
+							minexptime = 0.5,
+							maxexptime = 1,
+							minsize = 10,
+							maxsize = 20,
+							collisiondetection = false,
+							texture = "vehicles_explosion.png"
+						})
+						tnt.boom(pos, {damage_radius=5,radius=5,ignore_protection=false})
 						self.object:remove()
+						return
 					end
 				end
 			end
-			
-					for dx=-1,1 do
-						for dy=-1,1 do
-							for dz=-1,1 do
-								local p = {x=pos.x+dx, y=pos.y, z=pos.z+dz}
-								local t = {x=pos.x+dx, y=pos.y+dy, z=pos.z+dz}
-								local n = minetest.env:get_node(p).name
-								if n ~= "vehicles:missile_2" and n ~= "vehicles:tank" and n ~= "vehicles:jet" and n ~= "air" then
-									local pos = self.object:getpos()
-									minetest.add_particlespawner({
-			amount = 30,
-			time = 0.5,
-			minpos = {x=pos.x-0.5, y=pos.y-0.5, z=pos.z-0.5},
-			maxpos = {x=pos.x+0.5, y=pos.y+0.5, z=pos.z+0.5},
-			minvel = {x=-1, y=-1, z=-1},
-			maxvel = {x=1, y=1, z=1},
-			minacc = {x=0, y=0.2, z=0},
-			maxacc = {x=0, y=0.6, z=0},
-			minexptime = 0.5,
-			maxexptime = 1,
-			minsize = 10,
-			maxsize = 20,
-			collisiondetection = false,
-			texture = "vehicles_explosion.png"
-		})
-									tnt.boom(pos, {damage_radius=5,radius=5,ignore_protection=false})
-									self.object:remove()
-									return
-								end
-							end
-						end
-					end
+		end
 	end,
 })
 
@@ -214,27 +196,27 @@ minetest.register_entity("vehicles:water", {
 			self.object:remove()
 		end)
 		local pos = self.object:getpos()
-	minetest.add_particlespawner({
-		amount = 1,
-		time = 1,
-		minpos = {x=pos.x, y=pos.y, z=pos.z},
-		maxpos = {x=pos.x, y=pos.y, z=pos.z},
-		minvel = {x=0, y=0, z=0},
-		maxvel = {x=0, y=-0.2, z=0},
-		minacc = {x=0, y=-1, z=0},
-		maxacc = {x=0, y=-1, z=0},
-		minexptime = 1,
-		maxexptime = 1,
-		minsize = 4,
-		maxsize = 5,
-		collisiondetection = false,
-		vertical = false,
-		texture = "vehicles_water.png",
-	})
-	local node = minetest.env:get_node(pos).name
-	if node == "fire:basic_flame" then
-	minetest.remove_node(pos)
-	end
+		minetest.add_particlespawner({
+			amount = 1,
+			time = 1,
+			minpos = {x=pos.x, y=pos.y, z=pos.z},
+			maxpos = {x=pos.x, y=pos.y, z=pos.z},
+			minvel = {x=0, y=0, z=0},
+			maxvel = {x=0, y=-0.2, z=0},
+			minacc = {x=0, y=-1, z=0},
+			maxacc = {x=0, y=-1, z=0},
+			minexptime = 1,
+			maxexptime = 1,
+			minsize = 4,
+			maxsize = 5,
+			collisiondetection = false,
+			vertical = false,
+			texture = "vehicles_water.png",
+		})
+		local node = minetest.env:get_node(pos).name
+		if node == "fire:basic_flame" then
+			minetest.remove_node(pos)
+		end
 	end
 })
 
@@ -248,40 +230,40 @@ minetest.register_entity("vehicles:bullet", {
 	collisionbox = {0, 0, 0, 0, 0, 0},
 	on_activate = function(self)
 		local pos = self.object:getpos()
-		minetest.sound_play("shot", 
-		{gain = 0.4, max_hear_distance = 3, loop = false})
+		minetest.sound_play("shot",
+			{gain = 0.4, max_hear_distance = 3, loop = false})
 	end,
 	on_step = function(self, obj, pos)
 		minetest.after(10, function()
 			self.object:remove()
 		end)
 		local pos = self.object:getpos()
-		local objs = minetest.get_objects_inside_radius({x=pos.x,y=pos.y,z=pos.z}, 2)	
-			for k, obj in pairs(objs) do
-				if obj:get_luaentity() ~= nil then
-					if obj:get_luaentity().name ~= "vehicles:bullet" and obj ~= self.vehicle and obj:get_luaentity().name ~= "__builtin:item" then
-						obj:punch(self.launcher, 1.0, {
-							full_punch_interval=1.0,
-							damage_groups={fleshy=5},
-						}, nil)
+		local objs = minetest.get_objects_inside_radius({x=pos.x,y=pos.y,z=pos.z}, 2)
+		for k, obj in pairs(objs) do
+			if obj:get_luaentity() ~= nil then
+				if obj:get_luaentity().name ~= "vehicles:bullet" and obj ~= self.vehicle and obj:get_luaentity().name ~= "__builtin:item" then
+					obj:punch(self.launcher, 1.0, {
+						full_punch_interval=1.0,
+						damage_groups={fleshy=5},
+					}, nil)
+					self.object:remove()
+				end
+			end
+		end
+
+		for dx=-1,1 do
+			for dy=-1,1 do
+				for dz=-1,1 do
+					local p = {x=pos.x+dx, y=pos.y, z=pos.z+dz}
+					local t = {x=pos.x+dx, y=pos.y+dy, z=pos.z+dz}
+					local n = minetest.env:get_node(p).name
+					if n ~= "vehicles:bullet" and n ~= "air" then
 						self.object:remove()
+						return
 					end
 				end
 			end
-			
-					for dx=-1,1 do
-						for dy=-1,1 do
-							for dz=-1,1 do
-								local p = {x=pos.x+dx, y=pos.y, z=pos.z+dz}
-								local t = {x=pos.x+dx, y=pos.y+dy, z=pos.z+dz}
-								local n = minetest.env:get_node(p).name
-								if n ~= "vehicles:bullet" and n ~= "air" then
-									self.object:remove()
-									return
-								end
-							end
-						end
-					end
+		end
 	end,
 })
 
@@ -298,22 +280,22 @@ minetest.register_entity("vehicles:tank", {
 	collisionbox = {-1, 0, -0.9, 1, 1.5, 0.9},
 	on_rightclick = function(self, clicker)
 		if self.driver and clicker == self.driver then
-		vehicles.object_detach(self, clicker, {x=1, y=0, z=1})
+			vehicles.object_detach(self, clicker, {x=1, y=0, z=1})
 		elseif not self.driver then
-		vehicles.object_attach(self, clicker, {x=0, y=25, z=-3}, true, {x=0, y=6, z=-2})
+			vehicles.object_attach(self, clicker, {x=0, y=25, z=-3}, true, {x=0, y=6, z=-2})
 		end
 	end,
 	on_punch = vehicles.on_punch,
 	on_step = function(self, dtime)
 		return vehicles.on_step(self, dtime, {
-		speed = 6,
-		decell = 0.5, 
-		shoots = true, 
-		arrow = "vehicles:missile_2",
-		reload_time = 1,
-		shoot_y = 2,
-		moving_anim = {x=3, y=8},
-		stand_anim = {x=1, y=1},
+			speed = 6,
+			decell = 0.5,
+			shoots = true,
+			arrow = "vehicles:missile_2",
+			reload_time = 1,
+			shoot_y = 2,
+			moving_anim = {x=3, y=8},
+			stand_anim = {x=1, y=1},
 		})
 	end,
 })
@@ -333,22 +315,22 @@ minetest.register_entity("vehicles:tank2", {
 	collisionbox = {-1, 0, -0.9, 1, 1.5, 0.9},
 	on_rightclick = function(self, clicker)
 		if self.driver and clicker == self.driver then
-		vehicles.object_detach(self, clicker, {x=1, y=0, z=1})
+			vehicles.object_detach(self, clicker, {x=1, y=0, z=1})
 		elseif not self.driver then
-		vehicles.object_attach(self, clicker, {x=0, y=25, z=-3}, true, {x=0, y=6, z=-2})
+			vehicles.object_attach(self, clicker, {x=0, y=25, z=-3}, true, {x=0, y=6, z=-2})
 		end
 	end,
 	on_punch = vehicles.on_punch,
 	on_step = function(self, dtime)
 		return vehicles.on_step(self, dtime, {
-		speed = 6,
-		decell = 0.5, 
-		shoots = true, 
-		arrow = "vehicles:missile_2",
-		reload_time = 1,
-		shoot_y = 2,
-		moving_anim = {x=3, y=8},
-		stand_anim = {x=1, y=1},
+			speed = 6,
+			decell = 0.5,
+			shoots = true,
+			arrow = "vehicles:missile_2",
+			reload_time = 1,
+			shoot_y = 2,
+			moving_anim = {x=3, y=8},
+			stand_anim = {x=1, y=1},
 		})
 	end,
 })
@@ -368,23 +350,23 @@ minetest.register_entity("vehicles:turret", {
 	collisionbox = {-0.6, 0, -0.6, 0.6, 0.9, 0.6},
 	on_rightclick = function(self, clicker)
 		if self.driver and clicker == self.driver then
-		vehicles.object_detach(self, clicker, {x=1, y=0, z=1})
+			vehicles.object_detach(self, clicker, {x=1, y=0, z=1})
 		elseif not self.driver then
-		vehicles.object_attach(self, clicker, {x=0, y=5, z=4}, true, {x=0, y=2, z=4})
+			vehicles.object_attach(self, clicker, {x=0, y=5, z=4}, true, {x=0, y=2, z=4})
 		end
 	end,
 	on_punch = vehicles.on_punch,
 	on_step = function(self, dtime)
-	self.object:setvelocity({x=0, y=-1, z=0})
-	if self.driver then
-		vehicles.object_drive(self, dtime, {
-			fixed = true,
-			shoot_y = 1.5,
-			arrow = "vehicles:bullet",
-			shoots = true,
-			reload_time = 0.2,
-		})
-		return false
+		self.object:setvelocity({x=0, y=-1, z=0})
+		if self.driver then
+			vehicles.object_drive(self, dtime, {
+				fixed = true,
+				shoot_y = 1.5,
+				arrow = "vehicles:bullet",
+				shoots = true,
+				reload_time = 0.2,
+			})
+			return false
 		end
 		return true
 	end,
@@ -405,30 +387,30 @@ minetest.register_entity("vehicles:assaultsuit", {
 	collisionbox = {-0.8, 0, -0.8, 0.8, 3, 0.8},
 	on_rightclick = function(self, clicker)
 		if self.driver and clicker == self.driver then
-		vehicles.object_detach(self, clicker, {x=1, y=0, z=1})
+			vehicles.object_detach(self, clicker, {x=1, y=0, z=1})
 		elseif not self.driver then
-		vehicles.object_attach(self, clicker, {x=0, y=5, z=4}, false, {x=0, y=20, z=8})
+			vehicles.object_attach(self, clicker, {x=0, y=5, z=4}, false, {x=0, y=20, z=8})
 		end
 	end,
 	on_punch = vehicles.on_punch,
 	on_step = function(self, dtime)
 		return vehicles.on_step(self, dtime, {
-		speed = 8,
-		decell = 0.5, 
-		shoots = true,
-		arrow = "vehicles:bullet",
-		reload_time = 0.2,
-		shoots2 = true,
-		arrow2 = "vehicles:missile_2",
-		reload_time2 = 1,
-		moving_anim = {x=120, y=140},
-		stand_anim = {x=1, y=1},
-		jump_type = "hover",
-		jump_anim = {x=60, y=70},
-		shoot_anim = {x=40, y=51},
-		shoot_anim2 = {x=40, y=51},
-		shoot_y = 3.5,
-		shoot_y2 = 4,
+			speed = 8,
+			decell = 0.5,
+			shoots = true,
+			arrow = "vehicles:bullet",
+			reload_time = 0.2,
+			shoots2 = true,
+			arrow2 = "vehicles:missile_2",
+			reload_time2 = 1,
+			moving_anim = {x=120, y=140},
+			stand_anim = {x=1, y=1},
+			jump_type = "hover",
+			jump_anim = {x=60, y=70},
+			shoot_anim = {x=40, y=51},
+			shoot_anim2 = {x=40, y=51},
+			shoot_y = 3.5,
+			shoot_y2 = 4,
 		},
 		function() self.standing = false end,
 		function()
@@ -454,9 +436,9 @@ minetest.register_entity("vehicles:firetruck", {
 	collisionbox = {-1.1, 0, -1.1, 1.1, 1.9, 1.1},
 	on_rightclick = function(self, clicker)
 		if self.driver and clicker == self.driver then
-		vehicles.object_detach(self, clicker, {x=1, y=0, z=1})
+			vehicles.object_detach(self, clicker, {x=1, y=0, z=1})
 		elseif not self.driver then
-		vehicles.object_attach(self, clicker, {x=0, y=5, z=5}, false, {x=0, y=2, z=5})
+			vehicles.object_attach(self, clicker, {x=0, y=5, z=5}, false, {x=0, y=2, z=5})
 		end
 	end,
 	on_punch = vehicles.on_punch,
@@ -489,9 +471,9 @@ minetest.register_entity("vehicles:tractor", {
 	collisionbox = {-0.8, 0, -0.8, 0.8, 1.4, 0.8},
 	on_rightclick = function(self, clicker)
 		if self.driver and clicker == self.driver then
-		vehicles.object_detach(self, clicker, {x=1, y=0, z=1})
+			vehicles.object_detach(self, clicker, {x=1, y=0, z=1})
 		elseif not self.driver then
-		vehicles.object_attach(self, clicker, {x=0, y=14, z=-10}, true, {x=0, y=2, z=-5})
+			vehicles.object_attach(self, clicker, {x=0, y=14, z=-10}, true, {x=0, y=2, z=-5})
 		end
 	end,
 	on_punch = vehicles.on_punch,
@@ -523,21 +505,21 @@ minetest.register_entity("vehicles:geep", {
 	collisionbox = {-1.1, 0, -1.1, 1.1, 1, 1.1},
 	on_rightclick = function(self, clicker)
 		if self.driver and clicker == self.driver then
-		vehicles.object_detach(self, clicker, {x=1, y=0, z=1})
+			vehicles.object_detach(self, clicker, {x=1, y=0, z=1})
 		elseif self.driver and clicker ~= self.driver and not self.rider then
-		clicker:set_attach(self.object, "", {x=0, y=5, z=-5}, false, {x=0, y=0, z=-2})
-		self.rider = true
+			clicker:set_attach(self.object, "", {x=0, y=5, z=-5}, false, {x=0, y=0, z=-2})
+			self.rider = true
 		elseif self.driver and clicker ~=self.driver and self.rider then
-		clicker:set_detach()
-		self.rider = false
+			clicker:set_detach()
+			self.rider = false
 		elseif not self.driver then
-		vehicles.object_attach(self, clicker, {x=-2, y=15, z=-1}, true, {x=0, y=2, z=4})
-		minetest.sound_play("engine_start", 
-		{to_player=self.driver:get_player_name(), gain = 4, max_hear_distance = 3, loop = false})
-		self.sound_ready = false
-		minetest.after(14, function()
-		self.sound_ready = true
-		end)
+			vehicles.object_attach(self, clicker, {x=-2, y=15, z=-1}, true, {x=0, y=2, z=4})
+			minetest.sound_play("engine_start",
+				{to_player=self.driver:get_player_name(), gain = 4, max_hear_distance = 3, loop = false})
+			self.sound_ready = false
+			minetest.after(14, function()
+				self.sound_ready = true
+			end)
 		end
 	end,
 	on_punch = vehicles.on_punch,
@@ -546,7 +528,7 @@ minetest.register_entity("vehicles:geep", {
 	end,
 	on_step = function(self, dtime)
 		return vehicles.on_step(self, dtime, {
-			speed = 14, 
+			speed = 14,
 			decell = 0.6,
 			boost = true,
 			boost_duration = 6,
@@ -556,23 +538,23 @@ minetest.register_entity("vehicles:geep", {
 			brakes = true,
 		},
 		function()
-		local pos = self.object:getpos()
-		minetest.add_particlespawner(
-			4, --amount
-			1, --time
-			{x=pos.x, y=pos.y, z=pos.z}, --minpos
-			{x=pos.x, y=pos.y, z=pos.z}, --maxpos
-			{x=0, y=0, z=0}, --minvel
-			{x=0, y=0, z=0}, --maxvel
-			{x=-0,y=-0,z=-0}, --minacc
-			{x=0,y=0,z=0}, --maxacc
-			0.5, --minexptime
-			1, --maxexptime
-			10, --minsize
-			15, --maxsize
-			false, --collisiondetection
-			"vehicles_dust.png" --texture
-		)
+			local pos = self.object:getpos()
+			minetest.add_particlespawner(
+				4, --amount
+				1, --time
+				{x=pos.x, y=pos.y, z=pos.z}, --minpos
+				{x=pos.x, y=pos.y, z=pos.z}, --maxpos
+				{x=0, y=0, z=0}, --minvel
+				{x=0, y=0, z=0}, --maxvel
+				{x=-0,y=-0,z=-0}, --minacc
+				{x=0,y=0,z=0}, --maxacc
+				0.5, --minexptime
+				1, --maxexptime
+				10, --minsize
+				15, --maxsize
+				false, --collisiondetection
+				"vehicles_dust.png" --texture
+			)
 		end)
 	end,
 })
@@ -591,22 +573,22 @@ minetest.register_entity("vehicles:ambulance", {
 	collisionbox = {-1.4, 0, -1.4, 1.4, 2, 1.4},
 	on_rightclick = function(self, clicker)
 		if self.driver and clicker == self.driver then
-		vehicles.object_detach(self, clicker, {x=1, y=0, z=1})
+			vehicles.object_detach(self, clicker, {x=1, y=0, z=1})
 		elseif self.driver and clicker ~= self.driver and not self.rider then
-		clicker:set_attach(self.object, clicker, {x=0, y=5, z=4}, false, {x=0, y=7, z=10})
-		self.rider = true
-		clicker:set_hp(20)
+			clicker:set_attach(self.object, clicker, {x=0, y=5, z=4}, false, {x=0, y=7, z=10})
+			self.rider = true
+			clicker:set_hp(20)
 		elseif self.driver and clicker ~= self.driver and self.rider then
-		clicker:set_detach()
-		self.rider = false
+			clicker:set_detach()
+			self.rider = false
 		elseif not self.driver then
-		vehicles.object_attach(self, clicker, {x=0, y=5, z=4}, false, {x=0, y=7, z=14})
-		minetest.sound_play("engine_start", 
-		{to_player=self.driver:get_player_name(), gain = 4, max_hear_distance = 3, loop = false})
-		self.sound_ready = false
-		minetest.after(14, function()
-		self.sound_ready = true
-		end)
+			vehicles.object_attach(self, clicker, {x=0, y=5, z=4}, false, {x=0, y=7, z=14})
+			minetest.sound_play("engine_start",
+				{to_player=self.driver:get_player_name(), gain = 4, max_hear_distance = 3, loop = false})
+			self.sound_ready = false
+			minetest.after(14, function()
+				self.sound_ready = true
+			end)
 		end
 	end,
 	on_punch = vehicles.on_punch,
@@ -615,7 +597,7 @@ minetest.register_entity("vehicles:ambulance", {
 	end,
 	on_step = function(self, dtime)
 		return vehicles.on_step(self, dtime, {
-			speed = 13, 
+			speed = 13,
 			decell = 0.6,
 			moving_anim = {x=1, y=3},
 			stand_anim = {x=1, y=1},
@@ -626,8 +608,8 @@ minetest.register_entity("vehicles:ambulance", {
 		},
 		function()
 			if not self.siren_ready then
-				minetest.sound_play("ambulance", 
-				{pos=self.object:getpos(), gain = 0.1, max_hear_distance = 3, loop = false})
+				minetest.sound_play("ambulance",
+					{pos=self.object:getpos(), gain = 0.1, max_hear_distance = 3, loop = false})
 				self.siren_ready = true
 				minetest.after(4, function()
 					self.siren_ready = false
@@ -651,21 +633,21 @@ minetest.register_entity("vehicles:ute", {
 	collisionbox = {-1.4, 0, -1.4, 1.4, 1, 1.4},
 	on_rightclick = function(self, clicker)
 		if self.driver and clicker == self.driver then
-		vehicles.object_detach(self, clicker, {x=1, y=0, z=1})
+			vehicles.object_detach(self, clicker, {x=1, y=0, z=1})
 		elseif self.driver and clicker ~= self.driver and not self.rider then
-		clicker:set_attach(self.object, clicker, {x=0, y=5, z=-5}, false, {x=0, y=0, z=-2})
-		self.rider = true
+			clicker:set_attach(self.object, clicker, {x=0, y=5, z=-5}, false, {x=0, y=0, z=-2})
+			self.rider = true
 		elseif self.driver and clicker ~=self.driver and self.rider then
-		clicker:set_detach()
-		self.rider = false
+			clicker:set_detach()
+			self.rider = false
 		elseif not self.driver then
-		vehicles.object_attach(self, clicker, {x=0, y=5, z=4}, false, {x=0, y=2, z=4})
-		minetest.sound_play("engine_start", 
-		{to_player=self.driver:get_player_name(), gain = 4, max_hear_distance = 3, loop = false})
-		self.sound_ready = false
-		minetest.after(14, function()
-		self.sound_ready = true
-		end)
+			vehicles.object_attach(self, clicker, {x=0, y=5, z=4}, false, {x=0, y=2, z=4})
+			minetest.sound_play("engine_start",
+				{to_player=self.driver:get_player_name(), gain = 4, max_hear_distance = 3, loop = false})
+			self.sound_ready = false
+			minetest.after(14, function()
+				self.sound_ready = true
+			end)
 		end
 	end,
 	on_punch = vehicles.on_punch,
@@ -674,7 +656,7 @@ minetest.register_entity("vehicles:ute", {
 	end,
 	on_step = function(self, dtime)
 		return vehicles.on_step(self, dtime, {
-			speed = 17, 
+			speed = 17,
 			decell = 0.95,
 			boost = true,
 			boost_duration = 6,
@@ -719,30 +701,30 @@ minetest.register_entity("vehicles:ute2", {
 	collisionbox = {-1.4, 0, -1.4, 1.4, 1, 1.4},
 	on_rightclick = function(self, clicker)
 		if self.driver and clicker == self.driver then
-		vehicles.object_detach(self, clicker, {x=1, y=0, z=1})
+			vehicles.object_detach(self, clicker, {x=1, y=0, z=1})
 		elseif self.driver and clicker ~= self.driver and not self.rider then
-		clicker:set_attach(self.object, clicker, {x=0, y=5, z=-5}, {x=0, y=0, z=0})
-		self.rider = true
+			clicker:set_attach(self.object, clicker, {x=0, y=5, z=-5}, {x=0, y=0, z=0})
+			self.rider = true
 		elseif self.driver and clicker ~=self.driver and self.rider then
-		clicker:set_detach()
-		self.rider = false
+			clicker:set_detach()
+			self.rider = false
 		elseif not self.driver then
-		vehicles.object_attach(self, clicker, {x=0, y=5, z=4}, false, {x=0, y=2, z=4})
-		minetest.sound_play("engine_start", 
-		{to_player=self.driver:get_player_name(), gain = 4, max_hear_distance = 3, loop = false})
-		self.sound_ready = false
-		minetest.after(14, function()
-		self.sound_ready = true
-		end)
+			vehicles.object_attach(self, clicker, {x=0, y=5, z=4}, false, {x=0, y=2, z=4})
+			minetest.sound_play("engine_start",
+				{to_player=self.driver:get_player_name(), gain = 4, max_hear_distance = 3, loop = false})
+			self.sound_ready = false
+			minetest.after(14, function()
+				self.sound_ready = true
+			end)
 		end
 	end,
 	on_punch = vehicles.on_punch,
 	on_activate = function(self)
-	self.nitro = true
+		self.nitro = true
 	end,
 	on_step = function(self, dtime)
 		return vehicles.on_step(self, dtime, {
-			speed = 17, 
+			speed = 17,
 			decell = 0.95,
 			boost = true,
 			boost_duration = 6,
@@ -768,24 +750,24 @@ minetest.register_entity("vehicles:astonmaaton", {
 	collisionbox = {-1, 0, -1, 1.3, 1, 1},
 	on_rightclick = function(self, clicker)
 		if self.driver and clicker == self.driver then
-		vehicles.object_detach(self, clicker, {x=1, y=0, z=1})
+			vehicles.object_detach(self, clicker, {x=1, y=0, z=1})
 		elseif not self.driver then
-		vehicles.object_attach(self, clicker, {x=0, y=5, z=4}, false, {x=0, y=2, z=4})
-		minetest.sound_play("engine_start", 
-		{to_player=self.driver:get_player_name(), gain = 4, max_hear_distance = 3, loop = false})
-		self.sound_ready = false
-		minetest.after(14, function()
-		self.sound_ready = true
-		end)
+			vehicles.object_attach(self, clicker, {x=0, y=5, z=4}, false, {x=0, y=2, z=4})
+			minetest.sound_play("engine_start",
+				{to_player=self.driver:get_player_name(), gain = 4, max_hear_distance = 3, loop = false})
+			self.sound_ready = false
+			minetest.after(14, function()
+				self.sound_ready = true
+			end)
 		end
 	end,
 	on_punch = vehicles.on_punch,
 	on_activate = function(self)
-	self.nitro = true
+		self.nitro = true
 	end,
 	on_step = function(self, dtime)
 		return vehicles.on_step(self, dtime, {
-			speed = 19, 
+			speed = 19,
 			decell = 0.99,
 			boost = true,
 			boost_duration = 5,
@@ -811,15 +793,15 @@ minetest.register_entity("vehicles:nizzan", {
 	collisionbox = {-1, 0, -1, 1.3, 1, 1},
 	on_rightclick = function(self, clicker)
 		if self.driver and clicker == self.driver then
-		vehicles.object_detach(self, clicker, {x=1, y=0, z=1})
+			vehicles.object_detach(self, clicker, {x=1, y=0, z=1})
 		elseif not self.driver then
-		vehicles.object_attach(self, clicker, {x=0, y=5, z=4}, false, {x=0, y=2, z=4})
-		minetest.sound_play("engine_start", 
-		{to_player=self.driver:get_player_name(), gain = 4, max_hear_distance = 3, loop = false})
-		self.sound_ready = false
-		minetest.after(14, function()
-		self.sound_ready = true
-		end)
+			vehicles.object_attach(self, clicker, {x=0, y=5, z=4}, false, {x=0, y=2, z=4})
+			minetest.sound_play("engine_start",
+				{to_player=self.driver:get_player_name(), gain = 4, max_hear_distance = 3, loop = false})
+			self.sound_ready = false
+			minetest.after(14, function()
+				self.sound_ready = true
+			end)
 		end
 	end,
 	on_punch = vehicles.on_punch,
@@ -828,7 +810,7 @@ minetest.register_entity("vehicles:nizzan", {
 	end,
 	on_step = function(self, dtime)
 		return vehicles.on_step(self, dtime, {
-			speed = 18, 
+			speed = 18,
 			decell = 0.99,
 			boost = true,
 			boost_duration = 5,
@@ -873,15 +855,15 @@ minetest.register_entity("vehicles:nizzan2", {
 	collisionbox = {-1, 0, -1, 1.3, 1, 1},
 	on_rightclick = function(self, clicker)
 		if self.driver and clicker == self.driver then
-		vehicles.object_detach(self, clicker, {x=1, y=0, z=1})
+			vehicles.object_detach(self, clicker, {x=1, y=0, z=1})
 		elseif not self.driver then
-		vehicles.object_attach(self, clicker, {x=0, y=5, z=4}, false, {x=0, y=2, z=4})
-		minetest.sound_play("engine_start", 
-		{to_player=self.driver:get_player_name(), gain = 4, max_hear_distance = 3, loop = false})
-		self.sound_ready = false
-		minetest.after(14, function()
-		self.sound_ready = true
-		end)
+			vehicles.object_attach(self, clicker, {x=0, y=5, z=4}, false, {x=0, y=2, z=4})
+			minetest.sound_play("engine_start",
+				{to_player=self.driver:get_player_name(), gain = 4, max_hear_distance = 3, loop = false})
+			self.sound_ready = false
+			minetest.after(14, function()
+				self.sound_ready = true
+			end)
 		end
 	end,
 	on_activate = function(self)
@@ -890,7 +872,7 @@ minetest.register_entity("vehicles:nizzan2", {
 	on_punch = vehicles.on_punch,
 	on_step = function(self, dtime)
 		return vehicles.on_step(self, dtime, {
-			speed = 18, 
+			speed = 18,
 			decell = 0.99,
 			boost = true,
 			boost_duration = 5,
@@ -935,15 +917,15 @@ minetest.register_entity("vehicles:lambogoni", {
 	collisionbox = {-1, 0, -1, 1.3, 1, 1},
 	on_rightclick = function(self, clicker)
 		if self.driver and clicker == self.driver then
-		vehicles.object_detach(self, clicker, {x=1, y=0, z=1})
+			vehicles.object_detach(self, clicker, {x=1, y=0, z=1})
 		elseif not self.driver then
-		vehicles.object_attach(self, clicker, {x=0, y=5, z=4}, false, {x=0, y=2, z=4})
-		minetest.sound_play("engine_start", 
-		{to_player=self.driver:get_player_name(), gain = 4, max_hear_distance = 3, loop = false})
-		self.sound_ready = false
-		minetest.after(14, function()
-		self.sound_ready = true
-		end)
+			vehicles.object_attach(self, clicker, {x=0, y=5, z=4}, false, {x=0, y=2, z=4})
+			minetest.sound_play("engine_start",
+				{to_player=self.driver:get_player_name(), gain = 4, max_hear_distance = 3, loop = false})
+			self.sound_ready = false
+			minetest.after(14, function()
+				self.sound_ready = true
+			end)
 		end
 	end,
 	on_punch = vehicles.on_punch,
@@ -952,7 +934,7 @@ minetest.register_entity("vehicles:lambogoni", {
 	end,
 	on_step = function(self, dtime)
 		return vehicles.on_step(self, dtime, {
-			speed = 19, 
+			speed = 19,
 			decell = 0.99,
 			boost = true,
 			boost_duration = 4,
@@ -978,15 +960,15 @@ minetest.register_entity("vehicles:lambogoni2", {
 	collisionbox = {-1, 0, -1, 1.3, 1, 1},
 	on_rightclick = function(self, clicker)
 		if self.driver and clicker == self.driver then
-		vehicles.object_detach(self, clicker, {x=1, y=0, z=1})
+			vehicles.object_detach(self, clicker, {x=1, y=0, z=1})
 		elseif not self.driver then
-		vehicles.object_attach(self, clicker, {x=0, y=5, z=4}, false, {x=0, y=2, z=4})
-		minetest.sound_play("engine_start", 
-		{to_player=self.driver:get_player_name(), gain = 4, max_hear_distance = 3, loop = false})
-		self.sound_ready = false
-		minetest.after(14, function()
-		self.sound_ready = true
-		end)
+			vehicles.object_attach(self, clicker, {x=0, y=5, z=4}, false, {x=0, y=2, z=4})
+			minetest.sound_play("engine_start",
+				{to_player=self.driver:get_player_name(), gain = 4, max_hear_distance = 3, loop = false})
+			self.sound_ready = false
+			minetest.after(14, function()
+				self.sound_ready = true
+			end)
 		end
 	end,
 	on_punch = vehicles.on_punch,
@@ -995,7 +977,7 @@ minetest.register_entity("vehicles:lambogoni2", {
 	end,
 	on_step = function(self, dtime)
 		return vehicles.on_step(self, dtime, {
-			speed = 19, 
+			speed = 19,
 			decell = 0.99,
 			boost = true,
 			boost_duration = 4,
@@ -1021,15 +1003,15 @@ minetest.register_entity("vehicles:masda", {
 	collisionbox = {-1, 0, -1, 1.3, 1, 1},
 	on_rightclick = function(self, clicker)
 		if self.driver and clicker == self.driver then
-		vehicles.object_detach(self, clicker, {x=1, y=0, z=1})
+			vehicles.object_detach(self, clicker, {x=1, y=0, z=1})
 		elseif not self.driver then
-		vehicles.object_attach(self, clicker, {x=0, y=5, z=4}, false, {x=0, y=2, z=4})
-		minetest.sound_play("engine_start", 
-		{to_player=self.driver:get_player_name(), gain = 4, max_hear_distance = 3, loop = false})
-		self.sound_ready = false
-		minetest.after(14, function()
-		self.sound_ready = true
-		end)
+			vehicles.object_attach(self, clicker, {x=0, y=5, z=4}, false, {x=0, y=2, z=4})
+			minetest.sound_play("engine_start",
+				{to_player=self.driver:get_player_name(), gain = 4, max_hear_distance = 3, loop = false})
+			self.sound_ready = false
+			minetest.after(14, function()
+				self.sound_ready = true
+			end)
 		end
 	end,
 	on_punch = vehicles.on_punch,
@@ -1038,7 +1020,7 @@ minetest.register_entity("vehicles:masda", {
 	end,
 	on_step = function(self, dtime)
 		return vehicles.on_step(self, dtime, {
-			speed = 21, 
+			speed = 21,
 			decell = 0.99,
 			boost = true,
 			boost_duration = 4,
@@ -1064,15 +1046,15 @@ minetest.register_entity("vehicles:masda2", {
 	collisionbox = {-1, 0, -1, 1.3, 1, 1},
 	on_rightclick = function(self, clicker)
 		if self.driver and clicker == self.driver then
-		vehicles.object_detach(self, clicker, {x=1, y=0, z=1})
+			vehicles.object_detach(self, clicker, {x=1, y=0, z=1})
 		elseif not self.driver then
-		vehicles.object_attach(self, clicker, {x=0, y=5, z=4}, false, {x=0, y=2, z=4})
-		minetest.sound_play("engine_start", 
-		{to_player=self.driver:get_player_name(), gain = 4, max_hear_distance = 3, loop = false})
-		self.sound_ready = false
-		minetest.after(14, function()
-		self.sound_ready = true
-		end)
+			vehicles.object_attach(self, clicker, {x=0, y=5, z=4}, false, {x=0, y=2, z=4})
+			minetest.sound_play("engine_start",
+				{to_player=self.driver:get_player_name(), gain = 4, max_hear_distance = 3, loop = false})
+			self.sound_ready = false
+			minetest.after(14, function()
+				self.sound_ready = true
+			end)
 		end
 	end,
 	on_activate = function(self)
@@ -1081,7 +1063,7 @@ minetest.register_entity("vehicles:masda2", {
 	on_punch = vehicles.on_punch,
 	on_step = function(self, dtime)
 		return vehicles.on_step(self, dtime, {
-			speed = 21, 
+			speed = 21,
 			decell = 0.99,
 			boost = true,
 			boost_duration = 4,
@@ -1107,15 +1089,15 @@ minetest.register_entity("vehicles:policecar", {
 	collisionbox = {-1, 0, -1, 1.3, 1, 1},
 	on_rightclick = function(self, clicker)
 		if self.driver and clicker == self.driver then
-		vehicles.object_detach(self, clicker, {x=1, y=0, z=1})
+			vehicles.object_detach(self, clicker, {x=1, y=0, z=1})
 		elseif not self.driver then
-		vehicles.object_attach(self, clicker, {x=0, y=5, z=4}, false, {x=0, y=2, z=4})
-		minetest.sound_play("engine_start", 
-		{to_player=self.driver:get_player_name(), gain = 4, max_hear_distance = 3, loop = false})
-		self.sound_ready = false
-		minetest.after(14, function()
-		self.sound_ready = true
-		end)
+			vehicles.object_attach(self, clicker, {x=0, y=5, z=4}, false, {x=0, y=2, z=4})
+			minetest.sound_play("engine_start",
+				{to_player=self.driver:get_player_name(), gain = 4, max_hear_distance = 3, loop = false})
+			self.sound_ready = false
+			minetest.after(14, function()
+				self.sound_ready = true
+			end)
 		end
 	end,
 	on_activate = function(self)
@@ -1124,7 +1106,7 @@ minetest.register_entity("vehicles:policecar", {
 	on_punch = vehicles.on_punch,
 	on_step = function(self, dtime)
 		return vehicles.on_step(self, dtime, {
-			speed = 20, 
+			speed = 20,
 			decell = 0.99,
 			boost = true,
 			boost_duration = 8,
@@ -1150,15 +1132,15 @@ minetest.register_entity("vehicles:musting", {
 	collisionbox = {-1, 0, -1, 1.3, 1, 1},
 	on_rightclick = function(self, clicker)
 		if self.driver and clicker == self.driver then
-		vehicles.object_detach(self, clicker, {x=1, y=0, z=1})
+			vehicles.object_detach(self, clicker, {x=1, y=0, z=1})
 		elseif not self.driver then
-		vehicles.object_attach(self, clicker, {x=0, y=5, z=4}, false, {x=0, y=2, z=4})
-		minetest.sound_play("engine_start", 
-		{to_player=self.driver:get_player_name(), gain = 4, max_hear_distance = 3, loop = false})
-		self.sound_ready = false
-		minetest.after(14, function()
-		self.sound_ready = true
-		end)
+			vehicles.object_attach(self, clicker, {x=0, y=5, z=4}, false, {x=0, y=2, z=4})
+			minetest.sound_play("engine_start",
+				{to_player=self.driver:get_player_name(), gain = 4, max_hear_distance = 3, loop = false})
+			self.sound_ready = false
+			minetest.after(14, function()
+				self.sound_ready = true
+			end)
 		end
 	end,
 	on_activate = function(self)
@@ -1167,7 +1149,7 @@ minetest.register_entity("vehicles:musting", {
 	on_punch = vehicles.on_punch,
 	on_step = function(self, dtime)
 		return vehicles.on_step(self, dtime, {
-			speed = 17, 
+			speed = 17,
 			decell = 0.99,
 			boost = true,
 			boost_duration = 4,
@@ -1193,15 +1175,15 @@ minetest.register_entity("vehicles:musting2", {
 	collisionbox = {-1, 0, -1, 1.3, 1, 1},
 	on_rightclick = function(self, clicker)
 		if self.driver and clicker == self.driver then
-		vehicles.object_detach(self, clicker, {x=1, y=0, z=1})
+			vehicles.object_detach(self, clicker, {x=1, y=0, z=1})
 		elseif not self.driver then
-		vehicles.object_attach(self, clicker, {x=0, y=5, z=4}, false, {x=0, y=2, z=4})
-		minetest.sound_play("engine_start", 
-		{to_player=self.driver:get_player_name(), gain = 4, max_hear_distance = 3, loop = false})
-		self.sound_ready = false
-		minetest.after(14, function()
-		self.sound_ready = true
-		end)
+			vehicles.object_attach(self, clicker, {x=0, y=5, z=4}, false, {x=0, y=2, z=4})
+			minetest.sound_play("engine_start",
+				{to_player=self.driver:get_player_name(), gain = 4, max_hear_distance = 3, loop = false})
+			self.sound_ready = false
+			minetest.after(14, function()
+				self.sound_ready = true
+			end)
 		end
 	end,
 	on_punch = vehicles.on_punch,
@@ -1210,7 +1192,7 @@ minetest.register_entity("vehicles:musting2", {
 	end,
 	on_step = function(self, dtime)
 		return vehicles.on_step(self, dtime, {
-			speed = 17, 
+			speed = 17,
 			decell = 0.99,
 			boost = true,
 			boost_duration = 4,
@@ -1236,15 +1218,15 @@ minetest.register_entity("vehicles:fourd", {
 	collisionbox = {-1, 0, -1, 1.3, 1, 1},
 	on_rightclick = function(self, clicker)
 		if self.driver and clicker == self.driver then
-		vehicles.object_detach(self, clicker, {x=1, y=0, z=1})
+			vehicles.object_detach(self, clicker, {x=1, y=0, z=1})
 		elseif not self.driver then
-		vehicles.object_attach(self, clicker, {x=0, y=5, z=4}, false, {x=0, y=2, z=4})
-		minetest.sound_play("engine_start", 
-		{to_player=self.driver:get_player_name(), gain = 4, max_hear_distance = 3, loop = false})
-		self.sound_ready = false
-		minetest.after(14, function()
-		self.sound_ready = true
-		end)
+			vehicles.object_attach(self, clicker, {x=0, y=5, z=4}, false, {x=0, y=2, z=4})
+			minetest.sound_play("engine_start",
+				{to_player=self.driver:get_player_name(), gain = 4, max_hear_distance = 3, loop = false})
+			self.sound_ready = false
+			minetest.after(14, function()
+				self.sound_ready = true
+			end)
 		end
 	end,
 	on_activate = function(self)
@@ -1253,7 +1235,7 @@ minetest.register_entity("vehicles:fourd", {
 	on_punch = vehicles.on_punch,
 	on_step = function(self, dtime)
 		return vehicles.on_step(self, dtime, {
-			speed = 15, 
+			speed = 15,
 			decell = 0.99,
 			driving_sound = "engine",
 			sound_duration = 11,
@@ -1279,25 +1261,25 @@ minetest.register_entity("vehicles:fewawi", {
 	on_rightclick = function(self, clicker)
 		local ctrl = clicker:get_player_control()
 		if ctrl.sneak then
-		if not self.lights then
-		self.object:set_properties({textures = {"vehicles_fewawi_lights.png"},})
-		self.lights = true
+			if not self.lights then
+				self.object:set_properties({textures = {"vehicles_fewawi_lights.png"},})
+				self.lights = true
+			else
+				self.object:set_properties({textures = {"vehicles_fewawi.png"},})
+				self.lights = false
+			end
 		else
-		self.object:set_properties({textures = {"vehicles_fewawi.png"},})
-		self.lights = false		
-		end
-		else
-		if self.driver and clicker == self.driver then
-		vehicles.object_detach(self, clicker, {x=1, y=0, z=1})
-		elseif not self.driver then
-		vehicles.object_attach(self, clicker, {x=0, y=5, z=4}, false, {x=0, y=2, z=4})
-		minetest.sound_play("engine_start", 
-		{to_player=self.driver:get_player_name(), gain = 4, max_hear_distance = 3, loop = false})
-		self.sound_ready = false
-		minetest.after(14, function()
-		self.sound_ready = true
-		end)
-		end
+			if self.driver and clicker == self.driver then
+				vehicles.object_detach(self, clicker, {x=1, y=0, z=1})
+			elseif not self.driver then
+				vehicles.object_attach(self, clicker, {x=0, y=5, z=4}, false, {x=0, y=2, z=4})
+				minetest.sound_play("engine_start",
+					{to_player=self.driver:get_player_name(), gain = 4, max_hear_distance = 3, loop = false})
+				self.sound_ready = false
+				minetest.after(14, function()
+					self.sound_ready = true
+				end)
+			end
 		end
 	end,
 	on_punch = vehicles.on_punch,
@@ -1306,7 +1288,7 @@ minetest.register_entity("vehicles:fewawi", {
 	end,
 	on_step = function(self, dtime)
 		return vehicles.on_step(self, dtime, {
-			speed = 20, 
+			speed = 20,
 			decell = 0.99,
 			boost = true,
 			boost_duration = 4,
@@ -1333,25 +1315,25 @@ minetest.register_entity("vehicles:fewawi2", {
 	on_rightclick = function(self, clicker)
 		local ctrl = clicker:get_player_control()
 		if ctrl.sneak then
-		if not self.lights then
-		self.object:set_properties({textures = {"vehicles_fewawi_lights2.png"},})
-		self.lights = true
+			if not self.lights then
+				self.object:set_properties({textures = {"vehicles_fewawi_lights2.png"},})
+				self.lights = true
+			else
+				self.object:set_properties({textures = {"vehicles_fewawi2.png"},})
+				self.lights = false
+			end
 		else
-		self.object:set_properties({textures = {"vehicles_fewawi2.png"},})
-		self.lights = false
-		end
-		else
-		if self.driver and clicker == self.driver then
-		vehicles.object_detach(self, clicker, {x=1, y=0, z=1})
-		elseif not self.driver then
-		vehicles.object_attach(self, clicker, {x=0, y=5, z=4}, false, {x=0, y=2, z=4})
-		minetest.sound_play("engine_start", 
-		{to_player=self.driver:get_player_name(), gain = 4, max_hear_distance = 3, loop = false})
-		self.sound_ready = false
-		minetest.after(14, function()
-		self.sound_ready = true
-		end)
-		end
+			if self.driver and clicker == self.driver then
+				vehicles.object_detach(self, clicker, {x=1, y=0, z=1})
+			elseif not self.driver then
+				vehicles.object_attach(self, clicker, {x=0, y=5, z=4}, false, {x=0, y=2, z=4})
+				minetest.sound_play("engine_start",
+					{to_player=self.driver:get_player_name(), gain = 4, max_hear_distance = 3, loop = false})
+				self.sound_ready = false
+				minetest.after(14, function()
+					self.sound_ready = true
+				end)
+			end
 		end
 	end,
 	on_punch = vehicles.on_punch,
@@ -1360,7 +1342,7 @@ minetest.register_entity("vehicles:fewawi2", {
 	end,
 	on_step = function(self, dtime)
 		return vehicles.on_step(self, dtime, {
-			speed = 20, 
+			speed = 20,
 			decell = 0.99,
 			boost = true,
 			boost_duration = 4,
@@ -1386,15 +1368,15 @@ minetest.register_entity("vehicles:pooshe", {
 	collisionbox = {-1, 0, -1, 1.3, 1, 1},
 	on_rightclick = function(self, clicker)
 		if self.driver and clicker == self.driver then
-		vehicles.object_detach(self, clicker, {x=1, y=0, z=1})
+			vehicles.object_detach(self, clicker, {x=1, y=0, z=1})
 		elseif not self.driver then
-		vehicles.object_attach(self, clicker, {x=0, y=5, z=4}, false, {x=0, y=2, z=4})
-		minetest.sound_play("engine_start", 
-		{to_player=self.driver:get_player_name(), gain = 4, max_hear_distance = 3, loop = false})
-		self.sound_ready = false
-		minetest.after(14, function()
-		self.sound_ready = true
-		end)
+			vehicles.object_attach(self, clicker, {x=0, y=5, z=4}, false, {x=0, y=2, z=4})
+			minetest.sound_play("engine_start",
+				{to_player=self.driver:get_player_name(), gain = 4, max_hear_distance = 3, loop = false})
+			self.sound_ready = false
+			minetest.after(14, function()
+				self.sound_ready = true
+			end)
 		end
 	end,
 	on_activate = function(self)
@@ -1403,7 +1385,7 @@ minetest.register_entity("vehicles:pooshe", {
 	on_punch = vehicles.on_punch,
 	on_step = function(self, dtime)
 		return vehicles.on_step(self, dtime, {
-			speed = 15, 
+			speed = 15,
 			decell = 0.99,
 			boost = true,
 			boost_duration = 4,
@@ -1429,15 +1411,15 @@ minetest.register_entity("vehicles:pooshe2", {
 	collisionbox = {-1, 0, -1, 1.3, 1, 1},
 	on_rightclick = function(self, clicker)
 		if self.driver and clicker == self.driver then
-		vehicles.object_detach(self, clicker, {x=1, y=0, z=1})
+			vehicles.object_detach(self, clicker, {x=1, y=0, z=1})
 		elseif not self.driver then
-		vehicles.object_attach(self, clicker, {x=0, y=5, z=4}, false, {x=0, y=2, z=4})
-		minetest.sound_play("engine_start", 
-		{to_player=self.driver:get_player_name(), gain = 4, max_hear_distance = 3, loop = false})
-		self.sound_ready = false
-		minetest.after(14, function()
-		self.sound_ready = true
-		end)
+			vehicles.object_attach(self, clicker, {x=0, y=5, z=4}, false, {x=0, y=2, z=4})
+			minetest.sound_play("engine_start",
+				{to_player=self.driver:get_player_name(), gain = 4, max_hear_distance = 3, loop = false})
+			self.sound_ready = false
+			minetest.after(14, function()
+				self.sound_ready = true
+			end)
 		end
 	end,
 	on_punch = vehicles.on_punch,
@@ -1446,7 +1428,7 @@ minetest.register_entity("vehicles:pooshe2", {
 	end,
 	on_step = function(self, dtime)
 		return vehicles.on_step(self, dtime, {
-			speed = 20, 
+			speed = 20,
 			decell = 0.99,
 			boost = true,
 			boost_duration = 4,
@@ -1472,10 +1454,10 @@ minetest.register_entity("vehicles:lightcycle", {
 	collisionbox = {-1, 0, -1, 1.3, 1, 1},
 	on_rightclick = function(self, clicker)
 		if self.driver and clicker == self.driver then
-		vehicles.object_detach(self, clicker, {x=1, y=0, z=1})
+			vehicles.object_detach(self, clicker, {x=1, y=0, z=1})
 		elseif not self.driver then
-		vehicles.object_attach(self, clicker, {x=0, y=5, z=4}, false, {x=0, y=2, z=4})
-		self.sound_ready = true
+			vehicles.object_attach(self, clicker, {x=0, y=5, z=4}, false, {x=0, y=2, z=4})
+			self.sound_ready = true
 		end
 	end,
 	on_activate = function(self)
@@ -1484,7 +1466,7 @@ minetest.register_entity("vehicles:lightcycle", {
 	on_punch = vehicles.on_punch,
 	on_step = function(self, dtime)
 		return vehicles.on_step(self, dtime, {
-			speed = 20, 
+			speed = 20,
 			decell = 0.85,
 			boost = true,
 			boost_duration = 4,
@@ -1511,10 +1493,10 @@ minetest.register_entity("vehicles:lightcycle2", {
 	collisionbox = {-1, 0, -1, 1.3, 1, 1},
 	on_rightclick = function(self, clicker)
 		if self.driver and clicker == self.driver then
-		vehicles.object_detach(self, clicker, {x=1, y=0, z=1})
+			vehicles.object_detach(self, clicker, {x=1, y=0, z=1})
 		elseif not self.driver then
-		vehicles.object_attach(self, clicker, {x=0, y=5, z=4}, false, {x=0, y=2, z=4})
-		self.sound_ready = true
+			vehicles.object_attach(self, clicker, {x=0, y=5, z=4}, false, {x=0, y=2, z=4})
+			self.sound_ready = true
 		end
 	end,
 	on_activate = function(self)
@@ -1523,7 +1505,7 @@ minetest.register_entity("vehicles:lightcycle2", {
 	on_punch = vehicles.on_punch,
 	on_step = function(self, dtime)
 		return vehicles.on_step(self, dtime, {
-			speed = 20, 
+			speed = 20,
 			decell = 0.85,
 			boost = true,
 			boost_duration = 4,
@@ -1550,15 +1532,15 @@ minetest.register_entity("vehicles:boat", {
 	collisionbox = {-1, 0.2, -1, 1.3, 1, 1},
 	on_rightclick = function(self, clicker)
 		if self.driver and clicker == self.driver then
-		vehicles.object_detach(self, clicker, {x=1, y=0, z=1})
+			vehicles.object_detach(self, clicker, {x=1, y=0, z=1})
 		elseif not self.driver then
-		vehicles.object_attach(self, clicker, {x=0, y=5, z=4}, false, {x=0, y=2, z=4})
+			vehicles.object_attach(self, clicker, {x=0, y=5, z=4}, false, {x=0, y=2, z=4})
 		end
 	end,
 	on_punch = vehicles.on_punch,
 	on_step = function(self, dtime)
 		return vehicles.on_step(self, dtime, {
-			speed = 10, 
+			speed = 10,
 			decell = 0.85,
 			is_watercraft = true,
 			gravity = 0,
@@ -1584,21 +1566,21 @@ minetest.register_entity("vehicles:jet", {
 	animation_speed = 5,
 	physical = true,
 	animations = {
-      gear = {x=1, y=1},
-      nogear = {x=10, y=10},
+		gear = {x=1, y=1},
+		nogear = {x=10, y=10},
 	},
 	collisionbox = {-1, -0.9, -0.9, 1, 0.9, 0.9},
 	on_rightclick = function(self, clicker)
 		if self.driver and clicker == self.driver then
-		vehicles.object_detach(self, clicker, {x=1, y=0, z=1})
+			vehicles.object_detach(self, clicker, {x=1, y=0, z=1})
 		elseif not self.driver then
-		vehicles.object_attach(self, clicker, {x=0, y=4, z=3}, false, {x=0, y=4, z=3})
+			vehicles.object_attach(self, clicker, {x=0, y=4, z=3}, false, {x=0, y=4, z=3})
 		end
 	end,
 	on_punch = vehicles.on_punch,
 	on_step = function(self, dtime)
 		return vehicles.on_step(self, dtime, {
-			speed = 20, 
+			speed = 20,
 			decell = 0.95,
 			shoots = true,
 			arrow = "vehicles:missile_2",
@@ -1626,21 +1608,21 @@ minetest.register_entity("vehicles:apache", {
 	collisionbox = {-1.8, 0, -1.8, 1.8, 1.5, 1.8},
 	on_rightclick = function(self, clicker)
 		if self.driver and clicker == self.driver then
-		vehicles.object_detach(self, clicker, {x=1, y=0, z=1})
+			vehicles.object_detach(self, clicker, {x=1, y=0, z=1})
 		elseif not self.driver then
-		vehicles.object_attach(self, clicker, {x=0, y=20, z=17}, true, {x=0, y=10, z=14})
+			vehicles.object_attach(self, clicker, {x=0, y=20, z=17}, true, {x=0, y=10, z=14})
 		end
 	end,
 	on_punch = vehicles.on_punch,
 	on_step = function(self, dtime)
 		return vehicles.on_step(self, dtime, {
-			speed = 16, 
+			speed = 16,
 			decell = 0.95,
 			shoots = true,
 			arrow = "vehicles:missile_2",
 			reload_time = 1,
 			shoots2 = true,
-			shoot_y = 3, 
+			shoot_y = 3,
 			shoot_y2 = 1.5,
 			arrow2 = "vehicles:bullet",
 			reload_time2 = 0.1,
@@ -1666,21 +1648,21 @@ minetest.register_entity("vehicles:helicopter", {
 	animation_speed = 5,
 	physical = true,
 	animations = {
-      gear = {x=1, y=1},
-      nogear = {x=10, y=10},
+		gear = {x=1, y=1},
+		nogear = {x=10, y=10},
 	},
 	collisionbox = {-1.2, 0, -1.2, 1.2, 2, 1.2},
 	on_rightclick = function(self, clicker)
 		if self.driver and clicker == self.driver then
-		vehicles.object_detach(self, clicker, {x=1, y=0, z=1})
+			vehicles.object_detach(self, clicker, {x=1, y=0, z=1})
 		elseif not self.driver then
-		vehicles.object_attach(self, clicker, {x=0, y=4, z=1}, false, {x=0, y=2, z=13})
+			vehicles.object_attach(self, clicker, {x=0, y=4, z=1}, false, {x=0, y=2, z=13})
 		end
 	end,
 	on_punch = vehicles.on_punch,
 	on_step = function(self, dtime)
 		return vehicles.on_step(self, dtime, {
-			speed = 10, 
+			speed = 10,
 			decell = 0.95,
 			moving_anim = {x=1, y=20},
 			stand_anim = {x=1, y=1},
@@ -1705,18 +1687,18 @@ minetest.register_entity("vehicles:plane", {
 	collisionbox = {-1.1, 0, -1, 1, 1.9, 1.1},
 	on_rightclick = function(self, clicker)
 		if self.driver and clicker == self.driver then
-		vehicles.object_detach(self, clicker, {x=1, y=0, z=1})
+			vehicles.object_detach(self, clicker, {x=1, y=0, z=1})
 		elseif not self.driver then
-		vehicles.object_attach(self, clicker, {x=0, y=8, z=3}, false, {x=0, y=9, z=0})
+			vehicles.object_attach(self, clicker, {x=0, y=8, z=3}, false, {x=0, y=9, z=0})
 		end
 	end,
 	on_punch = vehicles.on_punch,
 	on_step = function(self, dtime)
-		if self.anim and not self.driver then 
+		if self.anim and not self.driver then
 			self.object:set_animation({x=1, y=1}, 5, 0)
 		end
 		return vehicles.on_step(self, dtime, {
-			speed = 14, 
+			speed = 14,
 			decell = 0.95,
 			fly = true,
 			fly_mode = "hold",
@@ -1746,16 +1728,17 @@ minetest.register_entity("vehicles:parachute", {
 	collisionbox = {-0.5, -1, -0.5, 0.5, 1, 0.5},
 	on_rightclick = function(self, clicker)
 		if self.driver and clicker == self.driver then
-		vehicles.object_detach(self, clicker, {x=1, y=0, z=1})
+			vehicles.object_detach(self, clicker, {x=1, y=0, z=1})
 		elseif not self.driver then
-		vehicles.object_attach(self, clicker, {x=0, y=0, z=-1.5}, false, {x=0, y=-4, z=0})
+			vehicles.object_attach(self, clicker, {x=0, y=0, z=-1.5}, false, {x=0, y=-4, z=0})
 		end
 	end,
 	on_step = function(self, dtime)
-	if self.driver then
-		vehicles.object_glide(self, dtime, 8, 0.92, -0.2, "", "")
-		return false
+		if self.driver then
+			vehicles.object_glide(self, dtime, 8, 0.92, -0.2, "", "")
+			return false
 		end
+		self.object:remove()
 		return true
 	end,
 })
@@ -1773,18 +1756,18 @@ minetest.register_tool("vehicles:backpack", {
 		damage_groups = {fleshy=1},
 	},
 	on_use = function(item, placer, pointed_thing)
-			local dir = placer:get_look_dir();
-			local playerpos = placer:getpos();
-			local pname = placer:get_player_name();
-			local obj = minetest.env:add_entity({x=playerpos.x+0+dir.x,y=playerpos.y+1+dir.y,z=playerpos.z+0+dir.z}, "vehicles:parachute")
-			local entity = obj:get_luaentity()
-			if obj.driver and placer == obj.driver then
+		local dir = placer:get_look_dir()
+		local playerpos = placer:getpos()
+		local pname = placer:get_player_name()
+		local obj = minetest.env:add_entity({x=playerpos.x+0+dir.x,y=playerpos.y+1+dir.y,z=playerpos.z+0+dir.z}, "vehicles:parachute")
+		local entity = obj:get_luaentity()
+		if obj.driver and placer == obj.driver then
 			vehicles.object_detach(entity, placer, {x=1, y=0, z=1})
-			elseif not obj.driver then
+		elseif not obj.driver then
 			vehicles.object_attach(entity, placer, {x=0, y=0, z=0}, true, {x=0, y=2, z=0})
-			end
-			item:take_item()
-			return item
+		end
+		item:take_item()
+		return item
 	end,
 })
 
@@ -1802,37 +1785,37 @@ minetest.register_entity("vehicles:wing_glider", {
 	physical = false,
 	collisionbox = {-0.5, -0.1, -0.5, 0.5, 0.1, 0.5},
 	on_step = function(self, dtime)
-	if self.driver then
-		local dir = self.driver:get_look_dir();
-		local velo = self.object:getvelocity();
-		local speed = math.sqrt(math.pow(velo.x, 2)+math.pow(velo.z, 2))
-		local vec = {x=dir.x*16,y=dir.y*16+1,z=dir.z*16}
-		local yaw = self.driver:get_look_yaw();
-		self.object:setyaw(yaw+math.pi/2)
-		self.object:setvelocity(vec)
-		self.driver:set_animation({x=162, y=167}, 0, 0)
-		if not self.anim then
-		self.object:set_animation({x=25, y=45}, 10, 0)
-		self.anim = true
-		end
-		return false
+		if self.driver then
+			local dir = self.driver:get_look_dir()
+			local velo = self.object:getvelocity()
+			local speed = math.sqrt(math.pow(velo.x, 2)+math.pow(velo.z, 2))
+			local vec = {x=dir.x*16,y=dir.y*16+1,z=dir.z*16}
+			local yaw = self.driver:get_look_yaw()
+			self.object:setyaw(yaw+math.pi/2)
+			self.object:setvelocity(vec)
+			self.driver:set_animation({x=162, y=167}, 0, 0)
+			if not self.anim then
+				self.object:set_animation({x=25, y=45}, 10, 0)
+				self.anim = true
+			end
+			return false
 		else
-		self.object:remove()
+			self.object:remove()
 		end
 		return true
 	end,
 	on_punch = function(self, puncher)
 		if not self.driver then
-		local name = self.object:get_luaentity().name
-		local pos = self.object:getpos()
-		minetest.env:add_item(pos, name.."_spawner")
-		self.object:remove()
+			local name = self.object:get_luaentity().name
+			local pos = self.object:getpos()
+			minetest.env:add_item(pos, name.."_spawner")
+			self.object:remove()
 		end
 		if self.object:get_hp() == 0 then
-		if self.driver then
-		vehicles.object_detach(self, self.driver, {x=1, y=0, z=1})
-		end
-		self.object:remove()
+			if self.driver then
+				vehicles.object_detach(self, self.driver, {x=1, y=0, z=1})
+			end
+			self.object:remove()
 		end
 	end,
 })
@@ -1850,35 +1833,35 @@ minetest.register_tool("vehicles:wings", {
 		damage_groups = {fleshy=1},
 	},
 	on_use = function(item, placer, pointed_thing)
-			local wings_ready = true
-			local dir = placer:get_look_dir();
-			local playerpos = placer:getpos();
-			local objs = minetest.get_objects_inside_radius({x=playerpos.x,y=playerpos.y,z=playerpos.z}, 2)	
-			for k, obj2 in pairs(objs) do
-				if obj2:get_luaentity() ~= nil and obj2:get_luaentity().name == "vehicles:wing_glider" then
-					local wing = obj2:get_luaentity()
-					wing.driver = nil
-					obj2:remove()
-					vehicles.object_detach(obj2:get_luaentity(), placer, {x=1, y=0, z=1})
-					placer:set_properties({
+		local wings_ready = true
+		local dir = placer:get_look_dir()
+		local playerpos = placer:getpos()
+		local objs = minetest.get_objects_inside_radius({x=playerpos.x,y=playerpos.y,z=playerpos.z}, 2)
+		for k, obj2 in pairs(objs) do
+			if obj2:get_luaentity() ~= nil and obj2:get_luaentity().name == "vehicles:wing_glider" then
+				local wing = obj2:get_luaentity()
+				wing.driver = nil
+				obj2:remove()
+				vehicles.object_detach(obj2:get_luaentity(), placer, {x=1, y=0, z=1})
+				placer:set_properties({
 					visual_size = {x=1, y=1},
-					})
-					wings_ready = false
-				end
+				})
+				wings_ready = false
 			end
-			
-			if wings_ready then
+		end
+
+		if wings_ready then
 			local obj = minetest.env:add_entity({x=playerpos.x+0+dir.x,y=playerpos.y+1+dir.y,z=playerpos.z+0+dir.z}, "vehicles:wing_glider")
-					local entity = obj:get_luaentity()
-					placer:set_attach(entity.object, "", {x=0,y=-5,z=0}, {x=0,y=-3,z=0})
-					entity.driver = placer
-					local dir = placer:get_look_dir()
-					placer:set_properties({
-					visual_size = {x=1, y=-1},
-					})
-					item:add_wear(500)
-					return item
-			end
+			local entity = obj:get_luaentity()
+			placer:set_attach(entity.object, "", {x=0,y=-5,z=0}, {x=0,y=-3,z=0})
+			entity.driver = placer
+			local dir = placer:get_look_dir()
+			placer:set_properties({
+				visual_size = {x=1, y=-1},
+			})
+			item:add_wear(500)
+			return item
+		end
 	end,
 })
 
@@ -1895,11 +1878,11 @@ minetest.register_tool("vehicles:rc", {
 		damage_groups = {fleshy=1},
 	},
 	on_use = function(item, placer, pointed_thing)
-			local dir = placer:get_look_dir();
-			local playerpos = placer:getpos();
-			local pname = placer:get_player_name();
-			local inv = minetest.get_inventory({type="player", name=pname});
-			if inv:contains_item("main", "vehicles:missile_2_item") then
+		local dir = placer:get_look_dir()
+		local playerpos = placer:getpos()
+		local pname = placer:get_player_name()
+		local inv = minetest.get_inventory({type="player", name=pname})
+		if inv:contains_item("main", "vehicles:missile_2_item") then
 			local remov = inv:remove_item("main", "vehicles:missile_2_item")
 			local obj = minetest.env:add_entity({x=playerpos.x+0+dir.x,y=playerpos.y+1+dir.y,z=playerpos.z+0+dir.z}, "vehicles:missile")
 			local object = obj:get_luaentity()
@@ -2321,19 +2304,19 @@ minetest.register_craft({
 --decorative nodes
 
 if minetest.settings:get("vehicles_nodes") == nil then
-minetest.settings:set("vehicles_nodes", "true")
+	minetest.settings:set("vehicles_nodes", "true")
 end
 
 if minetest.settings:get("vehicles_nodes") then
 function vehicles.register_simplenode(name, desc, texture, light)
-minetest.register_node("vehicles:"..name, {
-	description = desc,
-	tiles = {texture},
-	groups = {cracky=1},
-	paramtype2 = "facedir",
-	light_source = light,
-	sound = default.node_sound_stone_defaults(),
-})
+	minetest.register_node("vehicles:"..name, {
+		description = desc,
+		tiles = {texture},
+		groups = {cracky=1},
+		paramtype2 = "facedir",
+		light_source = light,
+		sound = default.node_sound_stone_defaults(),
+	})
 end--function vehicles.register_simplenode(name, desc, texture, light)
 
 vehicles.register_simplenode("road", S("Road surface"), "vehicles_road.png", 0)
@@ -2357,7 +2340,7 @@ minetest.register_node("vehicles:lights", {
 })
 
 if minetest.get_modpath("stairs") then
-stairs.register_stair_and_slab("road_surface", "vehicles:road",
+	stairs.register_stair_and_slab("road_surface", "vehicles:road",
 		{cracky = 1},
 		{"vehicles_road.png"},
 		S("Road Surface Stair"),
@@ -2378,7 +2361,7 @@ minetest.register_node("vehicles:neon_arrow", {
 	use_texture_alpha = true,
 	paramtype = "light",
 	paramtype2 = "wallmounted",
-	sunlight_propagates = true,	
+	sunlight_propagates = true,
 	light_source = 14,
 	walkable = false,
 	is_ground_content = true,
@@ -2402,7 +2385,7 @@ minetest.register_node("vehicles:neon_arrow_flp", {
 	use_texture_alpha = true,
 	paramtype = "light",
 	paramtype2 = "wallmounted",
-	sunlight_propagates = true,	
+	sunlight_propagates = true,
 	light_source = 14,
 	walkable = false,
 	is_ground_content = true,
@@ -2422,7 +2405,7 @@ minetest.register_node("vehicles:add_arrow", {
 	use_texture_alpha = true,
 	paramtype = "light",
 	paramtype2 = "wallmounted",
-	sunlight_propagates = true,	
+	sunlight_propagates = true,
 	light_source = 14,
 	walkable = false,
 	is_ground_content = true,
@@ -2442,7 +2425,7 @@ minetest.register_node("vehicles:add_arrow_flp", {
 	use_texture_alpha = true,
 	paramtype = "light",
 	paramtype2 = "wallmounted",
-	sunlight_propagates = true,	
+	sunlight_propagates = true,
 	light_source = 14,
 	walkable = false,
 	is_ground_content = true,
@@ -2466,7 +2449,7 @@ minetest.register_node("vehicles:scifi_ad", {
 	use_texture_alpha = true,
 	paramtype = "light",
 	paramtype2 = "wallmounted",
-	sunlight_propagates = true,	
+	sunlight_propagates = true,
 	light_source = 14,
 	walkable = false,
 	is_ground_content = true,
@@ -2486,7 +2469,7 @@ minetest.register_node("vehicles:mt_sign", {
 	use_texture_alpha = true,
 	paramtype = "light",
 	paramtype2 = "wallmounted",
-	sunlight_propagates = true,	
+	sunlight_propagates = true,
 	light_source = 14,
 	walkable = false,
 	is_ground_content = true,
@@ -2506,7 +2489,7 @@ minetest.register_node("vehicles:pacman_sign", {
 	use_texture_alpha = true,
 	paramtype = "light",
 	paramtype2 = "wallmounted",
-	sunlight_propagates = true,	
+	sunlight_propagates = true,
 	light_source = 14,
 	walkable = false,
 	is_ground_content = true,
@@ -2526,7 +2509,7 @@ minetest.register_node("vehicles:whee_sign", {
 	use_texture_alpha = true,
 	paramtype = "light",
 	paramtype2 = "wallmounted",
-	sunlight_propagates = true,	
+	sunlight_propagates = true,
 	light_source = 14,
 	walkable = false,
 	is_ground_content = true,
@@ -2643,7 +2626,7 @@ minetest.register_node("vehicles:tyres", {
 	groups = {cracky=1, falling_node=1},
 })
 
---nodeboxes from xpanes 
+--nodeboxes from xpanes
 --[[
 (MIT)
 Copyright (C) 2014-2016 xyz
@@ -2655,21 +2638,21 @@ Copyright (C) 2014-2016 Various Minetest developers
 minetest.register_node("vehicles:light_barrier", {
 	description = S("Light Barrier"),
 	tiles = {
-	"vehicles_lightblock.png^[transformR90",
-	"vehicles_lightblock.png^[transformR90",
-	"vehicles_lightblock.png",
+		"vehicles_lightblock.png^[transformR90",
+		"vehicles_lightblock.png^[transformR90",
+		"vehicles_lightblock.png",
 	},
 	use_texture_alpha = true,
 	drawtype = "nodebox",
 	paramtype = "light",
 	paramtype2 = "facedir",
 	node_box = {
-			type = "connected",
-			fixed = {{-1/32, -1/2, -1/32, 1/32, 1/2, 1/32}},
-			connect_front = {{-1/32, -1/2, -1/2, 1/32, 1/2, -1/32}},
-			connect_left = {{-1/2, -1/2, -1/32, -1/32, 1/2, 1/32}},
-			connect_back = {{-1/32, -1/2, 1/32, 1/32, 1/2, 1/2}},
-			connect_right = {{1/32, -1/2, -1/32, 1/2, 1/2, 1/32}},
+		type = "connected",
+		fixed = {{-1/32, -1/2, -1/32, 1/32, 1/2, 1/32}},
+		connect_front = {{-1/32, -1/2, -1/2, 1/32, 1/2, -1/32}},
+		connect_left = {{-1/2, -1/2, -1/32, -1/32, 1/2, 1/32}},
+		connect_back = {{-1/32, -1/2, 1/32, 1/32, 1/2, 1/2}},
+		connect_right = {{1/32, -1/2, -1/32, 1/2, 1/2, 1/32}},
 	},
 	connects_to = {"vehicles:light_barrier",},
 	sunlight_propagates = true,
@@ -2677,7 +2660,7 @@ minetest.register_node("vehicles:light_barrier", {
 	light_source = 9,
 	groups = {cracky=3,dig_immediate=3,not_in_creative_inventory=1},
 	on_construct = function(pos, node)
-			minetest.get_node_timer(pos):start(4)
+		minetest.get_node_timer(pos):start(4)
 		return
 	end,
 	on_timer = function(pos, elapsed)
@@ -2688,21 +2671,21 @@ minetest.register_node("vehicles:light_barrier", {
 minetest.register_node("vehicles:light_barrier2", {
 	description = S("Light Barrier 2"),
 	tiles = {
-	"vehicles_lightblock2.png^[transformR90",
-	"vehicles_lightblock2.png^[transformR90",
-	"vehicles_lightblock2.png",
+		"vehicles_lightblock2.png^[transformR90",
+		"vehicles_lightblock2.png^[transformR90",
+		"vehicles_lightblock2.png",
 	},
 	use_texture_alpha = true,
 	drawtype = "nodebox",
 	paramtype = "light",
 	paramtype2 = "facedir",
 	node_box = {
-			type = "connected",
-			fixed = {{-1/32, -1/2, -1/32, 1/32, 1/2, 1/32}},
-			connect_front = {{-1/32, -1/2, -1/2, 1/32, 1/2, -1/32}},
-			connect_left = {{-1/2, -1/2, -1/32, -1/32, 1/2, 1/32}},
-			connect_back = {{-1/32, -1/2, 1/32, 1/32, 1/2, 1/2}},
-			connect_right = {{1/32, -1/2, -1/32, 1/2, 1/2, 1/32}},
+		type = "connected",
+		fixed = {{-1/32, -1/2, -1/32, 1/32, 1/2, 1/32}},
+		connect_front = {{-1/32, -1/2, -1/2, 1/32, 1/2, -1/32}},
+		connect_left = {{-1/2, -1/2, -1/32, -1/32, 1/2, 1/32}},
+		connect_back = {{-1/32, -1/2, 1/32, 1/32, 1/2, 1/2}},
+		connect_right = {{1/32, -1/2, -1/32, 1/2, 1/2, 1/32}},
 	},
 	connects_to = {"vehicles:light_barrier2",},
 	sunlight_propagates = true,
@@ -2710,7 +2693,7 @@ minetest.register_node("vehicles:light_barrier2", {
 	light_source = 9,
 	groups = {cracky=3,dig_immediate=3,not_in_creative_inventory=1},
 	on_construct = function(pos, node)
-			minetest.get_node_timer(pos):start(4)
+		minetest.get_node_timer(pos):start(4)
 		return
 	end,
 	on_timer = function(pos, elapsed)
@@ -2719,6 +2702,6 @@ minetest.register_node("vehicles:light_barrier2", {
 })
 
 
-end--if minetest.setting_get("vehicles_nodes") then
+end--if minetest.settings:get("vehicles_nodes") then
 
 end--if enable_built_in then