OCD fixes. Fix javadocs on Boat. Make Entity extend Identifiable.