terminology.  avoid or clarify uses of "channel"
add tests