Fixes for right-hanging stats; also, aggregate based on stats that are available.
Allow aggregated samples to be averaged; better wording