cleaning up and some notes