last work before sending all to XMPP inbox. small edits on data and provisioning
Merge ../Peters/XMPP-SN