Several changes that actually belong to master

working on demos, etc.