Channel, Channels, & Stream

Extensive changes and edits.