Minor enhancements to the demo.