added retries for storage; minor fixes