adding multiplex reference to channel and some cleanup