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