Index: src/bp-xprofile/bp-xprofile-functions.php
===================================================================
--- src/bp-xprofile/bp-xprofile-functions.php	(revision 12522)
+++ src/bp-xprofile/bp-xprofile-functions.php	(working copy)
@@ -479,7 +479,7 @@
  *
  * @param int    $field_id         The ID of the xprofile field.
  * @param int    $user_id          The ID of the user to whom the data belongs.
- * @param string $visibility_level What the visibity setting should be.
+ * @param string $visibility_level What the visibility setting should be.
  * @return bool True on success
  */
 function xprofile_set_field_visibility_level( $field_id = 0, $user_id = 0, $visibility_level = '' ) {
@@ -1342,7 +1342,7 @@
  *
  * @since 4.0.0
  *
- * @param string $email_address  The userss email address.
+ * @param string $email_address  The users email address.
  * @return array An array of personal data.
  */
 function bp_xprofile_personal_data_exporter( $email_address ) {
Index: src/bp-xprofile/bp-xprofile-template.php
===================================================================
--- src/bp-xprofile/bp-xprofile-template.php	(revision 12522)
+++ src/bp-xprofile/bp-xprofile-template.php	(working copy)
@@ -593,12 +593,12 @@
 	function bp_get_the_profile_field_edit_value() {
 		global $field;
 
-		// Make sure field data object exists
+		// Make sure field data object exists.
 		if ( ! isset( $field->data ) ) {
 			$field->data = new stdClass;
 		}
 
-		// Default to empty value
+		// Default to empty value.
 		if ( ! isset( $field->data->value ) ) {
 			$field->data->value = '';
 		}
@@ -606,7 +606,7 @@
 		// Was a new value posted? If so, use it instead.
 		if ( isset( $_POST['field_' . $field->id] ) ) {
 
-			// This is sanitized via the filter below (based on the field type)
+			// This is sanitized via the filter below (based on the field type).
 			$field->data->value = $_POST['field_' . $field->id];
 		}
 
Index: src/bp-xprofile/classes/class-bp-xprofile-field-type.php
===================================================================
--- src/bp-xprofile/classes/class-bp-xprofile-field-type.php	(revision 12522)
+++ src/bp-xprofile/classes/class-bp-xprofile-field-type.php	(working copy)
@@ -491,7 +491,7 @@
 	/** Protected *************************************************************/
 
 	/**
-	 * Get a sanitised and escaped string of the edit field's HTML elements and attributes.
+	 * Get a sanitized and escaped string of the edit field's HTML elements and attributes.
 	 *
 	 * Must be used inside the {@link bp_profile_fields()} template loop.
 	 * This method was intended to be static but couldn't be because php.net/lsb/ requires PHP >= 5.3.
Index: src/bp-xprofile/classes/class-bp-xprofile-field.php
===================================================================
--- src/bp-xprofile/classes/class-bp-xprofile-field.php	(revision 12522)
+++ src/bp-xprofile/classes/class-bp-xprofile-field.php	(working copy)
@@ -177,7 +177,7 @@
 		if ( ! empty( $id ) ) {
 			$this->populate( $id, $user_id, $get_data );
 
-		// Initialise the type obj to prevent fatals when creating new profile fields.
+		// Initialize the type obj to prevent fatals when creating new profile fields.
 		} else {
 			$this->type_obj            = bp_xprofile_create_field_type( 'textbox' );
 			$this->type_obj->field_obj = $this;
@@ -639,7 +639,7 @@
 				}
 			}
 
-			// If no member types have been saved, intepret as *all* member types.
+			// If no member types have been saved, interpret as *all* member types.
 			if ( empty( $types ) ) {
 				$types = array_values( $registered_types );
 
@@ -1072,7 +1072,7 @@
 	}
 
 	/**
-	 * Validate form field data on sumbission.
+	 * Validate form field data on submission.
 	 *
 	 * @since 2.2.0
 	 *
@@ -1107,7 +1107,7 @@
 			return false;
 		}
 
-		// Get field type so we can check for and lavidate any field options.
+		// Get field type so we can check for and validate any field options.
 		$field_type = bp_xprofile_create_field_type( $_POST['fieldtype'] );
 
 		// Field type requires options.
@@ -1175,10 +1175,10 @@
 	 */
 	public function render_admin_form( $message = '' ) {
 
-		// Users Admin URL
+		// Users Admin URL.
 		$users_url = bp_get_admin_url( 'users.php' );
 
-		// Add New
+		// Add New.
 		if ( empty( $this->id ) ) {
 			$title  = __( 'Add New Field', 'buddypress' );
 			$button	= __( 'Save',          'buddypress' );
@@ -1200,7 +1200,7 @@
 				}
 			}
 
-		// Edit
+		// Edit.
 		} else {
 			$title  = __( 'Edit Field', 'buddypress' );
 			$button	= __( 'Update',     'buddypress' );
@@ -1613,7 +1613,7 @@
 	 */
 	private function default_field_hidden_inputs() {
 
-		// Nonce
+		// Nonce.
 		wp_nonce_field( 'bp_xprofile_admin_field', 'bp_xprofile_admin_field' );
 
 		// Field 1 is the fullname field, which cannot have custom visibility.