more polishing of demo
(#467)