Metrics + Sorting + Minor fix