Pimp and Bugfix MatchValidator

Based on the suggestions in #108 and #109.