Updates to the watcher code, which should improve the progress bar
use.