clean up and some notes