improved retry loop & fixed bugs
