Revise team metrics, fixes #160