diff --git a/lib/resource/abstract/Rules.gf b/lib/resource/abstract/Rules.gf
index 716109029..c108c70e2 100644
--- a/lib/resource/abstract/Rules.gf
+++ b/lib/resource/abstract/Rules.gf
@@ -212,8 +212,6 @@ fun
   ExistCN    : CN -> Cl ;                       -- "there is a bar"
   ExistNumCN : Num -> CN -> Cl ;                -- "there are (86) bars"
 
---- The type signatures of these ones should be changed from VP to VPI.
-
-  OneVP        : VP -> Cl ;                     -- "one walks"
+  OneNP      : NP ;                             -- "one (walks)"
 
 } ;
diff --git a/lib/resource/english/BasicEng.gf b/lib/resource/english/BasicEng.gf
index f55081b18..cb5301924 100644
--- a/lib/resource/english/BasicEng.gf
+++ b/lib/resource/english/BasicEng.gf
@@ -1,8 +1,11 @@
 --# -path=.:../abstract:../../prelude
+--# -val
 
 concrete BasicEng of Basic = CategoriesEng ** open NewParadigmsEng in {
 
-flags startcat=Phr ; lexer=textlit ; parser=chart ; unlexer=text ;
+flags 
+  startcat=Phr ; lexer=textlit ; unlexer=text ;
+  optimize=all ;
 
 lin
   airplane_N = regN "airplane" ;
diff --git a/lib/resource/english/ClauseEng.gf b/lib/resource/english/ClauseEng.gf
index e86b76f3d..0eb3faa26 100644
--- a/lib/resource/english/ClauseEng.gf
+++ b/lib/resource/english/ClauseEng.gf
@@ -1,64 +1,65 @@
 --# -path=.:../abstract:../../prelude
+--# -opt
 
 concrete ClauseEng of Clause = CategoriesEng ** 
   open Prelude, SyntaxEng in {
 
-  lin
-  SPredV np v = predVerbGroupClause np (predVerb v) ;
-  SPredPassV np v = predVerbGroupClause np (passVerb v) ;
-  SPredV2 np v x = predVerbGroupClause np (complTransVerb v x) ;
-  SPredReflV2 np v = predVerbGroupClause np (reflTransVerb v) ;
-  SPredVS np v x = predVerbGroupClause np (complSentVerb v x) ;
-  SPredVV np v x = predVerbGroupClause np (complVerbVerb v x) ;
-  SPredVQ np v x = predVerbGroupClause np (complQuestVerb v x) ;
-  SPredVA np v x = predVerbGroupClause np (complAdjVerb v x) ;
-  SPredV2A np v x y = predVerbGroupClause np (complDitransAdjVerb v x y) ;
-  SPredSubjV2V np v x y = predVerbGroupClause np (complDitransVerbVerb
-  False v x y) ;
-  SPredObjV2V np v x y = predVerbGroupClause np (complDitransVerbVerb
-  True v x y) ;
-  SPredV2S np v x y = predVerbGroupClause np (complDitransSentVerb v x y) ;
-  SPredV2Q np v x y = predVerbGroupClause np (complDitransQuestVerb v x y) ;
+  flags optimize=all ;
 
-  SPredAP np v = predBeGroup np (\\_ => v.s ! AAdj) ;
---  SPredAP np v = predVerbGroupClause np (predAdjective v) ;
-  SPredSuperl np a = predVerbGroupClause np (predAdjective (superlAdjPhrase a)) ;
-  SPredCN np v = predVerbGroupClause np (predCommNoun v) ;
-  SPredNP np v = predVerbGroupClause np (predNounPhrase v) ;
-  SPredPP np v = predVerbGroupClause np (predAdverb v) ;
-  SPredAV np v x = predVerbGroupClause np (complVerbAdj v x) ;
-  SPredObjA2V np v x y = predVerbGroupClause np (complVerbAdj2 True v x y) ;
+  lin
+  SPredV np v = predVerbClause np v (complVerb v) ;
+  SPredPassV np v = predBeGroup np (passVerb v) ;
+  SPredV2 np v x = predVerbClause np v (complTransVerb v x) ;
+  SPredReflV2 np v = predVerbClause np v (reflTransVerb v) ;
+  SPredVS np v x = predVerbClause np v (complSentVerb v x) ;
+  SPredVV np v x = predVerbClause np v (complVerbVerb v x) ;
+  SPredVQ np v x = predVerbClause np v (complQuestVerb v x) ;
+  SPredVA np v x = predVerbClause np v (complAdjVerb v x) ;
+  SPredV2A np v x y = predVerbClause np v (complDitransAdjVerb v x y) ;
+  SPredSubjV2V np v x y = predVerbClause np v (complDitransVerbVerb False v x y) ;
+  SPredObjV2V np v x y = predVerbClause np v (complDitransVerbVerb True v x y) ;
+  SPredV2S np v x y = predVerbClause np v (complDitransSentVerb v x y) ;
+  SPredV2Q np v x y = predVerbClause np v (complDitransQuestVerb v x y) ;
+
+  SPredAP np v = predBeGroup np (complAdjective v) ;
+  SPredSuperl np a = predBeGroup np (complAdjective (superlAdjPhrase a)) ;
+  SPredCN np v = predBeGroup np (complCommNoun v) ;
+  SPredNP np v = predBeGroup np (complNounPhrase v) ;
+  SPredPP np v = predBeGroup np (complAdverb v) ;
+
+  SPredAV np v x = predBeGroup np (complVerbAdj v x) ;
+  SPredObjA2V np v x y = predBeGroup np (complVerbAdj2 True v x y) ;
 
   SPredProgVP = progressiveClause ;
 
-  QPredV np v = intVerbPhrase np (predVerb v) ;
-  QPredPassV np v = intVerbPhrase np (passVerb v) ;
-  QPredV2 np v x = intVerbPhrase np (complTransVerb v x) ;
-  QPredReflV2 np v = intVerbPhrase np (reflTransVerb v) ;
-  QPredVS np v x = intVerbPhrase np (complSentVerb v x) ;
-  QPredVV np v x = intVerbPhrase np (complVerbVerb v x) ;
-  QPredVQ np v x = intVerbPhrase np (complQuestVerb v x) ;
-  QPredVA np v x = intVerbPhrase np (complAdjVerb v x) ;
-  QPredV2A np v x y = intVerbPhrase np (complDitransAdjVerb v x y) ;
-  QPredSubjV2V np v x y = intVerbPhrase np (complDitransVerbVerb
+  QPredV np v = intVerbClause np v (complVerb v) ;
+  QPredPassV np v = predBeGroupQ np (passVerb v) ;
+  QPredV2 np v x = intVerbClause np v (complTransVerb v x) ;
+  QPredReflV2 np v = intVerbClause np v (reflTransVerb v) ;
+  QPredVS np v x = intVerbClause np v (complSentVerb v x) ;
+  QPredVV np v x = intVerbClause np v (complVerbVerb v x) ;
+  QPredVQ np v x = intVerbClause np v (complQuestVerb v x) ;
+  QPredVA np v x = intVerbClause np v (complAdjVerb v x) ;
+  QPredV2A np v x y = intVerbClause np v (complDitransAdjVerb v x y) ;
+  QPredSubjV2V np v x y = intVerbClause np v (complDitransVerbVerb
   False v x y) ;
-  QPredObjV2V np v x y = intVerbPhrase np (complDitransVerbVerb
+  QPredObjV2V np v x y = intVerbClause np v (complDitransVerbVerb
   True v x y) ;
-  QPredV2S np v x y = intVerbPhrase np (complDitransSentVerb v x y) ;
-  QPredV2Q np v x y = intVerbPhrase np (complDitransQuestVerb v x y) ;
+  QPredV2S np v x y = intVerbClause np v (complDitransSentVerb v x y) ;
+  QPredV2Q np v x y = intVerbClause np v (complDitransQuestVerb v x y) ;
 
-  QPredAP np v = intVerbPhrase np (predAdjective v) ;
-  QPredSuperl np a = intVerbPhrase np (predAdjective (superlAdjPhrase a)) ;
-  QPredCN np v = intVerbPhrase np (predCommNoun v) ;
-  QPredNP np v = intVerbPhrase np (predNounPhrase v) ;
-  QPredPP np v = intVerbPhrase np (predAdverb v) ;
-  QPredAV np v x = intVerbPhrase np (complVerbAdj v x) ;
-  QPredObjA2V np v x y = intVerbPhrase np (complVerbAdj2 True v x y) ;
+  QPredAP np v = predBeGroupQ np (complAdjective v) ;
+  QPredSuperl np a = predBeGroupQ np (complAdjective (superlAdjPhrase a)) ;
+  QPredCN np v = predBeGroupQ np (complCommNoun v) ;
+  QPredNP np v = predBeGroupQ np (complNounPhrase v) ;
+  QPredPP np v = predBeGroupQ np (complAdverb v) ;
+  QPredAV np v x = predBeGroupQ np (complVerbAdj v x) ;
+  QPredObjA2V np v x y = predBeGroupQ np (complVerbAdj2 True v x y) ;
 
-  IPredV a v = predVerbGroupI True a (predVerb v) ;
-  IPredV2 a v x = predVerbGroupI True a (complTransVerb v x) ;
-----  SPredAP np v = predBeGroup np (\\_ => v.s ! AAdj) ;
-  IPredAP a v = predVerbGroupI True a (predAdjective v) ;
+  IPredV a v = predVerbI True a v (complVerb v) ;
+  IPredV2 a v x = predVerbI True a v (complTransVerb v x) ;
+
+  IPredAP a v = predBeGroupI True a (complAdjective v) ;
 
 {-
 -- Use VPs
diff --git a/lib/resource/english/RulesEng.gf b/lib/resource/english/RulesEng.gf
index 4c5161de5..2696d390d 100644
--- a/lib/resource/english/RulesEng.gf
+++ b/lib/resource/english/RulesEng.gf
@@ -69,7 +69,7 @@ lin
 -- verbs and verb prases
 
   PredAS = predAdjSent ;
-  PredV0 rain = predVerbGroupClause (pronNounPhrase pronIt) (predVerb rain) ;
+  PredV0 rain = predVerbClause (pronNounPhrase pronIt) rain (complVerb rain) ;
 
 -- Partial saturation.
 
@@ -186,16 +186,17 @@ lin
 -----------------------
 -- special constructions
 
-  OneVP = predVerbGroupClause (nameNounPhrase (nameReg "one" human)) ;
-----  ThereNP = thereIs ;
+  OneNP = nameNounPhrase (nameReg "one" human) ;
 
-  ExistCN A = predVerbGroupClause 
+  ExistCN A = predVerbClause 
                 (nameNounPhrase (nameReg "there" Neutr))
+                (mkTransVerbDir verbBe)
                 (complTransVerb (mkTransVerbDir verbBe) 
                    (indefNounPhrase singular A)) ;
   ExistNumCN nu A = 
-              predVerbGroupClause 
+              predVerbClause 
                 (nameNounPhrasePl (nameReg "there" Neutr))
+                (mkTransVerbDir verbBe)
                 (complTransVerb (mkTransVerbDir verbBe) 
                    (indefNounPhraseNum plural nu A)) ;
 
diff --git a/lib/resource/english/SyntaxEng.gf b/lib/resource/english/SyntaxEng.gf
index e58d03f3f..5231599af 100644
--- a/lib/resource/english/SyntaxEng.gf
+++ b/lib/resource/english/SyntaxEng.gf
@@ -327,8 +327,8 @@ oper
 
   SForm = 
      VFinite  Tense Anteriority
-   | VInfinit Anteriority
-   | VPresPart
+ ---  | VInfinit Anteriority
+ ---  | VPresPart
    ;
 
 -- This is how the syntactic verb phrase forms are realized as
@@ -336,6 +336,7 @@ oper
 
   oper
 
+{- --vg
   verbSForm : Bool -> Verb -> Bool -> SForm -> Agr -> {fin,inf : Str} = 
     \isAux,verb,b,sf,agr ->
     let 
@@ -380,7 +381,8 @@ oper
       VInfinit  Anter => parts neg (have ++ liked) ;
       VPresPart  => parts neg liking
       } ;
- 
+ -}
+
   auxHave : Bool -> Tense -> Agr -> Str = \b,t,a -> 
     let has = 
       case t of {
@@ -422,6 +424,7 @@ oper
 
   negAux : Bool -> Str -> Str = \b,is -> if_then_Str b is (is + "n't") ;
 
+{- --vg
   useVerbGen : Bool -> Verb -> (Agr => Str) -> VerbGroup = \isAux,verb,arg -> 
     let 
       go = verbSForm isAux verb 
@@ -436,6 +439,7 @@ oper
 
   beGroup : (Agr => Str) -> VerbGroup = 
     useVerbAux (verbBe ** {s1 = []}) ; 
+--vg -}
 
 ---- TODO: the contracted forms.
 
@@ -466,45 +470,49 @@ oper
 
 -- All negative verb phrase behave as auxiliary ones in questions.
 
-  predVerbGroup : Bool -> Anteriority -> VerbGroup -> VerbPhrase = \b,ant,vg -> {
-    s  = table {
-           VIInfinit => \\a => vg.s2 ! b ! VInfinit ant ! a ; -- s1 is just neg for inf
-           VIPresPart => \\a => vg.s2 ! b ! VPresPart ! a
+  predVerbI : Bool -> {s : Str ; a : Anteriority} -> Verb -> Complement -> VerbPhrase = 
+    \b,ant,verb,comp -> 
+    let
+      ans = ant.s ; --- just to avoid ? in parsing
+      inf = case ant.a of {
+        Simul => verb.s ! InfImp ;
+        Anter => "have" ++ verb.s ! PPart 
+        }
+      in
+      {s = table {
+           VIInfinit  => \\a => ans ++ inf ++ verb.s1 ++ comp ! a ;
+           VIPresPart => \\a => ans ++ verb.s ! PresPart ++ comp ! a
            } ;
-    s1 = if_then_Str b [] "not"
-    } ;
-
-  predVerbGroupI : Bool -> {s : Str ; a : Anteriority} -> VerbGroup -> VerbPhrase = 
-    \b,ant,vg -> 
-    let vp = predVerbGroup b ant.a vg in
-    {s = \\f,a => ant.s ++ vp.s ! f ! a ;
-     s1 = vp.s1
-    } ;
+       s1 = if_then_Str b [] "not"
+      } ;
 
 -- A simple verb can be made into a verb phrase with an empty complement.
 -- There are two versions, depending on if we want to negate the verb.
 -- N.B. negation is *not* a function applicable to a verb phrase, since
 -- double negations with "don't" are not grammatical.
 
-  predVerb : Verb -> VerbGroup = \walk ->
-    useVerb walk (\\_ => []) ;
+  complVerb : Verb -> Complement = \walk ->
+    \\_ => walk.s1 ;
+
+  mkComp : Verb -> Complement -> Complement = \verb,comp ->
+    \\a => verb.s1 ++ comp ! a ;
 
 -- Verb phrases can also be formed from adjectives ("is old"),
 -- common nouns ("is a man"), and noun phrases ("ist John").
 -- The third rule is overgenerating: "is every man" has to be ruled out
 -- on semantic grounds.
 
-  predAdjective : Adjective -> VerbGroup = \old ->
-    beGroup (\\_ => old.s ! AAdj) ;
+  complAdjective : Adjective -> Complement = \old ->
+    (\\_ => old.s ! AAdj) ;
 
-  predCommNoun : CommNoun -> VerbGroup = \man ->
-    beGroup (\\a => indefNoun (fromAgr a).n man) ;
+  complCommNoun : CommNoun -> Complement = \man ->
+    (\\a => indefNoun (fromAgr a).n man) ;
 
-  predNounPhrase : NounPhrase -> VerbGroup = \john ->
-    beGroup (\\_ => john.s ! NomP) ;
+  complNounPhrase : NounPhrase -> Complement = \john ->
+    (\\_ => john.s ! NomP) ;
 
-  predAdverb : PrepPhrase -> VerbGroup = \elsewhere ->
-    beGroup (\\_ => elsewhere.s) ;
+  complAdverb : PrepPhrase -> Complement = \elsewhere ->
+    (\\_ => elsewhere.s) ;
 
 {- --- compiles to 25k lines gfr 3/2/2005
   predAdjSent : Adjective -> Sentence -> Clause = \bra,hansover ->
@@ -517,7 +525,21 @@ oper
   predAdjSent : Adjective -> Sentence -> Clause = \bra,hansover ->
     predBeGroup (pronNounPhrase pronIt) (\\n => bra.s ! AAdj ++ "that" ++ hansover.s) ;
 
-  predBeGroup : NounPhrase -> (Agr => Str) -> Clause = \itt,goo ->
+  Complement = Agr => Str ;
+
+  predBeGroupI : Bool -> {s : Str ; a : Anteriority} -> Complement -> VerbPhrase = 
+    \b,ant,vg ->
+    {s = table {
+       VIInfinit => \\a => ant.s ++ case ant.a of {
+         Simul => "be" ++ vg ! a ;
+         Anter => "have" ++ "been" ++ vg ! a
+         } ;
+       VIPresPart => \\a => "being" ++ vg ! a
+       } ; 
+    s1 = if_then_Str b [] "not" ;
+    } ;
+
+  predBeGroup : NounPhrase -> Complement -> Clause = \itt,goo ->
     let
       it = itt.s ! NomP ;
       good = goo ! itt.a ;
@@ -551,10 +573,11 @@ oper
         VFinite t Anter => case o of {
           Dir => it ++ has b t ++ beengood t ;
           Inv => has b t ++ it ++ beengood t
-          } ;
-        VInfinit Simul => it ++ begood Future ;
-        VInfinit Anter => it ++ beengood Future ;
-        VPresPart => it ++ "being" ++ good
+          } 
+--- ;
+---        VInfinit Simul => it ++ begood Future ;
+---        VInfinit Anter => it ++ beengood Future ;
+---        VPresPart => it ++ "being" ++ good
         }
      } ;
 
@@ -578,8 +601,8 @@ oper
 -- ("I switch on the radio" / "I switch the radio on").
 ---- TODO: do this again.
 
-  complTransVerb : TransVerb -> NounPhrase -> VerbGroup = \switch,radio ->
-    useVerb switch (\\_ => switch.s3 ++ radio.s ! AccP) ;
+  complTransVerb : TransVerb -> NounPhrase -> Complement = \switch,radio ->
+    mkComp switch (\\_ => switch.s3 ++ radio.s ! AccP) ;
 
 -- Verbs that take direct object and a  particle:
 
@@ -601,14 +624,14 @@ oper
 -- Therefore, the function can also be used for "he is swum", etc.
 -- The syntax is the same as for adjectival predication.
 
-  passVerb : Verb -> VerbGroup = \love ->
-    predAdjective (adj2adjPhrase (regAdjective (love.s ! PPart))) ;
+  passVerb : Verb -> Complement = \love ->
+    complAdjective (adj2adjPhrase (regAdjective (love.s ! PPart))) ;
 
 -- Transitive verbs can also be used reflexively.
 -- But to formalize this we must make verb phrases depend on a person parameter.
 
-  reflTransVerb : TransVerb -> VerbGroup = \love -> 
-    useVerb love (\\a => love.s1 ++ love.s3 ++ reflPron a) ; ----
+  reflTransVerb : TransVerb -> Complement = \love -> 
+    mkComp love (\\a => love.s1 ++ love.s3 ++ reflPron a) ; ----
 
 -- Transitive verbs can be used elliptically as verbs. The semantics
 -- is left to applications. The definition is trivial, due to record
@@ -634,14 +657,14 @@ oper
       } ;
 
   complDitransAdjVerb : 
-    TransVerb -> NounPhrase -> AdjPhrase -> VerbGroup = \gor,dig,sur ->
-      useVerb 
+    TransVerb -> NounPhrase -> AdjPhrase -> Complement = \gor,dig,sur ->
+      mkComp
         gor 
         (\\_ => gor.s1 ++ gor.s3 ++ dig.s ! AccP ++ sur.s ! AAdj) ;
 
   complAdjVerb : 
-    Verb -> AdjPhrase -> VerbGroup = \seut,sur ->
-      useVerb 
+    Verb -> AdjPhrase -> Complement = \seut,sur ->
+      mkComp 
         seut 
         (\\n => sur.s ! AAdj ++ seut.s1) ;
 
@@ -716,8 +739,6 @@ oper
     APl P3 => "themselves"
     } ;
 
-  progressiveVerbPhrase : VerbPhrase -> VerbGroup = \vp ->
-    beGroup (vp.s ! VIPresPart) ; 
 
   progressiveClause : NounPhrase -> VerbPhrase -> Clause = \np,vp ->
     predBeGroup np (vp.s ! VIPresPart) ; 
@@ -734,6 +755,64 @@ oper
 
   ---- compiles to 4k lines gfr. also relSlash, relVerbPhrase are bad
   oper
+  Verbal = VForm => Agr => Str ;
+
+  -- This applies to non-auxiliaries.
+
+  predVerbClause : NounPhrase -> Verb -> Complement -> Clause = \np,verb,comp -> 
+    let 
+      it  = np.s ! NomP ;
+      agr = np.a ; 
+      itgoes : Order -> Str -> Str -> Str = \o,x,y -> case o of {
+        Dir => it ++ x ++ y ;
+        Inv => x ++ it ++ y
+        } ;
+      goes : Tense -> Str = \t -> verb.s ! case <t,agr> of {
+         <Present,ASgP1>   => Indic P1 ;
+         <Present,ASgP3 _> => Indic P3 ;
+         <Present,_>       => Indic P2 ;
+         <Past,ASgP1>      => Pastt Pl ;
+         <Past,ASgP3 _>    => Pastt Sg ;
+         _       => Pastt Pl --- Future doesn't matter
+         } ;
+      off   = comp ! agr ;
+      go    = verb.s ! InfImp ++ off ;
+      gone  = verb.s ! PPart ++ off ;
+      going = verb.s ! PresPart ++ off ;
+      have = "have" ;
+      has  : Bool -> Tense -> Str = \b,t -> auxHave b t agr ;
+      does : Bool -> Tense -> Str = \b,t -> auxTense b t agr
+    in
+    {s = \\o,b,sf => 
+     let       
+       neg  = if_then_Str b [] "not" ;
+     in
+     case sf of {
+      VFinite Present Simul => case b of {
+        True  => case o of {
+          Dir => it ++ goes Present ++ off ;
+          Inv => does b Present ++ it ++ go
+          } ;
+        False => itgoes o (does b Present) go
+        } ;
+      VFinite Past Simul => case b of {
+        True  => case o of {
+          Dir => it ++ goes Past ++ off ;
+          Inv => does b Past ++ it ++ go
+          } ;
+        False => itgoes o (does b Past) go
+        } ;
+      VFinite t       Simul => itgoes o (does b t)    go ;
+      VFinite Present Anter => itgoes o (has b Present) gone ;
+      VFinite Past    Anter => itgoes o (has b Past)    gone ;
+      VFinite t Anter       => itgoes o (does b t)    (have ++ gone) 
+--- ;
+---      VInfinit  Simul       => it ++ neg ++           go ;
+---      VInfinit  Anter       => it ++ neg ++           (have ++ gone) ;
+---      VPresPart             => it ++ neg ++           going
+      }
+     } ;
+{- --vg
   predVerbGroupClause : NounPhrase -> VerbGroup -> Clause = 
     \yo,dosleep -> {
       s = \\o,b,c => 
@@ -755,7 +834,7 @@ oper
             }
         }
       } ;
-
+-- vg -}
 
 --3 Sentence-complement verbs
 --
@@ -766,20 +845,20 @@ oper
 -- To generate "says that John walks" / "doesn't say that John walks":
 ---- TODO: the alternative without "that"
 
-  complSentVerb : SentenceVerb -> Sentence -> VerbGroup = \say,johnruns ->
-    useVerb say (\\_ => "that" ++ johnruns.s) ;
+  complSentVerb : SentenceVerb -> Sentence -> Complement = \say,johnruns ->
+    mkComp say (\\_ => "that" ++ johnruns.s) ;
 
-  complQuestVerb : SentenceVerb -> QuestionSent -> VerbGroup = \se,omduler ->
-    useVerb se (\\_ => se.s1 ++ omduler.s ! IndirQ) ;
+  complQuestVerb : SentenceVerb -> QuestionSent -> Complement = \se,omduler ->
+    mkComp se (\\_ => se.s1 ++ omduler.s ! IndirQ) ;
 
-  complDitransSentVerb : TransVerb -> NounPhrase -> Sentence -> VerbGroup = 
+  complDitransSentVerb : TransVerb -> NounPhrase -> Sentence -> Complement = 
     \sa,honom,duler ->
-      useVerb sa 
+      mkComp sa 
         (\\_ => sa.s1 ++ sa.s3 ++ honom.s ! AccP ++ "that" ++ duler.s) ;
 
-  complDitransQuestVerb : TransVerb -> NounPhrase -> QuestionSent -> VerbGroup = 
+  complDitransQuestVerb : TransVerb -> NounPhrase -> QuestionSent -> Complement = 
     \sa,honom,omduler ->
-      useVerb sa 
+      mkComp sa 
         (\\_ => sa.s1 ++ sa.s3 ++ honom.s ! AccP ++ omduler.s ! IndirQ) ;
 
 
@@ -799,16 +878,16 @@ oper
 -- The contraction of "not" is not provided, since it would require changing
 -- the verb parameter type.
 
-  complVerbVerb : VerbVerb -> VerbPhrase -> VerbGroup = \try,run ->
+  complVerbVerb : VerbVerb -> VerbPhrase -> Complement = \try,run ->
     let
        taux  = try.isAux ;
        to    = if_then_Str taux [] "to" ;
        torun : Agr => Str = 
          \\a => run.s1 ++ to ++ run.s ! VIInfinit ! a  
     in
-      if_then_else VerbGroup taux 
-        (useVerb    try torun)
-        (useVerbAux try torun) ;
+----      if_then_else VerbGroup taux 
+----        (useVerbAux try torun)
+        (mkComp    try torun) ;
 
 -- The three most important example auxiliaries.
 
@@ -834,9 +913,9 @@ oper
   DitransVerbVerb = TransVerb ** {s4 : Str} ;
 
   complDitransVerbVerb : 
-    Bool -> DitransVerbVerb -> NounPhrase -> VerbPhrase -> VerbGroup = 
+    Bool -> DitransVerbVerb -> NounPhrase -> VerbPhrase -> Complement = 
      \obj,be,dig,simma ->
-      useVerb be 
+      mkComp be 
         (\\a => be.s1 ++ be.s3 ++ dig.s ! AccP ++ be.s3 ++ be.s4 ++
                 simma.s1 ++ -- negation
               if_then_Str obj 
@@ -851,17 +930,15 @@ oper
      s3 = hitta.s3
     } ;
 
-  complVerbAdj : Adjective -> VerbPhrase -> VerbGroup = \grei, simma ->
-    beGroup
+  complVerbAdj : Adjective -> VerbPhrase -> Complement = \grei, simma ->
       (\\a => 
               grei.s ! AAdj ++ simma.s1 ++
               "to" ++
               simma.s ! VIInfinit ! a) ;
 
   complVerbAdj2 : 
-    Bool -> AdjCompl -> NounPhrase -> VerbPhrase -> VerbGroup = 
+    Bool -> AdjCompl -> NounPhrase -> VerbPhrase -> Complement = 
       \obj,grei,dig,simma ->
-        beGroup
           (\\a =>
               grei.s ! AAdj ++ 
               grei.s2 ++ dig.s ! AccP ++
@@ -892,10 +969,10 @@ oper
 
   slashTransVerbCl : NounPhrase -> TransVerb -> ClauseSlashNounPhrase = 
     \you,lookat ->
+    let youlookat = (predVerbClause you lookat (complVerb lookat)).s in 
     {s = table {
-       DirQ   => \\b,f => (questVerbPhrase     you (predVerb
-    lookat)).s ! b ! f ! DirQ ;
-       IndirQ => (predVerbGroupClause you (predVerb lookat)).s ! Dir
+       DirQ   => youlookat ! Inv ;
+       IndirQ => youlookat ! Dir
        } ;
      s2 = lookat.s3
     } ;
@@ -927,11 +1004,11 @@ oper
   RelClause   : Type = {s : Bool => SForm => Agr => Str} ;
   RelSentence : Type = {s :                  Agr => Str} ;
 
+------ relg
   relVerbPhrase : RelPron -> VerbGroup -> RelClause = \who,walks ->
-    {s = \\b,sf,a => 
-      let wa = fromAgr a in
-      (predVerbGroupClause (relNounPhrase who wa.g wa.n) walks).s ! Dir
-    ! b ! sf
+    {s = \\b,sf,a => [] 
+----      let wa = fromAgr a in
+----      (predVerbGroupClause (relNounPhrase who wa.g wa.n) walks).s  ! Dir ! b ! sf
     } ;
 
 --- TODO: full tense variation in relative clauses.
@@ -1056,7 +1133,7 @@ oper
        IndirQ => cl.s ! Dir ! b ! c
        }
     } ;
-
+{- --vg
   questVerbPhrase : NounPhrase -> VerbGroup -> Question = 
     questVerbPhrase' False ;
 
@@ -1080,19 +1157,38 @@ oper
                 (predVerbGroupClause John walk).s ! Dir ! b ! cl
       }
     } ;
+  -- vg -}
 
 --3 Wh-questions
 --
 -- Wh-questions are of two kinds: ones that are like $NP - VP$ sentences,
 -- others that are line $S/NP - NP$ sentences.
 
+  intNounPhrase : IntPron -> NounPhrase = \who -> 
+    {s = who.s ; a = toAgr who.n P3 who.g} ;
+
+  predBeGroupQ : IntPron -> Complement -> Question = \who,old ->
+    let whoisold = predBeGroup (intNounPhrase who) old
+    in
+    {s = \\b,sf,_ => whoisold.s ! Dir ! b ! sf} ;
+
+{- --vg
   intVerbPhrase : IntPron -> VerbGroup -> Question = \who,walk ->
     let 
-      who : NounPhrase = {s = who.s ; a = toAgr who.n P3 who.g} ;
+      who : NounPhrase =  {s = who.s ; a = toAgr who.n P3 who.g} ;
       whowalks : Clause = predVerbGroupClause who walk
     in
     {s = \\b,sf,_ => whowalks.s ! Dir ! b ! sf} ;
 
+  --vg -}
+
+  intVerbClause : IntPron -> Verb -> Complement -> Question = \who,walk,here ->
+    let 
+      who : NounPhrase =  {s = who.s ; a = toAgr who.n P3 who.g} ;
+      whowalks : Clause = predVerbClause who walk here
+    in
+    {s = \\b,sf,_ => whowalks.s ! Dir ! b ! sf} ;
+
   intSlash : IntPron -> ClauseSlashNounPhrase -> Question = \who,yousee ->
     {s = \\b,cl,q =>
            let 
diff --git a/lib/resource/scandinavian/RulesScand.gf b/lib/resource/scandinavian/RulesScand.gf
index 6f7c68174..cdbda0ea1 100644
--- a/lib/resource/scandinavian/RulesScand.gf
+++ b/lib/resource/scandinavian/RulesScand.gf
@@ -99,7 +99,6 @@ lin
 --
 
   SlashV2 = slashTransVerb ;
-  OneVP = predVerbGroupClause npMan ;
 
   IdRP = identRelPron ;
   FunRP = funRelPron ;
@@ -172,7 +171,7 @@ lin
 -----------------------
 -- special constructions
 
-  OneVP = predVerbGroupClause npMan ;
+  OneNP = npMan ;
 
   ExistCN A = predVerbGroupClause npDet 
                 (complTransVerb (mkDirectVerb (deponentVerb verbFinnas)) 
diff --git a/src/GF/Canon/Share.hs b/src/GF/Canon/Share.hs
index 4e3c485a7..ff9be59b2 100644
--- a/src/GF/Canon/Share.hs
+++ b/src/GF/Canon/Share.hs
@@ -9,10 +9,10 @@
 -- > CVS $Author $
 -- > CVS $Revision $
 --
--- (Description of the module)
+-- Optimizations on GFC code: sharing, parametrization, value sets.
 -----------------------------------------------------------------------------
 
-module Share (shareModule, OptSpec, basicOpt, fullOpt, valOpt) where
+module Share (shareModule, OptSpec, shareOpt, paramOpt, valOpt, allOpt) where
 
 import AbsGFC
 import Ident
@@ -28,9 +28,10 @@ import qualified Modules as M
 type OptSpec = [Integer] ---
 doOptFactor opt = elem 2 opt
 doOptValues opt = elem 3 opt
-basicOpt = []
-fullOpt = [2]
+shareOpt = []
+paramOpt = [2]
 valOpt = [3]
+allOpt = [2,3]
 
 shareModule :: OptSpec -> (Ident, CanonModInfo) -> (Ident, CanonModInfo)
 shareModule opt (i,m) = case m of
@@ -38,13 +39,14 @@ shareModule opt (i,m) = case m of
     (i,M.ModMod (M.Module mt st fs me ops (mapTree (shareInfo opt) js)))
   _ -> (i,m)
 
-shareInfo opt (c, CncCat ty t m) = (c, CncCat ty (shareOpt opt t) m)
-shareInfo opt (c, CncFun k xs t m) = (c, CncFun k xs (shareOpt opt t) m)
+shareInfo opt (c, CncCat ty t m) = (c, CncCat ty (shareOptim opt t) m)
+shareInfo opt (c, CncFun k xs t m) = (c, CncFun k xs (shareOptim opt t) m)
 shareInfo _ i = i
 
 -- the function putting together optimizations
-shareOpt :: OptSpec -> Term -> Term
-shareOpt opt 
+shareOptim :: OptSpec -> Term -> Term
+shareOptim opt 
+  | doOptFactor opt && doOptValues opt = values . factor 0
   | doOptFactor opt = share . factor 0
   | doOptValues opt = values    
   | otherwise = share
@@ -133,5 +135,6 @@ replace old new trm = case trm of
 
 values :: Term -> Term
 values t = case t of
+  T ty [c] -> T ty [Cas p (values t) | Cas p t <- [c]] -- preserve parametrization
   T ty cs  -> V ty [values t | Cas _ t <- cs] -- assumes proper order
   _ -> C.composSafeOp values t
diff --git a/src/GF/Compile/Compile.hs b/src/GF/Compile/Compile.hs
index 2c8016a61..bfd8f64f2 100644
--- a/src/GF/Compile/Compile.hs
+++ b/src/GF/Compile/Compile.hs
@@ -9,7 +9,7 @@
 -- > CVS $Author $
 -- > CVS $Revision $
 --
--- (Description of the module)
+-- The top-level compilation chain from source file to gfc/gfr.
 -----------------------------------------------------------------------------
 
 module Compile where
@@ -276,12 +276,16 @@ generateModuleCode :: Options -> InitPath -> SourceModule -> IOE GFC.CanonModule
 generateModuleCode opts path minfo@(name,info) = do
   let pname = prefixPathName path (prt name)
   minfo0     <- ioeErr $ redModInfo minfo
+  let oopts = addOptions opts (iOpts (flagsModule minfo))
+      optim = maybe "share" id $ getOptVal oopts useOptimizer
   minfo'     <- return $ 
-    if optim 
-    then shareModule fullOpt minfo0   -- parametrization and sharing
-    else if values                    
-    then shareModule valOpt minfo0     -- tables as courses-of-values
-    else shareModule basicOpt minfo0  -- sharing only
+    case optim of
+      "parametrize" -> shareModule paramOpt minfo0  -- parametrization and sharing
+      "values"      -> shareModule valOpt minfo0    -- tables as courses-of-values
+      "share"       -> shareModule shareOpt minfo0  -- sharing of branches
+      "all"         -> shareModule allOpt minfo0    -- first parametrize then values
+      "none"        -> minfo0                       -- no optimization
+      _             -> shareModule shareOpt minfo0  -- sharing; default
 
   -- for resource, also emit gfr
   case info of
@@ -305,8 +309,6 @@ generateModuleCode opts path minfo@(name,info) = do
      _ -> True
    nomulti = not $ oElem makeMulti opts
    emit  = oElem emitCode opts && not (oElem notEmitCode opts)
-   optim = oElem optimizeCanon opts
-   values = oElem optimizeValues opts
 
 -- for old GF: sort into modules, write files, compile as usual
 
diff --git a/src/GF/Grammar/Lookup.hs b/src/GF/Grammar/Lookup.hs
index 9d5b5114b..1cfb63be6 100644
--- a/src/GF/Grammar/Lookup.hs
+++ b/src/GF/Grammar/Lookup.hs
@@ -9,7 +9,7 @@
 -- > CVS $Author $
 -- > CVS $Revision $
 --
--- (Description of the module)
+-- Lookup in source (concrete and resource) when compiling.
 -----------------------------------------------------------------------------
 
 module Lookup where
diff --git a/src/GF/Infra/Modules.hs b/src/GF/Infra/Modules.hs
index 3da4bca9f..2f14095a9 100644
--- a/src/GF/Infra/Modules.hs
+++ b/src/GF/Infra/Modules.hs
@@ -9,7 +9,7 @@
 -- > CVS $Author $
 -- > CVS $Revision $
 --
--- (Description of the module)
+-- Datastructures and functions for modules, common to GF and GFC.
 -----------------------------------------------------------------------------
 
 module Modules where
@@ -91,6 +91,11 @@ addOpenQualif :: i -> i -> Module i f t -> Module i f t
 addOpenQualif i j (Module mt ms fs me ops js) = 
   Module mt ms fs me (oQualif i j : ops) js
 
+flagsModule :: (i,ModInfo i f a) -> [f]
+flagsModule (_,mi) = case mi of
+  ModMod m -> flags m
+  _ -> []
+
 allFlags :: MGrammar i f a -> [f]
 allFlags gr = concat $ map flags $ reverse [m | (_, ModMod m) <- modules gr]
 
diff --git a/src/GF/Infra/Option.hs b/src/GF/Infra/Option.hs
index 4aab45d4d..4d3cf5393 100644
--- a/src/GF/Infra/Option.hs
+++ b/src/GF/Infra/Option.hs
@@ -9,7 +9,7 @@
 -- > CVS $Author $
 -- > CVS $Revision $
 --
--- (Description of the module)
+-- Options and flags used in GF shell commands and files.
 -----------------------------------------------------------------------------
 
 module Option where
@@ -224,6 +224,7 @@ useAbsName     = aOpt "abs"
 useCncName     = aOpt "cnc"
 useResName     = aOpt "res"
 useFile        = aOpt "file"
+useOptimizer   = aOpt "optimize"
 
 markLin        = aOpt "mark"
 markOptXML     = oArg "xml"
diff --git a/src/GF/Shell/ShellCommands.hs b/src/GF/Shell/ShellCommands.hs
index 58fc527bf..be1137440 100644
--- a/src/GF/Shell/ShellCommands.hs
+++ b/src/GF/Shell/ShellCommands.hs
@@ -9,7 +9,7 @@
 -- > CVS $Author $
 -- > CVS $Revision $
 --
--- (Description of the module)
+-- The datatype of shell commands and the list of their options.
 -----------------------------------------------------------------------------
 
 module ShellCommands where
@@ -130,6 +130,7 @@ testValidFlag st co f x = case f of
   "transform" -> testInc customTermCommand
   "filter"  -> testInc customStringCommand
   "length"  -> testN
+  "optimize"-> testIn $ words "parametrize values all share none"
   _ -> return ()
  where
    testInc ci = 
@@ -148,8 +149,8 @@ testValidFlag st co f x = case f of
 
 optionsOfCommand :: Command -> ([String],[String])
 optionsOfCommand co = case co of
-  CImport _ -> both "old v s opt val src retain nocf nocheckcirc cflexer noemit o"
-                    "abs cnc res path"
+  CImport _ -> both "old v s src retain nocf nocheckcirc cflexer noemit o"
+                    "abs cnc res path optimize"
   CRemoveLanguage _ -> none
   CEmptyState -> none
   CStripState -> none
diff --git a/src/HelpFile b/src/HelpFile
index af09b5e01..5581039f2 100644
--- a/src/HelpFile
+++ b/src/HelpFile
@@ -25,7 +25,6 @@ i,  import: i File
       -old          old: parse in GF<2.0 format (not necessary)
       -v            verbose: give lots of messages 
       -s            silent: don't give error messages
-      -opt          perform branch-sharing optimization
       -src          source: ignore precompiled gfc and gfr files
       -retain       retain operations: read resource modules (needed in comm cc) 
       -nocf         don't build context-free grammar (thus no parser)
@@ -38,6 +37,7 @@ i,  import: i File
       -cnc          set the name used for concrete syntax (with -old option)
       -res          set the name used for resource (with -old option)
       -path         use the (colon-separated) search path to find modules
+      -optimize     select an optimization to override file-defined flags
   examples:
       i English.gf                      -- ordinary import of Concrete
       i -retain german/ParadigmsGer.gf  -- import of Resource to test
@@ -427,6 +427,15 @@ q, quit: q
 -number, the maximum number of generated items in a list. 
        The default is unlimited.
 
+-optimize, optimization on generated code.
+       The default is share.
+    -optimize=share        share common branches in tables
+    -optimize=parametrize  first try parametrize then do share with the rest
+    -optimize=values       represent tables as courses-of-values
+    -optimize=all          first try parametrize then do values with the rest
+    -optimize=none         no optimization
+
+
 -parser, Context-free    parsing algorithm. The default is chart.
     -parser=earley       Earley algorithm
     -parser=chart        bottom-up chart parser
diff --git a/src/HelpFile.hs b/src/HelpFile.hs
index 9409dd4cc..0b78947bb 100644
--- a/src/HelpFile.hs
+++ b/src/HelpFile.hs
@@ -1,17 +1,18 @@
 ----------------------------------------------------------------------
 -- |
--- Module      : (Module)
--- Maintainer  : (Maintainer)
+-- Module      : HelpFile
+-- Maintainer  : Aarne Ranta
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date $ 
+-- > CVS $Date $
 -- > CVS $Author $
 -- > CVS $Revision $
 --
--- (Description of the module)
+-- Help on shell commands. Generated from HelpFile by 'make help'.
 -----------------------------------------------------------------------------
 
+
 module HelpFile where
 
 import Operations
@@ -52,7 +53,6 @@ txtHelpFile =
   "\n      -old          old: parse in GF<2.0 format (not necessary)" ++
   "\n      -v            verbose: give lots of messages " ++
   "\n      -s            silent: don't give error messages" ++
-  "\n      -opt          perform branch-sharing optimization" ++
   "\n      -src          source: ignore precompiled gfc and gfr files" ++
   "\n      -retain       retain operations: read resource modules (needed in comm cc) " ++
   "\n      -nocf         don't build context-free grammar (thus no parser)" ++
@@ -65,6 +65,7 @@ txtHelpFile =
   "\n      -cnc          set the name used for concrete syntax (with -old option)" ++
   "\n      -res          set the name used for resource (with -old option)" ++
   "\n      -path         use the (colon-separated) search path to find modules" ++
+  "\n      -optimize     select an optimization to override file-defined flags" ++
   "\n  examples:" ++
   "\n      i English.gf                      -- ordinary import of Concrete" ++
   "\n      i -retain german/ParadigmsGer.gf  -- import of Resource to test" ++
@@ -454,6 +455,15 @@ txtHelpFile =
   "\n-number, the maximum number of generated items in a list. " ++
   "\n       The default is unlimited." ++
   "\n" ++
+  "\n-optimize, optimization on generated code." ++
+  "\n       The default is share." ++
+  "\n    -optimize=share        share common branches in tables" ++
+  "\n    -optimize=parametrize  first try parametrize then do share with the rest" ++
+  "\n    -optimize=values       represent tables as courses-of-values" ++
+  "\n    -optimize=all          first try parametrize then do values with the rest" ++
+  "\n    -optimize=none         no optimization" ++
+  "\n" ++
+  "\n" ++
   "\n-parser, Context-free    parsing algorithm. The default is chart." ++
   "\n    -parser=earley       Earley algorithm" ++
   "\n    -parser=chart        bottom-up chart parser" ++
diff --git a/src/tools/MkHelpFile.hs b/src/tools/MkHelpFile.hs
index bd3c10792..6f7fe0184 100644
--- a/src/tools/MkHelpFile.hs
+++ b/src/tools/MkHelpFile.hs
@@ -9,7 +9,7 @@
 -- > CVS $Author $
 -- > CVS $Revision $
 --
--- (Description of the module)
+-- Compile HelpFile.hs from HelpFile.
 -----------------------------------------------------------------------------
 
 module Main where
@@ -20,6 +20,7 @@ main = do
   writeFile "HelpFile.hs" s'
 
 mkHsFile ss =
+  helpHeader ++
   "module HelpFile where\n\n" ++
   "import Operations\n\n" ++
   "txtHelpFileSummary =\n" ++
@@ -39,3 +40,21 @@ mkOne s = "  \"" ++ pref s ++ (escs s) ++ "\" ++"
    escs [] = []
    escs (c:cs) | elem c "\"\\" = '\\':c:escs cs
    escs (c:cs) = c:escs cs
+
+helpHeader = unlines [
+  "----------------------------------------------------------------------",
+  "-- |",
+  "-- Module      : HelpFile",
+  "-- Maintainer  : Aarne Ranta",
+  "-- Stability   : (stable)",
+  "-- Portability : (portable)",
+  "--",
+  "-- > CVS $Date $", 
+  "-- > CVS $Author $",
+  "-- > CVS $Revision $",
+  "--",
+  "-- Help on shell commands. Generated from HelpFile by 'make help'.",
+  "-----------------------------------------------------------------------------",
+  "",
+  ""
+  ]
\ No newline at end of file