diff --git a/modules/db/doc/db.rst b/modules/db/doc/db.rst
index 98a15ddc0ec3de59fb65714f386bd23ff5273ed4..3203a416b1ac89d779f957c7cbd8a6f0ed0f6cec 100644
--- a/modules/db/doc/db.rst
+++ b/modules/db/doc/db.rst
@@ -1,8 +1,8 @@
 :mod:`~ost.db` - Linear Database
 ===============================================================================
 
-.. currentmodule:: ost.db
-
+.. module:: ost.db
+  :synopsis: Linear database.
 
 Many applications require to load lots of structures. Expecially on distributed
 file systems, io becomes a problem.
diff --git a/modules/gfx/doc/gfx.rst b/modules/gfx/doc/gfx.rst
index de9cf3ddbcf1170f9cfac59f7377ec284fdf3b5a..4d54795d01220eaf402c3dcbccebb8fb32ad548d 100644
--- a/modules/gfx/doc/gfx.rst
+++ b/modules/gfx/doc/gfx.rst
@@ -1,10 +1,10 @@
 :mod:`~ost.gfx` - Realtime 3D Rendering
 ================================================================================
 
-For a introduction to the :mod:`~ost.gfx` module, please have a look at the :doc:`../intro-03`.
-
 .. module:: ost.gfx
   :synopsis: Realtime 3D Rendering
+
+For a introduction to the :mod:`~ost.gfx` module, please have a look at the :doc:`../intro-03`.
   
 .. toctree::
   :maxdepth: 2
diff --git a/modules/img/base/doc/img.rst b/modules/img/base/doc/img.rst
index 0cd470a66cce267dc572c9e2a628ffa7e9673766..b36b0cd692ed02c18a450bd38c6912f6b51217ec 100644
--- a/modules/img/base/doc/img.rst
+++ b/modules/img/base/doc/img.rst
@@ -1,15 +1,15 @@
 :mod:`~ost.img` - Images and Density Maps
 ================================================================================
 
+.. module:: ost.img
+   :synopsis: Images and density maps
+
 .. toctree::
   :hidden:
 
   point-size-extent
   ../alg/alg
 
-.. module:: ost.img
-   :synopsis: Images and density maps
-              
 Introduction : The ImageHandle
 --------------------------------------------------------------------------------
 
diff --git a/modules/io/doc/io.rst b/modules/io/doc/io.rst
index 70174b3753f094fb5654c9a89a650c04943cb422..87bd4d3c808e7f6e6a2e990d1353c859ed3684a8 100644
--- a/modules/io/doc/io.rst
+++ b/modules/io/doc/io.rst
@@ -1,6 +1,9 @@
 :mod:`~ost.io` - Input and Output of Sequences, Structures and Maps
 ================================================================================
 
+.. module:: ost.io
+  :synopsis: Input and output of sequences, alignments, structures, images and density maps.
+
 .. toctree::
   :hidden:
   
@@ -11,10 +14,7 @@
   mmcif
   profile
 
-.. module:: ost.io
-  :synopsis: Input and output of sequences, alignments, structures, images and density maps.
-
-The io module deals with the input and output of :class:`entities 
+The io module deals with the input and output of :class:`entities
 <ost.mol.EntityHandle>`, :class:`alignments <ost.seq.AlignmentHandle>`, 
 :class:`sequences <ost.seq.SequenceHandle>`, :class:`images 
 <ost.img.ImageHandle>`. Importers for common file formats containing molecules 
diff --git a/modules/mol/alg/doc/qsscore.rst b/modules/mol/alg/doc/qsscore.rst
index 1422d625a5dca24bdb7a2745c16d307161159882..7b6f1711f1441ce8d7631c1bb28fab471d3568c6 100644
--- a/modules/mol/alg/doc/qsscore.rst
+++ b/modules/mol/alg/doc/qsscore.rst
@@ -1,6 +1,9 @@
 :mod:`~ost.mol.alg.qsscore` -- New QS Score Implementation
 --------------------------------------------------------------------------------
 
+.. module:: ost.mol.alg.qsscore
+   :synopsis: New QS score implementation
+
 .. note::
 
   This is a new implementation of QS Score, introduced in OpenStructure 2.4 and