diff --git a/.cursor/rules/version_control.mdc b/.cursor/rules/version_control.mdc
index c486997d..b1a53c33 100644
--- a/.cursor/rules/version_control.mdc
+++ b/.cursor/rules/version_control.mdc
@@ -1,7 +1,13 @@
 ---
 alwaysApply: true
 ---
- do not add or commit for the user; let him control that process
+# Rules for peaceful co-existence with developers
+
+do not add or commit for the user; let him control that process
+
+the content of commit messages should be from the files awaiting staging
+and those which have been staged.  use the differences in those files
+to inform the content of the commit message 
 
 always preview changes and commit message to use and allow me to copy and paste
 ✅ Preferred Commit Message Format
diff --git a/src/components/MembersList.vue b/src/components/MembersList.vue
index d10d4847..89840ebd 100644
--- a/src/components/MembersList.vue
+++ b/src/components/MembersList.vue
@@ -159,25 +159,6 @@
 </template>
 
 <script lang="ts">
-/* TODO: Human Testing Required - PlatformServiceMixin Migration */
-// Priority: High | Migrated: 2025-07-06 | Author: Matthew Raymer
-//
-// TESTING NEEDED: Component migrated from legacy logConsoleAndDb to PlatformServiceMixin
-// but requires human validation due to meeting component accessibility limitations.
-//
-// Test Scenarios Required:
-// 1. Load members list with valid meeting password
-// 2. Test member admission toggle (organizer role)
-// 3. Test adding member as contact
-// 4. Test error scenarios: network failure, invalid password, server errors
-// 5. Verify error logging appears in console and database
-// 6. Cross-platform testing: web, mobile, desktop
-//
-// Reference: docs/migration-testing/migration-checklist-MembersList.md
-// Migration Details: Replaced 3 logConsoleAndDb() calls with this.$logAndConsole()
-// Validation: Passes lint checks and TypeScript compilation
-// Navigation: Contacts → Chair Icon → Start/Join Meeting → Members List
-
 import { Component, Vue, Prop, Emit } from "vue-facing-decorator";
 
 import {
diff --git a/src/constants/app.ts b/src/constants/app.ts
index 6ec4c685..0d172dcc 100644
--- a/src/constants/app.ts
+++ b/src/constants/app.ts
@@ -19,7 +19,8 @@ export enum AppString {
 
   PROD_PARTNER_API_SERVER = "https://partner-api.endorser.ch",
   TEST_PARTNER_API_SERVER = "https://test-partner-api.endorser.ch",
-  LOCAL_PARTNER_API_SERVER = "http://127.0.0.1:3002",
+  // eslint-disable-next-line @typescript-eslint/no-duplicate-enum-values
+  LOCAL_PARTNER_API_SERVER = "http://127.0.0.1:3000",
 
   PROD_PUSH_SERVER = "https://timesafari.app",
   TEST1_PUSH_SERVER = "https://test.timesafari.app",
diff --git a/src/interfaces/common.ts b/src/interfaces/common.ts
index 11282c84..7aca4120 100644
--- a/src/interfaces/common.ts
+++ b/src/interfaces/common.ts
@@ -1,10 +1,7 @@
 // similar to VerifiableCredentialSubject... maybe rename this
 export interface GenericVerifiableCredential {
   "@context"?: string;
-  "@type": string;
-  name?: string;
-  description?: string;
-  agent?: string | { identifier: string };
+  "@type"?: string;
   [key: string]: unknown;
 }
 
@@ -47,7 +44,7 @@ export interface KeyMetaWithPrivate extends KeyMeta {
 }
 
 export interface QuantitativeValue extends GenericVerifiableCredential {
-  "@type": "QuantitativeValue";
+  "@type"?: "QuantitativeValue";
   "@context"?: string;
   amountOfThisGood: number;
   unitCode: string;
@@ -97,8 +94,7 @@ export interface ClaimObject {
 
 export interface VerifiableCredentialClaim {
   "@context"?: string;
-  "@type": string;
-  type: string[];
+  "@type"?: string;
   credentialSubject: ClaimObject;
   [key: string]: unknown;
 }
diff --git a/src/libs/endorserServer.ts b/src/libs/endorserServer.ts
index c4025f0e..e28b3ac9 100644
--- a/src/libs/endorserServer.ts
+++ b/src/libs/endorserServer.ts
@@ -697,7 +697,6 @@ export function hydrateGive(
 
   if (amount && !isNaN(amount)) {
     const quantitativeValue: QuantitativeValue = {
-      "@type": "QuantitativeValue",
       amountOfThisGood: amount,
       unitCode: unitCode || "HUR",
     };
@@ -1342,7 +1341,6 @@ export async function createEndorserJwtVcFromClaim(
     vc: {
       "@context": "https://www.w3.org/2018/credentials/v1",
       "@type": "VerifiableCredential",
-      type: ["VerifiableCredential"],
       credentialSubject: claim,
     },
   };
@@ -1380,7 +1378,6 @@ export async function createInviteJwt(
     vc: {
       "@context": "https://www.w3.org/2018/credentials/v1",
       "@type": "VerifiableCredential",
-      type: ["VerifiableCredential"],
       credentialSubject: vcClaim as unknown as ClaimObject, // Type assertion needed due to object being string
     },
   };
diff --git a/src/services/AbsurdSqlDatabaseService.ts b/src/services/AbsurdSqlDatabaseService.ts
index bd601755..083d3076 100644
--- a/src/services/AbsurdSqlDatabaseService.ts
+++ b/src/services/AbsurdSqlDatabaseService.ts
@@ -134,7 +134,7 @@ class AbsurdSqlDatabaseService implements DatabaseService {
 
     // An error is thrown without this pragma: "File has invalid page size. (the first block of a new file must be written first)"
     await this.db.exec(`PRAGMA journal_mode=MEMORY;`);
-    
+
     // Create wrapper functions that match the expected signatures
     const sqlExec = async (sql: string, params?: unknown[]): Promise<void> => {
       await this.db!.run(sql, params);
diff --git a/src/services/platforms/CapacitorPlatformService.ts b/src/services/platforms/CapacitorPlatformService.ts
index 18262f2a..bd22ef8d 100644
--- a/src/services/platforms/CapacitorPlatformService.ts
+++ b/src/services/platforms/CapacitorPlatformService.ts
@@ -492,10 +492,7 @@ export class CapacitorPlatformService implements PlatformService {
      * @param params - Optional parameters for prepared statements
      * @returns Promise resolving to execution results
      */
-    const sqlExec = async (
-      sql: string,
-      params?: unknown[],
-    ): Promise<void> => {
+    const sqlExec = async (sql: string, params?: unknown[]): Promise<void> => {
       logger.debug(`🔧 [CapacitorMigration] Executing SQL:`, sql);
 
       if (params && params.length > 0) {
diff --git a/src/utils/PlatformServiceMixin.ts b/src/utils/PlatformServiceMixin.ts
index 6afe5d18..6baa8cc6 100644
--- a/src/utils/PlatformServiceMixin.ts
+++ b/src/utils/PlatformServiceMixin.ts
@@ -459,13 +459,10 @@ export const PlatformServiceMixin = {
 
         return settings;
       } catch (error) {
-        logger.error(
-          `[${(this as unknown as VueComponentWithMixin).$options.name}] Failed to get settings:`,
-          {
-            key,
-            error,
-          },
-        );
+        logger.error(`[Settings Trace] ❌ Failed to get settings:`, {
+          key,
+          error,
+        });
         return fallback;
       }
     },
@@ -533,14 +530,11 @@ export const PlatformServiceMixin = {
 
         return mergedSettings;
       } catch (error) {
-        logger.error(
-          `[${(this as unknown as VueComponentWithMixin).$options.name}] Failed to get merged settings:`,
-          {
-            defaultKey,
-            accountDid,
-            error,
-          },
-        );
+        logger.error(`[Settings Trace] ❌ Failed to get merged settings:`, {
+          defaultKey,
+          accountDid,
+          error,
+        });
         return defaultFallback;
       }
     },
@@ -748,25 +742,20 @@ export const PlatformServiceMixin = {
           );
 
           mergedSettings.apiServer = DEFAULT_ENDORSER_API_SERVER;
-
-          logger.debug(
-            `[Electron Settings] Forced API server to: ${DEFAULT_ENDORSER_API_SERVER}`,
-          );
         }
 
         // Merge with any provided defaults (these take highest precedence)
-        const finalSettings = { ...mergedSettings, ...defaults };
-
-        console.log(
-          "[PlatformServiceMixin] $accountSettings",
-          JSON.stringify(finalSettings, null, 2),
+        // Filter out undefined and empty string values to prevent overriding real settings
+        const filteredDefaults = Object.fromEntries(
+          Object.entries(defaults).filter(
+            ([_, value]) => value !== undefined && value !== "",
+          ),
         );
+
+        const finalSettings = { ...mergedSettings, ...filteredDefaults };
         return finalSettings;
       } catch (error) {
-        logger.error(
-          "[PlatformServiceMixin] Error in $accountSettings:",
-          error,
-        );
+        logger.error("[Settings Trace] ❌ Error in $accountSettings:", error);
 
         // Fallback to defaults on error
         return defaults;
diff --git a/src/views/ContactImportView.vue b/src/views/ContactImportView.vue
index dcd27181..a926d189 100644
--- a/src/views/ContactImportView.vue
+++ b/src/views/ContactImportView.vue
@@ -253,22 +253,6 @@ import { createNotifyHelpers, TIMEOUTS } from "@/utils/notify";
  *
  * @component
  */
-// TODO: Testing Required - Database Operations + Logging Migration to PlatformServiceMixin
-// Priority: Medium | Migrated: 2025-07-06 | Author: Matthew Raymer
-//
-//
-// TESTING NEEDED: Contact import functionality
-// 1. Test contact import via URL: /contact-import?contacts=[{"did":"did:example:123","name":"Alice"}]
-// 2. Test JWT import via URL path: /contact-import/[JWT_TOKEN]
-// 3. Test manual JWT input via textarea
-// 4. Test duplicate contact detection and field comparison
-// 5. Test error scenarios: invalid JWT, malformed data, network issues
-// 6. Verify error logging appears correctly
-//
-// Test URLs:
-// /contact-import (manual input)
-// /contact-import?contacts=[{"did":"did:test:123","name":"Test User"}]
-
 @Component({
   components: { EntityIcon, OfferDialog, QuickNav },
   mixins: [PlatformServiceMixin],
diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
index 351a69b9..0a31c6a9 100644
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -310,7 +310,6 @@ import { PlatformServiceMixin } from "@/utils/PlatformServiceMixin";
 import { createNotifyHelpers, TIMEOUTS } from "@/utils/notify";
 import {
   NOTIFY_CONTACT_LOADING_ISSUE,
-  NOTIFY_FEED_LOADING_ISSUE,
   NOTIFY_CONFIRMATION_ERROR,
 } from "@/constants/notifications";
 import * as Package from "../../package.json";
@@ -486,6 +485,10 @@ export default class HomeView extends Vue {
     if (newDid !== oldDid) {
       // Re-initialize identity with new settings (loads settings internally)
       await this.initializeIdentity();
+    } else {
+      logger.info(
+        "[HomeView Settings Trace] 📍 DID unchanged, skipping re-initialization",
+      );
     }
   }
 
@@ -528,11 +531,7 @@ export default class HomeView extends Vue {
       // Load settings with better error context using ultra-concise mixin
       let settings;
       try {
-        settings = await this.$settings({
-          apiServer: "",
-          activeDid: "",
-          isRegistered: false,
-        });
+        settings = await this.$accountSettings();
       } catch (error) {
         this.$logAndConsole(
           `[HomeView] Failed to retrieve settings: ${error}`,
@@ -600,65 +599,21 @@ export default class HomeView extends Vue {
             // Ultra-concise settings update with automatic cache invalidation!
             await this.$saveMySettings({ isRegistered: true });
             this.isRegistered = true;
-            // Force Vue to re-render the template
-            await this.$nextTick();
           }
         } catch (error) {
-          // Consolidate logging: Only log unexpected errors, not expected 400s
-          const axiosError = error as any;
-          if (axiosError?.response?.status !== 400) {
-            this.$logAndConsole(
-              `[HomeView] Registration check failed: ${error}`,
-              true,
-            );
-          }
-          // Continue as unregistered - this is expected for new users
-        }
-      }
-
-      // Initialize feed and offers
-      try {
-        // Start feed update in background
-        this.updateAllFeed().catch((error) => {
-          this.$logAndConsole(
-            `[HomeView] Background feed update failed: ${error}`,
-            true,
+          logger.warn(
+            "[HomeView Settings Trace] ⚠️ Registration check failed",
+            {
+              error: error instanceof Error ? error.message : String(error),
+            },
           );
-        });
-
-        // Load new offers if we have an active DID
-        if (this.activeDid) {
-          const [offersToUser, offersToProjects] = await Promise.all([
-            getNewOffersToUser(
-              this.axios,
-              this.apiServer,
-              this.activeDid,
-              this.lastAckedOfferToUserJwtId,
-            ),
-            getNewOffersToUserProjects(
-              this.axios,
-              this.apiServer,
-              this.activeDid,
-              this.lastAckedOfferToUserProjectsJwtId,
-            ),
-          ]);
-
-          this.numNewOffersToUser = offersToUser.data.length;
-          this.newOffersToUserHitLimit = offersToUser.hitLimit;
-          this.numNewOffersToUserProjects = offersToProjects.data.length;
-          this.newOffersToUserProjectsHitLimit = offersToProjects.hitLimit;
         }
-      } catch (error) {
-        this.$logAndConsole(
-          `[HomeView] Failed to initialize feed/offers: ${error}`,
-          true,
-        );
-        // Don't throw - we can continue with empty feed
-        this.notify.warning(NOTIFY_FEED_LOADING_ISSUE.message, TIMEOUTS.LONG);
       }
-    } catch (error) {
-      this.handleError(error);
-      throw error; // Re-throw to be caught by mounted()
+    } catch (err: unknown) {
+      logger.error("[HomeView Settings Trace] ❌ initializeIdentity() failed", {
+        error: err instanceof Error ? err.message : String(err),
+      });
+      throw err;
     }
   }
 
@@ -683,10 +638,8 @@ export default class HomeView extends Vue {
   }
 
   /**
-   * Loads user settings from storage using ultra-concise mixin utilities
-   * Sets component state for:
-   * - API server, Active DID, Feed filters and view settings
-   * - Registration status, Notification acknowledgments
+   * Loads user settings from database using ultra-concise mixin
+   * Used for displaying settings in feed and actions
    *
    * @internal
    * Called by mounted() and reloadFeedOnChange()
@@ -816,7 +769,7 @@ export default class HomeView extends Vue {
    * Called by mounted()
    */
   private async checkOnboarding() {
-    const settings = await this.$settings();
+    const settings = await this.$accountSettings();
     if (!settings.finishedOnboarding) {
       (this.$refs.onboardingDialog as OnboardingDialog).open(OnboardPage.Home);
     }
diff --git a/src/views/IdentitySwitcherView.vue b/src/views/IdentitySwitcherView.vue
index 2926c00a..59eedbdf 100644
--- a/src/views/IdentitySwitcherView.vue
+++ b/src/views/IdentitySwitcherView.vue
@@ -214,7 +214,10 @@ export default class IdentitySwitcherView extends Vue {
       }
     } catch (err) {
       this.notify.error(NOTIFY_ERROR_LOADING_ACCOUNTS.message, TIMEOUTS.LONG);
-      logger.error("Telling user to clear cache at page create because:", err);
+      logger.error(
+        "[IdentitySwitcher Settings Trace] ❌ Error loading accounts:",
+        err,
+      );
     }
   }
 
@@ -225,12 +228,35 @@ export default class IdentitySwitcherView extends Vue {
     // Check if we need to load user-specific settings for the new DID
     if (did) {
       try {
-        await this.$accountSettings(did);
+        const newSettings = await this.$accountSettings(did);
+        logger.info(
+          "[IdentitySwitcher Settings Trace] ✅ New account settings loaded",
+          {
+            did,
+            settingsKeys: Object.keys(newSettings).filter(
+              (k) => (newSettings as any)[k] !== undefined,
+            ),
+          },
+        );
       } catch (error) {
+        logger.warn(
+          "[IdentitySwitcher Settings Trace] ⚠️ Error loading new account settings",
+          {
+            did,
+            error: error instanceof Error ? error.message : String(error),
+          },
+        );
         // Handle error silently - user settings will be loaded when needed
       }
     }
 
+    logger.info(
+      "[IdentitySwitcher Settings Trace] 🔄 Navigating to home to trigger watcher",
+      {
+        newDid: did,
+      },
+    );
+
     // Navigate to home page to trigger the watcher
     this.$router.push({ name: "home" });
   }
diff --git a/src/views/ImportDerivedAccountView.vue b/src/views/ImportDerivedAccountView.vue
index 182c9449..4c48fa20 100644
--- a/src/views/ImportDerivedAccountView.vue
+++ b/src/views/ImportDerivedAccountView.vue
@@ -166,10 +166,8 @@ export default class ImportAccountView extends Vue {
     ] as string;
 
     const newDerivPath = nextDerivationPath(maxDerivPath);
-
     const mne = selectedArray[0].mnemonic as string;
     const [address, privateHex, publicHex] = deriveAddress(mne, newDerivPath);
-
     const newId = newIdentifier(address, publicHex, privateHex, newDerivPath);
 
     try {
@@ -187,7 +185,10 @@ export default class ImportAccountView extends Vue {
       );
       this.$router.push({ name: "account" });
     } catch (err) {
-      logger.error("Error saving mnemonic & updating settings:", err);
+      logger.error(
+        "[ImportDerived Settings Trace] ❌ Error saving mnemonic & updating settings:",
+        err,
+      );
       this.notify.error(NOTIFY_ACCOUNT_DERIVATION_ERROR.message, TIMEOUTS.LONG);
     }
   }