Finished params setup Fixes #16