Minor fixes to demo-script.txt and some cosmetic fixes.