More bugfixing for scenario parser, but now crossing scenario file works as well.