diff --git a/lib/src/abstract/Lang.gf b/lib/src/abstract/Lang.gf
index ce2a0b724..8498984ed 100644
--- a/lib/src/abstract/Lang.gf
+++ b/lib/src/abstract/Lang.gf
@@ -8,8 +8,8 @@
 abstract Lang = 
   Grammar, 
   Lexicon
---  ,Construction  --- could 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/chinese/AllChi.gf b/lib/src/chinese/AllChi.gf
index f93576eb1..acabdec65 100644
--- a/lib/src/chinese/AllChi.gf
+++ b/lib/src/chinese/AllChi.gf
@@ -1,3 +1,3 @@
---# -path=.:../abstract:../common:prelude
+--# -path=.:../abstract:../common:../api
 
 concrete AllChi of AllChiAbs = LangChi, ExtraChi ;
diff --git a/lib/src/chinese/LangChi.gf b/lib/src/chinese/LangChi.gf
index e5ea42eba..2f71dd10e 100644
--- a/lib/src/chinese/LangChi.gf
+++ b/lib/src/chinese/LangChi.gf
@@ -4,7 +4,7 @@
 concrete LangChi of Lang = 
   GrammarChi,
   LexiconChi
---  ,ConstructionChi
+  ,ConstructionChi
   ** {
 
 flags startcat = Phr ; unlexer = concat ; lexer = text ;
diff --git a/lib/src/english/AllEng.gf b/lib/src/english/AllEng.gf
index e52f7af71..6a5236048 100644
--- a/lib/src/english/AllEng.gf
+++ b/lib/src/english/AllEng.gf
@@ -1,4 +1,4 @@
---# -path=.:../abstract:../common:prelude
+--# -path=.:../abstract:../common:../api
 
 concrete AllEng of AllEngAbs = 
   LangEng, 
diff --git a/lib/src/english/LangEng.gf b/lib/src/english/LangEng.gf
index ac7695f9a..6533caf4a 100644
--- a/lib/src/english/LangEng.gf
+++ b/lib/src/english/LangEng.gf
@@ -1,10 +1,10 @@
---# -path=.:../abstract:../common:../prelude
+--# -path=.:../abstract:../common:../api
 
 concrete LangEng of Lang = 
   GrammarEng,
   LexiconEng
---  ,ConstructionEng,
---  ,DocumentationEng
+  ,ConstructionEng
+  ,DocumentationEng
   ** {
 
 flags startcat = Phr ; unlexer = text ; lexer = text ;
diff --git a/lib/src/finnish/AllFin.gf b/lib/src/finnish/AllFin.gf
index 62c7f86ed..8c99bef0f 100644
--- a/lib/src/finnish/AllFin.gf
+++ b/lib/src/finnish/AllFin.gf
@@ -1,4 +1,4 @@
---# -path=.:../abstract:../common:prelude
+--# -path=.:../abstract:../common:../api
 
 concrete AllFin of AllFinAbs = 
   LangFin - [SlashV2VNP,SlashVV, TFut], ---- to speed up linking; to remove spurious parses
diff --git a/lib/src/finnish/DocumentationFinFunctor.gf b/lib/src/finnish/DocumentationFinFunctor.gf
index bbda2151d..f4f1c885a 100644
--- a/lib/src/finnish/DocumentationFinFunctor.gf
+++ b/lib/src/finnish/DocumentationFinFunctor.gf
@@ -98,9 +98,10 @@ oper
            th "1.p"  ++ gforms Pl P1 ++ tdf (vfin (ImperP1Pl))) ++
        tr (th "2.p"  ++ gforms Pl P2 ++ tdf (vfin (Imper Pl))) ++
        tr (th "3.p"  ++ gforms Pl P3 ++ tdf (vfin (ImperP3 Pl))) ++
-       tr (intagAttr "th" "colspan=2" (heading passive_Parameter)  ++ 
-                          tdf (vfin (PassPresn True))  ++ tdf (vfin (PassImpf True)) ++ --# notpresent
-                          tdf (vfin (PassCondit True)) ++ tdf (vfin (PassPotent True)) ++ tdf (vfin (PassImper True))) ++ --# notpresent 
+       tr (intagAttr "th" "colspan=2" (heading passive_Parameter)  
+                         ++ tdf (vfin (PassPresn True))  ++ tdf (vfin (PassImpf True))  ++ --# notpresent
+                            tdf (vfin (PassCondit True)) ++ tdf (vfin (PassPotent True)) ++ tdf (vfin (PassImper True))  --# notpresent
+                          ) ++ 
        tr (intagAttr "th" "rowspan=3" (heading negative_Parameter) ++ 
 
              th (heading singular_Parameter) 
diff --git a/lib/src/finnish/LangFin.gf b/lib/src/finnish/LangFin.gf
index 94ded5bdd..525a82201 100644
--- a/lib/src/finnish/LangFin.gf
+++ b/lib/src/finnish/LangFin.gf
@@ -1,10 +1,10 @@
---# -path=.:../abstract:../common:../prelude
+--# -path=.:../abstract:../common:../api
 
 concrete LangFin of Lang = 
   GrammarFin, 
   LexiconFin
---  , ConstructionFin,
---  , DocumentationFin
+  , ConstructionFin
+  , DocumentationFin
   ** {
 
 flags startcat = Phr ; unlexer = text ; lexer = finnish ;
diff --git a/lib/src/french/AllFre.gf b/lib/src/french/AllFre.gf
index fdf6ad691..1cc8674b3 100644
--- a/lib/src/french/AllFre.gf
+++ b/lib/src/french/AllFre.gf
@@ -1,4 +1,4 @@
---# -path=.:../romance:../abstract:../common:prelude
+--# -path=.:../romance:../abstract:../common:../api
 
 concrete AllFre of AllFreAbs = 
   LangFre,
diff --git a/lib/src/french/LangFre.gf b/lib/src/french/LangFre.gf
index 96cc21d89..18c854574 100644
--- a/lib/src/french/LangFre.gf
+++ b/lib/src/french/LangFre.gf
@@ -1,10 +1,10 @@
---# -path=.:../romance:../abstract:../common:../prelude
+--# -path=.:../romance:../abstract:../common:../api
 
 concrete LangFre of Lang = 
   GrammarFre,
   LexiconFre
---  ,DocumentationFre
---  ,ConstructionFre
+  ,DocumentationFre
+  ,ConstructionFre
   ** {
 
 flags startcat = Phr ; unlexer = text ; lexer = text ;
diff --git a/lib/src/german/AllGer.gf b/lib/src/german/AllGer.gf
index 7795174e4..7d67803a4 100644
--- a/lib/src/german/AllGer.gf
+++ b/lib/src/german/AllGer.gf
@@ -1,4 +1,4 @@
---# -path=.:../abstract:../common:prelude
+--# -path=.:../abstract:../common:../api
 
 concrete AllGer of AllGerAbs = 
   LangGer,
diff --git a/lib/src/german/LangGer.gf b/lib/src/german/LangGer.gf
index 30f255f5a..95f37a200 100644
--- a/lib/src/german/LangGer.gf
+++ b/lib/src/german/LangGer.gf
@@ -1,10 +1,10 @@
---# -path=.:../abstract:../common:../prelude
+--# -path=.:../abstract:../common:../api
 
 concrete LangGer of Lang = 
   GrammarGer,
   LexiconGer
---  ,ConstructionGer
---  ,DocumentationGer
+  ,ConstructionGer
+  ,DocumentationGer
   ** {
 
 flags startcat = Phr ; unlexer = text ; lexer = text ;
diff --git a/lib/src/swedish/AllSwe.gf b/lib/src/swedish/AllSwe.gf
index d539d1692..44a58fb07 100644
--- a/lib/src/swedish/AllSwe.gf
+++ b/lib/src/swedish/AllSwe.gf
@@ -1,4 +1,4 @@
---# -path=.:../scandinavian:../abstract:../common:prelude
+--# -path=.:../scandinavian:../abstract:../common:../api
 
 concrete AllSwe of AllSweAbs = 
   LangSwe - [PassV2],
diff --git a/lib/src/swedish/LangSwe.gf b/lib/src/swedish/LangSwe.gf
index d2b30ac17..aa29960e3 100644
--- a/lib/src/swedish/LangSwe.gf
+++ b/lib/src/swedish/LangSwe.gf
@@ -1,10 +1,10 @@
---# -path=.:../scandinavian:../abstract:../common:../prelude
+--# -path=.:../scandinavian:../abstract:../common:../api
 
 concrete LangSwe of Lang = 
   GrammarSwe,
   LexiconSwe
---  ,ConstructionSwe
---  ,DocumentationSwe
+  ,ConstructionSwe
+  ,DocumentationSwe
   ** {
 
 flags startcat = Phr ;  unlexer = text ; lexer = text ;