Testing of scene manager and minor fixes. AH-176
Began commenting. AH-176