diff --git a/modules/core/lib/Auth/Process/AttributeAdd.php b/modules/core/lib/Auth/Process/AttributeAdd.php
index ab98be8578f5feefa6d9737ab683bfa9d9deea23..62b5e80d6a8a98c2f84893b8a3ba6c7e9264ea31 100644
--- a/modules/core/lib/Auth/Process/AttributeAdd.php
+++ b/modules/core/lib/Auth/Process/AttributeAdd.php
@@ -5,27 +5,6 @@
  *
  * This filter allows you to add attributes to the attribute set being processed.
  *
- * Example - add attribute, single value:
- * <code>
- * 'authproc' => array(
- *   50 => array('class' => 'core:AttributeAdd', 'source' => 'myidp'),
- *   ),
- * </code>
- *
- * Examle - add attribute, multiple values:
- * <code>
- * 'authproc' => array(
- *   50 => array('class' => 'core:AttributeAdd', 'groups' => array('users', 'members')),
- *   ),
- * </code>
- *
- * Examle - replace attribute, single value:
- * <code>
- * 'authproc' => array(
- *   50 => array('class' => 'core:AttributeAdd', '%replace', 'uid' => array('guest')),
- *   ),
- * </code>
- *
  * @author Olav Morken, UNINETT AS.
  * @package simpleSAMLphp
  * @version $Id$
diff --git a/modules/core/lib/Auth/Process/AttributeLimit.php b/modules/core/lib/Auth/Process/AttributeLimit.php
index 0cf1a3f9b5de21c8a11fa59849a8d0d9bce22af3..53ac65212082ace40eaee3a0463b04120e729e62 100644
--- a/modules/core/lib/Auth/Process/AttributeLimit.php
+++ b/modules/core/lib/Auth/Process/AttributeLimit.php
@@ -3,13 +3,6 @@
 /**
  * A filter for limiting which attributes are passed on.
  *
- * Example - remove all attributes except 'cn' and 'mail':
- * <code>
- * 'authproc' => array(
- *   50 => array('class' => 'core:AttributeLimit', 'cn', 'mail'),
- *   ),
- * </code>
- *
  * @author Olav Morken, UNINETT AS.
  * @package simpleSAMLphp
  * @version $Id$
diff --git a/modules/core/lib/Auth/Process/AttributeMap.php b/modules/core/lib/Auth/Process/AttributeMap.php
index 5209f8430ff2eb4db9d2296797635a6e75661154..b9a8f31702f4de352bc694ab3afffb30178795ca 100644
--- a/modules/core/lib/Auth/Process/AttributeMap.php
+++ b/modules/core/lib/Auth/Process/AttributeMap.php
@@ -3,20 +3,6 @@
 /**
  * Attribute filter for renaming attributes.
  *
- * Example 1 - apply map stored in attributemap/defaultmap.php:
- * <code>
- * 'authproc' => array(
- *   50 => array('class' => 'core:AttributeMap', 'defaultmaps'),
- *   ),
- * </code>
- *
- * Example 2 - rename attributes 'mail' and 'uid' to 'email' and 'user':
- * <code>
- * 'authproc' => array(
- *   50 => array('class' => 'core:AttributeMap', 'mail' => 'email', 'uid' => 'user'),
- *   ),
- * </code>
- *
  * @author Olav Morken, UNINETT AS.
  * @package simpleSAMLphp
  * @version $Id$
diff --git a/modules/core/lib/Auth/Process/TargetedID.php b/modules/core/lib/Auth/Process/TargetedID.php
index b8f8a0b33731f28450aba2a94412ec544e907053..3852d63dd30060ddd9592ea747cb8045be0d0869 100644
--- a/modules/core/lib/Auth/Process/TargetedID.php
+++ b/modules/core/lib/Auth/Process/TargetedID.php
@@ -21,7 +21,7 @@
  * Example - generate from mail-attribute:
  * <code>
  * 'authproc' => array(
- *   50 => array('class' => 'core:TargetedID' , 'attribute' => 'mail'),
+ *   50 => array('class' => 'core:TargetedID' , 'attributename' => 'mail'),
  * ),
  * </code>
  *
@@ -50,8 +50,8 @@ class sspmod_core_Auth_Process_TargetedID extends SimpleSAML_Auth_ProcessingFilt
 
 		assert('is_array($config)');
 
-		if (array_key_exists('attribute', $config)) {
-			$this->attribute = $config['attribute'];
+		if (array_key_exists('attributename', $config)) {
+			$this->attribute = $config['attributename'];
 			if (!is_string($this->attribute)) {
 				throw new Exception('Invalid attribute name given to core:TargetedID filter.');
 			}
diff --git a/www/saml2/idp/SingleLogoutServiceiFrame.php b/www/saml2/idp/SingleLogoutServiceiFrame.php
index 88b746a0e85283772a1c0bf64859829cf1cedefd..b839c446dcfcc99e7f5a1717befd5aa646719d35 100644
--- a/www/saml2/idp/SingleLogoutServiceiFrame.php
+++ b/www/saml2/idp/SingleLogoutServiceiFrame.php
@@ -108,7 +108,8 @@ function updateslostatus() {
 
 	foreach ($listofsps AS $spentityid) {
 
-		error_log('Completed ' . $spentityid);
+		SimpleSAML_Logger::debug('SAML2.0 - IdP.SingleLogoutServiceiFrame: Completed ' . $spentityid);
+		
 		// add a command to the response to assign the innerHTML attribute of
 		// the element with id="SomeElementId" to whatever the new content is