Improved forward-scene
Minor cleanups