diff --git a/src/main/java/com/algorand/algosdk/v2/client/algod/AccountApplicationInformation.java b/src/main/java/com/algorand/algosdk/v2/client/algod/AccountApplicationInformation.java
index 37dd2a795..b23c62a4a 100644
--- a/src/main/java/com/algorand/algosdk/v2/client/algod/AccountApplicationInformation.java
+++ b/src/main/java/com/algorand/algosdk/v2/client/algod/AccountApplicationInformation.java
@@ -22,8 +22,8 @@ public class AccountApplicationInformation extends Query {
     private Long applicationId;
 
     /**
-     * @param address An account public key
-     * @param applicationId An application identifier
+     * @param address An account public key.
+     * @param applicationId An application identifier.
      */
     public AccountApplicationInformation(Client client, Address address, Long applicationId) {
         super(client, new HttpMethod("get"));
diff --git a/src/main/java/com/algorand/algosdk/v2/client/algod/AccountAssetInformation.java b/src/main/java/com/algorand/algosdk/v2/client/algod/AccountAssetInformation.java
index 97ca5216f..bd446851c 100644
--- a/src/main/java/com/algorand/algosdk/v2/client/algod/AccountAssetInformation.java
+++ b/src/main/java/com/algorand/algosdk/v2/client/algod/AccountAssetInformation.java
@@ -21,8 +21,8 @@ public class AccountAssetInformation extends Query {
     private Long assetId;
 
     /**
-     * @param address An account public key
-     * @param assetId An asset identifier
+     * @param address An account public key.
+     * @param assetId An asset identifier.
      */
     public AccountAssetInformation(Client client, Address address, Long assetId) {
         super(client, new HttpMethod("get"));
diff --git a/src/main/java/com/algorand/algosdk/v2/client/algod/AccountInformation.java b/src/main/java/com/algorand/algosdk/v2/client/algod/AccountInformation.java
index 77e8277b8..487c4b242 100644
--- a/src/main/java/com/algorand/algosdk/v2/client/algod/AccountInformation.java
+++ b/src/main/java/com/algorand/algosdk/v2/client/algod/AccountInformation.java
@@ -20,7 +20,7 @@ public class AccountInformation extends Query {
     private Address address;
 
     /**
-     * @param address An account public key
+     * @param address An account public key.
      */
     public AccountInformation(Client client, Address address) {
         super(client, new HttpMethod("get"));
diff --git a/src/main/java/com/algorand/algosdk/v2/client/algod/GetApplicationBoxByName.java b/src/main/java/com/algorand/algosdk/v2/client/algod/GetApplicationBoxByName.java
index 61b6a079d..79bc9ca82 100644
--- a/src/main/java/com/algorand/algosdk/v2/client/algod/GetApplicationBoxByName.java
+++ b/src/main/java/com/algorand/algosdk/v2/client/algod/GetApplicationBoxByName.java
@@ -21,7 +21,7 @@ public class GetApplicationBoxByName extends Query {
     private Long applicationId;
 
     /**
-     * @param applicationId An application identifier
+     * @param applicationId An application identifier.
      */
     public GetApplicationBoxByName(Client client, Long applicationId) {
         super(client, new HttpMethod("get"));
diff --git a/src/main/java/com/algorand/algosdk/v2/client/algod/GetApplicationBoxes.java b/src/main/java/com/algorand/algosdk/v2/client/algod/GetApplicationBoxes.java
index f8a734254..35398f224 100644
--- a/src/main/java/com/algorand/algosdk/v2/client/algod/GetApplicationBoxes.java
+++ b/src/main/java/com/algorand/algosdk/v2/client/algod/GetApplicationBoxes.java
@@ -19,7 +19,7 @@ public class GetApplicationBoxes extends Query {
     private Long applicationId;
 
     /**
-     * @param applicationId An application identifier
+     * @param applicationId An application identifier.
      */
     public GetApplicationBoxes(Client client, Long applicationId) {
         super(client, new HttpMethod("get"));
@@ -30,7 +30,7 @@ public GetApplicationBoxes(Client client, Long applicationId) {
      * Max number of box names to return. If max is not set, or max == 0, returns all
      * box-names.
      */
-    public GetApplicationBoxes max(Long max) {
+    public GetApplicationBoxes max(java.math.BigInteger max) {
         addQuery("max", String.valueOf(max));
         return this;
     }
diff --git a/src/main/java/com/algorand/algosdk/v2/client/algod/GetApplicationByID.java b/src/main/java/com/algorand/algosdk/v2/client/algod/GetApplicationByID.java
index e380b8445..29972195b 100644
--- a/src/main/java/com/algorand/algosdk/v2/client/algod/GetApplicationByID.java
+++ b/src/main/java/com/algorand/algosdk/v2/client/algod/GetApplicationByID.java
@@ -18,7 +18,7 @@ public class GetApplicationByID extends Query {
     private Long applicationId;
 
     /**
-     * @param applicationId An application identifier
+     * @param applicationId An application identifier.
      */
     public GetApplicationByID(Client client, Long applicationId) {
         super(client, new HttpMethod("get"));
diff --git a/src/main/java/com/algorand/algosdk/v2/client/algod/GetAssetByID.java b/src/main/java/com/algorand/algosdk/v2/client/algod/GetAssetByID.java
index ac18aa4da..fe9ff433f 100644
--- a/src/main/java/com/algorand/algosdk/v2/client/algod/GetAssetByID.java
+++ b/src/main/java/com/algorand/algosdk/v2/client/algod/GetAssetByID.java
@@ -18,7 +18,7 @@ public class GetAssetByID extends Query {
     private Long assetId;
 
     /**
-     * @param assetId An asset identifier
+     * @param assetId An asset identifier.
      */
     public GetAssetByID(Client client, Long assetId) {
         super(client, new HttpMethod("get"));
diff --git a/src/main/java/com/algorand/algosdk/v2/client/algod/GetBlock.java b/src/main/java/com/algorand/algosdk/v2/client/algod/GetBlock.java
index 99842af33..78d1333e7 100644
--- a/src/main/java/com/algorand/algosdk/v2/client/algod/GetBlock.java
+++ b/src/main/java/com/algorand/algosdk/v2/client/algod/GetBlock.java
@@ -17,7 +17,7 @@ public class GetBlock extends Query {
     private Long round;
 
     /**
-     * @param round The round from which to fetch block information.
+     * @param round A round number.
      */
     public GetBlock(Client client, Long round) {
         super(client, new HttpMethod("get"));
diff --git a/src/main/java/com/algorand/algosdk/v2/client/algod/GetBlockHash.java b/src/main/java/com/algorand/algosdk/v2/client/algod/GetBlockHash.java
index e07dd89fc..b60e7ab2b 100644
--- a/src/main/java/com/algorand/algosdk/v2/client/algod/GetBlockHash.java
+++ b/src/main/java/com/algorand/algosdk/v2/client/algod/GetBlockHash.java
@@ -17,7 +17,7 @@ public class GetBlockHash extends Query {
     private Long round;
 
     /**
-     * @param round The round from which to fetch block hash information.
+     * @param round A round number.
      */
     public GetBlockHash(Client client, Long round) {
         super(client, new HttpMethod("get"));
diff --git a/src/main/java/com/algorand/algosdk/v2/client/algod/GetBlockLogs.java b/src/main/java/com/algorand/algosdk/v2/client/algod/GetBlockLogs.java
index a7d96fa13..7657d4f07 100644
--- a/src/main/java/com/algorand/algosdk/v2/client/algod/GetBlockLogs.java
+++ b/src/main/java/com/algorand/algosdk/v2/client/algod/GetBlockLogs.java
@@ -17,7 +17,7 @@ public class GetBlockLogs extends Query {
     private Long round;
 
     /**
-     * @param round The round from which to fetch block log information.
+     * @param round A round number.
      */
     public GetBlockLogs(Client client, Long round) {
         super(client, new HttpMethod("get"));
diff --git a/src/main/java/com/algorand/algosdk/v2/client/algod/GetBlockTxids.java b/src/main/java/com/algorand/algosdk/v2/client/algod/GetBlockTxids.java
index 18058ccfd..d005384bc 100644
--- a/src/main/java/com/algorand/algosdk/v2/client/algod/GetBlockTxids.java
+++ b/src/main/java/com/algorand/algosdk/v2/client/algod/GetBlockTxids.java
@@ -17,7 +17,7 @@ public class GetBlockTxids extends Query {
     private Long round;
 
     /**
-     * @param round The round from which to fetch block transaction IDs.
+     * @param round A round number.
      */
     public GetBlockTxids(Client client, Long round) {
         super(client, new HttpMethod("get"));
diff --git a/src/main/java/com/algorand/algosdk/v2/client/algod/GetLedgerStateDelta.java b/src/main/java/com/algorand/algosdk/v2/client/algod/GetLedgerStateDelta.java
index 8bd624ac0..b994c6120 100644
--- a/src/main/java/com/algorand/algosdk/v2/client/algod/GetLedgerStateDelta.java
+++ b/src/main/java/com/algorand/algosdk/v2/client/algod/GetLedgerStateDelta.java
@@ -17,7 +17,7 @@ public class GetLedgerStateDelta extends Query {
     private Long round;
 
     /**
-     * @param round The round for which the deltas are desired.
+     * @param round A round number.
      */
     public GetLedgerStateDelta(Client client, Long round) {
         super(client, new HttpMethod("get"));
diff --git a/src/main/java/com/algorand/algosdk/v2/client/algod/GetLightBlockHeaderProof.java b/src/main/java/com/algorand/algosdk/v2/client/algod/GetLightBlockHeaderProof.java
index ecf9cdf87..1f21773d5 100644
--- a/src/main/java/com/algorand/algosdk/v2/client/algod/GetLightBlockHeaderProof.java
+++ b/src/main/java/com/algorand/algosdk/v2/client/algod/GetLightBlockHeaderProof.java
@@ -17,7 +17,7 @@ public class GetLightBlockHeaderProof extends Query {
     private Long round;
 
     /**
-     * @param round The round to which the light block header belongs.
+     * @param round A round number.
      */
     public GetLightBlockHeaderProof(Client client, Long round) {
         super(client, new HttpMethod("get"));
diff --git a/src/main/java/com/algorand/algosdk/v2/client/algod/GetPendingTransactionsByAddress.java b/src/main/java/com/algorand/algosdk/v2/client/algod/GetPendingTransactionsByAddress.java
index 16113a57c..33bbccd40 100644
--- a/src/main/java/com/algorand/algosdk/v2/client/algod/GetPendingTransactionsByAddress.java
+++ b/src/main/java/com/algorand/algosdk/v2/client/algod/GetPendingTransactionsByAddress.java
@@ -20,7 +20,7 @@ public class GetPendingTransactionsByAddress extends Query {
     private Address address;
 
     /**
-     * @param address An account public key
+     * @param address An account public key.
      */
     public GetPendingTransactionsByAddress(Client client, Address address) {
         super(client, new HttpMethod("get"));
diff --git a/src/main/java/com/algorand/algosdk/v2/client/algod/GetStateProof.java b/src/main/java/com/algorand/algosdk/v2/client/algod/GetStateProof.java
index dc35ba3cd..0625a87d3 100644
--- a/src/main/java/com/algorand/algosdk/v2/client/algod/GetStateProof.java
+++ b/src/main/java/com/algorand/algosdk/v2/client/algod/GetStateProof.java
@@ -17,7 +17,7 @@ public class GetStateProof extends Query {
     private Long round;
 
     /**
-     * @param round The round for which a state proof is desired.
+     * @param round A round number.
      */
     public GetStateProof(Client client, Long round) {
         super(client, new HttpMethod("get"));
diff --git a/src/main/java/com/algorand/algosdk/v2/client/algod/GetTransactionGroupLedgerStateDeltasForRound.java b/src/main/java/com/algorand/algosdk/v2/client/algod/GetTransactionGroupLedgerStateDeltasForRound.java
index 204e72f35..a9aaf6152 100644
--- a/src/main/java/com/algorand/algosdk/v2/client/algod/GetTransactionGroupLedgerStateDeltasForRound.java
+++ b/src/main/java/com/algorand/algosdk/v2/client/algod/GetTransactionGroupLedgerStateDeltasForRound.java
@@ -17,7 +17,7 @@ public class GetTransactionGroupLedgerStateDeltasForRound extends Query {
     private Long round;
 
     /**
-     * @param round The round for which the deltas are desired.
+     * @param round A round number.
      */
     public GetTransactionGroupLedgerStateDeltasForRound(Client client, Long round) {
         super(client, new HttpMethod("get"));
diff --git a/src/main/java/com/algorand/algosdk/v2/client/algod/GetTransactionProof.java b/src/main/java/com/algorand/algosdk/v2/client/algod/GetTransactionProof.java
index edde98b7e..5031aa501 100644
--- a/src/main/java/com/algorand/algosdk/v2/client/algod/GetTransactionProof.java
+++ b/src/main/java/com/algorand/algosdk/v2/client/algod/GetTransactionProof.java
@@ -6,7 +6,7 @@
 import com.algorand.algosdk.v2.client.common.QueryData;
 import com.algorand.algosdk.v2.client.common.Response;
 import com.algorand.algosdk.v2.client.model.Enums;
-import com.algorand.algosdk.v2.client.model.TransactionProofResponse;
+import com.algorand.algosdk.v2.client.model.TransactionProof;
 
 
 /**
@@ -19,7 +19,7 @@ public class GetTransactionProof extends Query {
     private String txid;
 
     /**
-     * @param round The round in which the transaction appears.
+     * @param round A round number.
      * @param txid The transaction ID for which to generate a proof.
      */
     public GetTransactionProof(Client client, Long round, String txid) {
@@ -45,9 +45,9 @@ public GetTransactionProof hashtype(Enums.Hashtype hashtype) {
     * @throws Exception
     */
     @Override
-    public Response<TransactionProofResponse> execute() throws Exception {
-        Response<TransactionProofResponse> resp = baseExecute();
-        resp.setValueType(TransactionProofResponse.class);
+    public Response<TransactionProof> execute() throws Exception {
+        Response<TransactionProof> resp = baseExecute();
+        resp.setValueType(TransactionProof.class);
         return resp;
     }
 
@@ -60,9 +60,9 @@ public Response<TransactionProofResponse> execute() throws Exception {
     * @throws Exception
     */
     @Override
-    public Response<TransactionProofResponse> execute(String[] headers, String[] values) throws Exception {
-        Response<TransactionProofResponse> resp = baseExecute(headers, values);
-        resp.setValueType(TransactionProofResponse.class);
+    public Response<TransactionProof> execute(String[] headers, String[] values) throws Exception {
+        Response<TransactionProof> resp = baseExecute(headers, values);
+        resp.setValueType(TransactionProof.class);
         return resp;
     }
 
diff --git a/src/main/java/com/algorand/algosdk/v2/client/algod/SetSyncRound.java b/src/main/java/com/algorand/algosdk/v2/client/algod/SetSyncRound.java
index f3b5cf94d..831ed0a2a 100644
--- a/src/main/java/com/algorand/algosdk/v2/client/algod/SetSyncRound.java
+++ b/src/main/java/com/algorand/algosdk/v2/client/algod/SetSyncRound.java
@@ -16,7 +16,7 @@ public class SetSyncRound extends Query {
     private Long round;
 
     /**
-     * @param round The round for which the deltas are desired.
+     * @param round A round number.
      */
     public SetSyncRound(Client client, Long round) {
         super(client, new HttpMethod("post"));
diff --git a/src/main/java/com/algorand/algosdk/v2/client/algod/WaitForBlock.java b/src/main/java/com/algorand/algosdk/v2/client/algod/WaitForBlock.java
index f1ea444f6..fdebf8884 100644
--- a/src/main/java/com/algorand/algosdk/v2/client/algod/WaitForBlock.java
+++ b/src/main/java/com/algorand/algosdk/v2/client/algod/WaitForBlock.java
@@ -19,7 +19,7 @@ public class WaitForBlock extends Query {
     private Long round;
 
     /**
-     * @param round The round to wait until returning status
+     * @param round A round number.
      */
     public WaitForBlock(Client client, Long round) {
         super(client, new HttpMethod("get"));
diff --git a/src/main/java/com/algorand/algosdk/v2/client/model/TransactionProofResponse.java b/src/main/java/com/algorand/algosdk/v2/client/model/TransactionProof.java
similarity index 91%
rename from src/main/java/com/algorand/algosdk/v2/client/model/TransactionProofResponse.java
rename to src/main/java/com/algorand/algosdk/v2/client/model/TransactionProof.java
index e74827b8e..b4d89349a 100644
--- a/src/main/java/com/algorand/algosdk/v2/client/model/TransactionProofResponse.java
+++ b/src/main/java/com/algorand/algosdk/v2/client/model/TransactionProof.java
@@ -9,7 +9,7 @@
 /**
  * Proof of transaction in a block.
  */
-public class TransactionProofResponse extends PathResponse {
+public class TransactionProof extends PathResponse {
 
     /**
      * The type of hash function used to create the proof, must be one of:
@@ -23,7 +23,7 @@ public class TransactionProofResponse extends PathResponse {
      * Index of the transaction in the block's payset.
      */
     @JsonProperty("idx")
-    public Long idx;
+    public java.math.BigInteger idx;
 
     /**
      * Proof of transaction membership.
@@ -54,7 +54,7 @@ public String stibhash() {
      * from a leaf to the root.
      */
     @JsonProperty("treedepth")
-    public Long treedepth;
+    public java.math.BigInteger treedepth;
 
     @Override
     public boolean equals(Object o) {
@@ -62,7 +62,7 @@ public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null) return false;
 
-        TransactionProofResponse other = (TransactionProofResponse) o;
+        TransactionProof other = (TransactionProof) o;
         if (!Objects.deepEquals(this.hashtype, other.hashtype)) return false;
         if (!Objects.deepEquals(this.idx, other.idx)) return false;
         if (!Objects.deepEquals(this.proof, other.proof)) return false;