fixed wait until methods to poll once in a while in case watches are missed
fixed issue with wait until methods when waiting indefinitely