Watch fixes, filesystem fixes, and started addressing rebuilding changed files