Improved display, added fields, added a get_aggregates function