fixes to stylus watcher