update code to balance the measure
update all scoring code
Merge branch 'master' into alloNotEvo