Major updates to MatchPro port