Fixed naming convention, watchers[] now contains more than just file name string, etc.