diff --git a/ICSharpCode.ILSpyX/MermaidDiagrammer/ClassDiagrammerFactory.cs b/ICSharpCode.ILSpyX/MermaidDiagrammer/ClassDiagrammerFactory.cs
index 6834160b78..f35f6645f3 100644
--- a/ICSharpCode.ILSpyX/MermaidDiagrammer/ClassDiagrammerFactory.cs
+++ b/ICSharpCode.ILSpyX/MermaidDiagrammer/ClassDiagrammerFactory.cs
@@ -47,6 +47,7 @@ public ClassDiagrammerFactory(XmlDocumentationFormatter? xmlDocs)
 		{
 			this.xmlDocs = xmlDocs;
 
+			//TODO not sure LanguageVersion.Latest is the wisest choice here; maybe cap this for better mermaid compatibility?
 			decompilerSettings = new DecompilerSettings(Decompiler.CSharp.LanguageVersion.Latest) {
 				AutomaticProperties = true // for IsHidden to return true for backing fields
 			};
diff --git a/ICSharpCode.ILSpyX/MermaidDiagrammer/html/script.js b/ICSharpCode.ILSpyX/MermaidDiagrammer/html/script.js
index 824d5d221c..f26c851b32 100644
--- a/ICSharpCode.ILSpyX/MermaidDiagrammer/html/script.js
+++ b/ICSharpCode.ILSpyX/MermaidDiagrammer/html/script.js
@@ -321,6 +321,8 @@
                         }
                     },
 
+                    /*  TODO watch https://github.com/mermaid-js/mermaid/issues/6034 for a solution to render multiple self-references,
+                        which is currently broken. E.g. for LightJson.JsonValue (compare console log) */
                     // renders HasOne and HasMany relations
                     renderRelations = (typeId, relations, many) => {
                         if (relations) // expecting object; only process if not null or undefined
diff --git a/ICSharpCode.ILSpyX/MermaidDiagrammer/html/template.html b/ICSharpCode.ILSpyX/MermaidDiagrammer/html/template.html
index 2d9dc35416..a9229c64bf 100644
--- a/ICSharpCode.ILSpyX/MermaidDiagrammer/html/template.html
+++ b/ICSharpCode.ILSpyX/MermaidDiagrammer/html/template.html
@@ -173,6 +173,7 @@ <h3>Looking for help with something else?</h3>
                         title="For off-line use, download a copy and save it with the diagrammer - at the bottom of which you find a script with a reference to the mermaid CDN. Replace its 'src' with the path to your local copy.">📥</a>
                 </span>
                 <span>
+                    <!--TODO update these links, they're broken ATM-->
                     using <a class="project" target="_blank" href="{{RepoUrl}}#readme" title="🤿 get learned and find out about or 🔱 fork the project">ICSharpCode.ILSpyX</a> v{{BuilderVersion}}
                     <a target="_blank" href="{{RepoUrl}}/tree/v{{BuilderVersion}}#readme" title="the manual for v{{BuilderVersion}}">📜</a>
                     <a target="_blank" href="{{RepoUrl}}/discussions" title="🤔 ask questions, share and discuss 💡 ideas">💬</a>