Address comments. Emphasis all instances of Notes