Improve demo support
Apply stash
Make improvements to the demo instructions. Change 'demo' to 'offline'