diff --git a/manifests/debian.pp b/manifests/debian.pp
index 0712344a12f830198b71269d39d81a157ea9bbdb..4c8b3c163bd7fc475ae5c664a8fd5dcb86dc4ae2 100644
--- a/manifests/debian.pp
+++ b/manifests/debian.pp
@@ -27,6 +27,7 @@ class sympa::debian {
   }
 }
 
+# move these to dirs
 class sympa::fastcgi::debian {
   package {
     [ libapache2-mod-fastcgi, libcgi-fast-perl ]:
diff --git a/manifests/fastcgi.pp b/manifests/fastcgi.pp
index 34ad68fa662f63bfcdfa079fc5408d92449886f4..e95db3a9dcdbbb435a73d16df6172dfc7c7c9312 100644
--- a/manifests/fastcgi.pp
+++ b/manifests/fastcgi.pp
@@ -25,9 +25,6 @@ class sympa::fastcgi {
 
   apache2::module {
     "fastcgi": ensure => present, require_package => "libapache2-mod-fastcgi";
-    # we need a way to set things in fcgid.conf, but the apache2 module
-    # we're currently (Aug 2011) using doesn't support that, so we deliver
-    # it as a file below
     "fcgid": ensure => absent;
   }
   
diff --git a/manifests/fcgid.pp b/manifests/fcgid.pp
index ce632b0584a0ec1fb59ff1a1b860335b0ad5e1f0..d18af7ddbf2649df8999705a1c2ee06c15cdaadf 100644
--- a/manifests/fcgid.pp
+++ b/manifests/fcgid.pp
@@ -10,17 +10,18 @@ class sympa::fcgid {
     # we're currently (Aug 2011) using doesn't support that, so we deliver
     # it as a file below
     "fcgid": ensure => present, require_package => "libapache2-mod-fcgid";
-    # disable fastcgi FIXME: too much?
     "fastcgi": ensure => absent;
   }
 
-  # FIXME: this is Riseup specific, figure out where to move it
   file {
     # NOTE: as mentioned above it would be better if the apache2 module
     # could handle setting things in the module conf files for us, but for
     # now we just deliver the file
+    # FIXME: a newer augeas supports making the changes that this file delivers
+    #  move to it once we have it backported
     "/etc/apache2/mods-available/fcgid.conf":
       source => "$fileserver/apache2/fcgid.conf",
       owner => root, group => root, mode => 0644;
   }
 }
+
diff --git a/manifests/init.pp b/manifests/init.pp
index 4a0ae10ceeb583840e4f58e3b92be712c5f4176c..030affa1e6264fba17ef5ebeb7d912b7f2752bda 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -3,9 +3,10 @@ class sympa {
   case $operatingsystem {
     debian: { include sympa::debian }
     mageia: { include sympa::mageia }
-    default: { include sympa::default }
+    default: { err("This operating system not supported") }
   }
 
+  #FIXME: globals suck, use the right method (see the dovecot module)
   if $use_munin { include sympa::munin }
   if $use_nagios { include sympa::nagios }
 
diff --git a/manifests/milter.pp b/manifests/milter.pp
index 0d5e4a8eedfacd375e616f0497eccd7ae06810b5..ecf4850022e87f20c27eecafdc9ca2b0103a8f5d 100644
--- a/manifests/milter.pp
+++ b/manifests/milter.pp
@@ -1,3 +1,5 @@
+# FIXME: maybe this shouldn't be in the sympa class?
+
 class sympa::samilter {
   case $operatingsystem {
     debian: { include sympa::samilter::debian }