refactor evaluation & add extra breakdowns