minor formatting
minor fixes
fix metrics method