improve match diagnostic messages and documentation. Add more basic matchers
updates due to code gen updates