Add the wait option + many readme fixes