Some tweaks and bugfixes

Uwe Dittusrequested to merge
develop into main

read the commit messages

Merge request reports