incremental improvements - most notably to the demo code