diff --git a/src/somali/CatSom.gf b/src/somali/CatSom.gf
index ea593b70..da1e65f9 100644
--- a/src/somali/CatSom.gf
+++ b/src/somali/CatSom.gf
@@ -16,29 +16,24 @@ concrete CatSom of Cat = CommonX - [Adv] ** open ResSom, Prelude in {
     Cl = ResSom.Clause ;
     ClSlash = ResSom.ClSlash ;
     SSlash  = ResSom.Sentence ; -- sentence missing NP; e.g. "she has looked at"
-    Imp     = { s : Str } ;   -- imperative             e.g. "look at this"
+    Imp     = SS ;              -- imperative             e.g. "look at this"
 
 --2 Questions and interrogatives
 
 -- Constructed in QuestionSom.
 
-    QCl = ResSom.Clause ;
+    QCl = ResSom.QClause ;
     IP = ResSom.NounPhrase ;
-    IComp = { s : Str } ; -- interrogative complement of copula  e.g. "where"
+    IComp = SS ;              -- interrogative complement of copula  e.g. "where"
     IDet = ResSom.Determiner ;  -- interrogative determiner            e.g. "how many"
     IQuant = ResSom.Quant ; -- interrogative quantifier            e.g. "which"
 
-
-
-
 --2 Relative clauses and pronouns
 
 -- Constructed in RelativeSom.
 
     RCl = ResSom.RClause ;
-    RP = { s : Str } ;
-
-
+    RP = SS ;
 
 --2 Verb phrases
 
diff --git a/src/somali/LexiconSom.gf b/src/somali/LexiconSom.gf
index bf06d494..0a1f8b3a 100644
--- a/src/somali/LexiconSom.gf
+++ b/src/somali/LexiconSom.gf
@@ -52,7 +52,7 @@ lin bread_N = mkN "rooti" ; --masc/fem
 -- lin brown_A = mkA "" ;
 -- lin burn_V = mkV "" ;
 -- lin butter_N = mkN "" ;
--- lin buy_V2 = mkV2 "" ;
+lin buy_V2 = mkV2 "iibsa" ;
 
 ----
 -- C
@@ -361,7 +361,7 @@ lin speak_V2 = mkV2 "hadlo" ;
 -- lin tail_N = mkN "" ;
 -- lin talk_V3 = mkV3 "" ;
 lin teach_V2 = mkV2 "bar" ku ;
--- lin teacher_N = mkN "" ;
+lin teacher_N = mkN "macallin" ;
 -- lin television_N = mkN "" ;
 -- lin thick_A = mkA "" ;
 -- lin thin_A = mkA "" ;
diff --git a/src/somali/ParamSom.gf b/src/somali/ParamSom.gf
index 196dfbcc..a5cd1b11 100644
--- a/src/somali/ParamSom.gf
+++ b/src/somali/ParamSom.gf
@@ -213,6 +213,8 @@ param
     | VRel -- "som är/har/…" TODO is this used in other verbs?
     | VImp Number Polarity ;
 
+  PredType = NoPred | Copula | NoCopula ;
+
 oper
   if_then_Pol : Polarity -> Str -> Str -> Str = \p,t,f ->
     case p of {Pos => t ; Neg => f } ;
diff --git a/src/somali/PhraseSom.gf b/src/somali/PhraseSom.gf
index f05afbe7..c0c620b4 100644
--- a/src/somali/PhraseSom.gf
+++ b/src/somali/PhraseSom.gf
@@ -4,7 +4,7 @@ concrete PhraseSom of Phrase = CatSom ** open Prelude, ResSom in {
     PhrUtt pconj utt voc = {s = pconj.s ++ utt.s ++ voc.s} ;
 
     UttS s = s ;
-    -- UttQS qs = qs ;
+    UttQS qs = qs ;
 
     UttImpSg pol imp =
       let ma = case pol.p of { Pos => [] ; Neg => "ma" }
diff --git a/src/somali/QuestionSom.gf b/src/somali/QuestionSom.gf
index 5b63dedb..ca28087b 100644
--- a/src/somali/QuestionSom.gf
+++ b/src/somali/QuestionSom.gf
@@ -1,12 +1,12 @@
 concrete QuestionSom of Question = CatSom ** open
-  ResSom, (VS=VerbSom), (NS=NounSom), (AS=AdverbSom) in {
+  Prelude, ResSom, (VS=VerbSom), (NS=NounSom), (AS=AdverbSom) in {
 
 -- A question can be formed from a clause ('yes-no question') or
 -- with an interrogative.
 
   lin
   -- : Cl -> QCl ;
-  -- QuestCl cl = ;
+  QuestCl cl = {s = cl.s ! True} ;
 
   -- : IP -> VP -> QCl ;
   -- QuestVP ip vp = ;
diff --git a/src/somali/ResSom.gf b/src/somali/ResSom.gf
index d97e5e01..ff01bb46 100644
--- a/src/somali/ResSom.gf
+++ b/src/somali/ResSom.gf
@@ -19,6 +19,9 @@ oper
     isPoss : Bool -- to prevent impossible forms in ComplN2 with Ns that have short possessive, e.g. "father"
     } ;
 
+  cn2str : Number -> Case -> CNoun -> Str = \n,c,cn ->
+    cn.s ! Indef n ++ cn.mod ! n ! c ;
+
   PNoun : Type = {s : Str ; a : Agreement} ;
 
   mkPNoun : Str -> Agreement -> PNoun = \str,agr -> {s = str ; a = agr} ;
@@ -611,11 +614,11 @@ oper
     c2 : Preposition ; np : NounPhrase} ; -- So that adverbs can also contribute to preposition contraction
 
   Complement : Type = {
-    comp : Agreement => {p1,p2 : Str} -- Agreement for AP complements
+    comp : Agreement => {p1,p2 : Str} ; -- Agreement for AP complements
+    pred : PredType ; -- to choose right sentence type marker and copula
     } ;
 
   VerbPhrase : Type = Verb ** Complement ** {
-    isPred : Bool ; -- to choose right sentence type marker
     adv : Str ;
     c2, c3 : Preposition ; -- can combine together and with object pronoun(s?)
     obj2 : {s : Str ; a : AgreementPlus} ;
@@ -626,7 +629,7 @@ oper
 
   useV : Verb -> VerbPhrase = \v -> v ** {
     comp = \\_ => <[],[]> ;
-    isPred = False ;
+    pred = NoPred ;
     adv = [] ;
     c2,c3 = noPrep ;
     obj2 = {s = [] ; a = Unassigned} ;
@@ -643,15 +646,11 @@ oper
     } ;
 
   complSlash : VPSlash -> VerbPhrase = \vps ->  let np = vps.obj2 in vps ** {
-    comp = \\agr =>
-        case np.a of {
-          Unassigned => vps.comp ! agr ;
-          _ => {p1 = np.s ; -- if object is a noun, it will come before verb in the sentence.
-                            -- if object is a pronoun, np.s is empty.
-                p2 = compl np.a vps ++ vps.secObj}  -- object combines with the preposition of the verb.
-                                                    -- secObj in case there was a ditransitive verb.
-          }
-    } ;
+    comp = \\agr => let cmp = vps.comp ! agr in
+      {p1 = np.s ++ cmp.p1 ; -- if object is a noun, it will come before verb in the sentence.
+                             -- if object is a pronoun, np.s is empty.
+       p2 = cmp.p2 ++ compl np.a vps ++ vps.secObj} -- object combines with the preposition of the verb.
+    } ;                                             -- secObj in case there was a ditransitive verb.
 
   compl : AgreementPlus -> VerbPhrase -> Str = \a,vp ->
     let agr = case a of {IsPron x => x ; _ => Pl3} ;
@@ -686,7 +685,7 @@ oper
 
     } ;
 
-  insertAdv : Adverb -> VerbPhrase -> VerbPhrase = \adv,vp ->
+  insertAdv : VerbPhrase -> Adverb -> VerbPhrase = \vp,adv ->
     case adv.c2 of {
       noPrep => vp ** {adv = adv.s} ; -- The adverb is not formed with PrepNP
       prep => case <vp.c2,vp.obj2.a,vp.c3> of {
@@ -698,7 +697,8 @@ oper
       } ;
 --------------------------------------------------------------------------------
 -- Sentences etc.
-  Clause : Type = {s : Tense => Anteriority => Polarity => Str} ;
+  Clause : Type = {s : Bool {-is question-} => Tense => Anteriority => Polarity => Str} ;
+  QClause : Type = {s : Tense => Anteriority => Polarity => Str} ;
   RClause,
   ClSlash,
   Sentence : Type = SS ; ---- TODO
@@ -746,6 +746,6 @@ oper
 -- linrefs
 
 oper
-  linVP : VerbPhrase -> Str = \vp -> vp.s ! VInf ; ----
-  linCN : CNoun -> Str = \cn -> cn.s ! NomSg ;
+  linVP : VerbPhrase -> Str = \vp -> let obj = vp.comp ! Sg3 Masc in obj.p1 ++ obj.p2 ++ vp.s ! VInf ; ----
+  linCN : CNoun -> Str = \cn -> cn.s ! NomSg ++ cn.mod ! Sg ! Abs ;
 }
diff --git a/src/somali/SentenceSom.gf b/src/somali/SentenceSom.gf
index 406d718c..9308d7ed 100644
--- a/src/somali/SentenceSom.gf
+++ b/src/somali/SentenceSom.gf
@@ -13,14 +13,19 @@ lin
                 passive => complSlash (insertComp vps np) ;
                 _ => complSlash vps } ;
         subj = case vps.c2 of {passive => impersNP ; _ => np} ;
-    in { s = \\t,a,p =>
-       let pred : {fin : Str ; inf : Str} = vf t a p subj.a vp ;
+    in { s = \\isQ,t,a,p =>
+       let predRaw : {fin : Str ; inf : Str} = vf t a p subj.a vp ;
+           pred : {fin : Str ; inf : Str} = case vp.pred of {
+              NoCopula => {fin,inf = []} ;
+              _        => predRaw
+           } ;
            subjnoun : Str = if_then_Str np.isPron [] (subj.s ! Nom) ;
            subjpron : Str = if_then_Str np.isPron (subj.s ! Nom) [] ;
            obj  : {p1,p2 : Str} = vp.comp ! subj.a ;
            stm : Str =
-            case <p,vp.isPred,subj.a> of {
-                 <Pos,True,Sg3 _|Impers> => "waa" ;
+            case <isQ,p,vp.pred,subj.a> of {
+                 <True,_,_,_> => "ma" ;
+                 <_,Pos,Copula|NoCopula,Sg3 _|Impers> => "waa" ;
                 -- _                => stmarker ! np.a ! b } -- marker+pronoun contract
                  _ => case <np.isPron,p> of {
                         <True,Pos> => "waa" ++ subjpron ; -- to force some string from NP to show in the tree
@@ -74,14 +79,15 @@ lin
 
 -}
   -- : Temp -> Pol -> Cl -> S ;
-  UseCl t p cl = { s = t.s ++ p.s ++ cl.s ! t.t ! t.a ! p.p } ;
+  UseCl t p cl = {s = t.s ++ p.s ++ cl.s ! False ! t.t ! t.a ! p.p} ;
+
+  -- : Temp -> Pol -> QCl -> QS ;
+  UseQCl t p cl = {s = t.s ++ p.s ++ cl.s ! t.t ! t.a ! p.p} ;
+
 {-
   -- : Temp -> Pol -> RCl -> RS ;
   UseRCl t p cl = { s = t.s ++ p.s ++ cl.s ! t.t ! t.a ! p.p } ;
 
-  -- : Temp -> Pol -> QCl -> QS ;
-  UseQCl t p cl = { s = t.s ++ p.s ++ cl.s ! t.t ! t.a ! p.p } ;
-
 -- An adverb can be added to the beginning of a sentence, either with comma ("externally")
 -- or without:
 
diff --git a/src/somali/VerbSom.gf b/src/somali/VerbSom.gf
index 8ac8e54b..29baad2d 100644
--- a/src/somali/VerbSom.gf
+++ b/src/somali/VerbSom.gf
@@ -9,7 +9,7 @@ lin
   UseV = ResSom.useV ;
 
   --  : V2 -> VP ; -- be loved
-  PassV2 = ResSom.passV2 ; 
+  PassV2 = ResSom.passV2 ;
 {-
   -- : VV  -> VP -> VP ;
   ComplVV vv vp =  ;
@@ -74,16 +74,13 @@ lin
   ReflVP vps = ;
 -}
   -- : Comp -> VP ;
-  UseComp comp = UseCopula ** comp ** {
-    isPred = True
-    } ;
+  UseComp comp = UseCopula ** comp ;
 
   -- : VP -> Adv -> VP ;  -- sleep here
-  AdvVP vp adv = insertAdv adv vp ; ---- TODO: how about combining adverbs?
-
+  AdvVP = insertAdv ;
 
   -- : VPSlash -> Adv -> VPSlash ;  -- use (it) here
-  AdvVPSlash vps adv = insertAdv adv vps ;
+  AdvVPSlash = insertAdv ;
 
 {-
   -- : VP -> Adv -> VP ;  -- sleep , even though ...
@@ -117,18 +114,29 @@ lin
   -- : AP  -> Comp ;
   CompAP ap = {
     comp = \\a => <[], ap.s ! AF (getNum a) Abs> ;
+    pred = Copula ;
     } ;
-{-
+
   -- : CN  -> Comp ;
-  CompCN cn = { } ;
+  CompCN cn = {
+    comp = \\a => <[], cn2str Sg Abs cn> ;
+    pred = NoCopula ;
+    } ;
 
   --  NP  -> Comp ;
-  CompNP np = {  } ;
+  CompNP np = {
+    comp = \\a => <[], np.s ! Abs> ;
+    pred = NoCopula ;
+    } ;
 
   -- : Adv  -> Comp ;
-  CompAdv adv = {  } ;
+  CompAdv adv = {
+    comp = \\a =>
+      <if_then_Str adv.np.isPron [] (adv.np.s ! Abs)
+      , adv.s ++ prepCombTable ! adv.np.a ! Single adv.c2> ;
+    pred = Copula ;
+    } ;
 
--}
   -- : VP -- Copula alone;
   UseCopula = useV copula ;