Committed to trunk item 1) from the roadmap.  This takes care
of the demo script submitted.  Leaving this open for the
other items, but they're mostly matters of cosmetics.