Add planet to ship and clean some accessors