cleanup and fixes
blubb