Add some more metrics, fix typo