Refactoring, Bugfixes