Resolved scene timings, general cleanup
Merge branch 'master' of https://github.com/CNM190/Nightmare