Added some comments and modified JABBER