little fixes
MF-50 Refactor scene
Merge branch 'master' into MF-49