diff --git a/lib/WebGUI/Account.pm b/lib/WebGUI/Account.pm
index 36ece27da..5f9f25084 100644
--- a/lib/WebGUI/Account.pm
+++ b/lib/WebGUI/Account.pm
@@ -39,11 +39,11 @@ public   store   => my %store;  #This is an all purpose hash to store stuff in:
 
 =head2 appendCommonVars ( var )
 
-    Appends common template variables that all most templates will use
-    
+Appends common template variables that all most templates will use
+
 =head3 var
 
-    The hash reference to append template variables to
+The hash reference to append template variables to
 
 =cut
 
@@ -203,7 +203,7 @@ sub displayContent {
 
 =head2 canView ( )
 
-    Override this method to create permission levels for your Account Pluggin
+Override this method to create permission levels for your Account Pluggin
 
 =cut
 
@@ -216,7 +216,7 @@ sub canView {
 
 =head2 editSettingsForm ( )
 
-    Override this method to create settings for your Account Pluggin
+Override this method to create settings for your Account Pluggin
 
 =cut
 
@@ -229,7 +229,7 @@ sub editSettingsForm {
 
 =head2 editSettingsFormSave ( )
 
-    Override this method to create settings for your Account Pluggin
+Override this method to create settings for your Account Pluggin
 
 =cut
 
@@ -242,7 +242,7 @@ sub editSettingsFormSave {
 
 =head2 getLayoutTemplateId ( )
 
-    Override this method to return the template Id for the account layout.
+Override this method to return the template Id for the account layout.
 
 =cut
 
@@ -255,7 +255,7 @@ sub getLayoutTemplateId {
 
 =head2 getStyleTemplate ( )
 
-    Override this method to return the template for the main style.
+Override this method to return the template for the main style.
 
 =cut
 
@@ -269,17 +269,17 @@ sub getStyleTemplateId {
 
 =head2 getUrl ( [pairs,appendUID] )
 
-    Builds the url for the current page.
+Builds the url for the current page.
 
 =head3 pairs
 
-    name value pairs to append to the page url.  If pairs is not passed in
-    the current module and do values will be used.
+name value pairs to append to the page url.  If pairs is not passed in
+the current module and do values will be used.
 
 =head3 appendUID
 
-    If this flag is set and uid is passed along the url, the uid passed in will be
-    appended to the end of it to the end of the url
+If this flag is set and uid is passed along the url, the uid passed in will be
+appended to the end of it to the end of the url
 
 =cut
 
@@ -401,7 +401,7 @@ sub processTemplate {
 
 =head2 showError ( vars )
 
-    Returns a general error screen with the message passed in.
+Returns a general error screen with the message passed in.
 
 =head3 vars
 
diff --git a/lib/WebGUI/Account/Friends.pm b/lib/WebGUI/Account/Friends.pm
index ef72551e0..f0d90375d 100644
--- a/lib/WebGUI/Account/Friends.pm
+++ b/lib/WebGUI/Account/Friends.pm
@@ -30,11 +30,11 @@ These subroutines are available from this package:
 
 =head2 appendCommonVars ( var )
 
-    Appends common template variables that all inbox templates use
-    
+Appends common template variables that all inbox templates use
+
 =head3 var
 
-    The hash reference to append template variables to
+The hash reference to append template variables to
 
 =cut
 
@@ -57,7 +57,7 @@ sub appendCommonVars {
 
 =head2 canView ( )
 
-  Whether or not the current user can view this user's friends
+Whether or not the current user can view this user's friends
 
 =cut
 
@@ -78,7 +78,7 @@ sub canView {
 
 =head2 editSettingsForm ( )
 
-  Creates form elements for user settings page custom to this account module
+Creates form elements for user settings page custom to this account module
 
 =cut
 
@@ -155,7 +155,7 @@ sub editSettingsForm {
 
 =head2 editSettingsFormSave ( )
 
-  Creates form elements for user settings page custom to this account module
+Creates form elements for user settings page custom to this account module
 
 =cut
 
diff --git a/lib/WebGUI/Account/Inbox.pm b/lib/WebGUI/Account/Inbox.pm
index 9b61e8e3d..98d6b799e 100644
--- a/lib/WebGUI/Account/Inbox.pm
+++ b/lib/WebGUI/Account/Inbox.pm
@@ -32,15 +32,15 @@ These subroutines are available from this package:
 
 =head2 appendCommonVars ( var, inbox )
 
-    Appends common template variables that all inbox templates use
-    
+Appends common template variables that all inbox templates use
+
 =head3 var
 
-    The hash reference to append template variables to
+The hash reference to append template variables to
 
 =head3 inbox
 
-    The instance of the inbox currently being worked with.
+The instance of the inbox currently being worked with.
 
 =cut
 
@@ -71,7 +71,7 @@ sub appendCommonVars {
 
 =head2 canView ( )
 
-    Returns whether or not the user can view the inbox tab
+Returns whether or not the user can view the inbox tab
 
 =cut
 
@@ -84,7 +84,7 @@ sub canView {
 
 =head2 editSettingsForm ( )
 
-  Creates form elements for user settings page custom to this account module
+Creates form elements for user settings page custom to this account module
 
 =cut
 
@@ -225,7 +225,7 @@ sub editSettingsForm {
 
 =head2 editSettingsFormSave ( )
 
-  Creates form elements for user settings page custom to this account module
+Creates form elements for user settings page custom to this account module
 
 =cut
 
diff --git a/lib/WebGUI/Account/Profile.pm b/lib/WebGUI/Account/Profile.pm
index f819e69bb..d4f42bbee 100644
--- a/lib/WebGUI/Account/Profile.pm
+++ b/lib/WebGUI/Account/Profile.pm
@@ -32,23 +32,23 @@ These subroutines are available from this package:
 
 =head2 appendCategoryVars ( var, category [,fields, errors] )
 
-    Appends cateogry variables to the hash ref passed in
-    
+Appends cateogry variables to the hash ref passed in
+
 =head3 var
 
-    The hash reference to append template variables to
+The hash reference to append template variables to
 
 =head3 category
 
-    WebGUI::ProfileCategory object to append variables for
+WebGUI::ProfileCategory object to append variables for
 
 =head3 fields
 
-    Optional array ref of fields in this category
+Optional array ref of fields in this category
 
 =head3 errors
 
-    Optional array ref of errors to attach to the category loop
+Optional array ref of errors to attach to the category loop
 
 =cut
 
@@ -95,11 +95,11 @@ sub appendCategoryVars {
 
 =head2 appendCommonVars ( var )
 
-    Appends common template variables that all profile templates use
-    
+Appends common template variables that all profile templates use
+
 =head3 var
 
-    The hash reference to append template variables to
+The hash reference to append template variables to
 
 =cut
 
@@ -137,7 +137,7 @@ sub appendCommonVars {
 
 =head2 editSettingsForm ( )
 
-  Creates form elements for user settings page custom to this account module
+Creates form elements for user settings page custom to this account module
 
 =cut
 
@@ -193,7 +193,7 @@ sub editSettingsForm {
 
 =head2 editSettingsFormSave ( )
 
-  Creates form elements for user settings page custom to this account module
+Creates form elements for user settings page custom to this account module
 
 =cut
 
diff --git a/lib/WebGUI/Account/Shop.pm b/lib/WebGUI/Account/Shop.pm
index 87e107310..788481615 100644
--- a/lib/WebGUI/Account/Shop.pm
+++ b/lib/WebGUI/Account/Shop.pm
@@ -30,11 +30,11 @@ These methods are available from this class:
 
 =head2 appendCommonVars ( var )
 
-    Appends common template variables that shop templates will use
-    
+Appends common template variables that shop templates will use
+
 =head3 var
 
-    The hash reference to append template variables to
+The hash reference to append template variables to
 
 =cut
 
@@ -56,7 +56,7 @@ sub appendCommonVars {
 
 =head2 canView ( )
 
-    Returns whether or not the user can view the the tab for this module
+Returns whether or not the user can view the the tab for this module
 
 =cut
 
@@ -69,7 +69,7 @@ sub canView {
 
 =head2 editSettingsForm ( )
 
-  Creates form elements for user settings page custom to this account module
+Creates form elements for user settings page custom to this account module
 
 =cut
 
@@ -116,7 +116,7 @@ sub editSettingsForm {
 
 =head2 editSettingsFormSave ( )
 
-  Creates form elements for the settings page custom to this account module
+Creates form elements for the settings page custom to this account module
 
 =cut
 
diff --git a/lib/WebGUI/Asset/Wobject/Matrix.pm b/lib/WebGUI/Asset/Wobject/Matrix.pm
index a1c9d937a..1b76f6629 100644
--- a/lib/WebGUI/Asset/Wobject/Matrix.pm
+++ b/lib/WebGUI/Asset/Wobject/Matrix.pm
@@ -27,10 +27,10 @@ use base 'WebGUI::Asset::Wobject';
 
 Returns true if able to add MatrixListings. 
 
- Checks to make sure that the 
- Calendar has been committed at least once. Checks to make sure that
- the user is in the appropriate group (either the group that can edit
- the calendar, or the group that can edit events in the calendar).
+Checks to make sure that the 
+Calendar has been committed at least once. Checks to make sure that
+the user is in the appropriate group (either the group that can edit
+the calendar, or the group that can edit events in the calendar).
 
 =cut
 
@@ -38,18 +38,16 @@ sub canAddMatrixListing {
     my $self    = shift;
 
     return 1;
-=cut
-    my $userId  = shift;
-
-    my $user    = $userId
-                ? WebGUI::User->new( $self->session, $userId )
-                : $self->session->user
-                ;
-
-    return 1 if (
-        $user->isInGroup( $self->get("groupIdEventEdit") )
-    );
-=cut
+#    my $userId  = shift;
+#
+#    my $user    = $userId
+#                ? WebGUI::User->new( $self->session, $userId )
+#                : $self->session->user
+#                ;
+#
+#    return 1 if (
+#        $user->isInGroup( $self->get("groupIdEventEdit") )
+#    );
 }
 
 #-------------------------------------------------------------------
diff --git a/lib/WebGUI/Content/Account.pm b/lib/WebGUI/Content/Account.pm
index b374cf249..2e67608db 100644
--- a/lib/WebGUI/Content/Account.pm
+++ b/lib/WebGUI/Content/Account.pm
@@ -63,11 +63,11 @@ These subroutines are available from this package:
 
 Creates an instance of an account pluggin
 
-=session
+=head3 session
 
 WebGUI::Session object
 
-=module
+=head3 module
 
 Module the method is in.  Defaults to the profileModuleIdentifier in the config file
 
diff --git a/lib/WebGUI/Inbox.pm b/lib/WebGUI/Inbox.pm
index dc6677b9f..42afe686a 100644
--- a/lib/WebGUI/Inbox.pm
+++ b/lib/WebGUI/Inbox.pm
@@ -328,7 +328,7 @@ The number of rows to display per page. If left blank it defaults to 25.
 
 Specify the form variable the paginator should use in its links.  Defaults to "pn".
 
-=head pageNumber
+=head4 pageNumber
 
 By default the page number will be determined by looking at $self->session->form->process("pn"). If that is empty the page number will be defaulted to "1". If you'd like to override the page number specify it here.
 
diff --git a/t/User.t b/t/User.t
index f5e9acd59..309f103a9 100644
--- a/t/User.t
+++ b/t/User.t
@@ -588,7 +588,7 @@ is ($neighbor->acceptsPrivateMessages($friend->userId), 1, 'acceptsPrivateMessag
 
 $friend->deleteFromGroups([$neighbor->friends->getId]);
 $neighbor->profileField('allowPrivateMessages', 'not a valid choice');
-is ($neighbor->acceptsPrivateMessages($friend->userId), 1, 'acceptsPrivateMessages: illegal profile field allows messages to be received from anyone');
+is ($neighbor->acceptsPrivateMessages($friend->userId), 0, 'acceptsPrivateMessages: illegal profile field doesn\'t allow messages to be received from anyone');
 
 ################################################################
 #