Bugfixes and refactoring progress