more examples and fixes