Some more work on the boats, also localization