More updates on Boat NPCs, ref #1195

please don't remove new line at end of files :) (same with other files)