Small improvements in buffer-watcher.el
various changes