diff --git a/linkimage.install b/linkimage.install
index 5fc232f..983222a 100644
--- a/linkimage.install
+++ b/linkimage.install
@@ -10,7 +10,7 @@
  */
 function linkimage_schema() {
   $schema['linkimage'] = array(
-    'description' => 'TODO: please describe this table!',
+    'description' => 'Stores additional field data for images.',
     'fields' => array(
       'entity_id' => array(
         'description' => 'The entity id.',
diff --git a/linkimage.module b/linkimage.module
index 5e179cc..07b08dd 100644
--- a/linkimage.module
+++ b/linkimage.module
@@ -174,12 +174,18 @@ function linkimage_widget_url_target_options() {
 }
 
 /**
- * Implements hook_field_formatter_info_alter().
+ * Implements hook_field_formatter_info().
  */
-function linkimage_field_formatter_info_alter(&$info) {
-  // Changed the module name to linkimage, so our module can
-  // make some altercations to the formatter.
-  $info['image']['module'] = 'linkimage';
+function linkimage_field_formatter_info() {
+  $formatters = array(
+    'link_image' => array(
+      'label' => t('Link Image'),
+      'field types' => array('image'),
+      'settings' => array('image_style' => '', 'image_link' => ''),
+    ),
+  );
+
+  return $formatters;
 }
 
 /**
@@ -204,7 +210,7 @@ function linkimage_field_formatter_settings_summary($field, $instance, $view_mod
 
   // Alter the image link summary to include the url.
   if ($instance['display'][$view_mode]['settings']['image_link'] == 'url') {
-    $summary .= '<br />Linked to: Image URL';
+    $summary .= '<br />' . t('Linked to: Image URL');
   }
 
   return $summary;
@@ -232,7 +238,7 @@ function linkimage_field_formatter_view($entity_type, $entity, $field, $instance
 function linkimage_attach_url_attributes($element) {
   $item = $element['#item'];
 
-  if (isset($item['url'])) {
+  if (isset($item['url']) && $item['url']) {
     $element['#path']['path'] = $item['url'];
     // Attach the rel to the element url.
     if (!empty($item['rel'])) {