Simple improvements to the ship task