Added more channels, fixed some mistakes + minor cleaning of the code