improved issues and add intercom funtionality