Added additional protocols
Added some comments and modified JABBER
Solve conflict
Clean and fix @Firefart's code