diff --git a/debug-viewer/GstDebugViewer/Common/Data.py b/debug-viewer/GstDebugViewer/Common/Data.py
index 8539f935a1..70a3cb44ec 100644
--- a/debug-viewer/GstDebugViewer/Common/Data.py
+++ b/debug-viewer/GstDebugViewer/Common/Data.py
@@ -17,7 +17,7 @@
 #  You should have received a copy of the GNU General Public License along with
 #  this program.  If not, see <http://www.gnu.org/licenses/>.
 
-"""GStreamer development utilities common Data module"""
+"""GStreamer Development Utilities Common Data module."""
 
 import pygtk
 pygtk.require ("2.0")
diff --git a/debug-viewer/GstDebugViewer/Common/GUI.py b/debug-viewer/GstDebugViewer/Common/GUI.py
index bf668ca6a6..ddc4334a3a 100644
--- a/debug-viewer/GstDebugViewer/Common/GUI.py
+++ b/debug-viewer/GstDebugViewer/Common/GUI.py
@@ -17,7 +17,7 @@
 #  You should have received a copy of the GNU General Public License along with
 #  this program.  If not, see <http://www.gnu.org/licenses/>.
 
-"""GStreamer development utilities common GUI module"""
+"""GStreamer Development Utilities Common GUI module."""
 
 import logging
 
diff --git a/debug-viewer/GstDebugViewer/Common/Main.py b/debug-viewer/GstDebugViewer/Common/Main.py
index 934276a304..414a0f75e1 100644
--- a/debug-viewer/GstDebugViewer/Common/Main.py
+++ b/debug-viewer/GstDebugViewer/Common/Main.py
@@ -15,9 +15,9 @@
 #  more details.
 #
 #  You should have received a copy of the GNU General Public License along with
-#  this program; if not, see <http://www.gnu.org/licenses/>.
+#  this program.  If not, see <http://www.gnu.org/licenses/>.
 
-"""GStreamer development utilities common main module."""
+"""GStreamer Development Utilities Common Main module."""
 
 import sys
 import os
diff --git a/debug-viewer/GstDebugViewer/Common/__init__.py b/debug-viewer/GstDebugViewer/Common/__init__.py
index c1549eb1a8..7adb873ef8 100644
--- a/debug-viewer/GstDebugViewer/Common/__init__.py
+++ b/debug-viewer/GstDebugViewer/Common/__init__.py
@@ -1,5 +1,7 @@
 # -*- coding: utf-8; mode: python; -*-
 #
+#  GStreamer Development Utilities
+#
 #  Copyright (C) 2007 René Stadler <mail@renestadler.de>
 #
 #  This program is free software; you can redistribute it and/or modify it
@@ -15,6 +17,6 @@
 #  You should have received a copy of the GNU General Public License along with
 #  this program.  If not, see <http://www.gnu.org/licenses/>.
 
-"""GStreamer development utilities common module"""
+"""GStreamer Development Utilities Common package."""
 
 import Data, GUI, Main, utils
diff --git a/debug-viewer/GstDebugViewer/Common/utils.py b/debug-viewer/GstDebugViewer/Common/utils.py
index 95f491e703..55dd54a6bf 100644
--- a/debug-viewer/GstDebugViewer/Common/utils.py
+++ b/debug-viewer/GstDebugViewer/Common/utils.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8; mode: python; -*-
 #
-#  GStreamer Inspector - Multimedia system plugin introspection
+#  GStreamer Development Utilities
 #
 #  Copyright (C) 2007 René Stadler <mail@renestadler.de>
 #
@@ -17,7 +17,7 @@
 #  You should have received a copy of the GNU General Public License along with
 #  this program; if not, see <http://www.gnu.org/licenses/>.
 
-"""Misc utilities."""
+"""GStreamer Development Utilities Common utils module."""
 
 import os
 import logging
diff --git a/debug-viewer/GstDebugViewer/Data.py b/debug-viewer/GstDebugViewer/Data.py
index c837e0096f..dc44f561ef 100644
--- a/debug-viewer/GstDebugViewer/Data.py
+++ b/debug-viewer/GstDebugViewer/Data.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8; mode: python; -*-
 #
-#  GStreamer Debug Viewer
+#  GStreamer Debug Viewer - View and analyze GStreamer debug log files
 #
 #  Copyright (C) 2007 René Stadler <mail@renestadler.de>
 #
@@ -17,7 +17,7 @@
 #  You should have received a copy of the GNU General Public License along with
 #  this program.  If not, see <http://www.gnu.org/licenses/>.
 
-"""GStreamer debug viewer data module"""
+"""GStreamer Debug Viewer Data module."""
 
 import os
 import logging
diff --git a/debug-viewer/GstDebugViewer/GUI.py b/debug-viewer/GstDebugViewer/GUI.py
index c335059ca6..b68bbbce06 100755
--- a/debug-viewer/GstDebugViewer/GUI.py
+++ b/debug-viewer/GstDebugViewer/GUI.py
@@ -1,25 +1,23 @@
-#!/usr/bin/python
 # -*- coding: utf-8; mode: python; -*-
-##
-## gst-debug-viewer.py: GStreamer debug log viewer
-##
-## Copyright (C) 2006 Rene Stadler <mail@renestadler.de>
-##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free
-## Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-## Boston, MA 02110-1301 USA
-##
+#
+#  GStreamer Debug Viewer - View and analyze GStreamer debug log files
+#
+#  Copyright (C) 2007 René Stadler <mail@renestadler.de>
+#
+#  This program is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU General Public License as published by the Free
+#  Software Foundation; either version 3 of the License, or (at your option)
+#  any later version.
+#
+#  This program is distributed in the hope that it will be useful, but WITHOUT
+#  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+#  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+#  more details.
+#
+#  You should have received a copy of the GNU General Public License along with
+#  this program.  If not, see <http://www.gnu.org/licenses/>.
+
+"""GStreamer Debug Viewer GUI module."""
 
 __author__ = u"René Stadler <mail@renestadler.de>"
 __version__ = "0.1"
diff --git a/debug-viewer/GstDebugViewer/Main.py b/debug-viewer/GstDebugViewer/Main.py
index 65ad0a3a55..7c296d194a 100644
--- a/debug-viewer/GstDebugViewer/Main.py
+++ b/debug-viewer/GstDebugViewer/Main.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8; mode: python; -*-
 #
-#  GStreamer Debug Viewer
+#  GStreamer Debug Viewer - View and analyze GStreamer debug log files
 #
 #  Copyright (C) 2007 René Stadler <mail@renestadler.de>
 #
@@ -17,7 +17,7 @@
 #  You should have received a copy of the GNU General Public License along with
 #  this program.  If not, see <http://www.gnu.org/licenses/>.
 
-"""GStreamer debug viewer main module"""
+"""GStreamer Debug Viewer Main module."""
 
 import sys
 from gettext import gettext as _, ngettext
diff --git a/debug-viewer/GstDebugViewer/Plugins/ColorizeRows.py b/debug-viewer/GstDebugViewer/Plugins/ColorizeRows.py
index e80130acff..bcf0902894 100644
--- a/debug-viewer/GstDebugViewer/Plugins/ColorizeRows.py
+++ b/debug-viewer/GstDebugViewer/Plugins/ColorizeRows.py
@@ -1,3 +1,23 @@
+# -*- coding: utf-8; mode: python; -*-
+#
+#  GStreamer Debug Viewer - View and analyze GStreamer debug log files
+#
+#  Copyright (C) 2007 René Stadler <mail@renestadler.de>
+#
+#  This program is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU General Public License as published by the Free
+#  Software Foundation; either version 3 of the License, or (at your option)
+#  any later version.
+#
+#  This program is distributed in the hope that it will be useful, but WITHOUT
+#  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+#  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+#  more details.
+#
+#  You should have received a copy of the GNU General Public License along with
+#  this program.  If not, see <http://www.gnu.org/licenses/>.
+
+"""GStreamer Debug Viewer row colorization plugin."""
 
 from GstDebugViewer.Plugins import FeatureBase, PluginBase
 
diff --git a/debug-viewer/GstDebugViewer/Plugins/FileProperties.py b/debug-viewer/GstDebugViewer/Plugins/FileProperties.py
index ea88ed7b09..5635c86751 100644
--- a/debug-viewer/GstDebugViewer/Plugins/FileProperties.py
+++ b/debug-viewer/GstDebugViewer/Plugins/FileProperties.py
@@ -1,3 +1,23 @@
+# -*- coding: utf-8; mode: python; -*-
+#
+#  GStreamer Debug Viewer - View and analyze GStreamer debug log files
+#
+#  Copyright (C) 2007 René Stadler <mail@renestadler.de>
+#
+#  This program is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU General Public License as published by the Free
+#  Software Foundation; either version 3 of the License, or (at your option)
+#  any later version.
+#
+#  This program is distributed in the hope that it will be useful, but WITHOUT
+#  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+#  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+#  more details.
+#
+#  You should have received a copy of the GNU General Public License along with
+#  this program.  If not, see <http://www.gnu.org/licenses/>.
+
+"""GStreamer Debug Viewer file properties plugin."""
 
 from GstDebugViewer.Plugins import *
 import logging
diff --git a/debug-viewer/GstDebugViewer/Plugins/Timeline.py b/debug-viewer/GstDebugViewer/Plugins/Timeline.py
index 71e1379949..7c1b7c9547 100644
--- a/debug-viewer/GstDebugViewer/Plugins/Timeline.py
+++ b/debug-viewer/GstDebugViewer/Plugins/Timeline.py
@@ -1,3 +1,23 @@
+# -*- coding: utf-8; mode: python; -*-
+#
+#  GStreamer Debug Viewer - View and analyze GStreamer debug log files
+#
+#  Copyright (C) 2007 René Stadler <mail@renestadler.de>
+#
+#  This program is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU General Public License as published by the Free
+#  Software Foundation; either version 3 of the License, or (at your option)
+#  any later version.
+#
+#  This program is distributed in the hope that it will be useful, but WITHOUT
+#  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+#  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+#  more details.
+#
+#  You should have received a copy of the GNU General Public License along with
+#  this program.  If not, see <http://www.gnu.org/licenses/>.
+
+"""GStreamer Debug Viewer timeline widget plugin."""
 
 import logging
 
diff --git a/debug-viewer/GstDebugViewer/Plugins/__init__.py b/debug-viewer/GstDebugViewer/Plugins/__init__.py
index e9ff712124..1fa3a00ab9 100644
--- a/debug-viewer/GstDebugViewer/Plugins/__init__.py
+++ b/debug-viewer/GstDebugViewer/Plugins/__init__.py
@@ -1,3 +1,23 @@
+# -*- coding: utf-8; mode: python; -*-
+#
+#  GStreamer Debug Viewer - View and analyze GStreamer debug log files
+#
+#  Copyright (C) 2007 René Stadler <mail@renestadler.de>
+#
+#  This program is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU General Public License as published by the Free
+#  Software Foundation; either version 3 of the License, or (at your option)
+#  any later version.
+#
+#  This program is distributed in the hope that it will be useful, but WITHOUT
+#  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+#  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+#  more details.
+#
+#  You should have received a copy of the GNU General Public License along with
+#  this program.  If not, see <http://www.gnu.org/licenses/>.
+
+"""GStreamer Debug Viewer Plugins package."""
 
 __all__ = ["_", "FeatureBase", "PluginBase"]
 
diff --git a/debug-viewer/GstDebugViewer/__init__.py b/debug-viewer/GstDebugViewer/__init__.py
index b903d2daa3..2bf8812737 100644
--- a/debug-viewer/GstDebugViewer/__init__.py
+++ b/debug-viewer/GstDebugViewer/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8; mode: python; -*-
 #
-#  GStreamer Debug Viewer
+#  GStreamer Debug Viewer - View and analyze GStreamer debug log files
 #
 #  Copyright (C) 2007 René Stadler <mail@renestadler.de>
 #
@@ -17,6 +17,8 @@
 #  You should have received a copy of the GNU General Public License along with
 #  this program.  If not, see <http://www.gnu.org/licenses/>.
 
+"""GStreamer Debug Viewer package."""
+
 version = "0.1"
 
 __version__ = version
diff --git a/debug-viewer/gst-debug-viewer b/debug-viewer/gst-debug-viewer
index 3343f7cd27..dff1b920b4 100755
--- a/debug-viewer/gst-debug-viewer
+++ b/debug-viewer/gst-debug-viewer
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8; mode: python; -*-
 #
-#  GStreamer Debug Viewer
+#  GStreamer Debug Viewer - View and analyze GStreamer debug log files
 #
 #  Copyright (C) 2007 René Stadler <mail@renestadler.de>
 #
diff --git a/debug-viewer/setup.py b/debug-viewer/setup.py
index 04a4e8568c..d7ddff4c1e 100755
--- a/debug-viewer/setup.py
+++ b/debug-viewer/setup.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
-# -*- coding: utf-8; -*-
+# -*- coding: utf-8; mode: python; -*-
 #
-#  GStreamer Debug Viewer
+#  GStreamer Debug Viewer - View and analyze GStreamer debug log files
 #
 #  Copyright (C) 2007 René Stadler <mail@renestadler.de>
 #