minor tweaks to scenarios