update backoff mechanism + use it in additional places

update backoff mechanism + use it in additional places #32