diff --git a/solidopinion.module b/solidopinion.module
index 3ae0c4f..f230e80 100644
--- a/solidopinion.module
+++ b/solidopinion.module
@@ -28,6 +28,10 @@ function solidopinion_permission() {
       'title' => t('Access solidopinion content'),
       'description' => t('Access solidopinion content.'),
     ),
+    'administer solidopinion' => array(
+      'title' => t('Administer SolidOpinion-Drupal integration'),
+      'description' => t('Access SolidOpinion administration pages.'),
+    ),
   );
 }
 
@@ -37,12 +41,12 @@ function solidopinion_permission() {
 function solidopinion_menu() {
   $items = array();
   $items['admin/config/services/solidopinion'] = array(
-    'title' => 'Solidopinion Comments',
+    'title' => 'Configure Solidopinion Commenting',
     'description' => 'The SolidOpinion commenting platform replaces your Drupal comment system with your comments hosted and powered by SolidOpinion.',
     'position' => 'left',
     'weight' => -100,
     'page callback' => 'solidopinion_admin_settings',
-    'access arguments' => array('administer node'),
+    'access arguments' => array('administer solidopinion'),
     'type' => MENU_NORMAL_ITEM,
     'file' => 'solidopinion.admin.inc',
   );
@@ -61,15 +65,20 @@ function solidopinion_module_implements_alter(&$implementations, $hook) {
 
 /**
  * Implements hook_node_view().
+ * 
+ * Adds the solid opinion comment widget if enabled
  */
 function solidopinion_node_view($node, $view_mode, $langcode) {
+  if (!variable_get('solidopinion_comment_'.$node->type,1)) {
+    return;
+  }
   $shortname = variable_get('solidopinion_shortname', '');
   if ($view_mode == 'full') {
     $link = request_uri();
     drupal_add_js(SOLIDOPINION_API_URL . 'widget/embed.js', 'external');
     // Adding SolidOpinion comments to end of post.
-    $node->content['links'] = array(
-      '#markup' => '<div class="so_comments" data-sitename="' . $shortname . '"></div><noscript>Please enable JavaScript to view the <a href="http://solidopinion.com/">comments powered by Solidopinion.</a></noscript> <noscript><a href=' . SOLIDOPINION_API_URL . 'frontend/simple/?sitename=' . $shortname . '&thread_url=' . $link . '">Solidopinion Comments</a></noscript>',
+    $node->content['links']['solidopinion'] = array(
+      '#markup' => '<div class="so_comments" data-thread="/node/'.$node->nid.'" data-sitename="' . $shortname . '"></div><noscript>Please enable JavaScript to view the <a href="http://solidopinion.com/">comments powered by Solidopinion.</a></noscript> <noscript><a href=' . SOLIDOPINION_API_URL . 'frontend/simple/?sitename=' . $shortname . '&thread_url=' . $link . '">Solidopinion Comments</a></noscript>',
     );
   }
   if ($view_mode == 'teaser') {
@@ -147,3 +156,21 @@ function solidopinion_block_configure($delta = '') {
   }
   return $form;
 }
+
+function solidopinion_form_node_type_form_alter(&$form, $form_state) {
+  if (isset($form['type'])) {
+    $form['solidopinion'] = array(
+      '#type' => 'fieldset',
+      '#title' => t('SolidOpinion settings'),
+      '#collapsible' => TRUE,   
+      '#collapsed' => TRUE,   
+      '#group' => 'additional_settings',
+    );
+    $form['solidopinion']['solidopinion_comment'] = array (
+      '#type' =>  'select',
+      '#title' => t('Enable solidopinion comments for this content type'),
+      '#default_value' => variable_get('solidopinion_comment_'. $form['#node_type']->type,1),
+      '#options' => array(0 => t('Disabled'), 1 => t('Enabled')),
+    );
+  }
+}