More cleanup.
upgrade WIP on dropbox.
Fixed upgrade notes.