Some corrections - was hanging on retry after power down (oops)