Some minor fixes
Put more in the retry loop
Order found arns
Connect with sts, not iam