Add wait option
Clean up help