major improvements to demo file