+ first draft of 2 new metrics
* fixed references