new examples, some fixes