Overall tweeks to make the game engine stable