Cleanup and minor bug fixes.
Merge branch 'master'
Add activity logging.
Rework demo environment.