Redid the watcher function so now it works, also modified readDir, and a few other misc changes