scene 2 fixes and debug mode fixes

scene 2 fixes and debug mode fixes