Introduce delay before testing keys
Handle external call errors
Misc touchups to config files