Update notes for submitted changes

* Use futures wait() when possible