fixed generator code; added scoring; made GameState singleton