Fixed a path issue that prevented file attributes from being set on files uploaded via the watcher
Fixed a couple things on the watcher.
Added a todo for moving files