Bug Fixes + Aggregation

Everything ready to run. Fixed lots of bugs that were causing inaccurate
data.