- a few bugfixes