diff --git a/core/modules/openid/openid.api.php b/core/modules/openid/openid.api.php
index bd286ff..8483408 100644
--- a/core/modules/openid/openid.api.php
+++ b/core/modules/openid/openid.api.php
@@ -77,7 +77,7 @@ function hook_openid_discovery_method_info_alter(&$methods) {
 /**
  * Allow modules to declare OpenID normalization methods.
  *
- * The discovery function callbacks will be called in turn with an unique
+ * The discovery function callbacks will be called in turn with a unique
  * parameter, the identifier to normalize. They have to return a normalized
  * identifier, or NULL if the identifier is not in a form they can handle.
  *
@@ -89,6 +89,7 @@ function hook_openid_discovery_method_info_alter(&$methods) {
  *   when normalizing an OpenID identifier. The normalization functions have
  *   to return a normalized identifier, or NULL if the identifier is not in
  *   a form they can handle.
+ *
  * @see hook_openid_normalization_method_info_alter()
  */
 function hook_openid_normalization_method_info() {
diff --git a/core/modules/openid/openid.inc b/core/modules/openid/openid.inc
index 518dc8a..837659c 100644
--- a/core/modules/openid/openid.inc
+++ b/core/modules/openid/openid.inc
@@ -66,6 +66,11 @@ const OPENID_NS_XRD = 'xri://$xrd*($v*2.0)';
 
 /**
  * Performs an HTTP 302 redirect (for the 1.x protocol).
+ *
+ * @param $url
+ *   The URL to redirect to.
+ * @param array $message
+ *   Array of query string variables.
  */
 function openid_redirect_http($url, $message) {
   $query = array();
@@ -80,7 +85,12 @@ function openid_redirect_http($url, $message) {
 }
 
 /**
- * Creates a js auto-submit redirect for (for the 2.x protocol)
+ * Creates a JavaScript auto-submit redirect for (for the 2.x protocol).
+ *
+ * @param $url
+ *   The URL to redirect to.
+ * @param array $message
+ *   Array of query string variables.Creates a js auto-submit redirect for (for the 2.x protocol)
  */
 function openid_redirect($url, $message) {
   global $language_interface;
@@ -102,6 +112,18 @@ function openid_redirect($url, $message) {
   drupal_exit();
 }
 
+/**
+ * Form constructor for the JavaScript auto-submit redirect form.
+ *
+ * Posts to the destination URL, does not have validate or submit functions.
+ *
+ * @param $url
+ *   The URL to redirect to.
+ * @param array $message
+ *   Array of query string variables.
+ *
+ * @ingroup forms
+ */
 function openid_redirect_form($form, &$form_state, $url, $message) {
   $form['#action'] = $url;
   $form['#method'] = "post";
@@ -124,10 +146,11 @@ function openid_redirect_form($form, &$form_state, $url, $message) {
 }
 
 /**
- * Parse an XRDS document.
+ * Parses an XRDS document.
  *
  * @param $raw_xml
  *   A string containing the XRDS document.
+ *
  * @return
  *   An array of service entries.
  */
@@ -167,7 +190,7 @@ function _openid_xrds_parse($raw_xml) {
 }
 
 /**
- * Select a service element.
+ * Selects a service element.
  *
  * The procedure is described in OpenID Authentication 2.0, section 7.3.2.
  *
@@ -176,6 +199,7 @@ function _openid_xrds_parse($raw_xml) {
  *
  * @param $services
  *   An array of service arrays as returned by openid_discovery().
+ *
  * @return
  *   The selected service array, or NULL if no valid services were found.
  */
@@ -224,7 +248,13 @@ function _openid_select_service(array $services) {
 }
 
 /**
- * Determine if the given identifier is an XRI ID.
+ * Determines if the given identifier is an XRI ID.
+ *
+ * @param $identifier
+ *   The identifier to test.
+ *
+ * @return
+ *   TRUE if the identifier is an XRI, FALSE otherwise.
  */
 function _openid_is_xri($identifier) {
   // Strip the xri:// scheme from the identifier if present.
@@ -242,9 +272,18 @@ function _openid_is_xri($identifier) {
 }
 
 /**
- * Normalize the given identifier.
+ * Normalizes the given identifier.
  *
  * The procedure is described in OpenID Authentication 2.0, section 7.2.
+ *
+ * @param $identifier
+ *   The identifier to normalize.
+ *
+ * @return $string
+ *   The normalized identifier.
+ *
+ * @see hook_openid_normalization_method_info()
+ * @see hook_openid_normalization_method_info_alter()
  */
 function openid_normalize($identifier) {
   $methods = module_invoke_all('openid_normalization_method_info');
@@ -264,7 +303,15 @@ function openid_normalize($identifier) {
 }
 
 /**
- * OpenID normalization method: normalize XRI identifiers.
+ * Normalizes XRI identifiers.
+ *
+ * This is one of this module's OpenID normalization methods.
+ *
+ * @param $identifier
+ *   The identifier to normalize.
+ *
+ * @return $string
+ *   The normalized identifier.
  */
 function _openid_xri_normalize($identifier) {
   if (_openid_is_xri($identifier)) {
@@ -276,7 +323,15 @@ function _openid_xri_normalize($identifier) {
 }
 
 /**
- * OpenID normalization method: normalize URL identifiers.
+ * Normalizes URL identifiers.
+ *
+ * This is one of this module's OpenID normalization methods.
+ *
+ * @param $identifier
+ *   The identifier to normalize.
+ *
+ * @return string
+ *   The normalized identifier.
  */
 function _openid_url_normalize($url) {
   $normalized_url = $url;
@@ -296,7 +351,15 @@ function _openid_url_normalize($url) {
 }
 
 /**
- * Create a serialized message packet as per spec: $key:$value\n .
+ * Normalizes URL identifiers.
+ *
+ * This is one of this module's OpenID normalization methods.
+ *
+ * @param $identifier
+ *   The identifier to normalize.
+ *
+ * @return string
+ *   The normalized identifier.
  */
 function _openid_create_message($data) {
   $serialized = '';
@@ -311,7 +374,16 @@ function _openid_create_message($data) {
 }
 
 /**
- * Encode a message from _openid_create_message for HTTP Post
+ * Encodes a message from _openid_create_message() for HTTP Post.
+ *
+ * @param $message
+ *   The serialized message packet.
+ *
+ * @return $string
+ *   The encoded message.
+ *
+ * @see _openid_create_message()
+ * @see _openid_parse_message()
  */
 function _openid_encode_message($message) {
   $encoded_message = '';
@@ -332,8 +404,16 @@ function _openid_encode_message($message) {
 }
 
 /**
- * Convert a direct communication message
- * into an associative array.
+ * Converts a direct communication message into an associative array.
+ *
+ * @param $message
+ *   The serialized message packet.
+ *
+ * @return array
+ *   The key/value pairs contained in the message.
+ *
+ * @see _openid_create_message()
+ * @see _openid_encode_message()
  */
 function _openid_parse_message($message) {
   $parsed_message = array();
@@ -351,7 +431,10 @@ function _openid_parse_message($message) {
 }
 
 /**
- * Return a nonce value - formatted per OpenID spec.
+ * Generates a nonce value, formatted per OpenID spec.
+ *
+ * @return array
+ *   The generated nonce.
  */
 function _openid_nonce() {
   // YYYY-MM-DDThh:mm:ssZ, plus some optional extra unique characters.
@@ -363,7 +446,10 @@ function _openid_nonce() {
 }
 
 /**
- * Pull the href attribute out of an html link element.
+ * Generates a nonce value, formatted per OpenID spec.
+ *
+ * @return array
+ *   The generated nonce.
  */
 function _openid_link_href($rel, $html) {
   $html_dom = new DOMDocument();
@@ -383,7 +469,14 @@ function _openid_link_href($rel, $html) {
 }
 
 /**
- * Pull the content attribute out of an X-XRDS-Location meta http-equiv element.
+ * Extracts the content attribute out of a X-XRDS-Location meta http-equiv element.
+ *
+ * @param $html
+ *   The HTML to parse.
+ *
+ * @return
+ *   The content attribute of the element if the HTML was successfully parsed,
+ *   FALSE otherwise.
  */
 function _openid_meta_httpequiv($html) {
   $html_dom = new DOMDocument();
@@ -402,12 +495,18 @@ function _openid_meta_httpequiv($html) {
 }
 
 /**
- * Sign certain keys in a message
- * @param $association - object loaded from openid_association or openid_server_association table
- *              - important fields are ->assoc_type and ->mac_key
- * @param $message_array - array of entire message about to be sent
- * @param $keys_to_sign - keys in the message to include in signature (without
- *  'openid.' appended)
+ * Signs certain keys in a message.
+ *
+ * @param $association
+ *   Object loaded from the {openid_association} or {openid_server_association} table.
+ *   The important fields are ->assoc_type and ->mac_key.
+ * @param array $message_array
+ *   The entire message about to be sent.
+ * @param $keys_to_sign
+ *   Keys in the message to include in signature (without 'openid.' appended).
+ *
+ * @return $signature
+ *   The base64 encoded signature.
  */
 function _openid_signature($association, $message_array, $keys_to_sign) {
   $signature = '';
@@ -426,16 +525,49 @@ function _openid_signature($association, $message_array, $keys_to_sign) {
   return base64_encode($signature);
 }
 
+/**
+ * Converts a base64 encoded string to a long.
+ *
+ * Part of this module's implementation of the Diffie-Hellman key exchange.
+ *
+ * @param $str
+ *   The base64 encoded string.
+ *
+ * @return
+ *   The same value, converted to a long.
+ */
 function _openid_dh_base64_to_long($str) {
   $b64 = base64_decode($str);
 
   return _openid_dh_binary_to_long($b64);
 }
 
+/**
+ * Converts a long to a base64 encoded string.
+ *
+ * Part of this module's implementation of the Diffie-Hellman key exchange.
+ *
+ * @param $str
+ *   The long.
+ *
+ * @return
+ *   The same value, converted to a base64 encoded string.
+ */
 function _openid_dh_long_to_base64($str) {
   return base64_encode(_openid_dh_long_to_binary($str));
 }
 
+/**
+ * Converts a binary string to a long.
+ *
+ * Part of this module's implementation of the Diffie-Hellman key exchange.
+ *
+ * @param $str
+ *   The binary string to convert.
+ *
+ * @return $n
+ *   The same value, converted to a long.
+ */
 function _openid_dh_binary_to_long($str) {
   $bytes = array_merge(unpack('C*', $str));
 
@@ -448,6 +580,17 @@ function _openid_dh_binary_to_long($str) {
   return $n;
 }
 
+/**
+ * Converts a long to a binary string.
+ *
+ * Part of this module's implementation of the Diffie-Hellman key exchange.
+ *
+ * @param $str
+ *   The long to convert.
+ *
+ * @return $n
+ *   The same value, converted to a binary string.
+ */
 function _openid_dh_long_to_binary($long) {
   $cmp = _openid_math_cmp($long, 0);
   if ($cmp < 0) {
@@ -477,6 +620,19 @@ function _openid_dh_long_to_binary($long) {
   return $string;
 }
 
+/**
+ * Gets a binary version of the shared secret, and runs an OR operation on it.
+ *
+ * Part of this module's implementation of the Diffie-Hellman key exchange.
+ *
+ * @param $shared
+ *   The shared key value.
+ * @param $secret
+ *   The secret value.
+ *
+ * @return $xsecret
+ *   The secret processed by the exclusive OR operation.
+ */
 function _openid_dh_xorsecret($shared, $secret) {
   $dh_shared_str = _openid_dh_long_to_binary($shared);
   $sha1_dh_shared = sha1($dh_shared_str, TRUE);
@@ -488,6 +644,17 @@ function _openid_dh_xorsecret($shared, $secret) {
   return $xsecret;
 }
 
+/**
+ * Generates a random number within a specific range defined by $stop.
+ *
+ * Part of this module's implementation of the Diffie-Hellman key exchange.
+ *
+ * @param $stop
+ *   The end of the range, or maximum random number to return.
+ *
+ * @return
+ *   The generated random number.
+ */
 function _openid_dh_rand($stop) {
   $duplicate_cache = &drupal_static(__FUNCTION__, array());
 
@@ -527,6 +694,15 @@ function _openid_dh_rand($stop) {
   return _openid_math_mod($n, $stop);
 }
 
+/**
+ * Generates a set of random bytes.
+ *
+ * @param $num_bytes
+ *   The number of bytes to generate.
+ *
+ * @return $bytes
+ *   The string of random bytes.
+ */
 function _openid_get_bytes($num_bytes) {
   $f = &drupal_static(__FUNCTION__);
   $bytes = '';
@@ -547,6 +723,15 @@ function _openid_get_bytes($num_bytes) {
   return $bytes;
 }
 
+/**
+ * Obtains the response from the OpenID provider.
+ *
+ * @param $str
+ *   The string to be populated with raw response data.
+ *
+ * @return array $data
+ *   The prepared response data.
+ */
 function _openid_response($str = NULL) {
   $data = array();
 
@@ -568,6 +753,15 @@ function _openid_response($str = NULL) {
   return $data;
 }
 
+/**
+ * Parses a URL-encoded query string.
+ *
+ * @param $str
+ *   The query string.
+ *
+ * @return $data
+ *   An array of key/value pairs.
+ */
 function _openid_get_params($str) {
   $chunks = explode("&", $str);
 
@@ -584,7 +778,7 @@ function _openid_get_params($str) {
 }
 
 /**
- * Extract all the parameters belonging to an extension in a response message.
+ * Extracts all the parameters belonging to an extension in a response message.
  *
  * OpenID 2.0 defines a simple extension mechanism, based on a namespace prefix.
  *
@@ -668,8 +862,10 @@ function openid_extract_namespace($response, $extension_namespace, $fallback_pre
  *   An array as returned by openid_extract_namespace(..., OPENID_NS_AX).
  * @param $uris
  *   An array of identifier URIs.
+ *
  * @return
  *   An array of values.
+ *
  * @see http://openid.net/specs/openid-attribute-exchange-1_0.html#fetch_response
  */
 function openid_extract_ax_values($values, $uris) {
@@ -692,7 +888,10 @@ function openid_extract_ax_values($values, $uris) {
 }
 
 /**
- * Determine the available math library GMP vs. BCMath, favouring GMP for performance.
+ * Determines the available math library GMP vs BCMath, opting GMP for performance.
+ *
+ * @return $library
+ *   The math library that is to be used.
  */
 function _openid_get_math_library() {
   // Not drupal_static(), because a function is not going to disappear and
@@ -713,6 +912,14 @@ function _openid_get_math_library() {
 
 /**
  * Calls the add function from the available math library for OpenID.
+ *
+ * @param $x
+ *   The base value.
+ * @param $y
+ *   The value to add to the base.
+ *
+ * @return
+ *   The result of $x + $y, using whatever math library function is available.
  */
 function _openid_math_add($x, $y) {
   $library = _openid_get_math_library();
@@ -725,7 +932,15 @@ function _openid_math_add($x, $y) {
 }
 
 /**
- * Calls the mul function from the available math library for OpenID.
+ * Calls the multiply function from the available math library for OpenID.
+ *
+ * @param $x
+ *   The base value.
+ * @param $y
+ *   The multiplier value.
+ *
+ * @return
+ *   The result of $x * $y, using whatever math library function is available.
  */
 function _openid_math_mul($x, $y) {
   $library = _openid_get_math_library();
@@ -738,7 +953,15 @@ function _openid_math_mul($x, $y) {
 }
 
 /**
- * Calls the div function from the available math library for OpenID.
+ * Calls the divide function from the available math library for OpenID.
+ *
+ * @param $x
+ *   The base value.
+ * @param $y
+ *   The divisor value.
+ *
+ * @return
+ *   The result of $x / $y, using whatever math library function is available.
  */
 function _openid_math_div($x, $y) {
   $library = _openid_get_math_library();
@@ -751,7 +974,16 @@ function _openid_math_div($x, $y) {
 }
 
 /**
- * Calls the cmp function from the available math library for OpenID.
+ * Calls the compare function from the available math library for OpenID.
+ *
+ * @param $x
+ *   The first value to compare.
+ * @param $y
+ *   The second value to compare.
+ *
+ * @return
+ *   The result of the comparison, using whatever math library function is
+ *   available.
  */
 function _openid_math_cmp($x, $y) {
   $library = _openid_get_math_library();
@@ -764,7 +996,15 @@ function _openid_math_cmp($x, $y) {
 }
 
 /**
- * Calls the mod function from the available math library for OpenID.
+ * Calls the modulo function from the available math library for OpenID.
+ *
+ * @param $x
+ *   The base value.
+ * @param $y
+ *   The modulo value.
+ *
+ * @return
+ *   The result of $x % $y, using whatever math library function is available.
  */
 function _openid_math_mod($x, $y) {
   $library = _openid_get_math_library();
@@ -777,7 +1017,7 @@ function _openid_math_mod($x, $y) {
 }
 
 /**
- * Calls the pow function from the available math library for OpenID.
+ * Calls the power function from the available math library for OpenID.
  */
 function _openid_math_pow($x, $y) {
   $library = _openid_get_math_library();
@@ -790,7 +1030,18 @@ function _openid_math_pow($x, $y) {
 }
 
 /**
- * Calls the mul function from the available math library for OpenID.
+ * Calls the power-modulo function from the available math library for OpenID.
+ *
+ * @param $x
+ *   The base value.
+ * @param $y
+ *   The exponent.
+ * @param $z
+ *   The modulo value.
+ *
+ * @return
+ *   The result of ($x ^ $y) %z, using whatever math library function is
+ *   available.
  */
 function _openid_math_powmod($x, $y, $z) {
   $library = _openid_get_math_library();
diff --git a/core/modules/openid/openid.module b/core/modules/openid/openid.module
index a3df38f..534a0c4 100644
--- a/core/modules/openid/openid.module
+++ b/core/modules/openid/openid.module
@@ -120,19 +120,32 @@ function openid_user_logout($account) {
 }
 
 /**
- * Implements hook_form_FORM_ID_alter().
+ * Implements hook_form_FORM_ID_alter() for user_login_block().
  */
 function openid_form_user_login_block_alter(&$form, &$form_state) {
   _openid_user_login_form_alter($form, $form_state);
 }
 
 /**
- * Implements hook_form_FORM_ID_alter().
+ * Implements hook_form_FORM_ID_alter() for user_login().
  */
 function openid_form_user_login_alter(&$form, &$form_state) {
   _openid_user_login_form_alter($form, $form_state);
 }
 
+/**
+ * Alters the user_login form.
+ *
+ * Adds OpenID-specific functionality to user login forms.
+ *
+ * @param $form
+ *   Nested array of form elements that comprise the form.
+ * @param $form_state
+ *   The state of the current form.
+ *
+ * @see openid_form_user_login_block_alter()
+ * @see openid_form_user_login_alter()
+ */
 function _openid_user_login_form_alter(&$form, &$form_state) {
   $form['#attached']['css'][] = drupal_get_path('module', 'openid') . '/openid.css';
   $form['#attached']['js'][] = drupal_get_path('module', 'openid') . '/openid.js';
@@ -288,7 +301,10 @@ function openid_form_user_register_form_alter(&$form, &$form_state) {
 }
 
 /**
- * Login form _validate hook
+ * Form validation handler for the user login form.
+ *
+ * Sets up redirection and starts the OpenID authentication process.
+ *
  */
 function openid_login_validate($form, &$form_state) {
   $return_to = $form_state['values']['openid.return_to'];
@@ -306,8 +322,10 @@ function openid_login_validate($form, &$form_state) {
  *  - Create the authentication request.
  *  - Perform the appropriate redirect.
  *
- * @param $claimed_id The OpenID to authenticate
- * @param $return_to The endpoint to return to from the OpenID Provider
+ * @param $claimed_id
+ *   The OpenID to authenticate.
+ * @param $return_to
+ *   The endpoint to return to from the OpenID Provider.
  */
 function openid_begin($claimed_id, $return_to = '', $form_values = array()) {
   module_load_include('inc', 'openid');
@@ -371,9 +389,11 @@ function openid_begin($claimed_id, $return_to = '', $form_values = array()) {
  * Completes OpenID authentication by validating returned data from the OpenID
  * Provider.
  *
- * @param $response Array of returned values from the OpenID Provider.
+ * @param $response
+ *   Array of returned values from the OpenID Provider.
  *
- * @return $response Response values for further processing with
+ * @return $response
+ *   Response values for further processing with
  *   $response['status'] set to one of 'success', 'failed' or 'cancel'.
  */
 function openid_complete($response = array()) {
@@ -497,13 +517,16 @@ function openid_openid_discovery_method_info() {
 /**
  * OpenID discovery method: perform an XRI discovery.
  *
- * @see http://openid.net/specs/openid-authentication-2_0.html#discovery
- * @see hook_openid_discovery_method_info()
- * @see openid_discovery()
+ * @param $claimed_id
+ *   The Extensible Resource Indicator (XRI) to attempt discovery on.
  *
  * @return
  *   An array of discovered services and claimed identifier or NULL. See
  *   openid_discovery() for more specific information.
+ *
+ * @see http://openid.net/specs/openid-authentication-2_0.html#discovery
+ * @see hook_openid_discovery_method_info()
+ * @see openid_discovery()
  */
 function _openid_xri_discovery($claimed_id) {
   if (_openid_is_xri($claimed_id)) {
@@ -532,13 +555,17 @@ function _openid_xri_discovery($claimed_id) {
 /**
  * OpenID discovery method: perform a XRDS discovery.
  *
- * @see http://openid.net/specs/openid-authentication-2_0.html#discovery
- * @see hook_openid_discovery_method_info()
- * @see openid_discovery()
+ * @param $claimed_id
+ *   The Extensible Resource Descriptor Sequence (XRDS) URL to attempt
+ *   discovery on.
  *
  * @return
  *   An array of discovered services and claimed identifier or NULL. See
  *   openid_discovery() for more specific information.
+ *
+ * @see http://openid.net/specs/openid-authentication-2_0.html#discovery
+ * @see hook_openid_discovery_method_info()
+ * @see openid_discovery()
  */
 function _openid_xrds_discovery($claimed_id) {
   $services = array();
@@ -634,9 +661,11 @@ function openid_openid_normalization_method_info() {
 /**
  * Attempt to create a shared secret with the OpenID Provider.
  *
- * @param $op_endpoint URL of the OpenID Provider endpoint.
+ * @param $op_endpoint
+ *   URL of the OpenID Provider endpoint.
  *
- * @return $assoc_handle The association handle.
+ * @return $assoc_handle
+ *   The association handle.
  */
 function openid_association($op_endpoint) {
   module_load_include('inc', 'openid');
@@ -698,7 +727,8 @@ function openid_association($op_endpoint) {
 /**
  * Authenticate a user or attempt registration.
  *
- * @param $response Response values from the OpenID Provider.
+ * @param $response
+ *   Response values from the OpenID Provider.
  */
 function openid_authentication($response) {
   $identity = $response['openid.claimed_id'];
@@ -767,6 +797,15 @@ function openid_authentication($response) {
   drupal_goto();
 }
 
+/**
+ * Generates a OpenID association request.
+ *
+ * @param $public
+ *   The generated public key.
+ *
+ * @return $request
+ *   An array representing the request.
+ */
 function openid_association_request($public) {
   module_load_include('inc', 'openid');
 
@@ -785,6 +824,17 @@ function openid_association_request($public) {
   return $request;
 }
 
+/**
+ * Generates a OpenID authentication request.
+ *
+ * @param $public
+ *   The generated public key.
+ *
+ * @return $request
+ *   An array representing the request.
+ *
+ * @see hook_openid_request_alter()
+ */
 function openid_authentication_request($claimed_id, $identity, $return_to = '', $assoc_handle = '', $service) {
   global $base_url;
 
@@ -852,7 +902,9 @@ function openid_authentication_request($claimed_id, $identity, $return_to = '',
  * @param $response
  *   Array of response values from the provider.
  *
- * @return boolean
+ * @return
+ *   TRUE if the response is valid, FALSE otherwise.
+ *
  * @see http://openid.net/specs/openid-authentication-2_0.html#rfc.section.11.4
  */
 function openid_verify_assertion($service, $response) {
@@ -935,7 +987,9 @@ function openid_verify_assertion($service, $response) {
  *   Array of response values from the provider.
  *
  * @return
- *   TRUE if the signature is valid and covers all fields required to be signed.
+ *   TRUE if the signature is valid and covers all fields required to be signed,
+ *   FALSE otherwise.
+ *
  * @see http://openid.net/specs/openid-authentication-2_0.html#rfc.section.11.4
  */
 function openid_verify_assertion_signature($service, $association, $response) {
@@ -973,7 +1027,8 @@ function openid_verify_assertion_signature($service, $association, $response) {
  *   Array of response values from the provider.
  *
  * @return
- *   TRUE if the nonce has not expired and has not been used earlier.
+ *   TRUE if the nonce has not expired and has not been used earlier,
+ *   FALSE otherwise.
  */
 function openid_verify_assertion_nonce($service, $response) {
   if ($service['version'] != 2) {
@@ -1062,9 +1117,9 @@ function openid_verify_assertion_return_url($service, $response) {
 }
 
 /**
- * Remove expired nonces from the database.
+ * Implements hook_cron().
  *
- * Implementation of hook_cron().
+ * Remove expired nonces from the database.
  */
 function openid_cron() {
   db_delete('openid_nonce')
diff --git a/core/modules/openid/openid.pages.inc b/core/modules/openid/openid.pages.inc
index 885fe1d..b3234d0 100644
--- a/core/modules/openid/openid.pages.inc
+++ b/core/modules/openid/openid.pages.inc
@@ -25,6 +25,12 @@ function openid_authentication_page() {
 
 /**
  * Menu callback; Manage OpenID identities for the specified user.
+ *
+ * @param object $account
+ *   The user account object to manage.
+ *
+ * @return $build
+ *   Array with the table of openid identities.
  */
 function openid_user_identities($account) {
   drupal_set_title(user_format_name($account));
@@ -64,10 +70,11 @@ function openid_user_identities($account) {
 }
 
 /**
- * Form builder; Add an OpenID identity.
+ * Form constructor for adding a new OpenID identity.
  *
- * @ingroup forms
  * @see openid_user_add_validate()
+ * @see openid_user_add_submit()
+ * @ingroup forms
  */
 function openid_user_add() {
   $form['openid_identifier'] = array(
@@ -79,6 +86,11 @@ function openid_user_add() {
   return $form;
 }
 
+/**
+ * Form validation handler for openid_user_add().
+ *
+ * @see openid_user_add_submit()
+ */
 function openid_user_add_validate($form, &$form_state) {
   // Check for existing entries.
   $claimed_id = openid_normalize($form_state['values']['openid_identifier']);
@@ -93,7 +105,10 @@ function openid_user_add_submit($form, &$form_state) {
 }
 
 /**
- * Menu callback; Delete the specified OpenID identity from the system.
+ * Form constructor: Delete the specified OpenID identity from the system.
+ *
+ * @see openid_user_delete_form_submit()
+ * @ingroup forms
  */
 function openid_user_delete_form($form, $form_state, $account, $aid = 0) {
   $authname = db_query("SELECT authname FROM {authmap} WHERE uid = :uid AND aid = :aid AND module = 'openid'", array(
@@ -104,6 +119,9 @@ function openid_user_delete_form($form, $form_state, $account, $aid = 0) {
   return confirm_form(array(), t('Are you sure you want to delete the OpenID %authname for %user?', array('%authname' => $authname, '%user' => $account->name)), 'user/' . $account->uid . '/openid');
 }
 
+/**
+ * Form submission handler for openid_user_delete_form().
+ */
 function openid_user_delete_form_submit($form, &$form_state) {
   $query = db_delete('authmap')
     ->condition('uid', $form_state['build_info']['args'][0]->uid)