re-work of channel -> socket references
Merge branch 'sockets'