Parser Changes to support named channels.
Other crap