diff --git a/lib/src/thai/LexiconTha.gf b/lib/src/thai/LexiconTha.gf
index cff6ee53c..2f05f95e0 100644
--- a/lib/src/thai/LexiconTha.gf
+++ b/lib/src/thai/LexiconTha.gf
@@ -73,7 +73,7 @@ lin
 --  computer_N = regN "computer" ;
   correct_A = mkA (thword "แท้") ;
   count_V2 = mkV2 (thword "นับ") ;
---  country_N = regN "country" ;
+  country_N = placeN (thword "ประ" "เทศ") ;
 --  cousin_N = regN "cousin" ;
 --  cow_N = regN "cow" ;
   cut_V2 = mkV2 (thword "ตัด") ;
@@ -175,7 +175,7 @@ lin
   know_VS = lin VS (regV "รู้") ; -----
   lake_N = mkN (thword "ทะ" "เล" "สาบ") ;
 --  lamp_N = regN "lamp" ;
---  language_N = regN "language" ;
+  language_N = mkN (thword "ภา" "ษา") ;
   laugh_V = mkV (thword "หัว" "เราะ") ;
   leaf_N = mkN (thword "ใบ") ;
 --  learn_V2 = dirV2 (regV "learn") ;
@@ -240,7 +240,7 @@ lin
   rain_V0 = mkV "มี" "ฝน" ; ----
   ready_A = mkA "พร้อม" ;
   reason_N = verbalN "เหตู" ;
---  read_V2 = dirV2 (irregV "read" "read" "read") ;
+  read_V2 = mkV2 "อา่น" ;
   red_A = mkA (thword "แดง") ;
 --  religion_N = regN "religion" ;
   restaurant_N = placeN (thword "ร้าน" "อาหาร") ;
@@ -337,7 +337,7 @@ lin
   university_N = placeN (thword "มหา" "วิ" "ฑยา" "ลัย") ;
 --  village_N = regN "village" ;
   vomit_V = mkV (thword "อ้วก") ;
---  wait_V2 = mkV2 (regV "wait") forP ;
+  wait_V2 = mkV2 "รี" ;
   walk_V = mkV (thword "เดิน") ;
 --  war_N = regN "war" ;
   warm_A = mkA (thword "ร้อน") ;
@@ -358,7 +358,7 @@ lin
   wonder_VQ = mkVQ (regV (thword "ประ" "หลาด" "ไจ")) ; ----
 --  wood_N = regN "wood" ;
   worm_N = animalN (thword "หนอน") ;
---  write_V2 = dirV2 (irregV "write" "wrote" "written") ;
+  write_V2 = mkV2 "ลง" ;
   year_N = mkN (thword "ปี") ;
   yellow_A = mkA (thword "เหลือง") ;
 --  young_A = regADeg "young" ;
diff --git a/lib/src/thai/ParadigmsTha.gf b/lib/src/thai/ParadigmsTha.gf
index 7c9b68656..8a1123260 100644
--- a/lib/src/thai/ParadigmsTha.gf
+++ b/lib/src/thai/ParadigmsTha.gf
@@ -33,6 +33,9 @@ oper
 
   mkA : Str -> A = \s -> lin A (mkAdj s) ;
 
+  mkPN : Str -> PN
+     = \s -> lin PN (ss s) ;
+
   mkA2 : A -> Str -> A2
       = \n,p -> lin A2 (n ** {c2 = p}) ;
 
diff --git a/lib/src/thai/ResTha.gf b/lib/src/thai/ResTha.gf
index 36d5d3bca..d635c36ae 100644
--- a/lib/src/thai/ResTha.gf
+++ b/lib/src/thai/ResTha.gf
@@ -40,6 +40,11 @@ resource ResTha = ParamX, StringsTha ** open Prelude in {
     thword : (s1,_,s3 : Str) -> Str = \s1,s2,s3 -> s1 + s2 + s3 ;
     thword : (s1,_,_,s4 : Str) -> Str = 
       \s1,s2,s3,s4 -> s1 + s2 + s3 + s4 ;
+    thword : (s1,_,_,_,s5 : Str) -> Str = 
+      \s1,s2,s3,s4,s5 -> s1 + s2 + s3 + s4 + s5 ;
+    thword : (s1,_,_,_,_,s6 : Str) -> Str = 
+      \s1,s2,s3,s4,s5,s6 -> s1 + s2 + s3 + s4 + s5 + s6 ;
+
     } ;
 
 -- noun and classifier
diff --git a/lib/src/thai/StructuralTha.gf b/lib/src/thai/StructuralTha.gf
index 85da1d894..6df51c046 100644
--- a/lib/src/thai/StructuralTha.gf
+++ b/lib/src/thai/StructuralTha.gf
@@ -28,7 +28,7 @@ concrete StructuralTha of Structural = CatTha **
 --  everything_NP = regNP "everything" Sg ;
 --  everywhere_Adv = ss "everywhere" ;
   few_Det = quantDet (thword "สอง" "สาม") ;
---  for_Prep = ss "for" ;
+  for_Prep = ss "ให้" ;
   from_Prep = ss "จาก" ;
   have_V2 = mkV2 "มี" ;
   he_Pron = ss khaw_s ;