cleanup, add some notes