Bring back file watcher and fix some bugs