minor tweaks during demo run