More demo tweaks