use a different fs watcher + other fixes
Version increase