bugfixes and scenario file updates