Rebase done. More notes.