improvements in FileWatcher class