Removing some more caching
Updating the stats to be more accurate.

Need to use an include instead of a join to get accurate numbers.