Empty Gamestate bug fixed, Feedback bug fixed
merge