more cleanup and notes