bug fix
bug fix + remove bogus XMPP logs
merge