fixed metrics past match grouping
refactored matches into 3 types of matches