Jabber, and some minor fixes...