Updated demos, other tweaks