Minor tweaks & fixes
Demo app in progress