diff --git a/modules/rwinfo/helpers/rwinfo_block.php b/modules/rwinfo/helpers/rwinfo_block.php
new file mode 100644
index 00000000..2d129b1e
--- /dev/null
+++ b/modules/rwinfo/helpers/rwinfo_block.php
@@ -0,0 +1,59 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2009 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+class rwinfo_block_Core {
+  static function get_site_list() {
+    return array("metadata" => t("Metadata"));
+  }
+
+  static function get($block_id, $theme) {
+    $block = "";
+    switch ($block_id) {
+    case "metadata":
+      if ($theme->item()) {
+        // rWatcher Edit: Don't display on root album.
+        if ($theme->item->id == 1) {
+          return "";
+        }
+        // End rWatcher Edit
+
+        $block = new Block();
+        $block->css_id = "g-metadata";
+
+        // rWatcher Edit:  Add Movie Info Option
+        //$block->title = $theme->item()->is_album() ? t("Album Info") : t("Photo Info");
+        $block_title = "";
+        if ($theme->item->is_album()) {
+          $block_title = t("Album Info");
+        } else if ($theme->item->is_movie()) {
+          $block_title = t("Movie Info");
+        } else {
+          $block_title = t("Photo Info");
+        }
+        $block->title = $block_title;
+        // End rWatcher Edit
+
+        // rWatcher Edit:  File Name change.
+        $block->content = new View("rwinfo_block.html");
+      }
+      break;
+    }
+    return $block;
+  }
+}
\ No newline at end of file
diff --git a/modules/rwinfo/helpers/rwinfo_installer.php b/modules/rwinfo/helpers/rwinfo_installer.php
deleted file mode 100644
index fd0359ae..00000000
--- a/modules/rwinfo/helpers/rwinfo_installer.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");
-/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2009 Bharat Mediratta
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
- */
-class rwinfo_installer {
-  static function install() {
-    module::set_version("rwinfo", 1);
-  }
-}
diff --git a/modules/rwinfo/helpers/rwinfo_theme.php b/modules/rwinfo/helpers/rwinfo_theme.php
index 31a29544..b1b6fb6c 100644
--- a/modules/rwinfo/helpers/rwinfo_theme.php
+++ b/modules/rwinfo/helpers/rwinfo_theme.php
@@ -18,28 +18,6 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class rwinfo_theme_Core {
-  static function sidebar_blocks($theme) {
-    if ($theme->item()) {
-      if ($theme->item->id == 1) {
-        return ;
-      }
-
-      $block = new Block();
-      $block->css_id = "g-metadata";
-      $block_title = "";
-      if ($theme->item->is_album()) {
-        $block_title = t("Album Info");
-      } else if ($theme->item->is_movie()) {
-        $block_title = t("Movie Info");
-      } else {
-        $block_title = t("Photo Info");
-      }
-      $block->title = $block_title;
-      $block->content = new View("rwinfo_block.html");
-      return $block;
-    }
-  }
-
   static function thumb_info($theme, $item) {
     $results = "";
     if ($item->view_count) {
@@ -48,6 +26,7 @@ class rwinfo_theme_Core {
       $results .= "</li>";
     }
 
+    // rWatcher Edit:  Display Tags
     if (module::is_active("tag")) {
       $tagsItem = ORM::factory("tag")
                   ->join("items_tags", "tags.id", "items_tags.tag_id")
@@ -66,13 +45,16 @@ class rwinfo_theme_Core {
       $results .= "</li>";
       }
     }
+    // rWatcher End Edit
 
     if ($item->owner) {
       $results .= "<li>";
       if ($item->owner->url) {
-        $results .= t("By: %owner_name", array("owner_name" => "<a href=\"{$item->owner->url}\">{$item->owner->full_name}</a>"));
+        $results .= t("By: <a href=\"%owner_url\">%owner_name</a>",
+                      array("owner_name" => $item->owner->display_name(),
+                            "owner_url" => $item->owner->url));
       } else {
-        $results .= t("By: %owner_name", array("owner_name" => "{$item->owner->full_name}"));
+        $results .= t("By: %owner_name", array("owner_name" => $item->owner->display_name()));
       }
       $results .= "</li>";
     }
diff --git a/modules/rwinfo/views/rwinfo_block.html.php b/modules/rwinfo/views/rwinfo_block.html.php
index c23aa3e6..8e3b36f6 100644
--- a/modules/rwinfo/views/rwinfo_block.html.php
+++ b/modules/rwinfo/views/rwinfo_block.html.php
@@ -9,27 +9,27 @@
     <?= html::clean($item->owner->display_name()) ?>
     <? endif ?>
   </li>
+  <? endif ?>
+
   <? if ($item->is_album()): ?>
   <li>
     <strong class="caption"><?= t("Date:") ?></strong>
     <?= date("F j, Y", $item->created)?>
   </li>
   <? endif ?>
+  <? if ($item->captured): ?>
+  <li>
+    <strong class="caption"><?= t("Date:") ?></strong>
+    <?= date("F j, Y h:i:s a", $item->captured)?>
+  </li>
   <? endif ?>
 
-
   <? if (!$item->is_album()): ?>
   <li>
     <strong class="caption"><?= t("File name:") ?></strong>
     <?= html::clean($item->name) ?>
   </li>
   <? endif ?>
-  <? if ($item->captured): ?>
-  <li>
-    <strong class="caption"><?= t("Date:") ?></strong>
-    <?= date("F j, Y h:i:s a", $item->captured)?>
-  </li>
-  <? endif ?>
 
   <? if (module::is_active("tag")): ?>
   <?