Added direct chat capability, fixe broken code