Finally fix metrics so they report correctly.
Merge pull request #79 from Clashnia/hqm

Finally fix metrics so they report correctly.