add xmppability
fix trailing spaces / indents