Move matchers to new format
Clean up some docs
Display all match errors in a context