Cleaned up some diffs.
Cleaned and added some notes.