Boat Builder: 36 fix bugs

fix bugs