Several updates on Boat NPCs, ref #1195 and cheers @EPuncker