Improved out of the box-ness of the demo.