diff --git a/lib/SimpleSAML/XML/AuthnResponse.php b/lib/SimpleSAML/XML/AuthnResponse.php
index faeef7be4bebf5075435490d8f0ad3cba626adbd..da697ccb5dca479c26baaf93666e2fb24434d142 100644
--- a/lib/SimpleSAML/XML/AuthnResponse.php
+++ b/lib/SimpleSAML/XML/AuthnResponse.php
@@ -1,15 +1,4 @@
 <?php
-
-
-/**
- * SimpleSAMLphp
- *
- * PHP versions 4 and 5
- *
- * LICENSE: See the COPYING file included in this distribution.
- *
- * @author Andreas Ĺkre Solberg, UNINETT AS. <andreas.solberg@uninett.no>
- */
  
 require_once('SimpleSAML/Configuration.php');
 require_once('SimpleSAML/Session.php');
@@ -19,9 +8,14 @@ require_once('SimpleSAML/Metadata/MetaDataStorageHandler.php');
 require_once('xmlseclibs.php');
  
 /**
- * Configuration of SimpleSAMLphp
+ * Abstract class of an Authentication response
+ *
+ * @author Andreas Ĺkre Solberg, UNINETT AS. <andreas.solberg@uninett.no>
+ * @package simpleSAMLphp
+ * @version $Id$
+ * @abstract
  */
-abstract class SimpleSAML_XML_AuthnResponse {
+ abstract class SimpleSAML_XML_AuthnResponse {
 
 	private $configuration = null;
 	private $metadata = 'default.php';
diff --git a/lib/SimpleSAML/XML/SAML20/AuthnResponse.php b/lib/SimpleSAML/XML/SAML20/AuthnResponse.php
index 1876ebc2ac25c97171f5744049eb47dd13636af3..e89ecafe99221de8bd66928045a50c3ea91c0a82 100644
--- a/lib/SimpleSAML/XML/SAML20/AuthnResponse.php
+++ b/lib/SimpleSAML/XML/SAML20/AuthnResponse.php
@@ -1,16 +1,5 @@
 <?php
 
-
-/**
- * SimpleSAMLphp
- *
- * PHP versions 4 and 5
- *
- * LICENSE: See the COPYING file included in this distribution.
- *
- * @author Andreas Ă…kre Solberg, UNINETT AS. <andreas.solberg@uninett.no>
- */
- 
 require_once('SimpleSAML/Configuration.php');
 require_once('SimpleSAML/Session.php');
 require_once('SimpleSAML/Utilities.php');
@@ -20,7 +9,12 @@ require_once('SimpleSAML/XML/AuthnResponse.php');
 require_once('xmlseclibs.php');
  
 /**
- * Configuration of SimpleSAMLphp
+ * An SAML 2.0 Authentication Response
+ *
+ * @author Andreas Ă…kre Solberg, UNINETT AS. <andreas.solberg@uninett.no>
+ * @package simpleSAMLphp
+ * @version $Id$
+ * @abstract
  */
 class SimpleSAML_XML_SAML20_AuthnResponse extends SimpleSAML_XML_AuthnResponse {
 
diff --git a/lib/SimpleSAML/XML/Shib13/AuthnResponse.php b/lib/SimpleSAML/XML/Shib13/AuthnResponse.php
index 7ad10749cadd626e24897ec5d827cd1f0600b2e0..98c24cbeb8646d25c124352f56c07817ef85bb84 100644
--- a/lib/SimpleSAML/XML/Shib13/AuthnResponse.php
+++ b/lib/SimpleSAML/XML/Shib13/AuthnResponse.php
@@ -1,13 +1,4 @@
 <?php
-
-
-/**
- * SimpleSAMLphp
- *
- * LICENSE: See the COPYING file included in this distribution.
- *
- * @author Andreas Ĺkre Solberg, UNINETT AS. <andreas.solberg@uninett.no>
- */
  
 require_once('SimpleSAML/Configuration.php');
 require_once('SimpleSAML/Session.php');
@@ -18,7 +9,12 @@ require_once('SimpleSAML/XML/AuthnResponse.php');
 require_once('xmlseclibs.php');
  
 /**
- * Configuration of SimpleSAMLphp
+ * A Shibboleth 1.3 authentication response.
+ *
+ * @author Andreas Ĺkre Solberg, UNINETT AS. <andreas.solberg@uninett.no>
+ * @package simpleSAMLphp
+ * @version $Id$
+ * @abstract
  */
 class SimpleSAML_XML_Shib13_AuthnResponse extends SimpleSAML_XML_AuthnResponse {
 
diff --git a/www/saml2/sp/AssertionConsumerService.php b/www/saml2/sp/AssertionConsumerService.php
index d1d5da804061270722496dab51cdae3409d02bce..2101498deac125adb874d2f8eb2990f8e747ee3d 100644
--- a/www/saml2/sp/AssertionConsumerService.php
+++ b/www/saml2/sp/AssertionConsumerService.php
@@ -11,6 +11,18 @@ require_once('SimpleSAML/XML/SAML20/AuthnRequest.php');
 require_once('SimpleSAML/Bindings/SAML20/HTTPPost.php');
 require_once('SimpleSAML/XHTML/Template.php');
 
+/**
+ * This SAML 2.0 endpoint is the endpoint at the SAML 2.0 SP that takes an Authentication Response
+ * as HTTP-POST in, and parses and processes it before it redirects the use to the RelayState.
+ *
+ * @author Andreas Ĺkre Solberg, UNINETT AS. <andreas.solberg@uninett.no>
+ * @package simpleSAMLphp
+ * @version $Id$
+ * @abstract
+ */
+
+
+
 /* Get the session object for the user. Create a new session if no session
  * exists for this user.
  */