improvements to parameter selection