Add watcher sketch. Minor updates.