Edits to Ship and Weapon