Add game state, fix scoring