Add docs for association matchers
Various tweaks