Make it more robust against new channels
* Be prepared for new channels
* Fix minor bugs