Fix boat flying up and some tweaks