Tweaks to demo script