Change name of retry counters.  Add settings values.  Add tests.