more object/game refactoring