fixed some matchmap issues