Update notes for submitted changes

* serrano: Sync some stuff with CAF, and some minor cleanup