clean up, make use of some new ParamHelpers funs and fix some FIXMEs