Remove examples
a few bugfixes