diff --git a/TODO b/TODO
index 143633730af774d412bb0a25dc33214e429c7056..0c5bfaa34aaa60581df5b257170fe220d0936464 100644
--- a/TODO
+++ b/TODO
@@ -1,13 +1,9 @@
 General fixes:
 =============
 
-- Move feature parsing from util into the library
-
-- 'const' for getter APIs? (use mutable internally)
-
 - Fix TT 'kern' on/off and GPOS interaction (move kerning before GPOS)
 
-- Do proper rounding when scaling from font space?
+- Do proper rounding when scaling from font space?  May be a non-issue.
 
 - Misc features:
   * init/medi/fina/isol for non-cursive scripts
@@ -19,26 +15,30 @@ General fixes:
 - Uniscribe backend needs to enforce one direction only, otherwise cluster
   values can confused the user.
 
+- GSUB ligation should call merge_clusters().
+
 
 API issues to fix before 1.0:
 ============================
 
-- Rename all internal symbols (static ones even) to have _hb prefix?
-
 - Add pkg-config files for glue codes (harfbuzz-glib, etc)
 
 - Figure out how many .so objects, how to link, etc
 
+- 'const' for getter APIs? (use mutable internally)
+
+
+API additions
+=============
+
+- Move feature parsing from util into the library
+
 - Add hb-cairo glue
 
 - Add sanitize API (and a cached version, that saves result on blob user-data)
 
 - Add glib GBoxedType stuff and introspection
 
-
-API to add (maybe after 1.0):
-============================
-
 - Add Uniscribe face / font get API
 
 - BCP 47 language handling / API (language_matches?)
@@ -47,7 +47,7 @@ API to add (maybe after 1.0):
 
 - Add hb_font_create_linear()?
 
-- Add hb_shape_plan()/hb_shape_execute()
+- Add hb_shape_plan()/hb_shape_planned()
 
 - Add query API for aalt-like features?
 
@@ -55,7 +55,9 @@ API to add (maybe after 1.0):
 
 - Add segmentation API
 
-- Add hb-fribidi?
+- Add hb-fribidi glue?
+
+- Add segmentation API
 
 
 hb-view / hb-shape enhancements: