diff --git a/balloon.lua b/balloon.lua
index 1400571..77d87e6 100644
--- a/balloon.lua
+++ b/balloon.lua
@@ -2,23 +2,25 @@ local mod_name = minetest.get_current_modname()
 local mod_path = minetest.get_modpath(mod_name)
 
 local me = {
-    lift = 4,
-    speed = 4,
-    fuel_time = 10,
-    speed_mult = 4,
-    i = {},
+	lift = 4,
+	speed = 4,
+	fuel_time = 10,
+	speed_mult = 4,
+	i = {},
 }
 
 local ship = {
-	physical = true,
-	pointable = true,
-	collisionbox = {-0.6, -0.2, -0.6, 0.6, 0.3, 0.6},
-	selectionbox = {-0.7, -0.35, -0.7, 0.7, 0.3, 0.7},
-	hp_max = 3,
-	visual = "mesh",
-    backface_culling = false,
-	mesh = "sum_airship.b3d",
-	textures = {"sum_airship_texture.png"},
+	initial_properties = {
+		physical = true,
+		pointable = true,
+		collisionbox = {-0.9, -0.0, -0.9, 0.9, 0.9, 0.9},
+		selectionbox = {-0.7, -0.0, -0.7, 0.7, 0.9, 0.7},
+		hp_max = 3,
+		visual = "mesh",
+		backface_culling = true,
+		mesh = "sum_airship.b3d",
+		textures = {"sum_airship_texture.png"},
+	},
 	_animations = {
 		idle = {x=  10, y= 90},
 		fly = {x=  91, y= 170},
@@ -26,8 +28,8 @@ local ship = {
 	},
 	_driver = nil,
 	_removed = false,
-    _flags = {},
-    _itemstring = "sum_airship:boat",
+	_flags = {},
+	_itemstring = "sum_airship:boat",
 	_passenger = nil,
 	_vel = 0,
 	_regen_timer = 0,
@@ -88,7 +90,7 @@ function me.sound_countdown(self, dtime)
 end
 
 function me.update_sound(self, dtime, forward)
-    me.sound_countdown(self, dtime)
+	me.sound_countdown(self, dtime)
 
 	local is_thrust = (forward ~= 0) and self._driver
 
@@ -128,15 +130,17 @@ function ship.on_activate(self, staticdata, dtime_s)
 		self._vel = data.v
 		self._itemstring = data.itemstring
 		self._fuel = data.fuel
-        if data._driver then
-            self._driver = minetest.get_player_by_name((data._driver))
-        else
-            self._driver = nil
-        end
-        self._flags = data._flags
-        if self._driver then me.detach(self) end
+		self._flags = data._flags
 	end
-    self.object:set_animation(ship._animations.idle, 24)
+	self.object:set_armor_groups({
+		pierce=100,
+		slash=100,
+		blunt=100,
+		magic=100,
+		poison=100,
+		fleshy=100,
+	})
+	self.object:set_animation(ship._animations.idle, 24)
 	self._sounds = { -- workaround for copy vs reference issue
 		engine = {
 			handle = nil,
@@ -156,41 +160,39 @@ end
 function ship.get_staticdata(self)
 	return minetest.serialize({
 		itemstring = self._itemstring,
-        _driver = ((self._driver and self._driver:is_player())
-            and self._driver:get_player_name()) or nil,
-        _flags = self._flags,
+		_flags = self._flags,
 		v = self._vel,
 		fuel = self._fuel,
 	})
 end
 
 function me.attach(self, player)
-    if not (player and player:is_player()) then
-        return false
-    end
+	if not (player and player:is_player()) then
+		return false
+	end
 	self._driver = player
-    self._driver:set_attach(self.object, "",
-		{x = 0, y = -3.0, z = 0}, {x = 0, y = 0, z = 0})
-    self._driver:set_look_horizontal(self.object:get_yaw())
+	self._driver:set_attach(self.object, "",
+		{x = 0, y = -0.0, z = -2}, {x = 0, y = 0, z = 0})
+	self._driver:set_look_horizontal(self.object:get_yaw())
 end
 
 function me.detach(self)
-    if not self._driver then return false end
-    self._driver:set_detach()
-    self._driver = nil
-    return true
+	if not self._driver then return false end
+	self._driver:set_detach()
+	self._driver = nil
+	return true
 end
 
 
 function ship.on_death(self, killer)
 	if killer and killer:is_player()
-    and not minetest.is_creative_enabled(killer:get_player_name()) then
+	and not minetest.is_creative_enabled(killer:get_player_name()) then
 		local inv = killer:get_inventory()
 		inv:add_item("main", self._itemstring)
 	else
 		minetest.add_item(self.object:get_pos(), self._itemstring)
 	end
-    me.detach(self)
+	me.detach(self)
 	self._driver = nil
 end
 
@@ -198,7 +200,7 @@ function ship.on_rightclick(self, clicker)
 	local item = clicker:get_wielded_item()
 	local item_name = item:get_name()
 	if clicker and (item and item_name)
-    and (string.find(item_name, ":coal")
+	and (string.find(item_name, ":coal")
 	or string.find(item_name, ":charcoal")) then
 		if not minetest.is_creative_enabled(clicker:get_player_name()) then
 			item:take_item()
@@ -260,16 +262,16 @@ function me.get_balloon_collide(self)
 	for _, check in pairs(balloon_nodes) do
 		local n = minetest.get_node(vector.add(check.p, o))
 		if n and minetest.registered_nodes[n.name]
-		and minetest.registered_nodes[n.name].walkable then
+		and (minetest.registered_nodes[n.name] or {}).walkable then
 			force = vector.add(force, check.dir)
 		end
 	end
 	return force
 end
 
-me.chimney_dist = -1.0
+me.chimney_dist = -0.8
 me.chimney_yaw = 0.13
-me.chimney_height = 0.9
+me.chimney_height = 1.5
 function me.get_chimney_pos(self)
 	local p = self.object:get_pos()
 	local yaw = self.object:get_yaw()
@@ -281,50 +283,50 @@ function me.get_chimney_pos(self)
 end
 
 function ship.on_step(self, dtime, moveresult)
-    local exit = false
-    local pi = nil
-    -- allow to exit
-    if self._driver and self._driver:is_player() then
-        local name = self._driver:get_player_name()
-        pi = self._driver:get_player_control()
-        exit = pi.sneak
-    end
-    if exit then
-        me.detach(self)
-        return false
-    end
+	local exit = false
+	local pi = nil
+	-- allow to exit
+	if self._driver and self._driver:is_player() then
+		local name = self._driver:get_player_name()
+		pi = self._driver:get_player_control()
+		exit = pi.sneak
+	end
+	if exit then
+		me.detach(self)
+		return false
+	end
 
-    local climb = 0
-    local right = 0
-    local forward = 0
-    local v = self.object:get_velocity()
-    local p = self.object:get_pos()
-    local node_below = minetest.get_node(vector.offset(p, 0, -0.8, 0)).name
-	local is_on_floor = minetest.registered_nodes[node_below].walkable
+	local climb = 0
+	local right = 0
+	local forward = 0
+	local v = self.object:get_velocity()
+	local p = self.object:get_pos()
+	local node_below = minetest.get_node(vector.offset(p, 0, -0.8, 0)).name
+	local is_on_floor = (minetest.registered_nodes[node_below] or {}).walkable
 	local in_water = minetest.get_item_group(minetest.get_node(p).name, "liquid") ~= 0
 	local on_water = (minetest.get_item_group(minetest.get_node(vector.offset(p, 0, -0.2, 0)).name, "liquid") ~= 0 and not in_water)
 
-    local speedboost = 1
-    if self._fuel > 0 then
-        self._fuel = self._fuel - dtime
-        speedboost = 3
-    end
+	local speedboost = 1
+	if self._fuel > 0 then
+		self._fuel = self._fuel - dtime
+		speedboost = 3
+	end
 
-    if pi then
-        if pi.up then forward = 1
-        elseif pi.down then forward = -1 end
-        if pi.jump then climb = 1
-        elseif pi.aux1 then climb = -1 end
-        if pi.right then right = 1
-        elseif pi.left then right = -1 end
+	if pi then
+		if pi.up then forward = 1
+		elseif pi.down then forward = -1 end
+		if pi.jump then climb = 1
+		elseif pi.aux1 then climb = -1 end
+		if pi.right then right = 1
+		elseif pi.left then right = -1 end
 
-        local yaw = self.object:get_yaw()
-        local dir = minetest.yaw_to_dir(yaw)
-        self.object:set_yaw(yaw - right * dtime)
-        local added_vel = vector.multiply(dir, forward * dtime * me.speed * speedboost)
-        added_vel.y = added_vel.y + (climb * dtime * me.lift)
-        v = vector.add(v, added_vel)
-    end
+		local yaw = self.object:get_yaw()
+		local dir = minetest.yaw_to_dir(yaw)
+		self.object:set_yaw(yaw - right * dtime)
+		local added_vel = vector.multiply(dir, forward * dtime * me.speed * speedboost)
+		added_vel.y = added_vel.y + (climb * dtime * me.lift)
+		v = vector.add(v, added_vel)
+	end
 
 	if self._driver then
 		local collide_force = me.get_balloon_collide(self)
@@ -335,32 +337,32 @@ function ship.on_step(self, dtime, moveresult)
 		v = vector.add(v, collide_force)
 	end
 
-    if not self._driver then
-        v.y = v.y - dtime
-    end
+	if not self._driver then
+		v.y = v.y - dtime
+	end
 
-	if sum_air_currents ~= nil then
+	if minetest.get_modpath("sum_air_currents") then
 		if self._driver or not is_on_floor then
-            local wind_vel = sum_air_currents.get_wind(p)
-            wind_vel = vector.multiply(wind_vel, dtime)
+			local wind_vel = sum_air_currents.get_wind(p)
+			wind_vel = vector.multiply(wind_vel, dtime)
 			v = vector.add(wind_vel, v)
 		end
 	end
-    if in_water then
-        v.y = 1
-    elseif on_water and not self._driver then
-        v.y = 0
-    end
+	if in_water then
+		v.y = 1
+	elseif on_water and not self._driver then
+		v.y = 0
+	end
 
-    if (not self._driver) and is_on_floor then
-        v.x = v.x * 0.8
-        v.y = v.y * 0.95
-        v.z = v.z * 0.8
-    else
-        v.x = v.x * (0.98)
-        v.y = v.y * (0.98)
-        v.z = v.z * (0.98)
-    end
+	if (not self._driver) and is_on_floor then
+		v.x = v.x * 0.8
+		v.y = v.y * 0.95
+		v.z = v.z * 0.8
+	else
+		v.x = v.x * (0.98)
+		v.y = v.y * (0.98)
+		v.z = v.z * (0.98)
+	end
 
 	local wind_vel = vector.new(0,0,0)
 	if minetest.get_modpath("sum_air_currents") ~= nil then
@@ -371,7 +373,7 @@ function ship.on_step(self, dtime, moveresult)
 	end
 
 
-    self.object:set_velocity(v)
+	self.object:set_velocity(v)
 
 	me.update_sound(self, dtime, forward)
 
@@ -407,31 +409,32 @@ minetest.register_entity("sum_airship:boat", ship)
 
 minetest.register_craftitem("sum_airship:boat", {
 	description = "Airship",
-    inventory_image = "sum_airship.png",
-    groups = { vehicle = 1, airship = 1, transport = 1},
-    on_place = function(itemstack, placer, pointed_thing)
-        if pointed_thing.type ~= "node" then
-            return itemstack
-        end
-        local node = minetest.get_node(pointed_thing.under)
-        if placer and not placer:get_player_control().sneak then
-            if minetest.registered_nodes[node.name] and minetest.registered_nodes[node.name].on_rightclick then
-                return minetest.registered_nodes[node.name].on_rightclick(pointed_thing.under, node, placer, itemstack) or itemstack
-            end
-        end
-        local pos = vector.offset(pointed_thing.above, 0, 0.5, 0)
-        local self = minetest.add_entity(pos, "sum_airship:boat"):get_luaentity()
-        if not minetest.is_creative_enabled(placer:get_player_name()) then
-            itemstack:take_item()
-        end
-        return itemstack
-    end,
+	inventory_image = "sum_airship.png",
+	groups = { vehicle = 1, airship = 1, transport = 1},
+	on_place = function(itemstack, placer, pointed_thing)
+		if pointed_thing.type ~= "node" then
+			return itemstack
+		end
+		local node = minetest.get_node(pointed_thing.under)
+		if placer and not placer:get_player_control().sneak then
+			local def = minetest.registered_nodes[node.name]
+			if def and def.on_rightclick then
+				return def.on_rightclick(pointed_thing.under, node, placer, itemstack) or itemstack
+			end
+		end
+		local pos = vector.offset(pointed_thing.above, 0, 0, 0)
+		local self = minetest.add_entity(pos, "sum_airship:boat"):get_luaentity()
+		if not minetest.is_creative_enabled(placer:get_player_name()) then
+			itemstack:take_item()
+		end
+		return itemstack
+	end,
 })
 
 
 -- Support SilverSandstone's subtitles mod:
 if minetest.get_modpath("subtitles") then
-	subtitles.register_description('sum_airship_lip_trill',                           'Engine purring');
-	subtitles.register_description('sum_airship_lip_trill_end',                       'Engine sputtering');
-	subtitles.register_description('sum_airship_fire',                                'Engine stoked');
+	subtitles.register_description('sum_airship_lip_trill',     'Engine purring');
+	subtitles.register_description('sum_airship_lip_trill_end', 'Engine sputtering');
+	subtitles.register_description('sum_airship_fire',          'Engine stoked');
 end