More examples, more bugfixes