More cleanup and some notes