add matchers and handlers, move defaults out, add other tools