Major bug fix for boat