Fixed stuff from PR, removed many redundant selves, sorry for broken matchup search code