Add TODO
diff --git a/src/hb-ft.c b/src/hb-ft.c
index 79e1084..b5dd657 100644
--- a/src/hb-ft.c
+++ b/src/hb-ft.c
@@ -177,7 +177,6 @@
 {
   hb_face_t *face;
 
-  /* TODO: Handle NULL ft_face (in other places too) */
   if (ft_face->stream->read == NULL) {
     hb_blob_t *blob;
 
@@ -204,7 +203,6 @@
 hb_face_t *
 hb_ft_face_create_cached (FT_Face ft_face)
 {
-  /* TODO: Not thread-safe */
   if (HB_UNLIKELY (!ft_face->generic.data || ft_face->generic.finalizer != (FT_Generic_Finalizer) hb_ft_face_finalize))
   {
     if (ft_face->generic.finalizer)
diff --git a/src/hb-ft.h b/src/hb-ft.h
index 8930804..d7dc97e 100644
--- a/src/hb-ft.h
+++ b/src/hb-ft.h
@@ -43,6 +43,7 @@
 hb_ft_face_create (FT_Face           ft_face,
 		   hb_destroy_func_t destroy);
 
+/* Note: This function is not thread-safe */
 hb_face_t *
 hb_ft_face_create_cached (FT_Face ft_face);
 
diff --git a/src/hb-open-file-private.hh b/src/hb-open-file-private.hh
index b6e282d..f45ba8f 100644
--- a/src/hb-open-file-private.hh
+++ b/src/hb-open-file-private.hh
@@ -84,7 +84,7 @@
   {
     Tag t;
     t.set (tag);
-    // TODO: bsearch (need to sort in sanitize)
+    /* TODO: bsearch (need to sort in sanitize) */
     unsigned int count = numTables;
     for (unsigned int i = 0; i < count; i++)
     {
diff --git a/src/hb-open-type-private.hh b/src/hb-open-type-private.hh
index d7354be..1a11cd1 100644
--- a/src/hb-open-type-private.hh
+++ b/src/hb-open-type-private.hh
@@ -366,6 +366,8 @@
 
 template <typename Type, int Bytes> class BEInt;
 
+/* LONGTERMTODO: On machines allowing unaligned access, we can make the
+ * following tighter by using byteswap instructions on ints directly. */
 template <typename Type>
 class BEInt<Type, 2>
 {
diff --git a/src/hb-ot-layout-common-private.hh b/src/hb-ot-layout-common-private.hh
index 2315df9..37d6782 100644
--- a/src/hb-ot-layout-common-private.hh
+++ b/src/hb-ot-layout-common-private.hh
@@ -87,7 +87,7 @@
   {
     Tag t;
     t.set (tag);
-    // TODO: bsearch (need to sort in sanitize)
+    /* TODO: bsearch (need to sort in sanitize) */
     const Record<Type> *a = this->array();
     unsigned int count = this->len;
     for (unsigned int i = 0; i < count; i++)
@@ -235,8 +235,8 @@
     return SANITIZE_SELF () && SANITIZE (lookupIndex);
   }
 
-  /* TODO: implement get_feature_parameters() */
-  /* TODO: implement FeatureSize and other special features? */
+  /* LONGTERMTODO: implement get_feature_parameters() */
+  /* LONGTERMTODO: implement FeatureSize and other special features? */
   Offset	featureParams;	/* Offset to Feature Parameters table (if one
 				 * has been defined for the feature), relative
 				 * to the beginning of the Feature Table; = Null
@@ -321,7 +321,7 @@
       return NOT_COVERED;
     GlyphID gid;
     gid.set (glyph_id);
-    // TODO: bsearch (need to sort in sanitize)
+    /* TODO: bsearch (need to sort in sanitize) */
     unsigned int num_glyphs = glyphArray.len;
     for (unsigned int i = 0; i < num_glyphs; i++)
       if (gid == glyphArray[i])
@@ -377,7 +377,7 @@
   private:
   inline unsigned int get_coverage (hb_codepoint_t glyph_id) const
   {
-    // TODO: bsearch (need to sort in sanitize)
+    /* TODO: bsearch (need to sort in sanitize) */
     unsigned int count = rangeRecord.len;
     for (unsigned int i = 0; i < count; i++)
     {
@@ -497,7 +497,7 @@
   private:
   inline hb_ot_layout_class_t get_class (hb_codepoint_t glyph_id) const
   {
-    // TODO: bsearch (need to sort in sanitize)
+    /* TODO: bsearch (need to sort in sanitize) */
     unsigned int count = rangeRecord.len;
     for (unsigned int i = 0; i < count; i++)
     {