diff --git a/lib/resource-1.4/Make.hs b/lib/resource-1.4/Make.hs
index f815540ff..725000d3f 100644
--- a/lib/resource-1.4/Make.hs
+++ b/lib/resource-1.4/Make.hs
@@ -51,7 +51,7 @@ langsMath = langsAPI
 langsTest = langsLang `except` ["Bul","Cat","Hin","Rus","Spa","Tha"]
 
 -- languages for which to run demo test
-langsDemo = langsLang `except` ["Bul","Hin","Ina","Rus","Tha"] ---- fix utf8 for Bul,Rus
+langsDemo = langsLang `except` ["Hin","Ina","Tha"]
 
 -- languages for which langs.pgf is built
 langsPGF = langsTest `only` ["Eng","Fre","Swe"]
diff --git a/lib/resource-1.4/demo/Demo.gf b/lib/resource-1.4/demo/Demo.gf
index 6888d3282..8378d48d7 100644
--- a/lib/resource-1.4/demo/Demo.gf
+++ b/lib/resource-1.4/demo/Demo.gf
@@ -12,6 +12,6 @@ abstract Demo =
   Phrase,
 ----  Text,
 ----  Idiom,
-  Structural,
+  Structural - [everybody_NP,everything_NP,something_NP],
   Lexicon ;
 
diff --git a/lib/resource-1.4/demo/DemoBul.gf b/lib/resource-1.4/demo/DemoBul.gf
index 05dee5c50..095da265d 100644
--- a/lib/resource-1.4/demo/DemoBul.gf
+++ b/lib/resource-1.4/demo/DemoBul.gf
@@ -1,20 +1,20 @@
 --# -path=.:alltenses
 
 concrete DemoBul of Demo = 
-  NounBul - [AdvCN,PredetNP,PPartNP,RelNP,RelCN,SentCN,ApposCN,MassNP,DetNP],
+  NounBul - [AdvCN,PredetNP,PPartNP,RelNP,RelCN,SentCN,ApposCN,MassNP,DetNP], 
 --  VerbBul, 
   ClauseBul, --
   AdjectiveBul - [SentAP],
   AdverbBul,
   NumeralBul,
 ----  SentenceBul,
-----  QuestionBul,
+  QuestionBul - [QuestVP,QuestSlash],
 ----  RelativeBul,
 ----  ConjunctionBul,
 ----  PhraseBul,
-----  TextX - [Tense,TPres,TPast,TFut,TCond],
+----  TextX,
 ----  IdiomBul,
-  StructuralBul,
+  StructuralBul - [everybody_NP,everything_NP,something_NP],
   LexiconBul
   ** {
 
diff --git a/lib/resource-1.4/demo/DemoCat.gf b/lib/resource-1.4/demo/DemoCat.gf
index b635ba16b..b2f7392ec 100644
--- a/lib/resource-1.4/demo/DemoCat.gf
+++ b/lib/resource-1.4/demo/DemoCat.gf
@@ -1,20 +1,20 @@
 --# -path=.:alltenses
 
 concrete DemoCat of Demo = 
-  NounCat - [AdvCN,PredetNP,PPartNP,RelNP,RelCN,SentCN,ApposCN,MassNP,DetNP],
+  NounCat - [AdvCN,PredetNP,PPartNP,RelNP,RelCN,SentCN,ApposCN,MassNP,DetNP], 
 --  VerbCat, 
   ClauseCat, --
   AdjectiveCat - [SentAP],
   AdverbCat,
   NumeralCat,
 ----  SentenceCat,
-----  QuestionCat,
+  QuestionCat - [QuestVP,QuestSlash],
 ----  RelativeCat,
 ----  ConjunctionCat,
 ----  PhraseCat,
-----  TextX - [Tense,TPres,TPast,TFut,TCond],
+----  TextX,
 ----  IdiomCat,
-  StructuralCat,
+  StructuralCat - [everybody_NP,everything_NP,something_NP],
   LexiconCat
   ** {
 
diff --git a/lib/resource-1.4/demo/DemoDan.gf b/lib/resource-1.4/demo/DemoDan.gf
index 6262fef81..0ea5b33f1 100644
--- a/lib/resource-1.4/demo/DemoDan.gf
+++ b/lib/resource-1.4/demo/DemoDan.gf
@@ -1,20 +1,20 @@
 --# -path=.:alltenses
 
 concrete DemoDan of Demo = 
-  NounDan - [AdvCN,PredetNP,PPartNP,RelNP,RelCN,SentCN,ApposCN,MassNP,DetNP],
+  NounDan - [AdvCN,PredetNP,PPartNP,RelNP,RelCN,SentCN,ApposCN,MassNP,DetNP], 
 --  VerbDan, 
   ClauseDan, --
   AdjectiveDan - [SentAP],
   AdverbDan,
   NumeralDan,
 ----  SentenceDan,
-----  QuestionDan,
+  QuestionDan - [QuestVP,QuestSlash],
 ----  RelativeDan,
 ----  ConjunctionDan,
 ----  PhraseDan,
-----  TextX - [Tense,TPres,TPast,TFut,TCond],
+----  TextX,
 ----  IdiomDan,
-  StructuralDan,
+  StructuralDan - [everybody_NP,everything_NP,something_NP],
   LexiconDan
   ** {
 
diff --git a/lib/resource-1.4/demo/DemoEng.gf b/lib/resource-1.4/demo/DemoEng.gf
index 3151b45be..bf7ccd2eb 100644
--- a/lib/resource-1.4/demo/DemoEng.gf
+++ b/lib/resource-1.4/demo/DemoEng.gf
@@ -14,7 +14,7 @@ concrete DemoEng of Demo =
 ----  PhraseEng,
 ----  TextX,
 ----  IdiomEng,
-  StructuralEng,
+  StructuralEng - [everybody_NP,everything_NP,something_NP],
   LexiconEng
   ** {
 
diff --git a/lib/resource-1.4/demo/DemoFin.gf b/lib/resource-1.4/demo/DemoFin.gf
index 3e0a61cc8..e8299e136 100644
--- a/lib/resource-1.4/demo/DemoFin.gf
+++ b/lib/resource-1.4/demo/DemoFin.gf
@@ -1,7 +1,7 @@
 --# -path=.:alltenses
 
 concrete DemoFin of Demo = 
-  NounFin - [AdvCN,PredetNP,PPartNP,RelNP,RelCN,SentCN,ApposCN,MassNP,DetNP],
+  NounFin - [AdvCN,PredetNP,PPartNP,RelNP,RelCN,SentCN,ApposCN,MassNP,DetNP], 
 --  VerbFin, 
   ClauseFin, --
   AdjectiveFin - [SentAP],
@@ -11,10 +11,10 @@ concrete DemoFin of Demo =
   QuestionFin - [QuestVP,QuestSlash],
 ----  RelativeFin,
 ----  ConjunctionFin,
-  PhraseFin,
+----  PhraseFin,
 ----  TextX,
 ----  IdiomFin,
-  StructuralFin,
+  StructuralFin - [everybody_NP,everything_NP,something_NP],
   LexiconFin
   ** {
 
diff --git a/lib/resource-1.4/demo/DemoFre.gf b/lib/resource-1.4/demo/DemoFre.gf
index 77b9e7b56..6845df3fe 100644
--- a/lib/resource-1.4/demo/DemoFre.gf
+++ b/lib/resource-1.4/demo/DemoFre.gf
@@ -1,20 +1,20 @@
 --# -path=.:alltenses
 
 concrete DemoFre of Demo = 
-  NounFre - [AdvCN,PredetNP,PPartNP,RelNP,RelCN,SentCN,ApposCN,MassNP,DetNP],
+  NounFre - [AdvCN,PredetNP,PPartNP,RelNP,RelCN,SentCN,ApposCN,MassNP,DetNP], 
 --  VerbFre, 
   ClauseFre, --
   AdjectiveFre - [SentAP],
   AdverbFre,
   NumeralFre,
 ----  SentenceFre,
-----  QuestionFre,
+  QuestionFre - [QuestVP,QuestSlash],
 ----  RelativeFre,
 ----  ConjunctionFre,
 ----  PhraseFre,
-----  TextX - [Tense,TPres,TPast,TFut,TCond],
+----  TextX,
 ----  IdiomFre,
-  StructuralFre,
+  StructuralFre - [everybody_NP,everything_NP,something_NP],
   LexiconFre
   ** {
 
diff --git a/lib/resource-1.4/demo/DemoGer.gf b/lib/resource-1.4/demo/DemoGer.gf
index a96c8d86e..a99bca262 100644
--- a/lib/resource-1.4/demo/DemoGer.gf
+++ b/lib/resource-1.4/demo/DemoGer.gf
@@ -1,20 +1,20 @@
 --# -path=.:alltenses
 
 concrete DemoGer of Demo = 
-  NounGer - [AdvCN,PredetNP,PPartNP,RelNP,RelCN,SentCN,ApposCN,MassNP,DetNP],
+  NounGer - [AdvCN,PredetNP,PPartNP,RelNP,RelCN,SentCN,ApposCN,MassNP,DetNP], 
 --  VerbGer, 
   ClauseGer, --
   AdjectiveGer - [SentAP],
   AdverbGer,
   NumeralGer,
---  SentenceGer,
+----  SentenceGer,
   QuestionGer - [QuestVP,QuestSlash],
---  RelativeGer,
---  ConjunctionGer,
---  PhraseGer,
---  TextX - [Tense,TPres,TPast,TFut,TCond],
---  IdiomGer,
-  StructuralGer,
+----  RelativeGer,
+----  ConjunctionGer,
+----  PhraseGer,
+----  TextX,
+----  IdiomGer,
+  StructuralGer - [everybody_NP,everything_NP,something_NP],
   LexiconGer
   ** {
 
diff --git a/lib/resource-1.4/demo/DemoIta.gf b/lib/resource-1.4/demo/DemoIta.gf
index f27944b6b..2a83be414 100644
--- a/lib/resource-1.4/demo/DemoIta.gf
+++ b/lib/resource-1.4/demo/DemoIta.gf
@@ -1,20 +1,20 @@
 --# -path=.:alltenses
 
 concrete DemoIta of Demo = 
-  NounIta - [AdvCN,PredetNP,PPartNP,RelNP,RelCN,SentCN,ApposCN,MassNP,DetNP],
+  NounIta - [AdvCN,PredetNP,PPartNP,RelNP,RelCN,SentCN,ApposCN,MassNP,DetNP], 
 --  VerbIta, 
   ClauseIta, --
   AdjectiveIta - [SentAP],
   AdverbIta,
   NumeralIta,
 ----  SentenceIta,
-----  QuestionIta,
+  QuestionIta - [QuestVP,QuestSlash],
 ----  RelativeIta,
 ----  ConjunctionIta,
 ----  PhraseIta,
-----  TextX - [Tense,TPres,TPast,TFut,TCond],
+----  TextX,
 ----  IdiomIta,
-  StructuralIta,
+  StructuralIta - [everybody_NP,everything_NP,something_NP],
   LexiconIta
   ** {
 
diff --git a/lib/resource-1.4/demo/DemoNor.gf b/lib/resource-1.4/demo/DemoNor.gf
index 306e76594..c9cf57ff2 100644
--- a/lib/resource-1.4/demo/DemoNor.gf
+++ b/lib/resource-1.4/demo/DemoNor.gf
@@ -1,20 +1,20 @@
 --# -path=.:alltenses
 
 concrete DemoNor of Demo = 
-  NounNor - [AdvCN,PredetNP,PPartNP,RelNP,RelCN,SentCN,ApposCN,MassNP,DetNP],
+  NounNor - [AdvCN,PredetNP,PPartNP,RelNP,RelCN,SentCN,ApposCN,MassNP,DetNP], 
 --  VerbNor, 
   ClauseNor, --
   AdjectiveNor - [SentAP],
   AdverbNor,
   NumeralNor,
 ----  SentenceNor,
-----  QuestionNor,
+  QuestionNor - [QuestVP,QuestSlash],
 ----  RelativeNor,
 ----  ConjunctionNor,
 ----  PhraseNor,
-----  TextX - [Tense,TPres,TPast,TFut,TCond],
+----  TextX,
 ----  IdiomNor,
-  StructuralNor,
+  StructuralNor - [everybody_NP,everything_NP,something_NP],
   LexiconNor
   ** {
 
diff --git a/lib/resource-1.4/demo/DemoRus.gf b/lib/resource-1.4/demo/DemoRus.gf
index 0caccbb7b..3de795f38 100644
--- a/lib/resource-1.4/demo/DemoRus.gf
+++ b/lib/resource-1.4/demo/DemoRus.gf
@@ -1,23 +1,23 @@
 --# -path=.:alltenses
 
 concrete DemoRus of Demo = 
-  NounRus - [AdvCN,PredetNP,PPartNP,RelNP,RelCN,SentCN,ApposCN,MassNP,DetNP],
+  NounRus - [AdvCN,PredetNP,PPartNP,RelNP,RelCN,SentCN,ApposCN,MassNP,DetNP], 
 --  VerbRus, 
   ClauseRus, --
   AdjectiveRus - [SentAP],
   AdverbRus,
   NumeralRus,
 ----  SentenceRus,
-----  QuestionRus,
+  QuestionRus - [QuestVP,QuestSlash],
 ----  RelativeRus,
 ----  ConjunctionRus,
 ----  PhraseRus,
-----  TextX - [Tense,TPres,TPast,TFut,TCond],
+----  TextX,
 ----  IdiomRus,
-  StructuralRus,
+  StructuralRus - [everybody_NP,everything_NP,something_NP],
   LexiconRus
   ** {
 
-flags startcat = Phr ; unlexer = text ; lexer = text ; coding = utf8 ;
+flags startcat = Phr ; unlexer = text ; lexer = text ;
 
 } ;
diff --git a/lib/resource-1.4/demo/DemoSpa.gf b/lib/resource-1.4/demo/DemoSpa.gf
index d772ce6f5..d97e4521d 100644
--- a/lib/resource-1.4/demo/DemoSpa.gf
+++ b/lib/resource-1.4/demo/DemoSpa.gf
@@ -1,20 +1,20 @@
 --# -path=.:alltenses
 
 concrete DemoSpa of Demo = 
-  NounSpa - [AdvCN,PredetNP,PPartNP,RelNP,RelCN,SentCN,ApposCN,MassNP,DetNP],
+  NounSpa - [AdvCN,PredetNP,PPartNP,RelNP,RelCN,SentCN,ApposCN,MassNP,DetNP], 
 --  VerbSpa, 
   ClauseSpa, --
   AdjectiveSpa - [SentAP],
   AdverbSpa,
   NumeralSpa,
 ----  SentenceSpa,
-----  QuestionSpa,
+  QuestionSpa - [QuestVP,QuestSlash],
 ----  RelativeSpa,
 ----  ConjunctionSpa,
 ----  PhraseSpa,
-----  TextX - [Tense,TPres,TPast,TFut,TCond],
+----  TextX,
 ----  IdiomSpa,
-  StructuralSpa,
+  StructuralSpa - [everybody_NP,everything_NP,something_NP],
   LexiconSpa
   ** {
 
diff --git a/lib/resource-1.4/demo/DemoSwe.gf b/lib/resource-1.4/demo/DemoSwe.gf
index 72d4a2c25..3b4d7f051 100644
--- a/lib/resource-1.4/demo/DemoSwe.gf
+++ b/lib/resource-1.4/demo/DemoSwe.gf
@@ -1,20 +1,20 @@
 --# -path=.:alltenses
 
 concrete DemoSwe of Demo = 
-  NounSwe - [AdvCN,PredetNP,PPartNP,RelNP,RelCN,SentCN,ApposCN,MassNP,DetNP],
+  NounSwe - [AdvCN,PredetNP,PPartNP,RelNP,RelCN,SentCN,ApposCN,MassNP,DetNP], 
 --  VerbSwe, 
   ClauseSwe, --
   AdjectiveSwe - [SentAP],
   AdverbSwe,
   NumeralSwe,
 ----  SentenceSwe,
-----  QuestionSwe,
+  QuestionSwe - [QuestVP,QuestSlash],
 ----  RelativeSwe,
 ----  ConjunctionSwe,
 ----  PhraseSwe,
-----  TextX - [Tense,TPres,TPast,TFut,TCond],
+----  TextX,
 ----  IdiomSwe,
-  StructuralSwe,
+  StructuralSwe - [everybody_NP,everything_NP,something_NP],
   LexiconSwe
   ** {