Added GameState, fixed minor bugs