Add Multi scenario and other improvements

[see24]

Significant update that adds support for multiple scenarios. Data prepared with the previous version will need to be re prepared or downloaded.