More updates on Boat NPCs, ref #1195

i'll remove it :p