durack1 param tweaks

@doutriaux1 sorted out branch conflicts