minor bugfixes and formattings