diff --git a/modules/crm_core_activity/crm_core_activity.controller.inc b/modules/crm_core_activity/crm_core_activity.controller.inc
index 1cc897b..2d76b54 100644
--- a/modules/crm_core_activity/crm_core_activity.controller.inc
+++ b/modules/crm_core_activity/crm_core_activity.controller.inc
@@ -87,7 +87,7 @@ class CRMCoreActivityTypeController extends EntityAPIControllerExportable {
     if (!empty($results)) {
       $activities_to_remove = array_keys($results['crm_core_activity']);
       crm_core_activity_delete_multiple($activities_to_remove);
-      watchdog('crm_core_activity', 'Delete !count activities due to delection activity type.', array('!count' => count($activities_to_remove)), WATCHDOG_INFO);
+      watchdog('crm_core_activity', 'Delete !count activities due to deletion of activity type.', array('!count' => count($activities_to_remove)), WATCHDOG_INFO);
     }
 
     // Finally delete the type itself.
diff --git a/modules/crm_core_contact/crm_core_contact.admin.inc b/modules/crm_core_contact/crm_core_contact.admin.inc
index c166c4f..20cc49e 100644
--- a/modules/crm_core_contact/crm_core_contact.admin.inc
+++ b/modules/crm_core_contact/crm_core_contact.admin.inc
@@ -103,7 +103,7 @@ function crm_core_contact_type_form($form, &$form_state, $contact_type) {
 function crm_core_contact_type_form_validate($form, &$form_state) {
   $contact_type = $form_state['contact_type'];
 
-  // If saving a new product type, ensure it has a unique machine name.
+  // If saving a new contact type, ensure it has a unique machine name.
   if (empty($contact_type->type)) {
     if (!crm_core_contact_type_validate_unique($form_state['values']['contact_type']['type'])) {
       form_set_error('contact_type][type', 'The machine name specified is already in use.');
diff --git a/modules/crm_core_contact/crm_core_contact.module b/modules/crm_core_contact/crm_core_contact.module
index 00cae30..1c0ea70 100644
--- a/modules/crm_core_contact/crm_core_contact.module
+++ b/modules/crm_core_contact/crm_core_contact.module
@@ -345,7 +345,7 @@ function crm_core_contact_uri($contact) {
  * Entity label callback.
  */
 function crm_core_contact_label($entity) {
-  // Check wheter bundle type label function exists.
+  // Check whether bundle type label function exists.
   // This is needed if we want to have different labels per contact type.
   // For example Individual contact's label is person's Name.
   // But for Organization -- organization's name.
@@ -544,7 +544,7 @@ function crm_core_contact_type_delete($type_id) {
 
 /**
  * Sets the default contact type
- * @param arary $info
+ * @param array $info
  *   an associative array of contact type information
  *   possible keys:
  *     - type
diff --git a/modules/crm_core_contact/includes/crm_core_contact.controller.inc b/modules/crm_core_contact/includes/crm_core_contact.controller.inc
index 149ce6f..ca5da16 100644
--- a/modules/crm_core_contact/includes/crm_core_contact.controller.inc
+++ b/modules/crm_core_contact/includes/crm_core_contact.controller.inc
@@ -66,7 +66,7 @@ class CRMCoreContactController extends DrupalDefaultEntityController {
         // Save the first revision
         $this->saveRevision($contact, $uid);
 
-        // Save the fields attched to the contact
+        // Save the fields attached to the contact
         field_attach_insert('crm_core_contact', $contact);
 
         $op = 'insert';
diff --git a/modules/crm_core_contact/includes/crm_core_contact_type.controller.inc b/modules/crm_core_contact/includes/crm_core_contact_type.controller.inc
index d6835be..08e7612 100644
--- a/modules/crm_core_contact/includes/crm_core_contact_type.controller.inc
+++ b/modules/crm_core_contact/includes/crm_core_contact_type.controller.inc
@@ -35,7 +35,7 @@ class CRMCoreContactTypeController extends EntityAPIControllerExportable {
     if (!empty($results)) {
       $contacts_to_remove = array_keys($results['crm_core_contact']);
       crm_core_contact_delete_multiple($contacts_to_remove);
-      watchdog('crm_core_contact', 'Delete !count contacts due to delection contact type.', array('!count' => count($contacts_to_remove)), WATCHDOG_INFO);
+      watchdog('crm_core_contact', 'Delete !count contacts due to deletion of contact type.', array('!count' => count($contacts_to_remove)), WATCHDOG_INFO);
     }
 
     // Finally delete the type itself.
diff --git a/modules/crm_core_contact/includes/views/crm_core_contact.views.inc b/modules/crm_core_contact/includes/views/crm_core_contact.views.inc
index 2530188..9eeb852 100644
--- a/modules/crm_core_contact/includes/views/crm_core_contact.views.inc
+++ b/modules/crm_core_contact/includes/views/crm_core_contact.views.inc
@@ -22,7 +22,7 @@ function crm_core_contact_views_data() {
 
   $data['crm_core_contact']['contact_id'] = array(
     'title' => t('Contact ID'),
-    'help' => t('The unqiue internal identifier for a contact.'),
+    'help' => t('The unique internal identifier for a contact.'),
     'field' => array(
       'handler' => 'crm_core_contact_handler_field_contact',
       'click sortable' => TRUE,
@@ -40,7 +40,7 @@ function crm_core_contact_views_data() {
 
   $data['crm_core_contact']['type'] = array(
     'title' => t('Contact Type'),
-    'help' => t('The human-readable name of the type of a contact.'),
+    'help' => t('The human-readable name of the type of contact.'),
     'field' => array(
       'handler' => 'crm_core_contact_handler_field_contact_type',
       'click sortable' => TRUE,
@@ -141,12 +141,12 @@ function crm_core_contact_views_data() {
 
   $data['crm_core_contact_revision']['vid'] = array(
     'title' => t('Contact revision ID'),
-    'help' => t('The unqiue internal identifier for a contact revision.'),
+    'help' => t('The unique internal identifier for a contact revision.'),
     'field' => array(
       'handler' => 'crm_core_contact_handler_field_contact_revision',
       'click sortable' => TRUE,
     ),
-    'fitler' => array(
+    'filter' => array(
       'handler' => 'views_handler_filter_numeric',
     ),
     'sort' => array(
@@ -167,12 +167,12 @@ function crm_core_contact_views_data() {
 
   $data['crm_core_contact_revision']['contact_id'] = array(
     'title' => t('Contact ID'),
-    'help' => t('The unqiue internal identifier for a contact revision.'),
+    'help' => t('The unique internal identifier for a contact.'),
     'field' => array(
       'handler' => 'crm_core_contact_handler_field_contact',
       'click sortable' => TRUE,
     ),
-    'fitler' => array(
+    'filter' => array(
       'handler' => 'views_handler_filter_numeric',
     ),
     'sort' => array(
@@ -256,7 +256,7 @@ function crm_core_contact_views_data() {
 
 
 /**
- * Implements hook_views_data().
+ * Implements hook_views_data_alter().
  */
 function crm_core_contact_views_data_alter(&$data) {
   // Integration with Drupal search index
diff --git a/modules/crm_core_contact_ui/crm_core_contact_ui.admin.inc b/modules/crm_core_contact_ui/crm_core_contact_ui.admin.inc
index 8d4f510..7aee03e 100644
--- a/modules/crm_core_contact_ui/crm_core_contact_ui.admin.inc
+++ b/modules/crm_core_contact_ui/crm_core_contact_ui.admin.inc
@@ -39,7 +39,7 @@ function crm_core_contact_ui_types_overview() {
     '#theme' => 'table',
     '#header' => $header,
     '#rows' => $rows,
-    '#empty' => t('The are no contact types. <a href="@link">Add contact type</a>.', array('@link' => url('crm/admin/contact-types/manage'))),
+    '#empty' => t('There are no contact types. <a href="@link">Add contact type</a>.', array('@link' => url('crm/admin/contact-types/manage'))),
   );
 
   return $build;
@@ -121,7 +121,7 @@ function crm_core_contact_ui_type_delete_confirm($form, &$form_state, $contact_t
   $form_state['contact_type'] = $contact_type;
 
   $form['message'] = array(
-    '#markup' => t('Are you sure you want to delete this contact type?  All contacts of this type will be delted.'),
+    '#markup' => t('Are you sure you want to delete this contact type?  All contacts of this type will be deleted.'),
   );
 
   $form['actions'] = array(
diff --git a/modules/crm_core_contact_ui/crm_core_contact_ui.module b/modules/crm_core_contact_ui/crm_core_contact_ui.module
index e2afe40..f9a076f 100644
--- a/modules/crm_core_contact_ui/crm_core_contact_ui.module
+++ b/modules/crm_core_contact_ui/crm_core_contact_ui.module
@@ -233,7 +233,7 @@ function crm_core_contact_ui_admin_paths() {
 
 
 /**
- * Implemenets hook_theme().
+ * Implements hook_theme().
  */
 function crm_core_contact_ui_theme() {
   $theme = array(
diff --git a/modules/crm_core_contact_ui/crm_core_contact_ui.pages.inc b/modules/crm_core_contact_ui/crm_core_contact_ui.pages.inc
index 1e93d4b..4c89aa5 100644
--- a/modules/crm_core_contact_ui/crm_core_contact_ui.pages.inc
+++ b/modules/crm_core_contact_ui/crm_core_contact_ui.pages.inc
@@ -89,7 +89,7 @@ function crm_core_contact_ui_form_validate($form, &$form_state) {
 
 
 /**
- * Submit callback for commerce_product_product_form().
+ * Submit callback for crm_core_contact_ui_form().
  */
 function crm_core_contact_ui_form_submit($form, &$form_state) {
   global $user;
@@ -118,7 +118,7 @@ function crm_core_contact_ui_form_submit($form, &$form_state) {
 
 
 /**
- * Form for deleteing a contact.
+ * Form for deleting a contact.
  */
 function crm_core_contact_ui_delete_form($form, &$form_state, $contact) {
   $form['contact_id'] = array('#type' => 'value', '#value' => $contact->contact_id);
diff --git a/modules/crm_core_contact_ui/views/crm_core_contact_ui.views.inc b/modules/crm_core_contact_ui/views/crm_core_contact_ui.views.inc
index 3c48e7b..12ecb97 100644
--- a/modules/crm_core_contact_ui/views/crm_core_contact_ui.views.inc
+++ b/modules/crm_core_contact_ui/views/crm_core_contact_ui.views.inc
@@ -46,7 +46,7 @@ function crm_core_contact_ui_views_query_alter(&$view, &$query) {
           );
         }
         
-        // let's construct another where claus component
+        // let's construct another where clause component
         $count = (empty($query->where)) ? 0 : count($query->where);
         $query->where[$count]['type'] = 'AND';
         $query->where[$count]['args'] = array();
diff --git a/modules/crm_og_sync/crm_og_sync.module b/modules/crm_og_sync/crm_og_sync.module
index 96c667c..1a2e2ec 100644
--- a/modules/crm_og_sync/crm_og_sync.module
+++ b/modules/crm_og_sync/crm_og_sync.module
@@ -47,7 +47,7 @@ function crm_og_sync_node_update($node) {
 }
 
 /**
- * Implements hook_node_update
+ * Implements hook_node_delete
  * Use this hook to delete the contact and the relationship reference
  */
 function crm_og_sync_node_delete($node) {
diff --git a/modules/crm_user_sync/crm_user_sync.module b/modules/crm_user_sync/crm_user_sync.module
index f67d665..3cb8377 100644
--- a/modules/crm_user_sync/crm_user_sync.module
+++ b/modules/crm_user_sync/crm_user_sync.module
@@ -90,6 +90,7 @@ function crm_user_sync_user_profile_form_submit($form, &$form_state) {
   $contact = &$form_state['storage']['crm_core_contact'];
   // Set the contact's uid if it's being created at this time.
   if (!isset($contact->contact_id)) {
+	// @TODO: Investigate how this variable should be used.
     $create = TRUE;
   }
   // Notify field widgets.