Fixes to statistics section -- not perfect but it's moving in the right direction