more cleanup, fixes