demo scene and fixes