Fix u/w issue, plus easier output
Param tweaks