Get matchit working
Minor tweaks