code changes...fix all of the statistics collection...clean up collection code