Added progress bar, finished adding NoWait option