Evaluation metrics: bug fixes. All metric are functional now