some cleanup
restored --new-game switch