Various fixes to scrapers in light of some RDG changes, plus some new features in the aggregates and a fix for aggregate merges.