- Yet another change to aggregate code -- think this is it. Easier to understand and works according to paper.
 - Fixed bug with code that selects normalization value based on count.