Some more work on the demo scenes