more metrics improvements