diff --git a/darwin/drawtext.m b/darwin/drawtext.m
index 2ac104c6..a84b68b5 100644
--- a/darwin/drawtext.m
+++ b/darwin/drawtext.m
@@ -82,7 +82,7 @@ static CFAttributedStringRef attrstrToCoreFoundation(uiAttributedString *s, uiDr
 	return mas;
 }
 
-// TODO this is wrong for our grapheme test; figure out what it should be...
+// TODO this is wrong for our hit-test example's multiple combining character example
 static uiDrawTextLayoutLineMetrics *computeLineMetrics(CTFrameRef frame, CGSize size)
 {
 	uiDrawTextLayoutLineMetrics *metrics;
diff --git a/unix/drawtext.c b/unix/drawtext.c
index f8ec1e67..6c01bc7d 100644
--- a/unix/drawtext.c
+++ b/unix/drawtext.c
@@ -2,6 +2,9 @@
 #include "uipriv_unix.h"
 #include "draw.h"
 
+// TODO
+// - if the RTL override is at the beginning of a line, the preceding space is included?
+
 struct uiDrawTextLayout {
 	PangoLayout *layout;
 	uiDrawTextLayoutLineMetrics *lineMetrics;
diff --git a/windows/drawtext.cpp b/windows/drawtext.cpp
index 0caac7f3..345723ce 100644
--- a/windows/drawtext.cpp
+++ b/windows/drawtext.cpp
@@ -2,6 +2,10 @@
 #include "uipriv_windows.hpp"
 #include "draw.hpp"
 
+// TODO
+// - consider the warnings about antialiasing in the PadWrite sample
+// - if that's not a problem, do we have overlapping rects in the hittest sample? I can't tell...
+
 struct uiDrawTextLayout {
 	IDWriteTextFormat *format;
 	IDWriteTextLayout *layout;