Tweaked demos a bit.