correctness changes
Merge pull request #2 from zrathustra/clt_params

correctness changes