Tweak to Watch Node info to close #236