bugfixing & refactoring