[47124187] styling various bugfixes