More tweaks to demo