added a few more matchers and such