various fixes
more cleanup