Scene, Tweaks

May need to reconsider how scene management is done...