Improved GameState and Player classes.