Bugfixes + style changes