Add retry logic

misc other changes, including 7 day availability window, and adding ePID as other Identifier on OnDemands
Shouldn't we throw here?