some work on the data types
fixed the typing of scenarios
Merge branch 'master' into newScenarioData