Added support for joining a channel
Small fixes in model