Add Channel + Bugfixing
Add Channel + Bugfixing