Bugfixes and refactoring.