Assorted bug fixes. Demo scenario complete.
Added a title.