cleanup and some notes