Improved wait/when documentation