diff --git a/sauron-dbus.el b/sauron-dbus.el
index 6c75588..984e332 100644
--- a/sauron-dbus.el
+++ b/sauron-dbus.el
@@ -1,13 +1,7 @@
-;;; sauron -- enhanced tracking of the world inside and outside your emacs
-;;; buffers. 
+;;; sauron-dbus.el --- a dbus tracking module, part of sauron
 ;;
 ;; Copyright (C) 2011 Dirk-Jan C. Binnema
 
-;; Author: Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
-;; Maintainer: Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
-;; Keywords: 
-;; Version: 0.0
-
 ;; This file is not part of GNU Emacs.
 ;;
 ;; Sauron is free software: you can redistribute it and/or modify
@@ -24,32 +18,10 @@
 ;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
-
-;; listen for dbus notifications.
-;; to call from shell, some convenience functions (for zsh, bash, *not* sh)
-;; # send URL to sauron...
-
-;; function sauron-url () {
-;;     # --print-reply
-;;     dbus-send --session          	   \
-;;     --dest="org.gnu.Emacs"		   \
-;;      "/org/gnu/Emacs/Sauron"            \
-;;     "org.gnu.Emacs.Sauron.AddUrlEvent"  \
-;;     string:shell uint32:3 string:url string:"$1"
-;; }
-
-;; # send message to sauron...
-;; function sauron-msg () {
-;;     # --print-reply
-;;     dbus-send --session          	       \
-;;     --dest="org.gnu.Emacs"		       \
-;;      "/org/gnu/Emacs/Sauron"                \
-;;     "org.gnu.Emacs.Sauron.AddMsgEvent"      \
-;;     string:shell uint32:3 string:$1
-;; }
+;;  For documentation, please see:
+;;  https://github.com/djcb/sauron/blob/master/README.org
 
 ;;; Code:
-
 (require 'dbus nil 'noerror)
 
 (defconst sr-dbus-service dbus-service-emacs
@@ -149,4 +121,5 @@
 
 (provide 'sauron-dbus)
 
+;;; sauron-dbus ends here
 
diff --git a/sauron-erc.el b/sauron-erc.el
index b08f780..751aca6 100644
--- a/sauron-erc.el
+++ b/sauron-erc.el
@@ -1,12 +1,7 @@
-;;; sauron-erc -- tracking your ERC irc-channels
+;;; sauron-erc.el --- an ERC tracking module, part of sauron
 ;;
 ;; Copyright (C) 2011 Dirk-Jan C. Binnema
 
-;; Author: Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
-;; Maintainer: Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
-;; Keywords:
-;; Version: 0.0
-
 ;; This file is not part of GNU Emacs.
 ;;
 ;; Sauron is free software: you can redistribute it and/or modify
@@ -23,6 +18,8 @@
 ;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
+;;  For documentation, please see:
+;;  https://github.com/djcb/sauron/blob/master/README.org
 
 ;;; Code:
 (require 'erc nil 'noerror)
@@ -141,3 +138,5 @@ The following events are erc-track
 	   :msg    ,msg))))
 
 (provide 'sauron-erc)
+
+;;; sauron-erc ends here
diff --git a/sauron-org.el b/sauron-org.el
index b2e859a..9283823 100644
--- a/sauron-org.el
+++ b/sauron-org.el
@@ -1,13 +1,7 @@
-;;; sauron-org -- enhanced tracking of the world inside and outside your emacs
-;;; buffers
+;;; sauron-org.el --- an org-mode (appt) tracking module, part of sauron
 ;;
 ;; Copyright (C) 2011 Dirk-Jan C. Binnema
 
-;; Author: Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
-;; Maintainer: Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
-;; Keywords: 
-;; Version: 0.0
-
 ;; This file is not part of GNU Emacs.
 ;;
 ;; Sauron is free software: you can redistribute it and/or modify
@@ -24,6 +18,8 @@
 ;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
+;;  For documentation, please see:
+;;  https://github.com/djcb/sauron/blob/master/README.org
 
 ;;; Code:
 (require 'appt nil 'noerror)
@@ -74,3 +70,5 @@ could be lists, too."
       (funcall sr-org-old-appt-func minutes-to-app new-time msg))))
   
 (provide 'sauron-org)  
+
+;;; sauron-org ends here
diff --git a/sauron.el b/sauron.el
index 69caeb0..1c027d0 100644
--- a/sauron.el
+++ b/sauron.el
@@ -1,12 +1,12 @@
-;;; sauron -- enhanced tracking of the world inside and outside your emacs
-;;; buffers
+;;; sauron.el --- a frame tracking events inside and outside your emacs buffers
 ;;
 ;; Copyright (C) 2011 Dirk-Jan C. Binnema
 
 ;; Author: Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
 ;; Maintainer: Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
-;; Keywords:
+;; Created: 06 Dec 2011
 ;; Version: 0.0
+;; Keywords:comm,frames
 
 ;; This file is not part of GNU Emacs.
 ;;
@@ -24,6 +24,9 @@
 ;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
+;;  For documentation, please see:
+;;  https://github.com/djcb/sauron/blob/master/README.org
+
 
 ;;; Code:
 (eval-when-compile (require 'cl))
@@ -465,3 +468,5 @@ id for the notification."
     note-id))
 
 (provide 'sauron)
+
+;;; sauron.el ends here