Allow retry timeout to be specified / adjusted

As discussed I will break up the previous PR into smaller ones, here is the first which adds the configurable retry time-out code back in and fixes some spelling / grammar issues