some tweaks in demo app