Added more channels and fixed some NPE