Bugfixing and Refactoring