Add an option to generate noise after substitution
Fix clause count
Merge branch 'noise' into master2