clean up and fix game saving