improvements in file watching