Lots of tweaks and fixes to the channel hierarchy.