new examples and more fixes