added matchers and rearranged a few things.