cleanup on factory, new shipyard!

stuff and things