diff --git a/src/main/java/com/oneidentity/safeguard/safeguardjava/ISafeguardConnection.java b/src/main/java/com/oneidentity/safeguard/safeguardjava/ISafeguardConnection.java
index af6846a..5d23049 100644
--- a/src/main/java/com/oneidentity/safeguard/safeguardjava/ISafeguardConnection.java
+++ b/src/main/java/com/oneidentity/safeguard/safeguardjava/ISafeguardConnection.java
@@ -90,7 +90,7 @@ FullResponse invokeMethodFull(Service service, Method method, String relativeUrl
      *  @param parameters           Additional parameters to add to the URL.
      *  @param additionalHeaders    Additional headers to add to the request.
      *  @param timeout              Per-request timeout in milliseconds (null for default)
-     *  @returns                    Response body as a CSV string.
+     *  @return                     Response body as a CSV string.
      *  @throws ObjectDisposedException Object has already been disposed.
      *  @throws SafeguardForJavaException General Safeguard for Java exception.
      *  @throws ArgumentException Invalid argument.
@@ -107,7 +107,7 @@ String invokeMethodCsv(Service service, Method method, String relativeUrl,
      *  @param spsConnection        A connection to the SafeguardForPrivilegedSessions appliance.
      *  @param certificateChain     The PEM certificate chain of the Safeguard web api.
      *  @param sppAddress           The address of the Safeguard appliance.
-     *  @returns                    Response with status code, headers, and body as string.
+     *  @return                     Response with status code, headers, and body as string.
      *  @throws ObjectDisposedException Object has already been disposed.
      *  @throws SafeguardForJavaException General Safeguard for Java exception.
      *  @throws ArgumentException Invalid argument.
diff --git a/src/main/java/com/oneidentity/safeguard/safeguardjava/IStreamingRequest.java b/src/main/java/com/oneidentity/safeguard/safeguardjava/IStreamingRequest.java
index f8931e8..405cb9c 100644
--- a/src/main/java/com/oneidentity/safeguard/safeguardjava/IStreamingRequest.java
+++ b/src/main/java/com/oneidentity/safeguard/safeguardjava/IStreamingRequest.java
@@ -22,11 +22,13 @@ public interface IStreamingRequest {
      * @param parameters        Additional parameters to add to the URL.
      * @param additionalHeaders Additional headers to add to the request.
      * @return                  Response body as a string.
-     * @throws com.oneidentity.safeguard.safeguardjava.exceptions.SafeguardForJavaException
-     * @throws com.oneidentity.safeguard.safeguardjava.exceptions.ArgumentException
-     * @throws com.oneidentity.safeguard.safeguardjava.exceptions.ObjectDisposedException
+     * @throws ObjectDisposedException Object has already been disposed.
+     * @throws SafeguardForJavaException General Safeguard for Java exception.
+     * @throws ArgumentException Invalid argument.
      */ 
-    String uploadStream(Service service, String relativeUrl, byte[] stream, IProgressCallback progressCallback, Map<String, String> parameters, Map<String, String> additionalHeaders) throws SafeguardForJavaException, ArgumentException, ObjectDisposedException;
+    String uploadStream(Service service, String relativeUrl, byte[] stream, IProgressCallback progressCallback, 
+            Map<String, String> parameters, Map<String, String> additionalHeaders) 
+            throws SafeguardForJavaException, ArgumentException, ObjectDisposedException;
 
     /**
      * Call a Safeguard GET API providing an output file path to which streaming download data will
@@ -38,9 +40,11 @@ public interface IStreamingRequest {
      * @param progressCallback  Optionally report upload progress.
      * @param parameters        Additional parameters to add to the URL.
      * @param additionalHeaders Additional headers to add to the request.
-     * @throws com.oneidentity.safeguard.safeguardjava.exceptions.SafeguardForJavaException
-     * @throws com.oneidentity.safeguard.safeguardjava.exceptions.ArgumentException
-     * @throws com.oneidentity.safeguard.safeguardjava.exceptions.ObjectDisposedException
+     * @throws ObjectDisposedException Object has already been disposed.
+     * @throws SafeguardForJavaException General Safeguard for Java exception.
+     * @throws ArgumentException Invalid argument.
      */ 
-    void downloadStream(Service service, String relativeUrl, String outputFilePath, IProgressCallback progressCallback, Map<String, String> parameters, Map<String, String> additionalHeaders) throws SafeguardForJavaException, ArgumentException, ObjectDisposedException;
+    void downloadStream(Service service, String relativeUrl, String outputFilePath, IProgressCallback progressCallback, 
+            Map<String, String> parameters, Map<String, String> additionalHeaders) 
+            throws SafeguardForJavaException, ArgumentException, ObjectDisposedException;
 }
diff --git a/src/main/java/com/oneidentity/safeguard/safeguardjava/Safeguard.java b/src/main/java/com/oneidentity/safeguard/safeguardjava/Safeguard.java
index 1207663..287dbe8 100644
--- a/src/main/java/com/oneidentity/safeguard/safeguardjava/Safeguard.java
+++ b/src/main/java/com/oneidentity/safeguard/safeguardjava/Safeguard.java
@@ -1372,7 +1372,7 @@ public static ISafeguardA2AContext getContext(String networkAddress, String keys
          *  @param ignoreSsl Ignore server certificate validation.
          * 
          *  @return Reusable Safeguard A2A context.
-         *  @throws com.oneidentity.safeguard.safeguardjava.exceptions.SafeguardForJavaException
+         *  @throws SafeguardForJavaException General Safeguard for Java exception.
          */
         public static ISafeguardA2AContext getContext(String networkAddress, String thumbprint,
                 Integer apiVersion, Boolean ignoreSsl) throws SafeguardForJavaException {
@@ -1409,7 +1409,7 @@ public static ISafeguardA2AContext getContext(String networkAddress, String thum
          *  @param validationCallback Callback function to be executed during SSL certificate validation.
          * 
          *  @return Reusable Safeguard A2A context.
-         *  @throws com.oneidentity.safeguard.safeguardjava.exceptions.SafeguardForJavaException
+         *  @throws SafeguardForJavaException General Safeguard for Java exception.
          */
         public static ISafeguardA2AContext getContext(String networkAddress, String thumbprint,
                 HostnameVerifier validationCallback, Integer apiVersion) throws SafeguardForJavaException {
@@ -1906,7 +1906,7 @@ public static ISafeguardEventListener getPersistentA2AEventListener(List<char[]>
              *  @return New persistent A2A event listener.
              *  @throws ObjectDisposedException Object has already been disposed.
              *  @throws ArgumentException Invalid argument.
-             *  @throws com.oneidentity.safeguard.safeguardjava.exceptions.SafeguardForJavaException
+             *  @throws SafeguardForJavaException General Safeguard for Java exception.
              */
             public static ISafeguardEventListener getPersistentA2AEventListener(List<char[]> apiKeys,
                     ISafeguardEventHandler handler, String networkAddress, String thumbprint,
@@ -1952,7 +1952,7 @@ public static ISafeguardEventListener getPersistentA2AEventListener(List<char[]>
              *  @return New persistent A2A event listener.
              *  @throws ObjectDisposedException Object has already been disposed.
              *  @throws ArgumentException Invalid argument.
-             *  @throws com.oneidentity.safeguard.safeguardjava.exceptions.SafeguardForJavaException
+             *  @throws SafeguardForJavaException General Safeguard for Java exception.
              */
             public static ISafeguardEventListener getPersistentA2AEventListener(List<char[]> apiKeys,
                     ISafeguardEventHandler handler, String networkAddress, String thumbprint,
diff --git a/src/main/java/com/oneidentity/safeguard/safeguardjava/restclient/ByteArrayEntity.java b/src/main/java/com/oneidentity/safeguard/safeguardjava/restclient/ByteArrayEntity.java
index 51d0a2c..e9ee59a 100644
--- a/src/main/java/com/oneidentity/safeguard/safeguardjava/restclient/ByteArrayEntity.java
+++ b/src/main/java/com/oneidentity/safeguard/safeguardjava/restclient/ByteArrayEntity.java
@@ -22,10 +22,6 @@ public void writeTo(OutputStream outstream) throws IOException {
         super.writeTo(this.outstream);
     }
 
-    /**
-     * Progress: 0-100
-     * @return 
-     */
     public int getProgress() {
         if (outstream == null) {
             return 0;