Further Ship edits