diff --git a/lib/src/abstract/Lang.gf b/lib/src/abstract/Lang.gf
index c0601f159..ce2a0b724 100644
--- a/lib/src/abstract/Lang.gf
+++ b/lib/src/abstract/Lang.gf
@@ -8,8 +8,8 @@
 abstract Lang = 
   Grammar, 
   Lexicon
-  ,Construction  --- can be compiled here, but not in concretes, as they call Syntax and Grammar
-  ,Documentation
+--  ,Construction  --- could be compiled here, but not in concretes, as they call Syntax and Grammar
+--  ,Documentation
   ** {
   flags startcat=Phr ;
   } ;
diff --git a/lib/src/bulgarian/ParseBul.gf b/lib/src/bulgarian/ParseBul.gf
index d39447d42..e3c8915dd 100644
--- a/lib/src/bulgarian/ParseBul.gf
+++ b/lib/src/bulgarian/ParseBul.gf
@@ -1,4 +1,4 @@
---# -path=alltenses:../english
+--# -path=alltenses:../english:../abstract
 concrete ParseBul of ParseEngAbs = 
   TenseX - [IAdv, CAdv],
   CatBul,
diff --git a/lib/src/chinese/ParseChi.gf b/lib/src/chinese/ParseChi.gf
index e55c5876e..cdd8fbea4 100644
--- a/lib/src/chinese/ParseChi.gf
+++ b/lib/src/chinese/ParseChi.gf
@@ -1,4 +1,5 @@
---# -path=.:../english
+--# -path=.:../english:../abstract
+
 concrete ParseChi of ParseEngAbs = 
   TenseChi,
 ---  CatChi,
diff --git a/lib/src/english/ParseEng.gf b/lib/src/english/ParseEng.gf
index fe0145901..7d265c864 100644
--- a/lib/src/english/ParseEng.gf
+++ b/lib/src/english/ParseEng.gf
@@ -1,3 +1,5 @@
+--# -path=.:../abstract
+
 concrete ParseEng of ParseEngAbs = 
   TenseX - [Pol, PNeg, PPos],
   CatEng,
diff --git a/lib/src/french/ParseFre.gf b/lib/src/french/ParseFre.gf
index a82a537c9..387a1d6cf 100644
--- a/lib/src/french/ParseFre.gf
+++ b/lib/src/french/ParseFre.gf
@@ -1,4 +1,4 @@
---# -path=.:../english/:../romance:alltenses
+--# -path=.:../english/:../abstract:../romance:alltenses
 concrete ParseFre of ParseEngAbs = 
   TenseFre,
 --  CatFre,
diff --git a/lib/src/german/ParseGer.gf b/lib/src/german/ParseGer.gf
index 39d48de11..af1cc5ce3 100644
--- a/lib/src/german/ParseGer.gf
+++ b/lib/src/german/ParseGer.gf
@@ -1,4 +1,4 @@
---# -path=alltenses:.:../english
+--# -path=alltenses:.:../english:../abstract
 concrete ParseGer of ParseEngAbs = 
   TenseGer,
   NounGer - [PPartNP],
diff --git a/lib/src/swedish/ParseSwe.gf b/lib/src/swedish/ParseSwe.gf
index c362d09e4..88e666d4c 100644
--- a/lib/src/swedish/ParseSwe.gf
+++ b/lib/src/swedish/ParseSwe.gf
@@ -1,4 +1,4 @@
---# -path=.:../english/:../scandinavian:alltenses
+--# -path=.:../english/:../scandinavian:alltenses:../abstract
 concrete ParseSwe of ParseEngAbs = 
   TenseSwe,
   NounSwe - [PPartNP],
@@ -40,20 +40,21 @@ lin
 -}
 
   CompoundCN num noun cn = {
-      s = \\n,d,c => noun.s ! num.n ! Indef ! Nom ++ BIND ++ cn.s ! n ! d ! c ; 
+      s = \\n,d,c => num.s ! cn.g ++ noun.co ++ BIND ++ cn.s ! n ! d ! c ; 
       g = cn.g ;
       isMod = False
       } ;
 
   DashCN noun1 noun2 = {
-    s = \\n,d,c => noun1.s ! Sg ! Indef ! Nom ++ BIND ++ noun2.s ! n ! d ! c ;
-    g = noun2.g ;
-    isMod = False ;
-  } ;
+      s = \\n,d,c => noun1.co ++ BIND ++ noun2.s ! n ! d ! c ; 
+      g = noun2.g ;
+      co = noun1.co ++ BIND ++ noun2.co ---- add s if not already there
+      } ;
 
   GerundN v = {
     s = \\n,d,c => v.s ! VI (VPtPres n d c) ;
-    g = Neutr
+    g = Neutr ;
+    co = v.s ! VI (VPtPres Sg Indef Nom) ;
   } ;
   
   GerundAP v = {