fix most of the examples, removed tree-matcher