cleanup and fixes

Merged Julian Johannes Steinsberger-Dührßen requested to merge develop into master Oct 26, 2020