Bugfixing and minor refactoring