improvements to the demo project