Update notes for submitted changes

* Add default timeout to wait method to avoid infinite loop