few fixes + retry on error
Merge branch 'develop'