minor tweaks, metrics