diff --git a/lib/src/thai/ResTha.gf b/lib/src/thai/ResTha.gf
index e2a30b6bd..9e4c800b6 100644
--- a/lib/src/thai/ResTha.gf
+++ b/lib/src/thai/ResTha.gf
@@ -42,459 +42,69 @@ resource ResTha = ParamX ** open StringsTha, Prelude in {
 
 -- Part before and after negation (mai_s)
 
-   Verb = {s1,s2 : Str} ;
+   Verb = {s1,s2 : Str ; isCompl : Bool} ;
 
-   resV : Str -> Str -> Verb = \s,c -> {s1 = s ; s2 = c} ;
+   resV : Str -> Str -> Verb = \s,c -> {s1 = s ; s2 = c ; isCompl = True} ;
 
-   regV : Str -> Verb = \s -> resV [] s ;
+   regV : Str -> Verb = \s -> {s1 = [] ; s2 = s ; isCompl = False} ;
 
    dirV2 : Verb -> Verb ** {c2 : Str} = \v -> v ** {c2 = []} ;
 
 -- Auxiliary verbs, according to order and negation.
 -- The three types are $VV may VP | may VV VP | VP may VV$
 
-   param VVTyp = VVPre | VVMid | VVPost ;
+ param VVTyp = VVPre | VVMid | VVPost ;
 
-   oper VVerb = {s : Str ; typ : VVTyp} ;
+ oper 
+   VVerb = {s : Str ; typ : VVTyp} ;
+
+   Adj = SS ; 
 
 -- Verb phrases: form negation and question, too.
 
    VP = {
-     s   : Polarity => Str 
+     s : Polarity => Str 
      } ;
 
    mkVP : Verb -> VP = \v -> {
-     s = \\p => v.s1 ++ polStr may_s p ++ v.s2
+     s = \\p => if_then_Str v.isCompl 
+                   (thbind v.s1 (polStr may_s p ++ v.s2))
+                   (v.s1 ++     (polStr may_s p ++ v.s2)) --- v.s1 = []
+     } ;
+
+   insertObj : VP -> NP -> VP = \vp,o -> {
+     s = \\p => thbind (vp.s ! p) o.s
+     } ; 
+
+   adjVP : Adj -> VP = \a -> {
+     s = \\p => polStr may_s p ++ a.s
      } ;
 
    insertObject : Str -> VP -> VP = \np,vp -> {
-     s = \\p => vp.s ! p ++ np
+     s = \\p => thbind (vp.s ! p) np
      } ;
 
    polStr : Str -> Polarity -> Str = \m,p -> case p of {
      Pos => [] ;
-     Neg => m
+     Neg => thbind m []
      } ;
 
---  flags optimize=all ;
---
---
----- Some parameters, such as $Number$, are inherited from $ParamX$.
---
-----2 For $Noun$
---
----- This is the worst-case $Case$ needed for pronouns.
---
---  param
---    Case = Nom | Acc | Gen ;
---
----- Agreement of $NP$ is a record. We'll add $Gender$ later.
---
---  oper
---    Agr = {n : Number ; p : Person} ;
---
---  param 
---    Gender = Neutr | Masc | Fem ;
---
-----2 For $Verb$
---
----- Only these five forms are needed for open-lexicon verbs.
---
---  param
---    VForm = 
---       VInf
---     | VPres
---     | VPPart
---     | VPresPart
---     | VPast      --# notpresent
---     ;
---
----- Auxiliary verbs have special negative forms.
---
---    VVForm = 
---       VVF VForm
---     | VVPresNeg
---     | VVPastNeg  --# notpresent
---     ;
---
----- The order of sentence is needed already in $VP$.
---
---    Order = ODir | OQuest ;
---
---
-----2 For $Adjective$
---
---    AForm = AAdj Degree | AAdv ;
---
-----2 For $Relative$
--- 
---    RAgr = RNoAg | RAg {n : Number ; p : Person} ;
---    RCase = RPrep | RC Case ;
---
-----2 For $Numeral$
---
---    CardOrd = NCard | NOrd ;
---    DForm = unit | teen | ten  ;
---
-----2 Transformations between parameter types
---
---  oper
---    agrP3 : Number -> Agr = \n -> 
---      {n = n ; p = P3} ;
---
---    conjAgr : Agr -> Agr -> Agr = \a,b -> {
---      n = conjNumber a.n b.n ;
---      p = conjPerson a.p b.p
---      } ;
---
----- For $Lex$.
---
----- For each lexical category, here are the worst-case constructors.
---
---    mkNoun : (_,_,_,_ : Str) -> {s : Number => Case => Str} = 
---      \man,mans,men,mens -> {
---      s = table {
---        Sg => table {
---          Gen => mans ;
---          _ => man
---          } ;
---        Pl => table {
---          Gen => mens ;
---          _ => men
---          }
---        }
---      } ;
---
---    mkAdjective : (_,_,_,_ : Str) -> {s : AForm => Str} = 
---      \good,better,best,well -> {
---      s = table {
---        AAdj Posit  => good ;
---        AAdj Compar => better ;
---        AAdj Superl => best ;
---        AAdv        => well
---        }
---      } ;
---
---    mkVerb : (_,_,_,_,_ : Str) -> Verb = 
---      \go,goes,went,gone,going -> {
---      s = table {
---        VInf   => go ;
---        VPres  => goes ;
---        VPast  => went ; --# notpresent
---        VPPart => gone ;
---        VPresPart => going
---        } ;
---      isRefl = False
---      } ;
---
---    mkIP : (i,me,my : Str) -> Number -> {s : Case => Str ; n : Number} =
---     \i,me,my,n -> let who = mkNP i me my n P3 in {s = who.s ; n = n} ;
---
---    mkNP : (i,me,my : Str) -> Number -> Person -> {s : Case => Str ; a : Agr} =
---     \i,me,my,n,p -> {
---     s = table {
---       Nom => i ;
---       Acc => me ;
---       Gen => my
---       } ;
---     a = {
---       n = n ;
---       p = p
---       }
---     } ;
---
----- These functions cover many cases; full coverage inflectional patterns are
----- in $MorphoTha$.
---
---    regN : Str -> {s : Number => Case => Str} = \car ->
---      mkNoun car (car + "'s") (car + "s") (car + "s'") ;
---
---    regA : Str -> {s : AForm => Str} = \warm ->
---      mkAdjective warm (warm + "er") (warm + "est") (warm + "ly") ;
---
---    regV : Str -> Verb = \walk ->
---      mkVerb walk (walk + "s") (walk + "ed") (walk + "ed") (walk + "ing") ;
---
---    regNP : Str -> Number -> {s : Case => Str ; a : Agr} = \that,n ->
---      mkNP that that (that + "'s") n P3 ;
---
----- We have just a heuristic definition of the indefinite article.
----- There are lots of exceptions: consonantic "e" ("euphemism"), consonantic
----- "o" ("one-sided"), vocalic "u" ("umbrella").
---
---    artIndef = pre {
---      "a" ; 
---      "an" / strs {"a" ; "e" ; "i" ; "o" ; "A" ; "E" ; "I" ; "O" }
---      } ;
---
---    artDef = "the" ;
---
----- For $Verb$.
---
---  Verb : Type = {
---    s : VForm => Str ;
---    isRefl : Bool
---    } ;
---
---  param
---  CPolarity = 
---     CPos
---   | CNeg Bool ;  -- contracted or not
---
---  oper
---  contrNeg : Bool -> Polarity -> CPolarity = \b,p -> case p of {
---    Pos => CPos ;
---    Neg => CNeg b
---    } ;
---
---  VerbForms : Type =
---    Tense => Anteriority => CPolarity => Order => Agr => {fin, inf : Str} ; 
---
---  VP : Type = {
---    s   : VerbForms ;
---    prp : Str ;   -- present participle 
---    inf : Str ;   -- the infinitive form ; VerbForms would be the logical place
---    ad  : Str ;   -- sentential adverb
---    s2  : Agr => Str -- complement
---    } ;
---
---
---  predV : Verb -> VP = \verb -> {
---    s = \\t,ant,b,ord,agr => 
---      let
---        inf  = verb.s ! VInf ;
---        fin  = presVerb verb agr ;
---        part = verb.s ! VPPart ;
---      in
---      case <t,ant,b,ord> of {
---        <Pres,Simul,CPos,ODir>   => vf            fin [] ;
---        <Pres,Simul,CPos,OQuest> => vf (does agr)   inf ;
---        <Pres,Anter,CPos,_>      => vf (have agr)   part ; --# notpresent
---        <Pres,Anter,CNeg c,_>    => vfn c (have agr) (havent agr) part ; --# notpresent
---        <Past,Simul,CPos,ODir>   => vf (verb.s ! VPast) [] ; --# notpresent
---        <Past,Simul,CPos,OQuest> => vf "did"        inf ; --# notpresent
---        <Past,Simul,CNeg c,_>    => vfn c "did" "didn't"     inf ; --# notpresent
---        <Past,Anter,CPos,_>      => vf "had"        part ; --# notpresent
---        <Past,Anter,CNeg c,_>    => vfn c "had" "hadn't"     part ; --# notpresent
---        <Fut, Simul,CPos,_>      => vf "will"       inf ; --# notpresent
---        <Fut, Simul,CNeg c,_>    => vfn c "will" "won't"      inf ; --# notpresent
---        <Fut, Anter,CPos,_>      => vf "will"       ("have" ++ part) ; --# notpresent
---        <Fut, Anter,CNeg c,_>    => vfn c "will" "won't"("have" ++ part) ; --# notpresent
---        <Cond,Simul,CPos,_>      => vf "would"      inf ; --# notpresent
---        <Cond,Simul,CNeg c,_>    => vfn c "would" "wouldn't"   inf ; --# notpresent
---        <Cond,Anter,CPos,_>      => vf "would"      ("have" ++ part) ; --# notpresent
---        <Cond,Anter,CNeg c,_> => vfn c "would" "wouldn't" ("have" ++ part) ; --# notpresent
---        <Pres,Simul,CNeg c,_>    => vfn c (does agr) (doesnt agr) inf
---        } ;
---    prp  = verb.s ! VPresPart ;
---    inf  = verb.s ! VInf ;
---    ad = [] ;
---    s2 = \\a => if_then_Str verb.isRefl (reflPron ! a) []
---    } ;
---
---  predAux : Aux -> VP = \verb -> {
---    s = \\t,ant,cb,ord,agr => 
---      let 
---        b = case cb of {
---          CPos => Pos ;
---          _ => Neg
---          } ;
---        inf  = verb.inf ;
---        fin  = verb.pres ! b ! agr ;
---        finp = verb.pres ! Pos ! agr ;
---        part = verb.ppart ;
---      in
---      case <t,ant,cb,ord> of {
---        <Pres,Anter,CPos,_>      => vf (have agr)   part ;  --# notpresent
---        <Pres,Anter,CNeg c,_>    => vfn c (have agr) (havent agr) part ; --# notpresent
---        <Past,Simul,CPos,  _>    => vf (verb.past ! b ! agr) [] ; --# notpresent
---        <Past,Simul,CNeg c,  _> => vfn c (verb.past!Pos!agr)(verb.past!Neg!agr) [] ; --# notpresent
---        <Past,Anter,CPos,_>      => vf "had"        part ; --# notpresent
---        <Past,Anter,CNeg c,_>    => vfn c "had" "hadn't"     part ; --# notpresent
---        <Fut, Simul,CPos,_>      => vf "will"       inf ; --# notpresent
---        <Fut, Simul,CNeg c,_>    => vfn c "will" "won't"      inf ; --# notpresent
---        <Fut, Anter,CPos,_>      => vf "will"       ("have" ++ part) ; --# notpresent
---        <Fut, Anter,CNeg c,_>    => vfn c "will" "won't"("have" ++ part) ; --# notpresent
---        <Cond,Simul,CPos,_>      => vf "would"      inf ; --# notpresent
---        <Cond,Simul,CNeg c,_>    => vfn c "would" "wouldn't"   inf ; --# notpresent
---        <Cond,Anter,CPos,_>      => vf "would"      ("have" ++ part) ; --# notpresent
---        <Cond,Anter,CNeg c,_> => vfn c "would" "wouldn't" ("have" ++ part) ; --# notpresent
---        <Pres,Simul,CPos,  _>    => vf fin          [] ;
---        <Pres,Simul,CNeg c,  _>  => vfn c finp fin          [] 
---        } ;
---    prp = verb.prpart ;
---    inf = verb.inf ;
---    ad = [] ;
---    s2 = \\_ => []
---    } ;
---        
---  vf : Str -> Str -> {fin, inf : Str} = \x,y -> vfn True x x y ;
---
---  vfn : Bool -> Str -> Str -> Str -> {fin, inf : Str} = \contr,x,y,z -> 
---    case contr of {
---      True  => {fin = y ; inf = z} ;
---      False => {fin = x ; inf = "not" ++ z}
---      } ;
---
---  insertObj : (Agr => Str) -> VP -> VP = \obj,vp -> {
---    s = vp.s ;
---    prp = vp.prp ;
---    inf = vp.inf ;
---    ad = vp.ad ;
---    s2 = \\a => vp.s2 ! a ++ obj ! a
---    } ;
---
------ The adverb should be before the finite verb.
---
---  insertAdV : Str -> VP -> VP = \adv,vp -> {
---    s = vp.s ;
---    prp = vp.prp ;
---    inf = vp.inf ;
---    ad = vp.ad ++ adv ;
---    s2 = \\a => vp.s2 ! a
---    } ;
---
----- 
---
---  predVV : {s : VVForm => Str ; isAux : Bool} -> VP = \verb ->
---    let verbs = verb.s
---    in
---    case verb.isAux of {
---      True => predAux {
---        pres = table {
---          Pos => \\_ => verbs ! VVF VPres ;
---          Neg => \\_ => verbs ! VVPresNeg
---          } ;
---        past = table {                       --# notpresent
---          Pos => \\_ => verbs ! VVF VPast ;  --# notpresent
---          Neg => \\_ => verbs ! VVPastNeg    --# notpresent
---          } ;    --# notpresent
---        inf = verbs ! VVF VInf ;
---        ppart = verbs ! VVF VPPart ;
---        prpart = verbs ! VVF VPresPart ;
---        } ;
---      _    => predV {s = \\vf => verbs ! VVF vf ; isRefl = False}
---      } ;
---
---  presVerb : {s : VForm => Str} -> Agr -> Str = \verb -> 
---    agrVerb (verb.s ! VPres) (verb.s ! VInf) ;
---
---  infVP : Bool -> VP -> Agr -> Str = \isAux,vp,a ->
---    vp.ad ++ if_then_Str isAux [] "to" ++ 
---    vp.inf ++ vp.s2 ! a ;
---
---  agrVerb : Str -> Str -> Agr -> Str = \has,have,agr -> 
---    case agr of {
---      {n = Sg ; p = P3} => has ;
---      _                 => have
---      } ;
---
---  have   = agrVerb "has"     "have" ;
---  havent = agrVerb "hasn't"  "haven't" ;
---  does   = agrVerb "does"    "do" ;
---  doesnt = agrVerb "doesn't" "don't" ;
---
---  Aux = {
---    pres : Polarity => Agr => Str ; 
---    past : Polarity => Agr => Str ;  --# notpresent
---    inf,ppart,prpart : Str
---    } ;
---
---  auxBe : Aux = {
---    pres = \\b,a => case <b,a> of {
---      <Pos,{n = Sg ; p = P1}> => "am" ; 
---      <Neg,{n = Sg ; p = P1}> => ["am not"] ; --- am not I
---      _ => agrVerb (posneg b "is")  (posneg b "are") a
---      } ;
---    past = \\b,a => case a of {                  --# notpresent
---      {n = Sg ; p = P1|P3} => (posneg b "was") ; --# notpresent
---      _                    => (posneg b "were") --# notpresent
---      } ; --# notpresent
---    inf  = "be" ;
---    ppart = "been" ;
---    prpart = "being"
---    } ;
---
---  posneg : Polarity -> Str -> Str = \p,s -> case p of {
---    Pos => s ;
---    Neg => s + "n't"
---    } ;
---
---  conjThat : Str = "that" ;
---
---  reflPron : Agr => Str = table {
---    {n = Sg ; p = P1} => "myself" ;
---    {n = Sg ; p = P2} => "yourself" ;
---    {n = Sg ; p = P3} => "itself" ; ----
---    {n = Pl ; p = P1} => "ourselves" ;
---    {n = Pl ; p = P2} => "yourselves" ;
---    {n = Pl ; p = P3} => "themselves"
---    } ;
---
----- For $Sentence$.
---
---  Clause : Type = {
---    s : Tense => Anteriority => CPolarity => Order => Str
---    } ;
---
---  mkClause : Str -> Agr -> VP -> Clause =
---    \subj,agr,vp -> {
---      s = \\t,a,b,o => 
---        let 
---          verb  = vp.s ! t ! a ! b ! o ! agr ;
---          compl = vp.s2 ! agr
---        in
---        case o of {
---          ODir   => subj ++ verb.fin ++ vp.ad ++ verb.inf ++ compl ;
---          OQuest => verb.fin ++ subj ++ vp.ad ++ verb.inf ++ compl
---          }
---    } ;
---
---
----- For $Numeral$.
---
---  mkNum : Str -> Str -> Str -> Str -> {s : DForm => CardOrd => Str} = 
---    \two, twelve, twenty, second ->
---    {s = table {
---       unit => table {NCard => two ; NOrd => second} ; 
---       teen => \\c => mkCard c twelve ; 
---       ten  => \\c => mkCard c twenty
---       }
---    } ;
---
---  regNum : Str -> {s : DForm => CardOrd => Str} = 
---    \six -> mkNum six (six + "teen") (six + "ty") (regOrd six) ;
---
---  regCardOrd : Str -> {s : CardOrd => Str} = \ten ->
---    {s = table {NCard => ten ; NOrd => regOrd ten}} ;
---
---  mkCard : CardOrd -> Str -> Str = \c,ten -> 
---    (regCardOrd ten).s ! c ; 
---
---  regOrd : Str -> Str = \ten -> 
---    case last ten of {
---      "y" => init ten + "ieth" ;
---      _   => ten + "th"
---      } ;
---
---  mkQuestion : 
---      {s : Str} -> Clause -> 
---      {s : Tense => Anteriority => CPolarity => QForm => Str} = \wh,cl ->
---      {
---      s = \\t,a,p => 
---            let 
---              cls = cl.s ! t ! a ! p ;
---              why = wh.s
---            in table {
---              QDir   => why ++ cls ! OQuest ;
---              QIndir => why ++ cls ! ODir
---              }
---      } ;
---
----- for VP conjunction
---
---  param
---    VPIForm = VPIInf | VPIPPart ;
---
---
+-- clauses
+
+param ClForm = ClDecl | ClQuest ;
+
+oper
+  NP = SS ;
+
+  Clause = {
+    s : ClForm => Polarity => Str
+    } ;
+
+  mkClause : NP -> VP -> Clause = \np,vp -> {
+    s = table {
+      ClDecl  => \\p => thbind np.s (vp.s ! p) ;
+      ClQuest => \\p => thbind np.s (vp.s ! p) m'ay_s
+      }
+    } ;
+
 }
diff --git a/lib/src/thai/StringsTha.gf b/lib/src/thai/StringsTha.gf
index 078c645f6..e57986de5 100644
--- a/lib/src/thai/StringsTha.gf
+++ b/lib/src/thai/StringsTha.gf
@@ -44,6 +44,7 @@ laa_s = "ลา" ; -- bye1
 lag_s = "หลัง" ; -- houses Classif
 lap_s = "หลับ" ; -- sleep2 
 lem_s = "เล่ม" ; -- books Classif
+mak_s = "มาก" ; -- very
 may_s = "ไม่" ; -- not
 m'ay_s = "ไหม" ; -- Question
 mvvn_s = "หมื่น" ; -- ten thousand
diff --git a/lib/src/thai/src/StringsTha.gf b/lib/src/thai/src/StringsTha.gf
index 2ea5b4641..36fd1e6e0 100644
--- a/lib/src/thai/src/StringsTha.gf
+++ b/lib/src/thai/src/StringsTha.gf
@@ -44,6 +44,7 @@ laa_s = "la:" ; -- bye1
 lag_s = "hlag" ; -- houses Classif
 lap_s = "hlab" ; -- sleep2 
 lem_s = "elT1m" ; -- books Classif
+mak_s = "ma:k" ; -- very
 may_s = "a&mT1" ; -- not
 m'ay_s = "a&hm" ; -- Question
 mvvn_s = "hmv:T1n" ; -- ten thousand