Enhanced to edit notes.
Enhanced to remove notes.