Clean up ship and fix bugs