refactored new game, more generators