Added nick change support and improved thread watcher