More rule cleanup and some data massaging, some aggregation tweaks as well