Updates to multi-value params plus tweaks