Fixed bugs... in the watcher code.