Adds really simple demo, plus makes things more robust overall.