Add more examples, bugfixes