Reverted to the new scoring system, contamination seems correct now, although build() needs some fixing after the revamp, @tzcoolman #reviewthis please