Update for ChatChannels and other changes

Signed-off-by: zml2008 <zach@zachsthings.com>