SwarmClient reconnection handler fix & other updates