diverse kleinere fixes/codecleanings