a LOT of ui additions, changed aggregation