diff --git a/Controller/GrouperGroupsController.php b/Controller/GrouperGroupsController.php
index b6f7a93..c2b9f69 100644
--- a/Controller/GrouperGroupsController.php
+++ b/Controller/GrouperGroupsController.php
@@ -28,7 +28,11 @@
 App::uses('Validator', 'Vendor/cakephp/Validation');
 App::uses('CoGrouperLite', 'GrouperLite.Model/');
 
-
+/**
+ * Class GrouperGroupsController
+ * Main Class for Grouper Lite functionality
+ *
+ */
 class GrouperGroupsController extends GrouperLiteAppController
 {
   public $helpers = array('Html', 'Form', 'Flash');
@@ -36,6 +40,12 @@ class GrouperGroupsController extends GrouperLiteAppController
 
   public $name = 'GrouperGroups';
 
+  /**
+   * Overrides parent beforeFilter to verify that Session contains the correct API settings.
+   *
+   * @return CakeResponse|void|null
+   *
+   */
   public function beforeFilter() {
     parent::beforeFilter();
 
@@ -78,8 +88,7 @@ private function setConnection() {
    *
    * @return CakeResponse Redirect to Optin page
    */
-  public function index()
-  {
+  public function index() {
     return $this->redirect(
       array('controller' => 'GrouperGroups', 'action' => 'groupoptin')
     );
@@ -89,18 +98,18 @@ public function index()
    * Display of Grouper Group Information, such as Group Properties, Members and Attributes
    *
    */
-  public function groupInfo()
-  {
+  public function groupInfo() {
     $name = urldecode($this->request->query['groupname']);
-    $details = $this->GrouperGroup->groupDescriptions($name);
-    $this->set('groupname', $name);
+
     $this->set('title', _txt('pl.grouperlite.title.groupinfo'));
 
     try {
+      $details = $this->GrouperGroup->groupDescriptions($name);
       $this->set('groupergroupsdetail', $details[0]);
+
     } catch (Exception $e) {
-      CakeLog::write('error',
-        'GrouperLite Controller - groupInfo: ' . var_export($e->getMessage(), true));
+      CakeLog::write('error', __METHOD__ . ': ' . var_export($e->getMessage(), true));
+
       $this->set('groupergroupsdetail', array());
       $this->Flash->set(_txt('pl.grouperlite.message.flash.info-group-failed'), array('key' => 'error'));
     }
@@ -109,25 +118,34 @@ public function groupInfo()
   /**
    * Listing of all Grouper Groups owned/admin by User Or search those Grouper Groups
    */
-  public function groupOwner()
-  {
+  public function groupOwner() {
     $this->set('title', _txt('pl.grouperlite.title.groupowner'));
 
-    if (isset($this->request->data['search'])){
+    if (isset($this->request->data['search'])) {
       $searchCriteria = urldecode($this->request->data['search']);
       $this->set('searchcriteria', $searchCriteria);
 
       try {
         $this->set('groupergroupsowner', $this->GrouperGroup->getSearchedGroups($this->userId, $searchCriteria, 'groupOwner'));
+
       } catch (Exception $e) {
-        CakeLog::write('error',
-          'GrouperLite Controller - groupOwner Search: ' . var_export($e->getMessage(), true));
+        CakeLog::write('error', __METHOD__ . ' Search: ' . var_export($e->getMessage(), true));
+
         $this->set('groupergroupsowner', array());
         $this->Flash->set(_txt('pl.grouperlite.message.flash.owner-group-failed'), array('key' => 'error'));
+        return;
       }
-
     } else {
-      $this->set('groupergroupsowner', $this->GrouperGroup->ownerGroups($this->userId));
+      try {
+        $this->set('groupergroupsowner', $this->GrouperGroup->ownerGroups($this->userId));
+      } catch (Exception $e) {
+        CakeLog::write('error', __METHOD__ . ': ' . var_export($e->getMessage(), true));
+
+        $this->set('groupergroupsowner', array());
+        $this->Flash->set(_txt('pl.grouperlite.message.flash.owner-group-failed'), array('key' => 'error'));
+        return;
+      }
+
     }
     $this->set('isuserowner', $this->GrouperGroup->isUserOwner($this->userId));
   }
@@ -139,22 +157,34 @@ public function groupOwner()
    */
   public function groupMember() {
     $this->set('title', _txt('pl.grouperlite.title.groupmember'));
-    try {
-      if (isset($this->request->data['search'])){
-        $searchCriteria = urldecode($this->request->data['search']);
+
+    if (isset($this->request->data['search'])) {
+      $searchCriteria = urldecode($this->request->data['search']);
+      $this->set('searchcriteria', $searchCriteria);
+
+      try {
         $this->set('groupergroupmemberships', $this->GrouperGroup->getSearchedGroups($this->userId, $searchCriteria, 'groupMember'));
-        $this->set('searchcriteria', $searchCriteria);
-      } else {
+
+      } catch (Exception $e) {
+        CakeLog::write('error', __METHOD__ . ' Search: ' . var_export($e->getMessage(), true));
+
+        $this->Flash->set("Your Search Group cannot be found, please try again later.", array('key' => 'error'));
+        $this->set('groupergroupmemberships', array());
+        return;
+      }
+    } else {
+      try {
         $this->set('groupergroupmemberships', $this->GrouperGroup->filteredMemberOfGroups($this->userId));
+
+      } catch (Exception $e) {
+        CakeLog::write('error', __METHOD__ . ': ' . var_export($e->getMessage(), true));
+
+        $this->Flash->set("Your Member Group cannot be found, please try again later.", array('key' => 'error'));
+        $this->set('groupergroupmemberships', array());
+        return;
       }
-    } catch (Exception $e) {
-      CakeLog::write('error',
-        'GrouperLite Controller - groupMember: ' . var_export($e->getMessage(), true));
-      $this->Flash->set("Your Membership Groups cannot be found currently, please try again later.", array('key' => 'error'));
-      $this->set('groupergroupmemberships', array());
     }
     $this->set('isuserowner', $this->GrouperGroup->isUserOwner($this->userId));
-
   }
 
   /**
@@ -163,24 +193,29 @@ public function groupMember() {
   public function groupOptin() {
     $this->set('title', _txt('pl.grouperlite.title.groupoptin'));
 
-    if (isset($this->request->data['search'])){
+    if (isset($this->request->data['search'])) {
       $searchCriteria = urldecode($this->request->data['search']);
-      $this->set('groupergroupoptin', $this->GrouperGroup->getSearchedGroups($this->userId, $searchCriteria, 'groupOptin'));
       $this->set('searchcriteria', $searchCriteria);
+
+      try {
+        $this->set('groupergroupoptin', $this->GrouperGroup->getSearchedGroups($this->userId, $searchCriteria, 'groupOptin'));
+
+      } catch (Exception $e) {
+        CakeLog::write('error', __METHOD__ . 'Search: ' . var_export($e->getMessage(), true));
+
+        $this->Flash->set("Your Optin Group Search cannot be found, please try again later.", array('key' => 'error'));
+        $this->set('groupergroupoptin', array());
+        return;
+      }
     } else {
       try {
-        $optin = $this->GrouperGroup->optinGroups($this->userId);
-        if (isset($optin['errorMessage'])){
-          $this->Flash->set('Some error', array('key' => 'error'));
-          $this->set('groupergroupoptin', array());
-        } else {
-          $this->set('groupergroupoptin', $optin);
-        }
+        $this->set('groupergroupoptin', $this->GrouperGroup->optinGroups($this->userId));
 
       } catch (Exception $e) {
-        CakeLog::write('error', 'GrouperLite Controller: Seeing is believing');
-        $this->Flash->set($e->getMessage(), array('key' => 'error'));
+        CakeLog::write('error', __METHOD__ . ': ' . var_export($e->getMessage(), true));
+        $this->Flash->set("An error occurred with the Optin Groups, please try again later.", array('key' => 'error'));
         $this->set('groupergroupoptin', array());
+        return;
       }
     }
     $this->set('isuserowner', $this->GrouperGroup->isUserOwner($this->userId));
@@ -209,10 +244,15 @@ public function joinGroup() {
     if ($this->request->is('post')) {
       $name = $this->request->data['GroupName'];
 
-      if($this->GrouperGroup->joinGroup($this->userId, $name)) {
-        $this->Flash->set(_txt('pl.grouperlite.message.flash.join-group-success'), array('key' => 'success'));
-      } else {
-        $this->Flash->set(_txt('pl.grouperlite.message.flash.join-group-failed'), array('key' => 'error'));
+      try {
+        if ($this->GrouperGroup->joinGroup($this->userId, $name)) {
+          $this->Flash->set(_txt('pl.grouperlite.message.flash.join-group-success'), array('key' => 'success'));
+        } else {
+          $this->Flash->set(_txt('pl.grouperlite.message.flash.join-group-failed'), array('key' => 'error'));
+        }
+      } catch (Exception $e) {
+        CakeLog::write('error', __METHOD__ . ': ' . var_export($e->getMessage(), true));
+        $this->Flash->set(_txt('pl.grouperlite.message.flash.join-group-error'), array('key' => 'error'));
       }
 
     } else {
@@ -231,11 +271,17 @@ public function leaveGroup() {
     if ($this->request->is('post')) {
       $name = $this->request->data['GroupName'];
 
-      if($this->GrouperGroup->leaveGroup($this->userId, $name)) {
-        $this->Flash->set(_txt('pl.grouperlite.message.flash.leave-group-success'), array('key' => 'success'));
-      } else {
-        $this->Flash->set(_txt('pl.grouperlite.message.flash.leave-group-failed'), array('key' => 'error'));
+      try {
+        if ($this->GrouperGroup->leaveGroup($this->userId, $name)) {
+          $this->Flash->set(_txt('pl.grouperlite.message.flash.leave-group-success'), array('key' => 'success'));
+        } else {
+          $this->Flash->set(_txt('pl.grouperlite.message.flash.leave-group-failed'), array('key' => 'error'));
+        }
+      } catch (Exception $e) {
+        CakeLog::write('error', __METHOD__ . ': ' . var_export($e->getMessage(), true));
+        $this->Flash->set(_txt('pl.grouperlite.message.flash.leave-group-error'), array('key' => 'error'));
       }
+
     } else {
       $this->Flash->set(_txt('pl.grouperlite.message.flash.leave-group-error'), array('key' => 'error'));
     }
@@ -251,14 +297,14 @@ public function leaveGroup() {
    * - precondition: Session.Auth holds data used for authz decisions
    * - postcondition: $permissions set with calculated permissions
    *
-   * @since  COmanage Registry v3.2.0
    * @return Array Permissions
+   * @since  COmanage Registry v3.2.0
    */
   function isAuthorized() {
     $roles = $this->Role->calculateCMRoles();
 
     //Need to pull in UserID for access to Grouper
-    if($this->Session->check('Auth.User.username')) {
+    if ($this->Session->check('Auth.User.username')) {
       $this->userId = $this->Session->read('Auth.User.username');
     }
 
@@ -324,5 +370,4 @@ public function emailListInfo() {
       'attributes' => array()
     ));
   }
-
 }
diff --git a/Lib/GrouperApiAccess.php b/Lib/GrouperApiAccess.php
index b7f53eb..81377e5 100644
--- a/Lib/GrouperApiAccess.php
+++ b/Lib/GrouperApiAccess.php
@@ -57,7 +57,7 @@ public function __construct() {
     $this->http = new GrouperHTTPWrapper();
 
     if (!CakeSession::check('Plugin.Grouper.Api.id')) {
-      CakeLog::write('error', 'GrouperLite API: No Widget record in Session');
+      CakeLog::write('error', __METHOD__ . ': No Widget record in Session');
       throw new GrouperLiteException("No GrouperLite instance captured");
     }
 
@@ -110,7 +110,7 @@ public function getGrouperUser(array $queryData) {
       }
 
     } catch (Exception $e) {
-      CakeLog::write('error', 'GrouperLite API - getGrouperUser: An error occurred');
+      CakeLog::write('error', __METHOD__ . ': An error occurred');
       throw $e;
     }
 
@@ -138,7 +138,7 @@ public function getGrouperMemberOfGroups(array $queryData) {
         return $results['WsGetGroupsLiteResult']['wsGroups'];
       }
     } catch (Exception $e) {
-      CakeLog::write('error', 'GrouperLite API - getGrouperMemberOfGroups: An error occurred');
+      CakeLog::write('error', __METHOD__ .  ': An error occurred');
       throw $e;
     }
 
@@ -168,8 +168,7 @@ public function grouperGroupLeaveOrJoin(array $queryData) {
       $resultResponse = 'WsAddMemberResults';
       $resultGroup = 'wsGroupAssigned';
     } else {
-      CakeLog::write('error',
-        "GrouperLite API - grouperGroupLeaveOrJoin: Option of $groupLeaveOrJoin is not supported");
+      CakeLog::write('error',__METHOD__ .  ": Option of $groupLeaveOrJoin is not supported");
       throw new GrouperLiteException("Receved option of $groupLeaveOrJoin  which is not supported");
     }
 
@@ -199,7 +198,7 @@ public function grouperGroupLeaveOrJoin(array $queryData) {
         }
       }
     } catch (Exception $e) {
-      CakeLog::write('error', 'GrouperLite API - grouperGroupLeaveOrJoin: An error occurred');
+      CakeLog::write('error', __METHOD__ .  ': An error occurred');
       throw $e;
     }
 
@@ -226,7 +225,7 @@ public function getOptinGroups(array $queryData) {
         return $results['WsGetMembershipsResults']['wsGroups'];
       }
     } catch (Exception $e) {
-      CakeLog::write('error', 'GrouperLite API - getOptinGroups: An error occurred');
+      CakeLog::write('error', __METHOD__ . ': An error occurred');
       throw $e;
     }
     return array();
@@ -250,7 +249,7 @@ public function getOwnerGroups(array $queryData) {
         return $results['WsGetMembershipsResults']['wsGroups'];
       }
     } catch (Exception $e) {
-      CakeLog::write('error', 'GrouperLite API - getOwnerGroups: An error occurred');
+      CakeLog::write('error', __METHOD__ .  ': An error occurred');
       throw $e;
     }
     return array();
@@ -273,7 +272,7 @@ public function getOwnerStems(array $queryData) {
         return $results['WsGetMembershipsResults']['wsStems'];
       }
     } catch (Exception $e) {
-      CakeLog::write('error', 'GrouperLite API - getOwnerStems: An error occurred');
+      CakeLog::write('error', __METHOD__ .  ': An error occurred');
       throw $e;
     }
     return array();
@@ -304,8 +303,7 @@ private function useMembershipUrl(array $queryData) {
       $fieldName = "stemAdmin";
       $subjectId = $userId;
     } else {
-      CakeLog::write('error',
-        "GrouperLite API - useMembershipUrl: Option of $groupType is not supported");
+      CakeLog::write('error', __METHOD__ .  ": Option of $groupType is not supported");
       throw new GrouperLiteException("Option of $groupType is not supported");
     }
 
@@ -324,7 +322,7 @@ private function useMembershipUrl(array $queryData) {
     try {
       return $this->http->sendRequest('POST', $connectionUrl, json_encode($groupsToShow));
     } catch (Exception $e) {
-      CakeLog::write('error', 'GrouperLite API - useMembershipUrl: An error occurred');
+      CakeLog::write('error', __METHOD__ .  ': An error occurred');
       throw $e;
     }
   }
@@ -350,7 +348,7 @@ public function getGrouperGroupDescription(array $queryData) {
         return $results['WsGetMembershipsResults']['wsGroups'];
       }
     } catch (Exception $e) {
-      CakeLog::write('error', 'GrouperLite API - getGrouperGroupDescription: An error occurred');
+      CakeLog::write('error', __METHOD__ .  ': An error occurred');
       throw $e;
     }
     return array();
@@ -407,7 +405,7 @@ public function createUpdateGroup(array $queryData) {
         }
       }
     } catch (Exception $e) {
-      CakeLog::write('error', 'GrouperLite API - createUpdateGroup: An error occurred');
+      CakeLog::write('error', __METHOD__ .  ': An error occurred');
       throw $e;
     }
     return false;
@@ -446,7 +444,7 @@ public function getGroupAttributes(array $queryData) {
         return $results['WsGetAttributeAssignmentsResults']['wsAttributeAssigns'];
       }
     } catch (Exception $e) {
-      CakeLog::write('error', 'GrouperLite API - getGroupAttributes: An error occurred');
+      CakeLog::write('error', __METHOD__ .  ': An error occurred');
       throw $e;
     }
     return array();
diff --git a/Lib/GrouperHTTPWrapper.php b/Lib/GrouperHTTPWrapper.php
index 9c9abb9..625d96c 100644
--- a/Lib/GrouperHTTPWrapper.php
+++ b/Lib/GrouperHTTPWrapper.php
@@ -115,8 +115,7 @@ public function sendRequest(string $method, string $uri, string $body = ''): arr
     try {
       $results = $this->request($this->_request);
     } catch (Exception $e) {
-      CakeLog::write('error',
-        'GrouperLite API: An error occurred: ' . var_export($e->getMessage(), true));
+      CakeLog::write('error', __METHOD__ .  ': An error occurred: ' . var_export($e->getMessage(), true));
       throw new GrouperLiteException('An error occurred talking to Grouper WS');
     }
     return $this->_verifyResults($results);
@@ -139,15 +138,12 @@ private function _verifyResults(HttpSocketResponse $apiResults): array {
       $apiSuccess = $resBody[$mainKey]['resultMetadata']['resultCode'];
 
       if ($apiSuccess != 'SUCCESS') {
-        CakeLog::write('error',
-          'GrouperLite: Result Code was not SUCCESS, it was: ' . var_export($apiSuccess, true));
-        CakeLog::write('error',
-          'GrouperLite: Error message: ' . var_export($apiResults->body(), true));
+        CakeLog::write('error', __METHOD__ .  ': Result Code was ' . var_export($apiSuccess, true));
+        CakeLog::write('error', __METHOD__ .  ': Error of ' . var_export($apiResults->body(), true));
         throw new GrouperLiteException('Result from Grouper WS was' . var_export($apiSuccess, true));
       }
     } else {
-      CakeLog::write('error',
-        'GrouperLite Verify: Error message = ' . var_export($apiResults->body(), true));
+      CakeLog::write('error', __METHOD__ .  ': Verify error of ' . var_export($apiResults->body(), true));
       throw new GrouperLiteException('An error occurred while talking to Grouper WS');
     }
     return $resBody;
diff --git a/Lib/lang.php b/Lib/lang.php
index 4ef1ffc..b52f529 100644
--- a/Lib/lang.php
+++ b/Lib/lang.php
@@ -1,35 +1,35 @@
 <?php
 
 $cm_grouper_lite_texts['en_US'] = array(
-    'pl.grouperlite.config.display.title' => 'Grouper Configuration Settings',
-    'pl.grouperlite.config.edit.title' => 'Edit Grouper Configuration Settings',
-    'pl.grouperlite.config.grouper-url' => 'Grouper URL',
-    'pl.grouperlite.config.grouper-version' => 'Grouper Version',
-    'pl.grouperlite.config.grouper-un' => 'Username',
-    'pl.grouperlite.config.grouper-pw' => 'Password',
+  'pl.grouperlite.config.display.title' => 'Grouper Configuration Settings',
+  'pl.grouperlite.config.edit.title' => 'Edit Grouper Configuration Settings',
+  'pl.grouperlite.config.grouper-url' => 'Grouper URL',
+  'pl.grouperlite.config.grouper-version' => 'Grouper Version',
+  'pl.grouperlite.config.grouper-un' => 'Username',
+  'pl.grouperlite.config.grouper-pw' => 'Password',
 
-    'pl.grouperlite.crumb.root' => 'Grouper',
-    'pl.grouperlite.nav.groups-can-join' => 'Groups I can join',
-    'pl.grouperlite.nav.groups-presided' => 'Groups I manage',
-    'pl.grouperlite.nav.memberships' => 'My memberships',
-    'pl.grouperlite.nav.email-lists' => 'Email lists',
-    'pl.grouperlite.nav.email-lists-managed' => 'Email lists I manage',
-    'pl.grouperlite.nav.create-group' => 'Create group',
+  'pl.grouperlite.crumb.root' => 'Grouper',
+  'pl.grouperlite.nav.groups-can-join' => 'Groups I can join',
+  'pl.grouperlite.nav.groups-presided' => 'Groups I manage',
+  'pl.grouperlite.nav.memberships' => 'My memberships',
+  'pl.grouperlite.nav.email-lists' => 'Email lists',
+  'pl.grouperlite.nav.email-lists-managed' => 'Email lists I manage',
+  'pl.grouperlite.nav.create-group' => 'Create group',
 
-    'pl.grouperlite.title.root' => 'Grouper Collaborations:',
-    'pl.grouperlite.title.groupinfo' => 'Group configuration and attributes',
-    'pl.grouperlite.title.groupowner' => 'Groups I manage',
-    'pl.grouperlite.title.groupmember' => 'My Memberships',
-    'pl.grouperlite.title.groupoptin' => 'Groups I can join',
-    'pl.grouperlite.title.emaillists' => 'Email lists',
-    'pl.grouperlite.title.emaillistsmanaged' => 'Email lists I manage',
-    'pl.grouperlite.title.emaillistsinfo' => 'Email list configuration and attributes',
-    'pl.grouperlite.title.groupcreate' => 'Create Group',
+  'pl.grouperlite.title.root' => 'Grouper Collaborations:',
+  'pl.grouperlite.title.groupinfo' => 'Group configuration and attributes',
+  'pl.grouperlite.title.groupowner' => 'Groups I manage',
+  'pl.grouperlite.title.groupmember' => 'My Memberships',
+  'pl.grouperlite.title.groupoptin' => 'Groups I can join',
+  'pl.grouperlite.title.emaillists' => 'Email lists',
+  'pl.grouperlite.title.emaillistsmanaged' => 'Email lists I manage',
+  'pl.grouperlite.title.emaillistsinfo' => 'Email list configuration and attributes',
+  'pl.grouperlite.title.groupcreate' => 'Create Group',
 
-    'pl.grouperlite.message.flash.join-group-success' => 'You have been added to the group!',
-    'pl.grouperlite.message.flash.join-group-failed' => 'You are unable to join the group!',
-    'pl.grouperlite.message.flash.join-group-error' => 'An error occurred in joining the group, please try again later.',
-    'pl.grouperlite.message.flash.info-group-failed' => 'Error in viewing group info, please try again later.',
+  'pl.grouperlite.message.flash.join-group-success' => 'You have been added to the group!',
+  'pl.grouperlite.message.flash.join-group-failed' => 'You are unable to join the group!',
+  'pl.grouperlite.message.flash.join-group-error' => 'An error occurred in joining the group, please try again later.',
+  'pl.grouperlite.message.flash.info-group-failed' => 'Error in viewing group info, please try again later.',
 
   'pl.grouperlite.message.flash.leave-group-success' => 'You have been deleted from the group!',
   'pl.grouperlite.message.flash.leave-group-failed' => 'You are unable to delete the group!',
@@ -39,42 +39,42 @@
   'pl.grouperlite.message.flash.optin-group-failed' => 'Error occurred in viewing Optin groups, please try again later.',
 
 
-    'pl.grouperlite.table.name'  => 'Name',
-    'pl.grouperlite.table.description'  => 'Description',
-    'pl.grouperlite.table.status'  => 'Status',
-    'pl.grouperlite.table.action'  => 'Action',
+  'pl.grouperlite.table.name'  => 'Name',
+  'pl.grouperlite.table.description'  => 'Description',
+  'pl.grouperlite.table.status'  => 'Status',
+  'pl.grouperlite.table.action'  => 'Action',
 
-    'pl.grouperlite.value.descr.zerostate' => 'No Description',
-    'pl.grouperlite.value.enabled' => 'Enabled',
-    'pl.grouperlite.value.disabled' => 'Disabled',
+  'pl.grouperlite.value.descr.zerostate' => 'No Description',
+  'pl.grouperlite.value.enabled' => 'Enabled',
+  'pl.grouperlite.value.disabled' => 'Disabled',
 
-    'pl.grouperlite.action.join-group' => 'Join group',
-    'pl.grouperlite.action.leave-group' => 'Leave group',
-    'pl.grouperlite.action.edit-group' => 'Edit',
-    'pl.grouperlite.action.disable-group' => 'Disable',
-    'pl.grouperlite.action.subscribe' => 'Subscribe',
-    'pl.grouperlite.action.unsubscribe' => 'Unsubscribe',
-    'pl.grouperlite.action.search' => 'Search',
-    'pl.grouperlite.action.remove' => 'Remove',
+  'pl.grouperlite.action.join-group' => 'Join group',
+  'pl.grouperlite.action.leave-group' => 'Leave group',
+  'pl.grouperlite.action.edit-group' => 'Edit',
+  'pl.grouperlite.action.disable-group' => 'Disable',
+  'pl.grouperlite.action.subscribe' => 'Subscribe',
+  'pl.grouperlite.action.unsubscribe' => 'Unsubscribe',
+  'pl.grouperlite.action.search' => 'Search',
+  'pl.grouperlite.action.remove' => 'Remove',
 
-    'pl.grouperlite.form.group.template.label' => 'Select a template',
-    'pl.grouperlite.form.group.template.empty' => '(choose one)',
-    'pl.grouperlite.form.group.name.label' => 'Display name',
-    'pl.grouperlite.form.group.name.help' => 'Name is the label that identifies this group, and might change.',
-    'pl.grouperlite.form.group.stem.label' => 'Create in this folder:',
-    'pl.grouperlite.form.group.stem.help' => 'Enter a folder name.',
-    'pl.grouperlite.form.group.description.label' => 'Description:',
-    'pl.grouperlite.form.group.description.help' => 'Description contains notes about the group, which could include: what the group represents, why it was created, etc.',
-    'pl.grouperlite.form.group.privs.label' => 'Privileges',
-    'pl.grouperlite.form.group.privs.label.READ' => 'READ',
-    'pl.grouperlite.form.group.privs.label.VIEW' => 'VIEW',
-    'pl.grouperlite.form.group.privs.label.OPTIN' => 'OPTIN',
-    'pl.grouperlite.form.group.privs.label.OPTOUT' => 'OPTOUT',
-    'pl.grouperlite.form.group.privs.label.ATTRIBUTE_READ' => 'ATTRIBUTE READ',
-    'pl.grouperlite.form.group.subs.label' => 'Subscribers:',
-    'pl.grouperlite.form.group.subs.help' => 'Select subscribers to add to the group.',
-    'pl.grouperlite.form.group.subs.placeholder' => 'Search subscribers',
-    'pl.grouperlite.form.group.action.save' => 'Save Group',
+  'pl.grouperlite.form.group.template.label' => 'Select a template',
+  'pl.grouperlite.form.group.template.empty' => '(choose one)',
+  'pl.grouperlite.form.group.name.label' => 'Display name',
+  'pl.grouperlite.form.group.name.help' => 'Name is the label that identifies this group, and might change.',
+  'pl.grouperlite.form.group.stem.label' => 'Create in this folder:',
+  'pl.grouperlite.form.group.stem.help' => 'Enter a folder name.',
+  'pl.grouperlite.form.group.description.label' => 'Description:',
+  'pl.grouperlite.form.group.description.help' => 'Description contains notes about the group, which could include: what the group represents, why it was created, etc.',
+  'pl.grouperlite.form.group.privs.label' => 'Privileges',
+  'pl.grouperlite.form.group.privs.label.READ' => 'READ',
+  'pl.grouperlite.form.group.privs.label.VIEW' => 'VIEW',
+  'pl.grouperlite.form.group.privs.label.OPTIN' => 'OPTIN',
+  'pl.grouperlite.form.group.privs.label.OPTOUT' => 'OPTOUT',
+  'pl.grouperlite.form.group.privs.label.ATTRIBUTE_READ' => 'ATTRIBUTE READ',
+  'pl.grouperlite.form.group.subs.label' => 'Subscribers:',
+  'pl.grouperlite.form.group.subs.help' => 'Select subscribers to add to the group.',
+  'pl.grouperlite.form.group.subs.placeholder' => 'Search subscribers',
+  'pl.grouperlite.form.group.action.save' => 'Save Group',
 
-    'pl.grouperlite.search.tags.text' => 'Search',
+  'pl.grouperlite.search.tags.text' => 'Search',
 );
\ No newline at end of file
diff --git a/Model/GrouperGroup.php b/Model/GrouperGroup.php
index 5525000..72e814e 100644
--- a/Model/GrouperGroup.php
+++ b/Model/GrouperGroup.php
@@ -88,7 +88,7 @@ public function isUserOwner(string $userId) {
       return 'F';
 
     } catch (Exception $e) {
-      CakeLog::write('error', 'GrouperLite Model - isUserOwner: An error occurred');
+      CakeLog::write('error', __METHOD__ . ': An error occurred');
       throw $e;
     }
   }
@@ -139,7 +139,7 @@ public function filteredMemberOfGroups(string $userId) {
       return $this->getFriendlyName($memberOfGroups);
 
     } catch (Exception $e) {
-      CakeLog::write('error', 'GrouperLite Model - filteredMemberOfGroups: An error occurred');
+      CakeLog::write('error', __METHOD__ . ': An error occurred');
       throw $e;
     }
   }
@@ -161,7 +161,7 @@ private function memberOfGroups(string $userId) {
       return $this->grouperAPI->getGrouperMemberOfGroups($args);
 
     } catch (Exception $e) {
-      CakeLog::write('error', 'GrouperLite Model - memberOfGroups: An error occurred');
+      CakeLog::write('error', __METHOD__ . ': An error occurred');
       throw $e;
     }
   }
@@ -181,15 +181,17 @@ public function groupDescriptions(string $groupName) {
       $args['conditions']['groupName'] = $groupName;
 
       $groupDescription = $this->grouperAPI->getGrouperGroupDescription($args);
+      $groupInfo = $this->getFriendlyName($groupDescription);
+
       //make call to get attributes for group
       $grouperAtt = new GrouperAttribute();
       $groupAttributes = $grouperAtt->getGroupAttributes($groupName);
 
-      $groupDescription[0]["attributes"] = $groupAttributes;
-      return $groupDescription;
+      $groupInfo[0]["attributes"] = $groupAttributes;
+      return $groupInfo;
 
     } catch (Exception $e) {
-      CakeLog::write('error', 'GrouperLite Model - groupDescriptions: An error occurred');
+      CakeLog::write('error', __METHOD__ . ': An error occurred');
       throw $e;
     }
 
@@ -216,7 +218,7 @@ public function leaveGroup(string $userId, string $groupName) {
       return $this->grouperAPI->grouperGroupLeaveOrJoin($args);
 
     } catch (Exception $e) {
-      CakeLog::write('error', 'GrouperLite Model - leaveGroup: An error occurred');
+      CakeLog::write('error', __METHOD__ . ': An error occurred');
       throw $e;
     }
   }
@@ -242,7 +244,7 @@ public function joinGroup(string $userId, string $groupName) {
       return $this->grouperAPI->grouperGroupLeaveOrJoin($args);
 
     } catch (Exception $e) {
-      CakeLog::write('error', 'GrouperLite Model - joinGroup: An error occurred');
+      CakeLog::write('error', __METHOD__ . ': An error occurred');
       throw $e;
     }
   }
@@ -263,12 +265,10 @@ public function ownerGroups(string $userId) {
       $args['conditions']['userId'] = $userId;
 
       $ownGroups = $this->grouperAPI->getOwnerGroups($args);
-      $ownerGroups = $this->getFriendlyName($ownGroups);
-
-      return $ownerGroups;
+      return $this->getFriendlyName($ownGroups);
 
     } catch (Exception $e) {
-      CakeLog::write('error', 'GrouperLite Model - ownerGroups: An error occurred');
+      CakeLog::write('error', __METHOD__ . ': An error occurred');
       throw $e;
     }
   }
@@ -306,7 +306,7 @@ public function optinGroups(string $userId) {
       return $this->getFriendlyName($joinOrLeave);
 
     } catch (Exception $e) {
-      CakeLog::write('error', 'GrouperLite Model - optinGroups: An error occurred');
+      CakeLog::write('error', __METHOD__ . ': An error occurred');
       throw $e;
     }
   }
@@ -339,7 +339,7 @@ public function createGroup(string $userId, string $groupName, string $stemName,
       return $this->grouperAPI->createUpdateGroup($args);
 
     } catch (Exception $e) {
-      CakeLog::write('error', 'GrouperLite Model - createGroup: An error occurred');
+      CakeLog::write('error', __METHOD__ . ': An error occurred');
       throw $e;
     }
   }
@@ -361,7 +361,7 @@ public function getOwnerStems(string $userId) {
       return $this->grouperAPI->getOwnerStems($args);
 
     } catch (Exception $e) {
-      CakeLog::write('error', 'GrouperLite Model - getOwnerStems: An error occurred');
+      CakeLog::write('error', __METHOD__ . ': An error occurred');
       throw $e;
     }
   }
@@ -405,7 +405,7 @@ public function getSearchedGroups(string $userId, string $searchCriteria, string
       return $returnResults;
 
     } catch (Exception $e) {
-      CakeLog::write('error', 'GrouperLite Model - getSearchedGroups: An error occurred');
+      CakeLog::write('error', __METHOD__ . ': An error occurred');
       throw $e;
     }
   }
diff --git a/View/GrouperGroups/groupinfo.ctp b/View/GrouperGroups/groupinfo.ctp
index c74a6b6..f20f1cc 100644
--- a/View/GrouperGroups/groupinfo.ctp
+++ b/View/GrouperGroups/groupinfo.ctp
@@ -13,7 +13,7 @@ $isuserowner = 'T';
 
 <div>
     <div class="border-bottom py-4 mb-4 d-flex justify-content-between">
-        <h2><strong>Group: </strong><?php echo $groupergroupsdetail['displayName']; ?></h2>
+        <h2><strong>Group: </strong><?php echo $groupergroupsdetail['friendlyName']; ?></h2>
         <div class="d-flex align-items-center">
             <?php if ($isuserowner === 'T') { ?>
                 <button class="btn btn-primary mr-2" data-toggle="modal" data-target="#subscribers">View Subscribers <i class="fa fa-group"></i></button>