sprinkle keywords everywhere to disambiguate
fix channel type parsing