diff --git a/lib/src/french/DiffFre.gf b/lib/src/french/DiffFre.gf
index d20f693bb..69967c30a 100644
--- a/lib/src/french/DiffFre.gf
+++ b/lib/src/french/DiffFre.gf
@@ -122,7 +122,7 @@ instance DiffFre of DiffRomance = open CommonRomance, PhonoFre, Prelude in {
           num   = if_then_else Number b Pl n ;
           verb  = vp.s.s ! vImper num p ;
           neg   = vp.neg ! pol ;
-          clpr  =  <vp.clit1 ++ vp.clit2, False> ;  ---- TODO: True if clit
+          clpr  = <vp.clit1 ++ vp.clit2, False> ;  ---- TODO: True if clit
           compl = vp.comp ! agr ++ vp.ext ! pol
         in
         case pol of {
diff --git a/lib/src/french/IrregFre.gf b/lib/src/french/IrregFre.gf
index 748cb4361..eedfc9912 100644
--- a/lib/src/french/IrregFre.gf
+++ b/lib/src/french/IrregFre.gf
@@ -33,7 +33,7 @@ lin
   asseoir_V2 = v_besch49 "asseoir" ** {vtyp = VHabere ; lock_V2 = <> ; c2 = complAcc} ;
   astreindre_V2 = v_besch57 "astreindre" ** {vtyp = VHabere ; lock_V2 = <> ; c2 = complAcc} ;
   atteindre_V2 = v_besch57 "atteindre" ** {vtyp = VHabere ; lock_V2 = <> ; c2 = complAcc} ;
-  attendre_V2 = v_besch53 "attendre" ** {vtyp = VHabere ; lock_V2 = <> ; c2 = complDat} ;
+  attendre_V2 = v_besch53 "attendre" ** {vtyp = VHabere ; lock_V2 = <> ; c2 = complAcc} ; --- Dat?
   avoir_V2 = v_besch1 "avoir" ** {vtyp = VHabere ; lock_V2 = <> ; c2 = complAcc} ;
   battre_V2 = v_besch55 "battre" ** {vtyp = VHabere ; lock_V2 = <> ; c2 = complAcc} ;
   boire_V2 = v_besch69 "boire" ** {vtyp = VHabere ; lock_V2 = <> ; c2 = complAcc} ;
diff --git a/lib/src/french/LexiconFre.gf b/lib/src/french/LexiconFre.gf
index 598d5af2b..b533cffb9 100644
--- a/lib/src/french/LexiconFre.gf
+++ b/lib/src/french/LexiconFre.gf
@@ -200,7 +200,7 @@ lin
   understand_V2 = comprendre_V2 ;
   university_N = regGenN "université" feminine ;
   village_N = regGenN "village" masculine ;
-  wait_V2 = attendre_V2 ; ---- dative?
+  wait_V2 = attendre_V2 ; 
   walk_V = regV "marcher" ;
   warm_A = regA "chaud" ;
   war_N = regGenN "guerre" masculine ;
diff --git a/lib/src/italian/DiffIta.gf b/lib/src/italian/DiffIta.gf
index 6981b613b..4f8d4b289 100644
--- a/lib/src/italian/DiffIta.gf
+++ b/lib/src/italian/DiffIta.gf
@@ -115,11 +115,11 @@ instance DiffIta of DiffRomance = open CommonRomance, PhonoIta, BeschIta, Prelud
           agr   = {g = g ; n = n ; p = pe} ;
           clpr  = <vp.clit1 ++ vp.clit2,[],False> ;  ---- TODO: True is clit 
           verb  = case <n,pol,pe> of {
-            <Sg,RNeg False,P2> => vp.s.s ! VInfin clpr.p3 ; ----  ! aag ;
+            <Sg, RNeg False, P2> => vp.s.s ! VInfin clpr.p3 ; ----  ! aag ;
             _ => vp.s.s ! vImper n pe
             } ;
           neg   = vp.neg ! pol ;
-          compl = clpr.p1 ++ vp.comp ! agr ++ vp.ext ! pol
+          compl = vp.comp ! agr ++ vp.ext ! pol
         in
         neg.p1 ++ verb ++ bindIf clpr.p3 ++ clpr.p1 ++ compl ;
         ---- TODO non mi mangi
diff --git a/lib/src/italian/LexiconIta.gf b/lib/src/italian/LexiconIta.gf
index c471fcf10..b1640c5ba 100644
--- a/lib/src/italian/LexiconIta.gf
+++ b/lib/src/italian/LexiconIta.gf
@@ -200,7 +200,7 @@ lin
   understand_V2 = dirV2 (regV "capire") ;
   university_N = regN "università" ;
   village_N = regN "paese" ;
-  wait_V2 = mkV2 (regV "aspettare") ParadigmsIta.dative ;
+  wait_V2 = mkV2 (regV "aspettare") ;
   walk_V = regV "camminare" ;
   warm_A = regADeg "caldo" ;
   war_N = regN "guerra" ;
diff --git a/lib/src/romance/CommonRomance.gf b/lib/src/romance/CommonRomance.gf
index 8493a0170..c5b959c29 100644
--- a/lib/src/romance/CommonRomance.gf
+++ b/lib/src/romance/CommonRomance.gf
@@ -134,7 +134,7 @@ oper
     <Sg,P2> => VImper SgP2 ; 
     <Pl,P1> => VImper PlP1 ; 
     <Pl,P2> => VImper PlP2 ;
-    _       => VInfin False
+    _       => VFin (VPres Conjunct) n p
     } ; 
 
 {-
diff --git a/lib/src/romance/DiffRomance.gf b/lib/src/romance/DiffRomance.gf
index c98490f5a..91906c9e0 100644
--- a/lib/src/romance/DiffRomance.gf
+++ b/lib/src/romance/DiffRomance.gf
@@ -96,7 +96,7 @@ interface DiffRomance = open CommonRomance, Prelude in {
   auxPassive : Verb ;
 
 
---2 Contants needed in type signatures above
+--2 Constants needed in type signatures above
 
 param
   Case = Nom | Acc | CPrep Prepos ;