Metrics updates

Most of this was pulled from FAQs.