Update log watcher, minor bug fixs