MatchComp no longer returns lists

Changed MatchComp to not return lists, but instead takes an index as
input argument.