Redo the parameters PR as a branch
Merge pull request #1075 from nden/parameters_update

Improve and simplify handling of parameters