Fixes and added channels as a configureable option in the config file