Update before start of speeding summary stats, and refactoring peer calcs