[Abhinav] - few typos and error rectifications, along with watcher.