some improvements in the scenario language