diff --git a/annotations/yo/classtemplates.yo b/annotations/yo/classtemplates.yo
index c4039ee3..fa881c99 100644
--- a/annotations/yo/classtemplates.yo
+++ b/annotations/yo/classtemplates.yo
@@ -39,6 +39,10 @@ includefile(classtemplates/definitions)
     subsect(Generic lambda expressions)
     includefile(classtemplates/lambda)
 
+        subsubsect(Standard template syntax)
+        TODO
+COMMENT(FBB N4713, 8.4.5, p. 87)
+
 sect(Static data members)
 includefile(classtemplates/static)
 
@@ -86,6 +90,7 @@ includefile(classtemplates/variadic)
 
     lsubsect(FOLDEXP)(Folding expressions)
     includefile(classtemplates/fold)
+COMMENT(FBB: inspect N4713, 8.4.6, p. 95)
 
 lsect(TUPLES)(Tuples)
 includefile(classtemplates/tuples)
diff --git a/annotations/yo/first.yo b/annotations/yo/first.yo
index e365dd31..7c091eff 100644
--- a/annotations/yo/first.yo
+++ b/annotations/yo/first.yo
@@ -40,6 +40,7 @@ sect(Several additions to C's grammar)
 
     subsect(Initializer lists)
     includefile(first/initializer)
+COMMENT(FBB: TODO: and designated initialization)
 
     lsubsect(AUTO)(Type inference using `auto')
     includefile(first/auto)
@@ -65,6 +66,10 @@ sect(Several additions to C's grammar)
     subsect(Attributes)
     includefile(first/attributes)
 
+    subsect(Three-way comparison (<=>))
+    TODO
+COMMENT(FBB: TODO N4713, 8.5.8, 120)
+
 sect(New language-defined data types)
 includefile(first/datatypes)
 
@@ -104,6 +109,6 @@ includefile(first/cast)
     subsect(Casting 'shared_ptr' objects)
     includefile(first/sharedcast)
 
-
 sect(Keywords and reserved names in C++)
 includefile(first/keywords)
+COMMENT(FBB: TODO: coroutine keywords, module keyword)
diff --git a/annotations/yo/intro.yo b/annotations/yo/intro.yo
index 4f367752..c9fc0195 100644
--- a/annotations/yo/intro.yo
+++ b/annotations/yo/intro.yo
@@ -73,15 +73,19 @@ IFDEF(html)(
         subsect(The keyword `typedef')
         includefile(intro/typedef)
 
+        subsubsect(Designated initialization}
+        TO DO
+COMMENT(FBB - N4713, p. 1286, 199)
+
         lsubsect(FunctionInStruct)(Functions as part of a struct)
         includefile(intro/struct)
 
         subsect(Additional features you should know about)
 
-            subsubsection(Evaluation order of operands)
+            subsubsect(Evaluation order of operands)
             includefile(intro/evaluation)
 
-            subsubsection(Attributes)
+            subsubsect(Attributes)
             includefile(intro/attributes)
 
 
@@ -90,3 +94,4 @@ IFDEF(html)(
 
 
 
+