Convergence for game scene and some minor design tweaks (missed one file)