More examples and bugfixing