diff --git a/.all-contributorsrc b/.all-contributorsrc
index d08594e6079..99597e4ccbe 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -112,6 +112,15 @@
       "contributions": [
         "doc"
       ]
+    },
+    {
+      "login": "omahs",
+      "name": "omahs",
+      "avatar_url": "https://avatars.githubusercontent.com/u/73983677?v=4",
+      "profile": "https://github.com/omahs",
+      "contributions": [
+        "doc"
+      ]
     }
   ],
   "contributorsPerLine": 7,
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index bd7d86f5395..18a5d228822 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -22,7 +22,7 @@ If you are opening a new issue, try to be descriptive as possible. Also please c
 
 ### Source code comments
 
-Follow the [NatSpec format](https://docs.soliditylang.org/en/v0.8.16/natspec-format.html) for documentating smart contract source code. Please adhere to a few additional standards:
+Follow the [NatSpec format](https://docs.soliditylang.org/en/v0.8.16/natspec-format.html) for documenting smart contract source code. Please adhere to a few additional standards:
 
 - Choose `/** */` over `///` for multi-line NatSpec comments, to save column space
 - Omit the usage of `@notice`, this will be automatically picked up so it will save column space and improve readability
diff --git a/README.md b/README.md
index 13d039bc7c8..bf9cc6b2eaf 100644
--- a/README.md
+++ b/README.md
@@ -75,6 +75,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center"><a href="https://github.com/shadab-taiko"><img src="https://avatars.githubusercontent.com/u/108871478?v=4?s=100" width="100px;" alt="shadab-taiko"/><br /><sub><b>shadab-taiko</b></sub></a><br /><a href="https://github.com/taikoxyz/taiko-mono/commits?author=shadab-taiko" title="Documentation">📖</a> <a href="https://github.com/taikoxyz/taiko-mono/commits?author=shadab-taiko" title="Code">💻</a></td>
       <td align="center"><a href="https://github.com/1xDeFi"><img src="https://avatars.githubusercontent.com/u/90858998?v=4?s=100" width="100px;" alt="1xDeFi"/><br /><sub><b>1xDeFi</b></sub></a><br /><a href="https://github.com/taikoxyz/taiko-mono/commits?author=1xDeFi" title="Documentation">📖</a></td>
       <td align="center"><a href="https://github.com/odesium"><img src="https://avatars.githubusercontent.com/u/56487762?v=4?s=100" width="100px;" alt="Ben"/><br /><sub><b>Ben</b></sub></a><br /><a href="https://github.com/taikoxyz/taiko-mono/commits?author=odesium" title="Documentation">📖</a></td>
+      <td align="center"><a href="https://github.com/omahs"><img src="https://avatars.githubusercontent.com/u/73983677?v=4?s=100" width="100px;" alt="omahs"/><br /><sub><b>omahs</b></sub></a><br /><a href="https://github.com/taikoxyz/taiko-mono/commits?author=omahs" title="Documentation">📖</a></td>
     </tr>
   </tbody>
 </table>
diff --git a/packages/protocol/hardhat.config.ts b/packages/protocol/hardhat.config.ts
index 10d30879eaf..e5b50213f5d 100644
--- a/packages/protocol/hardhat.config.ts
+++ b/packages/protocol/hardhat.config.ts
@@ -1,4 +1,3 @@
-import "./tasks/deploy_L1"
 import "@nomiclabs/hardhat-etherscan"
 import "@nomiclabs/hardhat-waffle"
 import "@openzeppelin/hardhat-upgrades"
@@ -6,9 +5,10 @@ import "@typechain/hardhat"
 import "hardhat-abi-exporter"
 import "hardhat-gas-reporter"
 import "hardhat-preprocessor"
+import { HardhatUserConfig } from "hardhat/config"
 import "solidity-coverage"
 import "solidity-docgen"
-import { HardhatUserConfig } from "hardhat/config"
+import "./tasks/deploy_L1"
 
 const hardhatMnemonic =
     "test test test test test test test test test test test taik"
@@ -91,24 +91,21 @@ const config: HardhatUserConfig = {
     preprocess: {
         eachLine: () => ({
             transform: (line) => {
-                if (
-                    process.env.CHAIN_ID &&
-                    line.includes("uint256 public constant TAIKO_CHAIN_ID")
-                ) {
-                    return `${line.slice(0, line.indexOf(" ="))} = ${
-                        process.env.CHAIN_ID
-                    };`
-                }
-
-                if (
-                    process.env.COMMIT_DELAY_CONFIRMATIONS &&
-                    line.includes(
-                        "uint256 public constant TAIKO_COMMIT_DELAY_CONFIRMATIONS"
-                    )
-                ) {
-                    return `${line.slice(0, line.indexOf(" ="))} = ${
-                        process.env.COMMIT_DELAY_CONFIRMATIONS
-                    };`
+                for (const constantName of [
+                    "TAIKO_CHAIN_ID",
+                    "K_COMMIT_DELAY_CONFIRMATIONS",
+                    "TAIKO_BLOCK_MAX_TXS",
+                    "TAIKO_TXLIST_MAX_BYTES",
+                    "TAIKO_BLOCK_MAX_GAS_LIMIT",
+                ]) {
+                    if (
+                        process.env[constantName] &&
+                        line.includes(`uint256 public constant ${constantName}`)
+                    ) {
+                        return `${line.slice(0, line.indexOf(" ="))} = ${
+                            process.env[constantName]
+                        };`
+                    }
                 }
 
                 return line
diff --git a/packages/whitepaper/main.tex b/packages/whitepaper/main.tex
index 27dad7aac71..33268ef7497 100644
--- a/packages/whitepaper/main.tex
+++ b/packages/whitepaper/main.tex
@@ -373,7 +373,7 @@ \subsubsection{Invalid Blocks} \label{sec:proving-invalid}
 
 It's important to note that these throw-away blocks are never a part of the Taiko chain. The only purpose of the block is to be able reuse the EVM proving subsystem so that we can create proofs for blocks with unexpected transaction data.
 
-\subsection{On-chain Finalization of Blocks}\label{sec:verifying}
+\subsection{On-chain Verification of Blocks}\label{sec:verifying}
 
 Assuming the $j$-th block is the last verified valid block. The $i$-th block ($i > j$) can be verified if 1) the $(i-1)$-th block has been verified, and 2) the $i$-th block has a Fork Choice $E$ whose parent block hash $E(H_p)$ equals the $j$-th block's hash.