#488 More examples and simple bugfixes