getting scenarios back in working order
tweak error messages