Simplify and improve descriptions of wait, waitN