better retry handling. adding blacklist. remove some clutter/gems