clone watcher corrections to match blog