TODO cleaned up
fixed issue with loading the scenario info