Changes to scenarios

Several changes by Golress to the scenarios