Bugfixes and style update