Added an Enum for the type of boat
Did some cleanup
More CleanUp