Style- and Bugfixes