bugfixes
more tests...
...
...