fix wait, update doc string, detailed exception messages