diff --git a/src/basque/AditzTrinkoak.gf b/src/basque/AditzTrinkoak.gf
index 7363973f..ad878a0d 100644
--- a/src/basque/AditzTrinkoak.gf
+++ b/src/basque/AditzTrinkoak.gf
@@ -333,9 +333,9 @@ oper
                      Hauek => mkVForms "zeuden" } ;
 	           _ =>  table {
                      Ni => mkVForms "nago" ; 
-                     Hi _ => mkVForms "hago" ; 
+                     Hi _ => mkVForms "hago" "hagoe" ; 
                      Zu => mkVForms "zaude" ; 
-                     Hau => mkVForms "dago" ; 
+                     Hau => mkVForms "dago" "dagoe" ; 
                      Gu => mkVForms "gaude" ; 
                      Zuek => mkVForms "zaudete" ; 
                      Hauek => mkVForms "daude" }
diff --git a/src/basque/AdjectiveEus.gf b/src/basque/AdjectiveEus.gf
index 82ebd1f1..d70121b6 100644
--- a/src/basque/AdjectiveEus.gf
+++ b/src/basque/AdjectiveEus.gf
@@ -29,8 +29,8 @@ concrete AdjectiveEus of Adjective = CatEus ** open ResEus, Prelude in {
                  neureBuru : NounPhrase = empty_NP ** 
                   { s = \\cas => neure ++ "buru" 
                               ++ artDef ! getNum agr ! cas ! FinalVow ;
-                    agr = agr } -- neure buruekin eskondua naiz / 
-                                -- geure buruekin eskonduak gara
+                    agr = agr } -- neure buruekin ezkondua naiz / 
+                                -- geure buruekin ezkonduak gara
              in applyPost a2.compl neureBuru ++ a2.s ! AF Posit ; 
     typ  = Bare } ;
 
@@ -59,7 +59,10 @@ concrete AdjectiveEus of Adjective = CatEus ** open ResEus, Prelude in {
 -- phrases, although the semantics is only clear for some adjectives.
  
   -- : AP -> SC -> AP ;  -- good that she is here
-  SentAP  ap sc = ap ; --TODO
+  SentAP  ap sc = ap ** { 
+    s = \\agr => sc.s ++ ap.s ! agr ;
+    typ = Bare 
+  } ; 
 
 -- An adjectival phrase can be modified by an *adadjective*, such as "very".
 
@@ -72,7 +75,9 @@ concrete AdjectiveEus of Adjective = CatEus ** open ResEus, Prelude in {
 -- It can also be postmodified by an adverb, typically a prepositional phrase.
 
 -- : AP -> Adv -> AP ; -- warm by nature
-  AdvAP  ap adv = ap ; --TODO
+  AdvAP  ap adv = ap **
+   { s = \\agr => ap.s ! agr ++ adv.s ;
+     typ = Bare } ;
  
 
 
diff --git a/src/basque/IdiomEus.gf b/src/basque/IdiomEus.gf
index f9cac2da..032b03cc 100644
--- a/src/basque/IdiomEus.gf
+++ b/src/basque/IdiomEus.gf
@@ -7,10 +7,13 @@ concrete IdiomEus of Idiom = CatEus ** open Prelude, ResEus in {
 -- often different even in closely related languages.
 
   lin
-{-
-    ImpersCl  : VP -> Cl ;        -- it is hot
-    GenericCl : VP -> Cl ;        -- one sleeps
 
+  -- : VP -> Cl ;        -- it is hot
+  ImpersCl = clFromVP empty_NP ;
+
+  -- : VP -> Cl ;        -- one sleeps
+  GenericCl = clFromVP empty_NP ;
+{-
     CleftNP   : NP  -> RS -> Cl ; -- it is I who did it
     CleftAdv  : Adv -> S  -> Cl ; -- it is here she slept
 
diff --git a/src/basque/ResEus.gf b/src/basque/ResEus.gf
index 4f04c351..561faf22 100644
--- a/src/basque/ResEus.gf
+++ b/src/basque/ResEus.gf
@@ -372,6 +372,7 @@ oper
   --to be used in linref, PhraseEus ... anything where a VP is turned into string!
   linVP : VerbPhrase -> Str = linVPTense Pres Pres ;
 
+ -- TODO: fix trinkoak
   linVPTense : Tense -> Tense -> VerbPhrase -> Str = 
    \tnsPrc,tnsAux,vp ->
    let prc = case vp.val of {