minor bugs and cleanup
Merge branch 'master' of https://github.com/DESY-Petra-III/P02