Merge branch 'tweak_demos' into 'master'

cosmetics and adjustments

See merge request !182
6 jobs for master in 32 minutes and 40 seconds (queued for 1 second)