Issue #237 - correct row number display
Issue #231 - correct metric statistics