watch changed to 2-way call

+ disconnection properly handled