Bugfixes
Style changes