diff --git a/lib/resource-0.6/abstract/Logic.gf b/lib/resource-0.6/abstract/Logic.gf
index 4e46cde2f..06181d880 100644
--- a/lib/resource-0.6/abstract/Logic.gf
+++ b/lib/resource-0.6/abstract/Logic.gf
@@ -22,9 +22,9 @@ oper
   predA2 : Adj2 -> NP -> NP -> AS ;    -- two-place adj: "John is married to Mary"
   predAComp : AdjDeg -> NP -> NP -> AS ; -- compar adj: "John is older than Mary"
   predAColl : Adj1 -> NP -> NP -> AS ; -- collective adj: "John and Mary are married"
-  predN1 : N -> NP -> AS ;             -- one-place noun: "John is a man"
+  predN1 : CN -> NP -> AS ;            -- one-place noun: "John is a man"
   predN2 : Fun -> NP -> NP -> AS ;     -- two-place noun: "John is a lover of Mary"
-  predNColl : N -> NP -> NP -> AS ;    -- collective noun: "John and Mary are lovers"
+  predNColl : CN -> NP -> NP -> AS ;   -- collective noun: "John and Mary are lovers"
   predAdv : AdV -> NP -> AS ;          -- adverb: "Joh is outside"
 
 -- Individual-valued function applications.
@@ -67,10 +67,11 @@ oper
   predA2 = \F, x, y -> mkPred x (PredAP (ComplAdj F y)) ;
   predAComp = \F, x, y -> mkPred x (PredAP (ComparAdjP F y)) ;
   predAColl = \F, x, y -> mkPred (conjNP x y) (PredAP (AdjP1 F)) ;
-  predN1 = \F, x -> mkPred x (PredCN (UseN F)) ;
+  predN1 = \F, x -> mkPred x (PredCN F) ;
   predN2 = \F, x, y -> mkPred x (PredCN (AppFun F y)) ;
-  predNColl = \F, x, y -> mkPred (conjNP x y) (PredCN (UseN F)) ;
+  predNColl = \F, x, y -> mkPred (conjNP x y) (PredCN F) ;
   predAdv = \F, x -> mkPred x (PredAdV F) ;
+----  predAdvColl = \F, x, y -> mkPred (conjNP x y) (PredAdV F) ;
 
 
   appFun1 = \f, x -> DefOneNP (AppFun f x) ;
diff --git a/lib/resource-0.6/german/ParadigmsGer.gf b/lib/resource-0.6/german/ParadigmsGer.gf
index a596ca3a8..f763823fa 100644
--- a/lib/resource-0.6/german/ParadigmsGer.gf
+++ b/lib/resource-0.6/german/ParadigmsGer.gf
@@ -174,17 +174,22 @@ oper
 
 -- Regular verbs are those where no Umlaut occurs.
 
-  vReg  : Str -> V ;         -- kommen
+  vReg  : Str -> V ;         -- führen
 
 -- The verbs 'be' and 'have' are special.
 
   vSein  : V ;
   vHaben : V ;
 
+-- Some irregular verbs.
+
+  vFahren : V ;
+
 -- Verbs with a detachable particle, with regular ones as a special case.
 
   vPart    :  (_,_,_,_,_ : Str) -> V ;     -- sehen, sieht, sieh, gesehen, aus
   vPartReg :  (_,_     : Str) -> V ;       -- bringen, um
+  mkVPart  :  V -> Str -> V ;              -- vFahren, aus
 
 -- Two-place verbs, and the special case with direct object. Notice that
 -- a particle can be included in a $V$.
@@ -310,9 +315,11 @@ oper
   vReg = \s -> mkVerbSimple (regVerb s) ** {lock_V = <>} ;
   vSein = verbSein ** {lock_V = <>} ;
   vHaben = verbHaben ** {lock_V = <>} ;
+  vFahren = mkV "fahren" "fährt" "fuhr" "gefahren" ;
   vPart = \sehen, sieht, sieh, gesehen, aus -> 
     mkVerb (mkVerbum sehen sieht sieh gesehen) aus ** {lock_V = <>} ;
   vPartReg = \sehen, aus -> mkVerb (regVerb sehen) aus ** {lock_V = <>} ;
+  mkVPart v p = mkVerb v.s p  ** {lock_V = <>} ;
 
   mkTV v p c = mkTransVerb v p c  ** {lock_TV = <>} ;
   tvReg = \hören, zu, dat -> mkTV (vReg hören) zu dat ;
diff --git a/src/Today.hs b/src/Today.hs
index f9ac9d793..ff873bb57 100644
--- a/src/Today.hs
+++ b/src/Today.hs
@@ -1 +1 @@
-module Today where today = "Thu Jun  3 19:06:03 CEST 2004"
+module Today where today = "Thu Jun  3 22:31:54 CEST 2004"