More metrics and documentation improvements