fixed commit issues, fixed spaceship issues