Fixed boat and bugs