extracted ship object and fixed references