diff --git a/lib/WebGUI/Asset/Shortcut.pm b/lib/WebGUI/Asset/Shortcut.pm
index 43081882a..b2c8dceec 100644
--- a/lib/WebGUI/Asset/Shortcut.pm
+++ b/lib/WebGUI/Asset/Shortcut.pm
@@ -307,7 +307,7 @@ sub getEditForm {
 
 =head2 getExtraHeadTags (  )
 
-Returns the extraHeadTags stored in the asset.  Called in $self->session->style->generateAdditionalHeadTags if this asset is the $self->session->asset.  Also called in WebGUI::Layout::view for its child assets.  Overriden here in Shortcut.pm.
+Returns the extraHeadTags stored in the asset.  Called in $self->session->style->generateAdditionalHeadTags if this asset is the $self->session->asset.  Also called in WebGUI::Asset::Wobject::Layout for its child assets.  Overriden to also add tags from shortcutted asset.
 
 =cut
 
diff --git a/lib/WebGUI/Asset/Sku/EMSBadge.pm b/lib/WebGUI/Asset/Sku/EMSBadge.pm
index cab929f2d..48ca37c9b 100644
--- a/lib/WebGUI/Asset/Sku/EMSBadge.pm
+++ b/lib/WebGUI/Asset/Sku/EMSBadge.pm
@@ -289,7 +289,7 @@ sub onRemoveFromCart {
 
 =head2 prepareView
 
-See Asset.pm, prepareView for details.
+See WebGUI::Asset, prepareView for details.
 
 =cut
 
diff --git a/lib/WebGUI/Asset/Wobject/Shelf.pm b/lib/WebGUI/Asset/Wobject/Shelf.pm
index 3436f62bd..cb08117cb 100644
--- a/lib/WebGUI/Asset/Wobject/Shelf.pm
+++ b/lib/WebGUI/Asset/Wobject/Shelf.pm
@@ -382,7 +382,7 @@ sub www_importProducts {
 		}
 		else {
 			$status_message = $i18n->get('import successful');
-			##Copy and paste from Asset.pm, www_editSave
+			##Copy and paste from WebGUI::Asset, www_editSave
 			if ($self->session->setting->get("autoRequestCommit")) {
 				# Make sure version tag hasn't already been committed by another process
 				my $versionTag = WebGUI::VersionTag->getWorking($self->session, "nocreate");
diff --git a/lib/WebGUI/Asset/Wobject/WSClient.pm b/lib/WebGUI/Asset/Wobject/WSClient.pm
index 8f7fc1879..7f9ff1e4a 100644
--- a/lib/WebGUI/Asset/Wobject/WSClient.pm
+++ b/lib/WebGUI/Asset/Wobject/WSClient.pm
@@ -504,10 +504,6 @@ sub view {
           $self->session->errorHandler->warn("changed mimetype: " .  $self->get("httpHeader"));
        }
 
-   # Note, we still process our template below even though it will never
-   # be displayed if the redirectURL is set.  Not sure how important it is
-   # to do it this way, but it certainly is the least obtrusive to default
-   # webgui flow.  This feature currently requires a patched WebGUI.pm file.
    if ($self->session->form->process('redirectURL')) {
     $self->session->http->setRedirect($self->session->form->process('redirectURL'));
     return undef;
diff --git a/lib/WebGUI/DateTime.pm b/lib/WebGUI/DateTime.pm
index aa6898e1b..89f8a7fe5 100755
--- a/lib/WebGUI/DateTime.pm
+++ b/lib/WebGUI/DateTime.pm
@@ -120,7 +120,7 @@ doing date/time math.
 
 sub new 
 {
-	# Drop-in replacement for Perl's DateTime.pm
+	# Drop-in replacement for Perl's DateTime
 	my $class	= shift;
     my $param0 = $_[0];
     my $self;
diff --git a/lib/WebGUI/Form/Control.pm b/lib/WebGUI/Form/Control.pm
index c35c68410..4414f1759 100644
--- a/lib/WebGUI/Form/Control.pm
+++ b/lib/WebGUI/Form/Control.pm
@@ -103,7 +103,7 @@ If no starting value is specified, this will be used instead.
 =head4 _defaulted
 
 This flag indicates that the defaultValue was used.  It is used by Form types that support
-an initial blank field, instead of using a default, like WebGUI::Form::Date.pm
+an initial blank field, instead of using a default, like WebGUI::Form::Date
 
 =head4 extras
 
diff --git a/lib/WebGUI/HTML.pm b/lib/WebGUI/HTML.pm
index 68301e5c1..ef0ce86f0 100644
--- a/lib/WebGUI/HTML.pm
+++ b/lib/WebGUI/HTML.pm
@@ -280,7 +280,7 @@ sub makeAbsolute {
 
 	my $linkParser = sub {
 		my ($tagname, $attr, $text) = @_;
-		my %linkElements =            # from HTML::Element.pm
+		my %linkElements =            # from HTML::Element
 		(
 			body   => 'background',
 			base   => 'href',
diff --git a/lib/WebGUI/i18n/English/WebGUI.pm b/lib/WebGUI/i18n/English/WebGUI.pm
index ae13603ed..ee1288776 100644
--- a/lib/WebGUI/i18n/English/WebGUI.pm
+++ b/lib/WebGUI/i18n/English/WebGUI.pm
@@ -1125,22 +1125,22 @@ to add or remove users from their groups.
 Here are some examples for other databases.</p>
 <div>
 <dl>
-<dt><a href="http://search.cpan.org/author/TIMB/DBD-Oracle-1.14/Oracle.pm#CONNECTING_TO_ORACLE">Oracle</a>:</dt>
+<dt><a href="http://search.cpan.org/perldoc?DBD::Oracle#CONNECTING_TO_ORACLE">Oracle</a>:</dt>
 <dd>DBI:Oracle:SID<br />
 DBD::Oracle must be installed.<br />
 You must be using mod_perl and configure <b>PerlSetEnv ORACLE_HOME /home/oracle/product/8.1.7</b> in httpd.conf. Without setting ORACLE_HOME, you can connect using DBI:Oracle:host=myhost.com;sid=SID
 </dd>
-<dt><a href="http://search.cpan.org/author/OYAMA/DBD-PgPP-0.04/PgPP.pm#THE_DBI_CLASS">PostgreSQL</a>:</dt>
+<dt><a href="http://search.cpan.org/perldoc?DBD::PgPP#THE_DBI_CLASS">PostgreSQL</a>:</dt>
 <dd>DBI:PgPP:dbname=DBNAME[;host=hOST]<br />
 DBD::PgPP must be installed.
 </dd>
-<dt><a href="http://search.cpan.org/author/MEWP/DBD-Sybase-1.00/Sybase.pm#Specifying_other_connection_specific_parameters">Sybase</a>:</dt>
+<dt><a href="http://search.cpan.org/perldoc?DBD::Sybase#Specifying_other_connection_specific_parameters">Sybase</a>:</dt>
 <dd>DBI:Sybase:[server=SERVERNAME][database=DATABASE]<br />
 DBD::Sybase must be installed.<br />
 You must be using mod_perl and configure <b>PerlSetEnv SYBASE /opt/sybase/11.0.2</b> in httpd.conf.
 </dd>
 </dl></div>|,
-                lastUpdated => 1146630103,
+                lastUpdated => 1221362751,
         },
 
         '994 description' => {