some cleanup and notes