[Anton] Work on the shipbuilder + cleanup