brought muc invites back. + couple of bug fixes + refactoring