some more verbosity on wait; further tweaks of timing