improvements in channels + other bugfixes