fixes from the demo
nit
Merge pull request #1902 from devoncarew/devoncarew_demo_fixes

Devoncarew demo fixes