Added ChannelThreadManager, minor changes