Bugfix and some refactoring.