General cleanup and added support for quick messaging channels