Some sundry fixes and add is_channel