more cleanup/changes