Fix watch tool; implement long polling; start websockets