watcher options and message tweak