diff --git a/docs/CONTRIBUTING.html b/docs/CONTRIBUTING.html
index ab8a393..f283664 100644
--- a/docs/CONTRIBUTING.html
+++ b/docs/CONTRIBUTING.html
@@ -128,7 +128,7 @@ github.com/go-i2p/go-i2p
     </main>
     
     <footer class="page-footer">
-      <p>Generated on 2025-06-28 08:26:19 • <a href="https://github.com/go-i2p/go-i2p" target="_blank">View on GitHub</a></p>
+      <p>Generated on 2025-06-28 09:22:10 • <a href="https://github.com/go-i2p/go-i2p" target="_blank">View on GitHub</a></p>
     </footer>
   </div>
 </body>
diff --git a/docs/ROADMAP.html b/docs/ROADMAP.html
index 1dafc97..fd46dcb 100644
--- a/docs/ROADMAP.html
+++ b/docs/ROADMAP.html
@@ -127,7 +127,7 @@
     </main>
     
     <footer class="page-footer">
-      <p>Generated on 2025-06-28 08:26:19 • <a href="https://github.com/go-i2p/go-i2p" target="_blank">View on GitHub</a></p>
+      <p>Generated on 2025-06-28 09:22:10 • <a href="https://github.com/go-i2p/go-i2p" target="_blank">View on GitHub</a></p>
     </footer>
   </div>
 </body>
diff --git a/docs/template.html b/docs/template.html
index 48f54e8..53e82e2 100644
--- a/docs/template.html
+++ b/docs/template.html
@@ -65,7 +65,7 @@
     </main>
     
     <footer class="page-footer">
-      <p>Generated on 2025-06-28 08:26:19 • <a href="https://github.com/go-i2p/go-i2p" target="_blank">View on GitHub</a></p>
+      <p>Generated on 2025-06-28 09:22:10 • <a href="https://github.com/go-i2p/go-i2p" target="_blank">View on GitHub</a></p>
     </footer>
   </div>
 </body>
diff --git a/images/exportable.svg b/images/exportable.svg
index b913992..4d2598d 100644
--- a/images/exportable.svg
+++ b/images/exportable.svg
@@ -4,125 +4,87 @@
 <!-- Generated by graphviz version 2.40.1 (20161225.0304)
  -->
 <!-- Title: gocallvis Pages: 1 -->
-<svg width="298pt" height="367pt"
- viewBox="0.00 0.00 297.74 367.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(0 367)">
+<svg width="257pt" height="245pt"
+ viewBox="0.00 0.00 257.22 245.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(0 245)">
 <title>gocallvis</title>
-<polygon fill="#d3d3d3" stroke="transparent" points="0,0 0,-367 297.7392,-367 297.7392,0 0,0"/>
+<polygon fill="#d3d3d3" stroke="transparent" points="0,0 0,-245 257.2202,-245 257.2202,0 0,0"/>
 <g id="clust1" class="cluster">
 <title>cluster_focus</title>
-<polygon fill="#e6ecfa" stroke="#000000" stroke-width=".5" points="8,-8 8,-359 289.7392,-359 289.7392,-8 8,-8"/>
-<text text-anchor="middle" x="148.8696" y="-338.8" font-family="Arial" font-size="18.00" fill="#000000">exportable</text>
+<polygon fill="#e6ecfa" stroke="#000000" stroke-width=".5" points="8,-8 8,-237 249.2202,-237 249.2202,-8 8,-8"/>
+<text text-anchor="middle" x="128.6101" y="-216.8" font-family="Arial" font-size="18.00" fill="#000000">exportable</text>
 </g>
 <g id="clust2" class="cluster">
-<title>cluster_github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress</title>
-<g id="a_clust2"><a xlink:title="type: github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress">
-<path fill="#eed8ae" stroke="#000000" stroke-width=".5" d="M162.7686,-60C162.7686,-60 263.9706,-60 263.9706,-60 269.9706,-60 275.9706,-66 275.9706,-72 275.9706,-72 275.9706,-309 275.9706,-309 275.9706,-315 269.9706,-321 263.9706,-321 263.9706,-321 162.7686,-321 162.7686,-321 156.7686,-321 150.7686,-315 150.7686,-309 150.7686,-309 150.7686,-72 150.7686,-72 150.7686,-66 156.7686,-60 162.7686,-60"/>
-<text text-anchor="middle" x="213.3696" y="-68.5" font-family="Arial" font-size="15.00" fill="#222222">(RouterAddress)</text>
+<title>cluster_github.com/go&#45;i2p/go&#45;i2p/lib/common/data.I2PString</title>
+<g id="a_clust2"><a xlink:title="type: github.com/go&#45;i2p/go&#45;i2p/lib/common/data.I2PString">
+<path fill="#eed8ae" stroke="#000000" stroke-width=".5" d="M162.7812,-60C162.7812,-60 226.439,-60 226.439,-60 232.439,-60 238.439,-66 238.439,-72 238.439,-72 238.439,-187 238.439,-187 238.439,-193 232.439,-199 226.439,-199 226.439,-199 162.7812,-199 162.7812,-199 156.7812,-199 150.7812,-193 150.7812,-187 150.7812,-187 150.7812,-72 150.7812,-72 150.7812,-66 156.7812,-60 162.7812,-60"/>
+<text text-anchor="middle" x="194.6101" y="-68.5" font-family="Arial" font-size="15.00" fill="#222222">(I2PString)</text>
 </a>
 </g>
 </g>
-<!-- github.com/go&#45;i2p/go&#45;i2p/lib/common/fuzz/router_address.Fuzz -->
+<!-- github.com/go&#45;i2p/go&#45;i2p/lib/common/fuzz/string.Fuzz -->
 <g id="node1" class="node">
-<title>github.com/go&#45;i2p/go&#45;i2p/lib/common/fuzz/router_address.Fuzz</title>
-<g id="a_node1"><a xlink:title="github.com/go&#45;i2p/go&#45;i2p/lib/common/fuzz/router_address.Fuzz | defined in fuzz.go:5&#10;at fuzz.go:10: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).TransportStyle]&#10;at fuzz.go:6: calling [github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.ReadRouterAddress]&#10;at fuzz.go:7: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).Cost]&#10;at fuzz.go:8: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).Expiration]&#10;at fuzz.go:9: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).Options]">
-<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M58,-191C58,-191 28,-191 28,-191 22,-191 16,-185 16,-179 16,-179 16,-167 16,-167 16,-161 22,-155 28,-155 28,-155 58,-155 58,-155 64,-155 70,-161 70,-167 70,-167 70,-179 70,-179 70,-185 64,-191 58,-191"/>
-<text text-anchor="middle" x="43" y="-168.8" font-family="Verdana" font-size="14.00" fill="#000000">Fuzz</text>
+<title>github.com/go&#45;i2p/go&#45;i2p/lib/common/fuzz/string.Fuzz</title>
+<g id="a_node1"><a xlink:title="github.com/go&#45;i2p/go&#45;i2p/lib/common/fuzz/string.Fuzz | defined in fuzz.go:5&#10;at fuzz.go:8: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.I2PString).Length]&#10;at fuzz.go:11: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.I2PString).Length]&#10;at fuzz.go:9: calling [github.com/go&#45;i2p/go&#45;i2p/lib/common/data.ToI2PString]&#10;at fuzz.go:7: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.I2PString).Data]&#10;at fuzz.go:10: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.I2PString).Data]">
+<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M58,-130C58,-130 28,-130 28,-130 22,-130 16,-124 16,-118 16,-118 16,-106 16,-106 16,-100 22,-94 28,-94 28,-94 58,-94 58,-94 64,-94 70,-100 70,-106 70,-106 70,-118 70,-118 70,-124 64,-130 58,-130"/>
+<text text-anchor="middle" x="43" y="-107.8" font-family="Verdana" font-size="14.00" fill="#000000">Fuzz</text>
 </a>
 </g>
 </g>
-<!-- github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.ReadRouterAddress -->
+<!-- github.com/go&#45;i2p/go&#45;i2p/lib/common/data.ToI2PString -->
 <g id="node2" class="node">
-<title>github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.ReadRouterAddress</title>
-<g id="a_node2"><a xlink:title="github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.ReadRouterAddress | defined in router_address.go:345">
-<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M269.609,-52C269.609,-52 157.1302,-52 157.1302,-52 151.1302,-52 145.1302,-46 145.1302,-40 145.1302,-40 145.1302,-28 145.1302,-28 145.1302,-22 151.1302,-16 157.1302,-16 157.1302,-16 269.609,-16 269.609,-16 275.609,-16 281.609,-22 281.609,-28 281.609,-28 281.609,-40 281.609,-40 281.609,-46 275.609,-52 269.609,-52"/>
-<text text-anchor="middle" x="213.3696" y="-38.2" font-family="Verdana" font-size="14.00" fill="#000000">router_address</text>
-<text text-anchor="middle" x="213.3696" y="-21.4" font-family="Verdana" font-size="14.00" fill="#000000">ReadRouterAddress</text>
+<title>github.com/go&#45;i2p/go&#45;i2p/lib/common/data.ToI2PString</title>
+<g id="a_node2"><a xlink:title="github.com/go&#45;i2p/go&#45;i2p/lib/common/data.ToI2PString | defined in string.go:114">
+<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M229.3306,-52C229.3306,-52 159.8896,-52 159.8896,-52 153.8896,-52 147.8896,-46 147.8896,-40 147.8896,-40 147.8896,-28 147.8896,-28 147.8896,-22 153.8896,-16 159.8896,-16 159.8896,-16 229.3306,-16 229.3306,-16 235.3306,-16 241.3306,-22 241.3306,-28 241.3306,-28 241.3306,-40 241.3306,-40 241.3306,-46 235.3306,-52 229.3306,-52"/>
+<text text-anchor="middle" x="194.6101" y="-38.2" font-family="Verdana" font-size="14.00" fill="#000000">data</text>
+<text text-anchor="middle" x="194.6101" y="-21.4" font-family="Verdana" font-size="14.00" fill="#000000">ToI2PString</text>
 </a>
 </g>
 </g>
-<!-- github.com/go&#45;i2p/go&#45;i2p/lib/common/fuzz/router_address.Fuzz&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.ReadRouterAddress -->
+<!-- github.com/go&#45;i2p/go&#45;i2p/lib/common/fuzz/string.Fuzz&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/common/data.ToI2PString -->
 <g id="edge2" class="edge">
-<title>github.com/go&#45;i2p/go&#45;i2p/lib/common/fuzz/router_address.Fuzz&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.ReadRouterAddress</title>
-<g id="a_edge2"><a xlink:title="at fuzz.go:6: calling [github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.ReadRouterAddress]">
-<path fill="none" stroke="#8b4513" d="M54.2,-154.8153C69.8891,-130.7191 100.687,-88.1071 143.143,-57.8152"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="145.2054,-60.6453 151.4961,-52.1202 141.2621,-54.8616 145.2054,-60.6453"/>
+<title>github.com/go&#45;i2p/go&#45;i2p/lib/common/fuzz/string.Fuzz&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/common/data.ToI2PString</title>
+<g id="a_edge2"><a xlink:title="at fuzz.go:9: calling [github.com/go&#45;i2p/go&#45;i2p/lib/common/data.ToI2PString]">
+<path fill="none" stroke="#8b4513" d="M70.0043,-97.129C89.2049,-86.6594 115.8894,-72.3156 146.6535,-56.7465"/>
+<polygon fill="#8b4513" stroke="#8b4513" points="148.5211,-59.7249 155.8799,-52.1027 145.374,-53.4722 148.5211,-59.7249"/>
 </a>
 </g>
 </g>
-<!-- (github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).Cost -->
+<!-- (github.com/go&#45;i2p/go&#45;i2p/lib/common/data.I2PString).Data -->
 <g id="node3" class="node">
-<title>(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).Cost</title>
-<g id="a_node3"><a xlink:title="(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).Cost | defined in router_address.go:163">
-<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M254.7758,-130C254.7758,-130 171.9634,-130 171.9634,-130 165.9634,-130 159.9634,-124 159.9634,-118 159.9634,-118 159.9634,-106 159.9634,-106 159.9634,-100 165.9634,-94 171.9634,-94 171.9634,-94 254.7758,-94 254.7758,-94 260.7758,-94 266.7758,-100 266.7758,-106 266.7758,-106 266.7758,-118 266.7758,-118 266.7758,-124 260.7758,-130 254.7758,-130"/>
-<text text-anchor="middle" x="213.3696" y="-116.2" font-family="Verdana" font-size="14.00" fill="#000000">router_address</text>
-<text text-anchor="middle" x="213.3696" y="-99.4" font-family="Verdana" font-size="14.00" fill="#000000">Cost</text>
+<title>(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.I2PString).Data</title>
+<g id="a_node3"><a xlink:title="(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.I2PString).Data | defined in string.go:73">
+<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M209.6101,-130C209.6101,-130 179.6101,-130 179.6101,-130 173.6101,-130 167.6101,-124 167.6101,-118 167.6101,-118 167.6101,-106 167.6101,-106 167.6101,-100 173.6101,-94 179.6101,-94 179.6101,-94 209.6101,-94 209.6101,-94 215.6101,-94 221.6101,-100 221.6101,-106 221.6101,-106 221.6101,-118 221.6101,-118 221.6101,-124 215.6101,-130 209.6101,-130"/>
+<text text-anchor="middle" x="194.6101" y="-116.2" font-family="Verdana" font-size="14.00" fill="#000000">data</text>
+<text text-anchor="middle" x="194.6101" y="-99.4" font-family="Verdana" font-size="14.00" fill="#000000">Data</text>
 </a>
 </g>
 </g>
-<!-- github.com/go&#45;i2p/go&#45;i2p/lib/common/fuzz/router_address.Fuzz&#45;&gt;(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).Cost -->
+<!-- github.com/go&#45;i2p/go&#45;i2p/lib/common/fuzz/string.Fuzz&#45;&gt;(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.I2PString).Data -->
 <g id="edge3" class="edge">
-<title>github.com/go&#45;i2p/go&#45;i2p/lib/common/fuzz/router_address.Fuzz&#45;&gt;(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).Cost</title>
-<g id="a_edge3"><a xlink:title="at fuzz.go:7: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).Cost]">
-<path fill="none" stroke="#8b4513" d="M70.3728,-163.1993C92.7676,-155.181 125.2557,-143.5488 153.6076,-133.3975"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="154.8086,-136.6851 163.0435,-130.019 152.4489,-130.0948 154.8086,-136.6851"/>
+<title>github.com/go&#45;i2p/go&#45;i2p/lib/common/fuzz/string.Fuzz&#45;&gt;(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.I2PString).Data</title>
+<g id="a_edge3"><a xlink:title="at fuzz.go:7: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.I2PString).Data]&#10;at fuzz.go:10: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.I2PString).Data]">
+<path fill="none" stroke="#8b4513" d="M70.1048,-112C94.3917,-112 130.2444,-112 157.2471,-112"/>
+<polygon fill="#8b4513" stroke="#8b4513" points="157.4848,-115.5001 167.4848,-112 157.4847,-108.5001 157.4848,-115.5001"/>
 </a>
 </g>
 </g>
-<!-- (github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).Expiration -->
+<!-- (github.com/go&#45;i2p/go&#45;i2p/lib/common/data.I2PString).Length -->
 <g id="node4" class="node">
-<title>(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).Expiration</title>
-<g id="a_node4"><a xlink:title="(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).Expiration | defined in router_address.go:168">
-<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M254.7758,-191C254.7758,-191 171.9634,-191 171.9634,-191 165.9634,-191 159.9634,-185 159.9634,-179 159.9634,-179 159.9634,-167 159.9634,-167 159.9634,-161 165.9634,-155 171.9634,-155 171.9634,-155 254.7758,-155 254.7758,-155 260.7758,-155 266.7758,-161 266.7758,-167 266.7758,-167 266.7758,-179 266.7758,-179 266.7758,-185 260.7758,-191 254.7758,-191"/>
-<text text-anchor="middle" x="213.3696" y="-177.2" font-family="Verdana" font-size="14.00" fill="#000000">router_address</text>
-<text text-anchor="middle" x="213.3696" y="-160.4" font-family="Verdana" font-size="14.00" fill="#000000">Expiration</text>
+<title>(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.I2PString).Length</title>
+<g id="a_node4"><a xlink:title="(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.I2PString).Length | defined in string.go:31">
+<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M214.2688,-191C214.2688,-191 174.9514,-191 174.9514,-191 168.9514,-191 162.9514,-185 162.9514,-179 162.9514,-179 162.9514,-167 162.9514,-167 162.9514,-161 168.9514,-155 174.9514,-155 174.9514,-155 214.2688,-155 214.2688,-155 220.2688,-155 226.2688,-161 226.2688,-167 226.2688,-167 226.2688,-179 226.2688,-179 226.2688,-185 220.2688,-191 214.2688,-191"/>
+<text text-anchor="middle" x="194.6101" y="-177.2" font-family="Verdana" font-size="14.00" fill="#000000">data</text>
+<text text-anchor="middle" x="194.6101" y="-160.4" font-family="Verdana" font-size="14.00" fill="#000000">Length</text>
 </a>
 </g>
 </g>
-<!-- github.com/go&#45;i2p/go&#45;i2p/lib/common/fuzz/router_address.Fuzz&#45;&gt;(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).Expiration -->
-<g id="edge4" class="edge">
-<title>github.com/go&#45;i2p/go&#45;i2p/lib/common/fuzz/router_address.Fuzz&#45;&gt;(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).Expiration</title>
-<g id="a_edge4"><a xlink:title="at fuzz.go:8: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).Expiration]">
-<path fill="none" stroke="#8b4513" d="M70.3728,-173C91.7248,-173 122.2521,-173 149.6217,-173"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="149.9311,-176.5001 159.931,-173 149.931,-169.5001 149.9311,-176.5001"/>
-</a>
-</g>
-</g>
-<!-- (github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).Options -->
-<g id="node5" class="node">
-<title>(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).Options</title>
-<g id="a_node5"><a xlink:title="(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).Options | defined in router_address.go:323">
-<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M254.7758,-252C254.7758,-252 171.9634,-252 171.9634,-252 165.9634,-252 159.9634,-246 159.9634,-240 159.9634,-240 159.9634,-228 159.9634,-228 159.9634,-222 165.9634,-216 171.9634,-216 171.9634,-216 254.7758,-216 254.7758,-216 260.7758,-216 266.7758,-222 266.7758,-228 266.7758,-228 266.7758,-240 266.7758,-240 266.7758,-246 260.7758,-252 254.7758,-252"/>
-<text text-anchor="middle" x="213.3696" y="-238.2" font-family="Verdana" font-size="14.00" fill="#000000">router_address</text>
-<text text-anchor="middle" x="213.3696" y="-221.4" font-family="Verdana" font-size="14.00" fill="#000000">Options</text>
-</a>
-</g>
-</g>
-<!-- github.com/go&#45;i2p/go&#45;i2p/lib/common/fuzz/router_address.Fuzz&#45;&gt;(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).Options -->
-<g id="edge5" class="edge">
-<title>github.com/go&#45;i2p/go&#45;i2p/lib/common/fuzz/router_address.Fuzz&#45;&gt;(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).Options</title>
-<g id="a_edge5"><a xlink:title="at fuzz.go:9: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).Options]">
-<path fill="none" stroke="#8b4513" d="M70.3728,-182.8007C92.7676,-190.819 125.2557,-202.4512 153.6076,-212.6025"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="152.4489,-215.9052 163.0435,-215.981 154.8086,-209.3149 152.4489,-215.9052"/>
-</a>
-</g>
-</g>
-<!-- (github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).TransportStyle -->
-<g id="node6" class="node">
-<title>(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).TransportStyle</title>
-<g id="a_node6"><a xlink:title="(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).TransportStyle | defined in router_address.go:173">
-<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M255.0718,-313C255.0718,-313 171.6674,-313 171.6674,-313 165.6674,-313 159.6674,-307 159.6674,-301 159.6674,-301 159.6674,-289 159.6674,-289 159.6674,-283 165.6674,-277 171.6674,-277 171.6674,-277 255.0718,-277 255.0718,-277 261.0718,-277 267.0718,-283 267.0718,-289 267.0718,-289 267.0718,-301 267.0718,-301 267.0718,-307 261.0718,-313 255.0718,-313"/>
-<text text-anchor="middle" x="213.3696" y="-299.2" font-family="Verdana" font-size="14.00" fill="#000000">router_address</text>
-<text text-anchor="middle" x="213.3696" y="-282.4" font-family="Verdana" font-size="14.00" fill="#000000">TransportStyle</text>
-</a>
-</g>
-</g>
-<!-- github.com/go&#45;i2p/go&#45;i2p/lib/common/fuzz/router_address.Fuzz&#45;&gt;(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).TransportStyle -->
+<!-- github.com/go&#45;i2p/go&#45;i2p/lib/common/fuzz/string.Fuzz&#45;&gt;(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.I2PString).Length -->
 <g id="edge1" class="edge">
-<title>github.com/go&#45;i2p/go&#45;i2p/lib/common/fuzz/router_address.Fuzz&#45;&gt;(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).TransportStyle</title>
-<g id="a_edge1"><a xlink:title="at fuzz.go:10: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).TransportStyle]">
-<path fill="none" stroke="#8b4513" d="M59.628,-191.1509C78.7338,-211.2098 111.7512,-243.5148 145,-265 149.0077,-267.5898 153.2766,-270.0551 157.6487,-272.3782"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="156.211,-275.5729 166.7171,-276.9412 159.3574,-269.3198 156.211,-275.5729"/>
+<title>github.com/go&#45;i2p/go&#45;i2p/lib/common/fuzz/string.Fuzz&#45;&gt;(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.I2PString).Length</title>
+<g id="a_edge1"><a xlink:title="at fuzz.go:8: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.I2PString).Length]&#10;at fuzz.go:11: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.I2PString).Length]">
+<path fill="none" stroke="#8b4513" d="M70.1048,-122.9056C93.2412,-132.2144 126.8736,-145.7464 153.3522,-156.4"/>
+<polygon fill="#8b4513" stroke="#8b4513" points="152.1674,-159.6959 162.7511,-160.1816 154.7804,-153.2018 152.1674,-159.6959"/>
 </a>
 </g>
 </g>
diff --git a/images/handshake.svg b/images/handshake.svg
index 947c327..52fc991 100644
--- a/images/handshake.svg
+++ b/images/handshake.svg
@@ -4,10 +4,133 @@
 <!-- Generated by graphviz version 2.40.1 (20161225.0304)
  -->
 <!-- Title: gocallvis Pages: 1 -->
-<svg width="0pt" height="0pt"
- viewBox="0.00 0.00 0.00 0.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(0 0)">
+<svg width="374pt" height="306pt"
+ viewBox="0.00 0.00 374.02 306.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(0 306)">
 <title>gocallvis</title>
-<polygon fill="#d3d3d3" stroke="transparent" points="0,0 0,0 0,0 0,0 0,0"/>
+<polygon fill="#d3d3d3" stroke="transparent" points="0,0 0,-306 374.0184,-306 374.0184,0 0,0"/>
+<g id="clust1" class="cluster">
+<title>cluster_focus</title>
+<polygon fill="#e6ecfa" stroke="#000000" stroke-width=".5" points="8,-8 8,-298 366.0184,-298 366.0184,-8 8,-8"/>
+<text text-anchor="middle" x="187.0092" y="-277.8" font-family="Arial" font-size="18.00" fill="#000000">handshake</text>
+</g>
+<g id="clust2" class="cluster">
+<title>cluster_*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.HandshakeState</title>
+<g id="a_clust2"><a xlink:title="type: *github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.HandshakeState">
+<path fill="#b0c4de" stroke="#000000" stroke-width=".5" d="M28,-60C28,-60 160.6326,-60 160.6326,-60 166.6326,-60 172.6326,-66 172.6326,-72 172.6326,-72 172.6326,-248 172.6326,-248 172.6326,-254 166.6326,-260 160.6326,-260 160.6326,-260 28,-260 28,-260 22,-260 16,-254 16,-248 16,-248 16,-72 16,-72 16,-66 22,-60 28,-60"/>
+<text text-anchor="middle" x="94.3163" y="-68.5" font-family="Arial" font-size="15.00" fill="#222222">(*HandshakeState)</text>
+</a>
+</g>
+</g>
+<!-- github.com/samber/oops.Errorf -->
+<g id="node1" class="node">
+<title>github.com/samber/oops.Errorf</title>
+<g id="a_node1"><a xlink:title="github.com/samber/oops.Errorf | defined in oops.go:34">
+<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M315.0208,-167C315.0208,-167 280.6302,-167 280.6302,-167 274.6302,-167 268.6302,-161 268.6302,-155 268.6302,-155 268.6302,-143 268.6302,-143 268.6302,-137 274.6302,-131 280.6302,-131 280.6302,-131 315.0208,-131 315.0208,-131 321.0208,-131 327.0208,-137 327.0208,-143 327.0208,-143 327.0208,-155 327.0208,-155 327.0208,-161 321.0208,-167 315.0208,-167"/>
+<text text-anchor="middle" x="297.8255" y="-153.2" font-family="Verdana" font-size="14.00" fill="#000000">oops</text>
+<text text-anchor="middle" x="297.8255" y="-136.4" font-family="Verdana" font-size="14.00" fill="#000000">Errorf</text>
+</a>
+</g>
+</g>
+<!-- github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.NewHandshakeState -->
+<g id="node2" class="node">
+<title>github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.NewHandshakeState</title>
+<g id="a_node2"><a xlink:title="github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.NewHandshakeState | defined in handshake.go:78&#10;at handshake.go:98: calling [github.com/go&#45;i2p/go&#45;i2p/lib/crypto/curve25519.GenerateKeyPair]&#10;at handshake.go:101: calling [github.com/samber/oops.Errorf]&#10;at handshake.go:107: calling [github.com/samber/oops.Errorf]">
+<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M152.4326,-52C152.4326,-52 36.2,-52 36.2,-52 30.2,-52 24.2,-46 24.2,-40 24.2,-40 24.2,-28 24.2,-28 24.2,-22 30.2,-16 36.2,-16 36.2,-16 152.4326,-16 152.4326,-16 158.4326,-16 164.4326,-22 164.4326,-28 164.4326,-28 164.4326,-40 164.4326,-40 164.4326,-46 158.4326,-52 152.4326,-52"/>
+<text text-anchor="middle" x="94.3163" y="-29.8" font-family="Verdana" font-size="14.00" fill="#000000">NewHandshakeState</text>
+</a>
+</g>
+</g>
+<!-- github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.NewHandshakeState&#45;&gt;github.com/samber/oops.Errorf -->
+<g id="edge6" class="edge">
+<title>github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.NewHandshakeState&#45;&gt;github.com/samber/oops.Errorf</title>
+<g id="a_edge6"><a xlink:title="at handshake.go:101: calling [github.com/samber/oops.Errorf]&#10;at handshake.go:107: calling [github.com/samber/oops.Errorf]">
+<path fill="none" stroke="#8b4513" d="M164.0061,-52.1084C166.9555,-53.3343 169.8436,-54.6307 172.6326,-56 192.2937,-65.6526 237.1068,-100.2496 267.4276,-124.4066"/>
+<polygon fill="#8b4513" stroke="#8b4513" points="265.5671,-127.4003 275.5624,-130.9138 269.9397,-121.934 265.5671,-127.4003"/>
+</a>
+</g>
+</g>
+<!-- github.com/go&#45;i2p/go&#45;i2p/lib/crypto/curve25519.GenerateKeyPair -->
+<g id="node3" class="node">
+<title>github.com/go&#45;i2p/go&#45;i2p/lib/crypto/curve25519.GenerateKeyPair</title>
+<g id="a_node3"><a xlink:title="github.com/go&#45;i2p/go&#45;i2p/lib/crypto/curve25519.GenerateKeyPair | defined in curve25519.go:24">
+<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M346.2119,-86C346.2119,-86 249.4391,-86 249.4391,-86 243.4391,-86 237.4391,-80 237.4391,-74 237.4391,-74 237.4391,-62 237.4391,-62 237.4391,-56 243.4391,-50 249.4391,-50 249.4391,-50 346.2119,-50 346.2119,-50 352.2119,-50 358.2119,-56 358.2119,-62 358.2119,-62 358.2119,-74 358.2119,-74 358.2119,-80 352.2119,-86 346.2119,-86"/>
+<text text-anchor="middle" x="297.8255" y="-72.2" font-family="Verdana" font-size="14.00" fill="#000000">curve25519</text>
+<text text-anchor="middle" x="297.8255" y="-55.4" font-family="Verdana" font-size="14.00" fill="#000000">GenerateKeyPair</text>
+</a>
+</g>
+</g>
+<!-- github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.NewHandshakeState&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/crypto/curve25519.GenerateKeyPair -->
+<g id="edge5" class="edge">
+<title>github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.NewHandshakeState&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/crypto/curve25519.GenerateKeyPair</title>
+<g id="a_edge5"><a xlink:title="at handshake.go:98: calling [github.com/go&#45;i2p/go&#45;i2p/lib/crypto/curve25519.GenerateKeyPair]">
+<path fill="none" stroke="#8b4513" d="M164.6376,-45.7485C184.8842,-49.1311 206.9719,-52.8212 227.2347,-56.2065"/>
+<polygon fill="#8b4513" stroke="#8b4513" points="226.8909,-59.6975 237.331,-57.8933 228.0445,-52.7932 226.8909,-59.6975"/>
+</a>
+</g>
+</g>
+<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.HandshakeState).WriteMessage -->
+<g id="node4" class="node">
+<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.HandshakeState).WriteMessage</title>
+<g id="a_node4"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.HandshakeState).WriteMessage | defined in methods.go:66&#10;at methods.go:67: calling [github.com/samber/oops.Errorf]">
+<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M134.665,-191C134.665,-191 53.9676,-191 53.9676,-191 47.9676,-191 41.9676,-185 41.9676,-179 41.9676,-179 41.9676,-167 41.9676,-167 41.9676,-161 47.9676,-155 53.9676,-155 53.9676,-155 134.665,-155 134.665,-155 140.665,-155 146.665,-161 146.665,-167 146.665,-167 146.665,-179 146.665,-179 146.665,-185 140.665,-191 134.665,-191"/>
+<text text-anchor="middle" x="94.3163" y="-168.8" font-family="Verdana" font-size="14.00" fill="#000000">WriteMessage</text>
+</a>
+</g>
+</g>
+<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.HandshakeState).WriteMessage&#45;&gt;github.com/samber/oops.Errorf -->
+<g id="edge3" class="edge">
+<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.HandshakeState).WriteMessage&#45;&gt;github.com/samber/oops.Errorf</title>
+<g id="a_edge3"><a xlink:title="at methods.go:67: calling [github.com/samber/oops.Errorf]">
+<path fill="none" stroke="#8b4513" d="M146.725,-166.8194C181.5362,-162.7141 226.5141,-157.4098 258.3176,-153.6592"/>
+<polygon fill="#8b4513" stroke="#8b4513" points="259.0431,-157.098 268.5644,-152.4508 258.2233,-150.1462 259.0431,-157.098"/>
+</a>
+</g>
+</g>
+<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.HandshakeState).CompleteHandshake -->
+<g id="node5" class="node">
+<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.HandshakeState).CompleteHandshake</title>
+<g id="a_node5"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.HandshakeState).CompleteHandshake | defined in methods.go:10&#10;at methods.go:13: calling [github.com/samber/oops.Errorf]&#10;at methods.go:17: calling [github.com/samber/oops.Errorf]&#10;at methods.go:21: calling [github.com/samber/oops.Errorf]">
+<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M152.4494,-252C152.4494,-252 36.1832,-252 36.1832,-252 30.1832,-252 24.1832,-246 24.1832,-240 24.1832,-240 24.1832,-228 24.1832,-228 24.1832,-222 30.1832,-216 36.1832,-216 36.1832,-216 152.4494,-216 152.4494,-216 158.4494,-216 164.4494,-222 164.4494,-228 164.4494,-228 164.4494,-240 164.4494,-240 164.4494,-246 158.4494,-252 152.4494,-252"/>
+<text text-anchor="middle" x="94.3163" y="-229.8" font-family="Verdana" font-size="14.00" fill="#000000">CompleteHandshake</text>
+</a>
+</g>
+</g>
+<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.HandshakeState).CompleteHandshake&#45;&gt;github.com/samber/oops.Errorf -->
+<g id="edge4" class="edge">
+<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.HandshakeState).CompleteHandshake&#45;&gt;github.com/samber/oops.Errorf</title>
+<g id="a_edge4"><a xlink:title="at methods.go:13: calling [github.com/samber/oops.Errorf]&#10;at methods.go:17: calling [github.com/samber/oops.Errorf]&#10;at methods.go:21: calling [github.com/samber/oops.Errorf]">
+<path fill="none" stroke="#8b4513" d="M142.5048,-215.9594C152.499,-212.1007 162.9361,-207.9844 172.6326,-204 201.904,-191.972 234.6371,-177.5571 259.2897,-166.5026"/>
+<polygon fill="#8b4513" stroke="#8b4513" points="260.9686,-169.5853 268.653,-162.2915 258.0973,-163.2013 260.9686,-169.5853"/>
+</a>
+</g>
+</g>
+<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.HandshakeState).GenerateEphemeral -->
+<g id="node6" class="node">
+<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.HandshakeState).GenerateEphemeral</title>
+<g id="a_node6"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.HandshakeState).GenerateEphemeral | defined in methods.go:27&#10;at methods.go:31: calling [github.com/go&#45;i2p/go&#45;i2p/lib/crypto/curve25519.GenerateKeyPair]&#10;at methods.go:33: calling [github.com/samber/oops.Errorf]&#10;at methods.go:40: calling [github.com/samber/oops.Errorf]">
+<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M149.9708,-130C149.9708,-130 38.6618,-130 38.6618,-130 32.6618,-130 26.6618,-124 26.6618,-118 26.6618,-118 26.6618,-106 26.6618,-106 26.6618,-100 32.6618,-94 38.6618,-94 38.6618,-94 149.9708,-94 149.9708,-94 155.9708,-94 161.9708,-100 161.9708,-106 161.9708,-106 161.9708,-118 161.9708,-118 161.9708,-124 155.9708,-130 149.9708,-130"/>
+<text text-anchor="middle" x="94.3163" y="-107.8" font-family="Verdana" font-size="14.00" fill="#000000">GenerateEphemeral</text>
+</a>
+</g>
+</g>
+<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.HandshakeState).GenerateEphemeral&#45;&gt;github.com/samber/oops.Errorf -->
+<g id="edge2" class="edge">
+<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.HandshakeState).GenerateEphemeral&#45;&gt;github.com/samber/oops.Errorf</title>
+<g id="a_edge2"><a xlink:title="at methods.go:33: calling [github.com/samber/oops.Errorf]&#10;at methods.go:40: calling [github.com/samber/oops.Errorf]">
+<path fill="none" stroke="#8b4513" d="M162.0819,-124.3205C194.1733,-130.155 231.3605,-136.916 258.689,-141.8846"/>
+<polygon fill="#8b4513" stroke="#8b4513" points="258.1842,-145.3501 268.649,-143.6954 259.4364,-138.463 258.1842,-145.3501"/>
+</a>
+</g>
+</g>
+<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.HandshakeState).GenerateEphemeral&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/crypto/curve25519.GenerateKeyPair -->
+<g id="edge1" class="edge">
+<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.HandshakeState).GenerateEphemeral&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/crypto/curve25519.GenerateKeyPair</title>
+<g id="a_edge1"><a xlink:title="at methods.go:31: calling [github.com/go&#45;i2p/go&#45;i2p/lib/crypto/curve25519.GenerateKeyPair]">
+<path fill="none" stroke="#8b4513" d="M162.0819,-97.3486C183.1436,-92.795 206.4003,-87.7667 227.6243,-83.178"/>
+<polygon fill="#8b4513" stroke="#8b4513" points="228.5039,-86.5687 237.5384,-81.0345 227.0245,-79.7268 228.5039,-86.5687"/>
+</a>
+</g>
+</g>
 </g>
 </svg>
diff --git a/index.html b/index.html
index 9ca2d62..e7b4ce7 100644
--- a/index.html
+++ b/index.html
@@ -336,7 +336,7 @@ It is unsafe for production use, and intended only for debugging and testing pur
     </main>
     
     <footer class="page-footer">
-      <p>Generated on 2025-06-28 08:26:19 • <a href="https://github.com/go-i2p/go-i2p" target="_blank">View on GitHub</a></p>
+      <p>Generated on 2025-06-28 09:22:10 • <a href="https://github.com/go-i2p/go-i2p" target="_blank">View on GitHub</a></p>
     </footer>
   </div>
 </body>