bugfixes, refactoring