more cleanup and updates