catherine-wheel: Some minor demo changes