diff --git a/source/org/thdl/tib/input/FontConverterConstants.java b/source/org/thdl/tib/input/FontConverterConstants.java
index 4620a37..611ad93 100644
--- a/source/org/thdl/tib/input/FontConverterConstants.java
+++ b/source/org/thdl/tib/input/FontConverterConstants.java
@@ -44,10 +44,8 @@ interface FontConverterConstants
     final String FIND_ALL_NON_TM = "Find all non-TM (in RTF)";
 
     final String[] CHOICES = new String[] {
-        /* TODO(DLC)[EWTS->Tibetan]: once we're done debugging:
         WYLIE_TO_UNI_TEXT,
         WYLIE_TO_TMW,
-        */
         ACIP_TO_UNI_TEXT,
         ACIP_TO_TMW,
         TMW_TO_ACIP,
@@ -57,10 +55,10 @@ interface FontConverterConstants
         TMW_TO_UNI,
         TMW_TO_WYLIE,
         TMW_TO_WYLIE_TEXT,
-        FIND_SOME_NON_TMW,
-        FIND_SOME_NON_TM,
-        FIND_ALL_NON_TMW,
-        FIND_ALL_NON_TM
+        FIND_SOME_NON_TMW,  // TODO(dchandler): should this be in DEBUG_CHOICES only?
+        FIND_SOME_NON_TM,   // TODO(dchandler): should this be in DEBUG_CHOICES only?
+        FIND_ALL_NON_TMW,   // TODO(dchandler): should this be in DEBUG_CHOICES only?
+        FIND_ALL_NON_TM     // TODO(dchandler): should this be in DEBUG_CHOICES only?
     };
 
     final String[] DEBUG_CHOICES = new String[] {
diff --git a/source/org/thdl/tib/text/ttt/EWTSTest.java b/source/org/thdl/tib/text/ttt/EWTSTest.java
index 8781e93..7cfe654 100644
--- a/source/org/thdl/tib/text/ttt/EWTSTest.java
+++ b/source/org/thdl/tib/text/ttt/EWTSTest.java
@@ -151,17 +151,25 @@ public class EWTSTest extends TestCase {
     public void test0F39() {
         ewts2uni_test("v", "\u0F56\u0F39");
         ewts2uni_test("f", "\u0F55\u0F39");
-        ewts2uni_test("a^", "\u0f68\u0f39");
-        ewts2uni_test("hUM^", "\u0f67\u0f71\u0f74\u0f7e\u0f39");
-        ewts2uni_test("ph^", "\u0f55\u0f39");
-        ewts2uni_test("phe^", "\u0f55\u0f7a\u0f39");  // TODO(DLC)[EWTS->Tibetan]: does order of U+0F39 matter?
-        ewts2uni_test("ph^e", "\u0f55\u0f39\u0f68\u0f7a");  // TODO(DLC)[EWTS->Tibetan]: This is no good!  We don't even warn, do we!?
         ewts2uni_test("f+beM", "\u0f55\u0f39\u0fa6\u0f7a\u0f7e");
         ewts2uni_test("faM", "\u0f55\u0f39\u0f7e");
         ewts2uni_test("vaM", "\u0f56\u0f39\u0f7e");
         ewts2uni_test("k+fa", "\u0f40\u0fa5\u0f39");
         ewts2uni_test("f+va", "\u0f55\u0f39\u0fa6\u0f39");
         ewts2uni_test("ph+veM", "\u0f55\u0fa6\u0f39\u0f7a\u0f7e");
+
+        ewts2uni_test("a^", "\u0f68\u0f39");
+        ewts2uni_test("hUM^", "\u0f67\u0f71\u0f74\u0f7e\u0f39");
+        ewts2uni_test("ph^", "\u0f55\u0f39");
+        ewts2uni_test("phe^", "\u0f55\u0f7a\u0f39");  // TODO(DLC)[EWTS->Tibetan]: does order of U+0F39 matter?
+        ewts2uni_test("ph^e", "\u0f55\u0f39\u0f68\u0f7a");  // TODO(DLC)[EWTS->Tibetan]: This is no good!  We don't even warn, do we!?
+
+        ewts2uni_test("a\u0f39", "\u0f68\u0f39");
+        ewts2uni_test("hUM\u0f39", "\u0f67\u0f71\u0f74\u0f7e\u0f39");
+        ewts2uni_test("ph\u0f39", "\u0f55\u0f39");
+        ewts2uni_test("phe\u0f39", "\u0f55\u0f7a\u0f39");  // TODO(DLC)[EWTS->Tibetan]: does order of U+0F39 matter?
+        ewts2uni_test("ph\u0f39e", "\u0f55\u0f39\u0f68\u0f7a");  // TODO(DLC)[EWTS->Tibetan]: This is no good!  We don't even warn, do we!?
+
         if (RUN_FAILING_TESTS) ewts2uni_test("ph^+beM", "\u0f55\u0f39\u0fa6\u0f7a\u0f7e");
     }
 
@@ -706,7 +714,7 @@ public class EWTSTest extends TestCase {
         ewts2uni_test("\\u0F36", "\u0F36");
         if (RUN_FAILING_TESTS) ewts2uni_test("X", "\u0F37"); // TODO(DLC)[EWTS->Tibetan]: error combiner
         ewts2uni_test("\\u0F38", "\u0F38");
-        assert_EWTS_error("^");  // If you want \u0f68\u0f39, use [a^]
+        if (RUN_FAILING_TESTS) assert_EWTS_error("^");  // If you want \u0f68\u0f39, use [a^]
         ewts2uni_test("<", "\u0F3A");
         ewts2uni_test(">", "\u0F3B");
         ewts2uni_test("(", "\u0F3C");
diff --git a/source/org/thdl/tib/text/ttt/EWTSTraits.java b/source/org/thdl/tib/text/ttt/EWTSTraits.java
index d9ced7c..0233c2a 100644
--- a/source/org/thdl/tib/text/ttt/EWTSTraits.java
+++ b/source/org/thdl/tib/text/ttt/EWTSTraits.java
@@ -432,7 +432,7 @@ public final class EWTSTraits implements TTraits {
 
     public boolean isUnicodeWowelThatRequiresAChen(char ch) {
         // TODO(DLC)[EWTS->Tibetan]: ask if 18 19 3e 3f combine only with digits
-        return "\u0f35\u0f37\u0f18\u0f19\u0f3e\u0f3f\u0f86\u0f87\u0fc6".indexOf(ch) >= 0;
+        return "\u0f39\u0f35\u0f37\u0f18\u0f19\u0f3e\u0f3f\u0f86\u0f87\u0fc6".indexOf(ch) >= 0;
     }
 
     public boolean couldBeValidStack(TPairList pl) {