Improve parameters

Made some improvements to the parameters, please see individual commit messages.