first pass of fixes to runAndWait