.wait() improvements