Several updates on boat NPCs, ref #1195

pr re-added