Fixed most stuff in boat