add ability to cancel watchers

squash