Fixed and added thread watcher