GameState and some finishing touches