Made a lot of bug fixes in Aggregate