diff --git a/edit_limit.admin.inc b/edit_limit.admin.inc
old mode 100644
new mode 100755
index 9d303bf..85d4004
--- a/edit_limit.admin.inc
+++ b/edit_limit.admin.inc
@@ -74,7 +74,7 @@ function edit_limit_settings($form, $form_state) {
   $form['node_limits']['edit_limit_node_types'] = array(
     '#type' => 'select',
     '#title' => t('Content types'),
-    '#description' => t('Select the content types to apply these node liits to. Only content types selected here will have any limits applied.'),
+    '#description' => t('Select the content types to apply these node limits to. Only content types selected here will have any limits applied.'),
     '#multiple' => TRUE,
     '#options' => $types,
     '#default_value' => variable_get('edit_limit_node_types', array()),
@@ -95,6 +95,15 @@ function edit_limit_settings($form, $form_state) {
     '#default_value' => variable_get('edit_limit_comment_time', EDIT_LIMIT_COMMENT_TIME),
     '#maxlength' => 10,
   );
+  $form['comment_limits']['edit_limit_comments'] = array(
+      '#type' => 'select',
+      '#title' => t('Content types'),
+      '#description' => t('Select the content types to apply these comment limits to. Only comments related to the content types selected here will have any limits applied.'),
+      '#multiple' => TRUE,
+      '#options' => $types,
+      '#default_value' => variable_get('edit_limit_comments', array()),
+  );
+  
   /* TODO: Need to add support for this option in edit_limit.module: edit_limit_link_alter().
    $form['comment_limits']['edit_limit_comment_count'] = array(
    '#type' => 'textfield',
diff --git a/edit_limit.info b/edit_limit.info
old mode 100644
new mode 100755
diff --git a/edit_limit.install b/edit_limit.install
old mode 100644
new mode 100755
diff --git a/edit_limit.js b/edit_limit.js
old mode 100644
new mode 100755
diff --git a/edit_limit.module b/edit_limit.module
old mode 100644
new mode 100755
index 49a5ce5..9c1dd16
--- a/edit_limit.module
+++ b/edit_limit.module
@@ -25,7 +25,7 @@ function edit_limit_menu() {
     'description' => 'Configure how often or how soon nodes and comments can be edited before they are locked.',
   );
 
-  return $items;
+   return $items;
 }
 
 
@@ -156,6 +156,12 @@ function edit_limit_comment_access($edit = NULL, $comment = NULL) {
       return TRUE;
     }
     $return = TRUE;
+    
+    // Only limit edits if content type is in the list.
+    $node = node_load($comment->nid);
+    if (!in_array($node->type, variable_get('edit_limit_comments', array()))) {
+      return $return;
+    }
 
     if (variable_get('edit_limit_comment_time_enabled', FALSE)) {
       // By this point, we want to return false if the time has passed.
@@ -259,7 +265,7 @@ function edit_limit_node_view_alter(&$build) {
       
       // We don't have to do much user access checking, since this link will only exist if the user passed
       // the comment_access() check for this given comment.
-      if (!user_access('bypass edit limits') && variable_get('edit_limit_comment_time_enabled', FALSE) && !empty($build['comments']['comments'][$key]['links']['comment']['#links']['comment-edit'])) {
+      if (!user_access('bypass edit limits') && variable_get('edit_limit_comment_time_enabled', FALSE) && !empty($build['comments']['comments'][$key]['links']['comment']['#links']['comment-edit']) && in_array($comment['#node']->type, variable_get('edit_limit_comments', array()))) {
         $time_limit = $comment['#comment']->created + intval(variable_get('edit_limit_comment_time', EDIT_LIMIT_COMMENT_TIME));
 
         // If too much time has passed, destroy the link.
