Add comments to the tools
Make KeyVersionFetcherCLI have generous timeouts