Re-organize some of the stats.