using exponential backoff for retry Delay
few minnor fixes