fixups
some more cleanup