performance fix due cwd-status and directory/file watching