Backport of chokidar + wording and fixes