rename a bunch of methods. Add onError to MatchListener