Contains fixes and possible improvements for parameter scenarios, uncertainty.
Will also include fixes and general improvements of the code.