diff --git a/src/GF/API/BatchTranslate.hs b/src/GF/API/BatchTranslate.hs
index 88a10a2af..783cc7296 100644
--- a/src/GF/API/BatchTranslate.hs
+++ b/src/GF/API/BatchTranslate.hs
@@ -1,7 +1,7 @@
 ----------------------------------------------------------------------
 -- |
--- Module      : (Module)
--- Maintainer  : (Maintainer)
+-- Module      : BatchTranslate
+-- Maintainer  : Aarne Ranta
 -- Stability   : (stable)
 -- Portability : (portable)
 --
diff --git a/src/GF/API/GrammarToHaskell.hs b/src/GF/API/GrammarToHaskell.hs
index 61e720dd1..35f254b64 100644
--- a/src/GF/API/GrammarToHaskell.hs
+++ b/src/GF/API/GrammarToHaskell.hs
@@ -1,7 +1,7 @@
 ----------------------------------------------------------------------
 -- |
--- Module      : (Module)
--- Maintainer  : (Maintainer)
+-- Module      : GrammarToHaskell
+-- Maintainer  : Aarne Ranta
 -- Stability   : (stable)
 -- Portability : (portable)
 --
diff --git a/src/GF/API/IOGrammar.hs b/src/GF/API/IOGrammar.hs
index 5a12e6b42..85dd3bbd1 100644
--- a/src/GF/API/IOGrammar.hs
+++ b/src/GF/API/IOGrammar.hs
@@ -1,7 +1,7 @@
 ----------------------------------------------------------------------
 -- |
--- Module      : (Module)
--- Maintainer  : (Maintainer)
+-- Module      : IOGrammar
+-- Maintainer  : Aarne Ranta
 -- Stability   : (stable)
 -- Portability : (portable)
 --
@@ -12,7 +12,8 @@
 -- for reading grammars and terms from strings and files
 -----------------------------------------------------------------------------
 
-module IOGrammar where
+module IOGrammar (shellStateFromFiles, 
+		  getShellStateFromFiles) where
 
 import Abstract
 import qualified GFC
diff --git a/src/GF/API/MyParser.hs b/src/GF/API/MyParser.hs
index c45f30c3d..a3a489bd2 100644
--- a/src/GF/API/MyParser.hs
+++ b/src/GF/API/MyParser.hs
@@ -1,7 +1,7 @@
 ----------------------------------------------------------------------
 -- |
--- Module      : (Module)
--- Maintainer  : (Maintainer)
+-- Module      : MyParser
+-- Maintainer  : Peter Ljunglöf
 -- Stability   : (stable)
 -- Portability : (portable)
 --
@@ -9,7 +9,7 @@
 -- > CVS $Author $
 -- > CVS $Revision $
 --
--- template to define your own parser
+-- template to define your own parser (obsolete?)
 -----------------------------------------------------------------------------
 
 module MyParser (myParser) where
diff --git a/src/GF/Canon/Share.hs b/src/GF/Canon/Share.hs
index b6d1df520..8b4e7f2e6 100644
--- a/src/GF/Canon/Share.hs
+++ b/src/GF/Canon/Share.hs
@@ -1,7 +1,7 @@
 ----------------------------------------------------------------------
 -- |
--- Module      : (Module)
--- Maintainer  : (Maintainer)
+-- Module      : Share
+-- Maintainer  : AR
 -- Stability   : (stable)
 -- Portability : (portable)
 --
diff --git a/src/GF/Canon/SkelGFC.hs b/src/GF/Canon/SkelGFC.hs
index 3949351e6..9f5729418 100644
--- a/src/GF/Canon/SkelGFC.hs
+++ b/src/GF/Canon/SkelGFC.hs
@@ -1,16 +1,3 @@
-----------------------------------------------------------------------
--- |
--- Module      : (Module)
--- Maintainer  : (Maintainer)
--- Stability   : (stable)
--- Portability : (portable)
---
--- > CVS $Date $ 
--- > CVS $Author $
--- > CVS $Revision $
---
--- (Description of the module)
------------------------------------------------------------------------------
 
 module SkelGFC where
 
diff --git a/src/GF/Canon/TestGFC.hs b/src/GF/Canon/TestGFC.hs
index a9aa71f31..9dc2f3e88 100644
--- a/src/GF/Canon/TestGFC.hs
+++ b/src/GF/Canon/TestGFC.hs
@@ -1,16 +1,3 @@
-----------------------------------------------------------------------
--- |
--- Module      : (Module)
--- Maintainer  : (Maintainer)
--- Stability   : (stable)
--- Portability : (portable)
---
--- > CVS $Date $ 
--- > CVS $Author $
--- > CVS $Revision $
---
--- (Description of the module)
------------------------------------------------------------------------------
 
 -- automatically generated by BNF Converter
 module Main where
diff --git a/src/GF/Canon/Unlex.hs b/src/GF/Canon/Unlex.hs
index 934fe3c43..febf8f5c7 100644
--- a/src/GF/Canon/Unlex.hs
+++ b/src/GF/Canon/Unlex.hs
@@ -1,11 +1,11 @@
 ----------------------------------------------------------------------
 -- |
--- Module      : (Module)
--- Maintainer  : (Maintainer)
+-- Module      : Unlex
+-- Maintainer  : AR
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date $ 
+-- > CVS $Date: 2005/02/17 10:22:10 $ 
 -- > CVS $Author $
 -- > CVS $Revision $
 --