setup updates, file-watcher fixes