revisions to game engine
merged conflicts