Improves stats

Merged improved stats work from evernote/pootle.