bugfixes / refactoring