Lots more fiddling

More plotting, tweaking/fixing aggregation script
Still need to properly code in some nice figures but it’ll do