add new metrics and fix review comments
update documentation and fix tests