Update notes for submitted changes

* add timeout/retry for teardown instances