diff --git a/resource-1.0/abstract/Adjective.gf b/resource-1.0/abstract/Adjective.gf
index b97f37700..1659d4caa 100644
--- a/resource-1.0/abstract/Adjective.gf
+++ b/resource-1.0/abstract/Adjective.gf
@@ -1,4 +1,4 @@
---1 Adjectives and adjectival phrases
+--1 Adjective: Adjectives and Adjectival Phrases
 
 abstract Adjective = Cat ** {
 
diff --git a/resource-1.0/abstract/Adverb.gf b/resource-1.0/abstract/Adverb.gf
index 57f5fa28b..1266cda22 100644
--- a/resource-1.0/abstract/Adverb.gf
+++ b/resource-1.0/abstract/Adverb.gf
@@ -1,4 +1,4 @@
---1 Adverbs and adverbial phrases
+--1 Adverb: Adverbs and Adverbial Phrases
 
 abstract Adverb = Cat ** {
 
diff --git a/resource-1.0/abstract/Cat.gf b/resource-1.0/abstract/Cat.gf
index f683ee526..64b13dc97 100644
--- a/resource-1.0/abstract/Cat.gf
+++ b/resource-1.0/abstract/Cat.gf
@@ -1,4 +1,4 @@
---1 The category system
+--1 Cat: the Category System
 
 -- The category system is central to the library in the sense
 -- that the other modules ($Adjective$, $Adverb$, $Noun$, $Verb$ etc)
diff --git a/resource-1.0/abstract/Common.gf b/resource-1.0/abstract/Common.gf
index 82c1ae50c..2209019cf 100644
--- a/resource-1.0/abstract/Common.gf
+++ b/resource-1.0/abstract/Common.gf
@@ -1,4 +1,4 @@
---1 Infrastructure with common implementations.
+--1 Common: Structures with Common Implementations.
 
 -- This module defines the categories that uniformly have the linearization
 -- ${s : Str}$ in all languages. 
diff --git a/resource-1.0/abstract/Conjunction.gf b/resource-1.0/abstract/Conjunction.gf
index 38a99dcb0..46d9030ba 100644
--- a/resource-1.0/abstract/Conjunction.gf
+++ b/resource-1.0/abstract/Conjunction.gf
@@ -1,4 +1,4 @@
---1 Coordination
+--1 Conjunction: Coordination
 
 -- Coordination is defined for many different categories; here is
 -- a sample. The rules apply to *lists* of two or more elements,
diff --git a/resource-1.0/abstract/Grammar.gf b/resource-1.0/abstract/Grammar.gf
index 460ab91f6..dfc6291d5 100644
--- a/resource-1.0/abstract/Grammar.gf
+++ b/resource-1.0/abstract/Grammar.gf
@@ -1,4 +1,4 @@
---1 The Main Module of the Resource Grammar
+--1 Grammar: the Main Module of the Resource Grammar
 
 -- This grammar a collection of the different grammar modules,
 -- To test the resource, import [Lang Lang.html], which also contains
diff --git a/resource-1.0/abstract/Idiom.gf b/resource-1.0/abstract/Idiom.gf
index 3b29102ce..8a8168b5a 100644
--- a/resource-1.0/abstract/Idiom.gf
+++ b/resource-1.0/abstract/Idiom.gf
@@ -1,4 +1,4 @@
---1 Idiomatic expressions
+--1 Idiom: Idiomatic Expressions
 
 abstract Idiom = Cat ** {
 
diff --git a/resource-1.0/abstract/Lang.gf b/resource-1.0/abstract/Lang.gf
index 5586df2da..0f0dc0af6 100644
--- a/resource-1.0/abstract/Lang.gf
+++ b/resource-1.0/abstract/Lang.gf
@@ -1,8 +1,8 @@
---1 The Main Module of the Resource Grammar
+--1 Lang: a Test Module for the Resource Grammar
 
--- This grammar is just a collection of the different modules,
--- and the one that can be imported when one wants to test the
--- grammar. A module without a lexicon is [Grammar Grammar.html],
+-- This grammar is for testing the resource as included in the
+-- language-independent API, consisting of a grammar and a lexicon.
+-- The grammar without a lexicon is [Grammar Grammar.html],
 -- which may be more suitable to open in applications.
 
 abstract Lang = 
diff --git a/resource-1.0/abstract/Noun.gf b/resource-1.0/abstract/Noun.gf
index e0cae05b1..cb4bc799a 100644
--- a/resource-1.0/abstract/Noun.gf
+++ b/resource-1.0/abstract/Noun.gf
@@ -1,4 +1,4 @@
---1 The construction of nouns, noun phrases, and determiners
+--1 Noun: Nouns, noun phrases, and determiners
 
 abstract Noun = Cat ** {
 
diff --git a/resource-1.0/abstract/Phrase.gf b/resource-1.0/abstract/Phrase.gf
index 4b571f107..486e488d0 100644
--- a/resource-1.0/abstract/Phrase.gf
+++ b/resource-1.0/abstract/Phrase.gf
@@ -1,4 +1,4 @@
---1 Phrases and utterances
+--1 Phrase: Phrases and Utterances
 
 abstract Phrase = Cat ** {
 
diff --git a/resource-1.0/abstract/Question.gf b/resource-1.0/abstract/Question.gf
index a09b203bf..7cc47e607 100644
--- a/resource-1.0/abstract/Question.gf
+++ b/resource-1.0/abstract/Question.gf
@@ -1,4 +1,4 @@
---1 Questions and interrogative pronouns
+--1 Question: Questions and Interrogative Pronouns
 
 abstract Question = Cat ** {
 
diff --git a/resource-1.0/abstract/Sentence.gf b/resource-1.0/abstract/Sentence.gf
index 927eda09b..d5d9e7bc5 100644
--- a/resource-1.0/abstract/Sentence.gf
+++ b/resource-1.0/abstract/Sentence.gf
@@ -1,4 +1,4 @@
---1 Sentences, clauses, imperatives, and sentential complements
+--1 Sentence: Sentences, Clauses, and Imperatives
 
 abstract Sentence = Cat ** {
 
diff --git a/resource-1.0/abstract/Structural.gf b/resource-1.0/abstract/Structural.gf
index e765ad589..32768a4c5 100644
--- a/resource-1.0/abstract/Structural.gf
+++ b/resource-1.0/abstract/Structural.gf
@@ -1,7 +1,5 @@
---1 GF Resource Grammar API for Structural Words
+--1 Structural: Structural Words
 -- 
--- AR 21/11/2003 -- 30/11/2005
---
 -- Here we have some words belonging to closed classes and appearing
 -- in all languages we have considered.
 -- Sometimes they are not really meaningful, e.g. $we_Pron$ in Spanish
diff --git a/resource-1.0/abstract/Text.gf b/resource-1.0/abstract/Text.gf
index 2f35f48ac..ee4056a42 100644
--- a/resource-1.0/abstract/Text.gf
+++ b/resource-1.0/abstract/Text.gf
@@ -1,11 +1,15 @@
---1 Texts
+--1 Text: Texts
+
+-- Texts are built from an empty text by adding $Phr$ases,
+-- using as constructors the punctuation marks ".", "?", and "!".
+-- Any punctuation mark can be attached to any kind of phrase.
 
 abstract Text = Common ** {
 
   fun
-    TEmpty : Text ;
-    TFullStop : Phr -> Text -> Text ;
-    TQuestMark : Phr -> Text -> Text ;
-    TExclMark : Phr -> Text -> Text ;
+    TEmpty     : Text ;                 --
+    TFullStop  : Phr -> Text -> Text ;  -- John walks. ...
+    TQuestMark : Phr -> Text -> Text ;  -- Are you OK? ...
+    TExclMark  : Phr -> Text -> Text ;  -- John walks! ...
 
 }