DemoScene + various changes