improvements to demo app