(Hopefully) fixed channels nonsense
fix NPE
Fixed another NPE
Merge pull request #7 from M3gaFr3ak/rv2

Rv2