More updates to the demo, better aggregate
Merge master from github.