new metrics, several improvements