Revert "Revert "Update parameters + minor changes""

This reverts commit 99dc983b84eea2cccaae86aa552b435e05c9b891.