diff --git a/app/components/Achievements/TopScreen.vue b/app/components/Achievements/TopScreen.vue
index 2c59a73..5a2ee0b 100644
--- a/app/components/Achievements/TopScreen.vue
+++ b/app/components/Achievements/TopScreen.vue
@@ -37,7 +37,7 @@ onRender((ctx) => {
   );
 
   // progress text
-  const unlockedCount = achievementsStore.achievements.length;
+  const unlockedCount = achievementsStore.unlocked.length;
   const totalCount = ACHIEVEMENTS.length;
 
   ctx.font = "7px NDS7";
diff --git a/app/components/Contact/BottomScreen/BottomScreen.vue b/app/components/Contact/BottomScreen/BottomScreen.vue
index d646498..2865ea4 100644
--- a/app/components/Contact/BottomScreen/BottomScreen.vue
+++ b/app/components/Contact/BottomScreen/BottomScreen.vue
@@ -1,6 +1,4 @@
 <script setup lang="ts">
-// TODO: buttons should take in account opacity
-
 import Background from "./Background.vue";
 import Buttons from "./Buttons.vue";
 import ButtonSelector from "~/components/Common/ButtonSelector.vue";
diff --git a/app/components/Settings/BottomScreen/Menus/Clock/Achievements.vue b/app/components/Settings/BottomScreen/Menus/Clock/Achievements.vue
index ae574d8..5c69568 100644
--- a/app/components/Settings/BottomScreen/Menus/Clock/Achievements.vue
+++ b/app/components/Settings/BottomScreen/Menus/Clock/Achievements.vue
@@ -110,7 +110,7 @@ onRender((ctx) => {
 
 <template>
   <NumberInput
-    :model-value="achievements.achievements.length"
+    :model-value="achievements.unlocked.length"
     :title="$t('settings.clock.achievements.obtained')"
     :x="4 * 16 - 1"
     :selected="achievements.allObtained"
diff --git a/app/components/Settings/BottomScreen/Menus/User/PersonalMessage.vue b/app/components/Settings/BottomScreen/Menus/User/PersonalMessage.vue
index 27dfa19..58d1bf2 100644
--- a/app/components/Settings/BottomScreen/Menus/User/PersonalMessage.vue
+++ b/app/components/Settings/BottomScreen/Menus/User/PersonalMessage.vue
@@ -16,15 +16,11 @@ const handleCancel = () => {
   switch (state.value) {
     case "alive": {
       state.value = "pause";
-      // TODO: onClosed should as "choice" as a parameter, like "confirmed" or "canceled"
-      let quit = false;
       confirmationModal.open({
         text: $t("settings.user.personalMessage.quitConfirmation"),
-        onConfirm: () => {
-          quit = true;
-        },
-        onClosed: () => {
-          if (quit) store.closeSubMenu();
+        onConfirm: () => {},
+        onClosed: (choice) => {
+          if (choice === "cancel") store.closeSubMenu();
         },
         onCancel: () => {
           state.value = "alive";
diff --git a/app/stores/achievements.ts b/app/stores/achievements.ts
index 83ca348..afce216 100644
--- a/app/stores/achievements.ts
+++ b/app/stores/achievements.ts
@@ -72,8 +72,7 @@ export const useAchievementsStore = defineStore("achievements", () => {
   };
 
   return {
-    // TODO: rename to unlocked
-    achievements: computed(() => storage.value.unlocked),
+    unlocked: computed(() => storage.value.unlocked),
     advancement: computed(() => storage.value.advancement),
     allObtained: computed(
       () => storage.value.unlocked.length === ACHIEVEMENTS.length,
diff --git a/app/stores/confirmationModal.ts b/app/stores/confirmationModal.ts
index 9f8adc0..4e294da 100644
--- a/app/stores/confirmationModal.ts
+++ b/app/stores/confirmationModal.ts
@@ -96,15 +96,7 @@ export const useConfirmationModal = defineStore("confirmationModal", {
         })
         .call(() => {
           const closedCallback = this.onClosed;
-
-          // TODO: this.$reset() ?
-          this.isVisible = false;
-          this.isClosing = false;
-          this.isOpen = false;
-          this.text = "";
-          this.onConfirm = null;
-          this.onClosed = null;
-
+          this.$reset();
           closedCallback?.(choice);
         });
     },