- minor bug fixes in scenario generator