Multiple changes, now have one scorer that could do all the requirements, need some testing
Merge branch 'master' of https://github.com/hunterhector/EvmEval