few fixes + retry on error