diff --git a/lib/src/Make.hs b/lib/src/Make.hs
index 30e999e47..c0f47ceec 100644
--- a/lib/src/Make.hs
+++ b/lib/src/Make.hs
@@ -161,7 +161,8 @@ gfc pres ppath file = do
   let preproc = if pres then "-preproc=mkPresent" else ""
   let path    = if pres then ppath else ""
   putStrLn $ "Compiling " ++ file
-  run_gfc ["-s","-src","-no-pmcfg",preproc, path, file]
+----  run_gfc ["-s","-src","-no-pmcfg",preproc, path, file]
+  run_gfc ["-s","-src",preproc, path, file]
 
 gfcmin path file = do
   let preproc = "-preproc=mkMinimal"
diff --git a/lib/src/thai/LexiconTha.gf b/lib/src/thai/LexiconTha.gf
index 044b852eb..b79459cab 100644
--- a/lib/src/thai/LexiconTha.gf
+++ b/lib/src/thai/LexiconTha.gf
@@ -16,9 +16,8 @@ lin
 --  apartment_N = regN "apartment" ;
 --  apple_N = regN "apple" ;
 --  art_N = regN "art" ;
-  ash_N = mkN (thbind "เถ้า") ;
---  ashes_N = regN "ash" ;  FIXME: plural only?
---  ask_V2Q = mkV2Q (regV "ask") noPrep ;
+  ashes_N = mkN (thbind "เถ้า") ;
+  ask_V2Q = regV "ถาน" ** {c2 = []} ;
 --  atP = mkPrep "at" ;
 --  baby_N = regN "baby" ;
   back_N = mkN (thbind "หลัง") ;
@@ -27,8 +26,8 @@ lin
   bark_N = mkN (thbind "เปลือก") ;
 --  beautiful_A = regADeg "beautiful" ;
 --  become_VA = mkVA (irregV "become" "became" "become") ;
---  beer_N = mkN biar_s kew_s ; 
---  beg_V2V = mkV2V (regDuplV "beg") noPrep toP ;
+  beer_N = mkN biar_s kew_s ; 
+  beg_V2V = regV "ขอ" ** {c2 = []} ;
   belly_N = mkN (thbind "พุง") ;
   big_A = mkA (thbind "ใหญ่") ;
 --  bike_N = regN "bike" ;
@@ -40,7 +39,7 @@ lin
 --  blue_A = regADeg "blue" ;
 --  boat_N = regN "boat" ;
   bone_N = mkN (thbind "กระดูก") ;
---  book_N = mkN (nag_s ++ svv_s) lem_s ;
+  book_N = mkN (thbind nag_s svv_s) lem_s ;
 --  boot_N = regN "boot" ;
 --  boss_N = regN "boss" ;
 --  boy_N = regN "boy" ;
@@ -64,7 +63,7 @@ lin
 --  cheese_N = regN "cheese" ;
   child_N = mkN (thbind "เด็ก") ;
 --  church_N = regN "church" ;
---  city_N = regN "city" ;
+  city_N = mkN "นคร" "แห่ง" ;
 --  clean_A = regADeg "clean" ;
 --  clever_A = regADeg "clever" ;
 --  close_V2 = dirV2 (regV "close") ;
@@ -139,7 +138,7 @@ lin
 --  girl_N = regN "girl" ;
 ---  give_V3 = mkV3 (thbind "ให้") ;
 --  glove_N = regN "glove" ;
---  go_V = regV pay_s ;
+  go_V = regV pay_s ;
 --  gold_N = regN "gold" ;
   good_A = mkA (thbind "ดี") ;
 --  grammar_N = regN "grammar" ;
@@ -164,7 +163,7 @@ lin
   horn_N = mkN (thbind "เขา") ;
 --  horse_N = regN "horse" ;
 --  hot_A = duplADeg "hot" ;
---  house_N = mkN baan_s lag_s ;
+  house_N = mkN baan_s lag_s ;
   how_IAdv = ss (thbind "อย่างไร") ;
   hunt_V2 = mkV2 (thbind "ล่า") ;
   husband_N = personN (thbind "ผัว") ;
@@ -176,7 +175,7 @@ lin
   john_PN = ss "จน" ;
 --  jump_V = regV "jump" ;
   kill_V2 = mkV2 (thbind "ฆ่า") ;
---  king_N = regN "king" ;
+  king_N = mkN (thbind "พระ" "รา" "ชา") (thbind "พระ" "องด์") ;
   knee_N = mkN (thbind "เข่า") ;
   know_V2 = mkV2 "รู้" ; -----
   know_VQ = lin VQ (regV "รู้") ; -----
@@ -200,15 +199,14 @@ lin
 --  lose_V2 = dirV2 (irregV "lose" "lost" "lost") ;
   louse_N = animalN (thbind "เล็น") ;
 --  love_N = regN "love" ;
---  love_V2 = mkV2 rak_s ;
+  love_V2 = mkV2 rak_s ;
   man_N = personN (thbind "ชาย") ;
   many_Det = mkN (thbind "หลาย") ;
 --  married_A2 = mkA2 (regA "married") toP ;
   meat_N = mkN (thbind "เนื้อ") ;
 --  milk_N = regN "milk" ;
   moon_N = mkN (thbind "เดือน") ;
-  mother_N = personN (thbind "แม่") ;
---  mother_N2 = regN2 "mother" ;
+  mother_N2 = personN "แม่" ** {c2 = []} ;
   mountain_N = mkN (thbind "เขา") ;
   mouth_N = mkN (thbind "ปาก") ;
 --  music_N = regN "music" ;
@@ -230,7 +228,7 @@ lin
   other_A = mkA (thbind "อื่น") ;
 --  paint_V2A = mkV2A (regV "paint") noPrep ;
 --  paper_N = regN "paper" ;
---  paris_PN = regPN "Paris" ;
+  paris_PN = ss "ปารีส" ;
 --  peace_N = regN "peace" ;
 --  pen_N = regN "pen" ;
 --  person_N = genderN human (regN "person") ;
@@ -276,9 +274,8 @@ lin
   seed_N = mkN (thbind "เม็ด") ;
 --  seek_V2 = dirV2 (irregV "seek" "sought" "sought") ;
 --  sell_V3 = dirV3 (irregV "sell" "sold" "sold") toP ;
---  send_V3 = dirV3 (irregV "send" "sent" "sent") toP ;
---  sew_V = sew_V ;
-  sew_V2 = mkV2 (thbind "เย็บ") ;
+  send_V3 = regV "ส่ง" ** {c2,c3 = []} ; ---- prep
+  sew_V = mkV (thbind "เย็บ") ;
   sharp_A = mkA (thbind "คม") ;
 --  sheep_N = mk2N "sheep" "sheep" ;
 --  ship_N = regN "ship" ;
@@ -315,7 +312,7 @@ lin
 --  stop_V = regDuplV "stop" ;
 --  stove_N = regN "stove" ;
   straight_A = mkA (thbind "ดิ่ง") ;
---  student_N = regN "student" ;
+  student_N = personN (thbind "นัก" "สืก" "สา") ;
 --  stupid_A = regADeg "stupid" ;
   suck_V2 = mkV2 (thbind "ดูด") ;
   sun_N = mkN (thbind "ตะ" "วัน") ;
diff --git a/lib/src/thai/StructuralTha.gf b/lib/src/thai/StructuralTha.gf
index ce0e2a165..7dd1898ba 100644
--- a/lib/src/thai/StructuralTha.gf
+++ b/lib/src/thai/StructuralTha.gf
@@ -4,12 +4,12 @@ concrete StructuralTha of Structural = CatTha **
   flags coding = utf8 ;
 
   lin
---  above_Prep = ss "above" ;
+  above_Prep = ss (thbind "ข้าง" "บน") ;
 --  after_Prep = ss "after" ;
 --  all_Predet = ss "all" ;
---  almost_AdA, almost_AdN = ss "almost" ;
+  almost_AdA, almost_AdN = ss (thbind "เกิ" "อบ") ;
 --  although_Subj = ss "although" ;
---  always_AdV = ss "always" ;
+  always_AdV = ss (thbind "ตลอด" "ไป") ;
   and_Conj = {s1 = [] ; s2 = "และ"} ;
 --  because_Subj = ss "because" ;
 --  before_Prep = ss "before" ;
@@ -53,7 +53,7 @@ concrete StructuralTha of Structural = CatTha **
 --  on_Prep = ss "on" ;
 --  one_Quant = mkDeterminer Sg "one" ;
 --  only_Predet = ss "only" ;
---  or_Conj = ss "or" ** {n = Sg} ;
+  or_Conj = {s1 = [] ; s2 = "หริอ"} ;
 --  otherwise_PConj = ss "otherwise" ;
 --  part_Prep = ss "of" ;
   please_Voc = ss "ขอ" ;
@@ -90,7 +90,7 @@ concrete StructuralTha of Structural = CatTha **
   where_IAdv = ss (thbind "ฑี" "ไหน") ;
   which_IQuant = {s1 = "ไหน" ; s2 = [] ; hasC = True} ;
   whoPl_IP, whoSg_IP = ss "ไคร" ;
---  why_IAdv = ss "why" ;
+  why_IAdv = ss (thbind "ฑำ" "ไม") ;
 --  without_Prep = ss "without" ;
 --  with_Prep = ss "with" ;
   yes_Utt = ss chay_s ;