various fixes and improvements
Merge branch 'demos' into dev