Bugfixes, refactoring.