bugfixes / refactoring / ...