Improvements to Aggregator

Talked about this in issue #358 

/cc @ejconlon @avibryant @gabriel439