Add more info to help message
Add a max-retries option