merged path fix and added XMPP ping