single response channel, some fixes and cleaning