bugfix, gamefield refactor