diff --git a/src/hypercert-minter.ts b/src/hypercert-minter.ts
index be1ebea..a9f65e3 100644
--- a/src/hypercert-minter.ts
+++ b/src/hypercert-minter.ts
@@ -78,6 +78,20 @@ export function handleTransferSingle(event: TransferSingleEvent): void {
 export function handleURI(event: URIEvent): void {}
 
 export function handleValueTransfer(event: ValueTransferEvent): void {
+  log.debug("Received ValueTransferEvent claimID: {}", [
+    event.params.claimID.toString(),
+  ]);
+  log.debug("Received ValueTransferEvent fromTokenID: {}", [
+    event.params.fromTokenID.toString(),
+  ]);
+  log.debug("Received ValueTransferEvent toTokenID: {}", [
+    event.params.toTokenID.toString(),
+  ]);
+
+  log.debug("Received ValueTransferEvent value: {}", [
+    event.params.value.toString(),
+  ]);
+
   let from = getOrCreateClaimToken(
     event.params.claimID,
     event.params.fromTokenID,
@@ -91,6 +105,10 @@ export function handleValueTransfer(event: ValueTransferEvent): void {
 
   let value = event.params.value;
 
+  log.debug("Got from: {}", [from.id]);
+  log.debug("Got to: {}", [to.id]);
+  log.debug("Transfering value: {}", [value.toString()]);
+
   // New mint
   if (from.tokenID.isZero() && !to.tokenID.isZero()) {
     to.units = value;
@@ -129,6 +147,9 @@ export function handleBatchValueTransfer(event: BatchValueTransfer): void {
 
     let value = values[i];
 
+    log.debug("Got from: {}", [from.id]);
+    log.debug("Got to: {}", [to.id]);
+
     // New mint
     if (from.tokenID.isZero() && !to.tokenID.isZero()) {
       to.units = value;
diff --git a/src/utils.ts b/src/utils.ts
index 026609f..a401c24 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -14,7 +14,7 @@ export function getOrCreateAllowlist(
   let id = getID(claimID, contract);
   let list = Allowlist.load(id);
 
-  log.debug("Created claimID: {}", [id]);
+  log.debug("Created allowlistID: {}", [id]);
 
   if (list == null) {
     list = new Allowlist(id);
@@ -60,6 +60,8 @@ export function getOrCreateClaimToken(
   let fraction = ClaimToken.load(id);
 
   if (fraction == null) {
+    log.debug("Creating claimToken: {}", [id]);
+
     let owner = minterContract.ownerOf(tokenID);
 
     fraction = new ClaimToken(id);
diff --git a/subgraph.yaml b/subgraph.yaml
index ddbf128..946c8fa 100644
--- a/subgraph.yaml
+++ b/subgraph.yaml
@@ -8,7 +8,7 @@ dataSources:
     source:
       address: "0x94a04Ce2e537eaf2Bdabd629dE503797e7021E87"
       abi: HypercertMinter
-      startBlock: 8100246
+      startBlock: 8385407
     mapping:
       kind: ethereum/events
       apiVersion: 0.0.7
@@ -42,5 +42,5 @@ dataSources:
         - event: ValueTransfer(uint256,uint256,uint256,uint256)
           handler: handleValueTransfer
         - event: BatchValueTransfer(uint256[],uint256[],uint256[],uint256[])
-          handler: handleValueTransfer
+          handler: handleBatchValueTransfer
       file: ./src/hypercert-minter.ts
diff --git a/tests/.bin/hypercert-minter-allowlist.wasm b/tests/.bin/hypercert-minter-allowlist.wasm
index 73ece0d..db81617 100644
Binary files a/tests/.bin/hypercert-minter-allowlist.wasm and b/tests/.bin/hypercert-minter-allowlist.wasm differ
diff --git a/tests/.bin/hypercert-minter-fraction.wasm b/tests/.bin/hypercert-minter-fraction.wasm
index 2b8aab6..96f4fe0 100644
Binary files a/tests/.bin/hypercert-minter-fraction.wasm and b/tests/.bin/hypercert-minter-fraction.wasm differ
diff --git a/tests/.latest.json b/tests/.latest.json
index 68d9051..b6ac03a 100644
--- a/tests/.latest.json
+++ b/tests/.latest.json
@@ -1,4 +1,4 @@
 {
   "version": "0.5.4",
-  "timestamp": 1674820266495
+  "timestamp": 1675088377873
 }
\ No newline at end of file