Metrics fixes made; update docs