bugfixes
refactoring