fixed some of the scenario stuff