fixed the patch numbers; added maxRetries; added ErrorHandler tweak