Bugfix + style changes.