Extracted responder from watchStream; some minor fixes