Fixed state management of game universe, fixes #3