many changes, mostly to channel view