Revise team metrics, fixes #161