better stats and tweaks.

Change-Id: I0dde132d43569a7c0a584ba77dd4000098d5d16c
3 files changed