diff --git a/package.json b/package.json
index e2840021..192eca10 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ptn-ninja",
-  "version": "3.4.21",
+  "version": "3.4.22",
   "description": "An editor and viewer for Portable Tak Notation",
   "productName": "PTN Ninja",
   "author": "Craig Laparo <gruppler+github@gmail.com>",
diff --git a/src/Game/comments.js b/src/Game/comments.js
index bcc60333..cd302570 100644
--- a/src/Game/comments.js
+++ b/src/Game/comments.js
@@ -49,12 +49,19 @@ export default class GameComments {
 
   addComments(type, messages) {
     const isEvaluation = /^[?!'"]+$/;
+    const isReplacement = /^!r(\d+):/;
     for (const plyID in messages) {
       messages[plyID].forEach((message) => {
         if (isEvaluation.test(message)) {
           this._setEvaluation(plyID, message);
         } else {
-          this._addComment(type, message, plyID);
+          if (isReplacement.test(message)) {
+            let index = message.match(isReplacement)[1];
+            message = message.substring(index.length + 3);
+            this._replaceComment(type, plyID, index, message);
+          } else {
+            this._addComment(type, message, plyID);
+          }
         }
       });
     }
@@ -64,11 +71,18 @@ export default class GameComments {
     this.board.updatePositionOutput();
   }
 
-  editComment(type, plyID, index, message) {
+  _replaceComment(type, plyID, index, message) {
     if (this[type][plyID] && this[type][plyID][index]) {
       this[type][plyID][index].message = message;
-      this._updatePTN(true);
       this.board.dirtyComment(type, plyID);
+      return true;
+    }
+    return false;
+  }
+
+  editComment(type, plyID, index, message) {
+    if (this._replaceComment(type, plyID, index, message)) {
+      this._updatePTN(true);
       this.board.updateCommentsOutput();
       return this[type][plyID][index];
     }
diff --git a/src/components/board/Board.vue b/src/components/board/Board.vue
index 91fb8a0c..0f3ddfbb 100644
--- a/src/components/board/Board.vue
+++ b/src/components/board/Board.vue
@@ -221,7 +221,7 @@ export default {
       return this.$store.state.game.ptn;
     },
     evaluation() {
-      if (this.$store.state.game.evaluation) {
+      if (this.$store.state.game.evaluation !== null) {
         return this.$store.state.game.evaluation;
       } else if (this.position.boardPly) {
         return this.$store.state.game.comments.evaluations[
diff --git a/src/components/board/CurrentMove.vue b/src/components/board/CurrentMove.vue
index 01add7c7..36d84eac 100644
--- a/src/components/board/CurrentMove.vue
+++ b/src/components/board/CurrentMove.vue
@@ -1,13 +1,11 @@
 <template>
-  <div
-    v-show="position.ply && !$store.state.ui.showPTN"
-    class="board-move-container no-pointer-events"
-  >
+  <div v-show="position.ply" class="board-move-container no-pointer-events">
     <div class="board-move" :class="{ collapsed }">
       <q-btn
         @click="toggle"
         :icon="icon"
         class="collapse dimmed-btn all-pointer-events"
+        :class="{ hidden: this.$store.state.ui.showPTN }"
         :ripple="false"
         :color="btnColor"
         dense
@@ -34,7 +32,7 @@ export default {
   computed: {
     collapsed: {
       get() {
-        return !this.$store.state.ui.showMove;
+        return !this.$store.state.ui.showMove || this.$store.state.ui.showPTN;
       },
       set(value) {
         this.$store.dispatch("ui/SET_UI", ["showMove", !value]);
diff --git a/src/components/drawers/BotSuggestions.vue b/src/components/drawers/BotSuggestions.vue
index 8d136163..5354942a 100644
--- a/src/components/drawers/BotSuggestions.vue
+++ b/src/components/drawers/BotSuggestions.vue
@@ -82,10 +82,11 @@
             </template>
           </q-select>
 
+          <!-- Tiltak Cloud -->
           <template v-if="botSettings.bot === 'tiltak-cloud'">
             <!-- Max Suggestions -->
             <q-input
-              v-model.number="botSettings.maxSuggestedMoves"
+              v-model.number="botSettings[botSettings.bot].maxSuggestedMoves"
               :label="$t('analysis.maxSuggestedMoves')"
               type="number"
               min="1"
@@ -99,10 +100,12 @@
               </template>
             </q-input>
           </template>
+
+          <!-- Topaz -->
           <template v-if="botSettings.bot === 'topaz'">
             <!-- Depth -->
             <q-input
-              v-model.number="botSettings.depth"
+              v-model.number="botSettings[botSettings.bot].depth"
               :label="$t('analysis.Depth')"
               type="number"
               min="2"
@@ -118,7 +121,7 @@
 
             <!-- Time Budget -->
             <q-input
-              v-model.number="botSettings.timeBudget"
+              v-model.number="botSettings[botSettings.bot].timeBudget"
               :label="$t('analysis.timeBudget')"
               type="number"
               min="1"
@@ -188,7 +191,7 @@
             <q-item-section v-if="tiltakInteractive.isEnabled" side>
               <div class="text-caption">
                 {{ $n((tiltakInteractive.time || 0) / 1e3, "n0") }}
-                {{ $t("analysis.seconds_unit") }}
+                {{ $t("analysis.secondsUnit") }}
               </div>
               <div class="text-caption">
                 {{ $n(tiltakInteractive.nps || 0, "n0") }}
@@ -242,7 +245,7 @@
         <AnalysisItem
           v-for="(move, i) in suggestions.slice(
             0,
-            botSettings.maxSuggestedMoves
+            botSettings[botSettings.bot].maxSuggestedMoves
           )"
           :key="i"
           :ply="move.ply"
@@ -278,6 +281,7 @@
 
       <!-- Secondary Controls -->
       <smooth-reflow>
+        <!-- Think Harder -->
         <q-btn
           v-if="
             botSettings.bot === 'tiltak-cloud' &&
@@ -295,13 +299,35 @@
         >
           {{ $t("analysis.Think Harder") }}
         </q-btn>
+
+        <!-- Save Comments -->
+        <div class="row no-wrap">
+          <q-btn
+            @click="saveEvalComments(botSettings[botSettings.bot].pvLimit)"
+            class="full-width"
+            color="primary"
+            icon="notes"
+            :label="$t('Save to Notes')"
+            stretch
+          />
+          <q-input
+            type="number"
+            v-model.number="botSettings[botSettings.bot].pvLimit"
+            :label="$t('analysis.pvLimit')"
+            :min="0"
+            :max="20"
+            item-align
+            filled
+            dense
+          />
+        </div>
       </smooth-reflow>
     </q-expansion-item>
   </div>
 </template>
 
 <script>
-import { pick, uniq } from "lodash";
+import { cloneDeep, uniq } from "lodash";
 import asyncPool from "tiny-async-pool";
 import Ply from "../../Game/PTN/Ply";
 import { deepFreeze } from "../../utilities";
@@ -338,13 +364,13 @@ export default {
       positions: {},
       suggestions: [],
       bots: ["tiltak-cloud"],
-      botSettings: { ...this.$store.state.ui.botSettings },
+      botSettings: cloneDeep(this.$store.state.ui.botSettings),
       botThinkBudgetInSeconds: {
         short: 5,
         long: 10,
       },
-      botSettingsHash: this.hashBotSettings(this.$store.state.ui.botSettings),
-      sections: { ...this.$store.state.ui.analysisSections },
+      botSettingsKey: this.getBotSettingsKey(this.$store.state.ui.botSettings),
+      sections: cloneDeep(this.$store.state.ui.analysisSections),
       tiltakWorker: null,
       topazWorker: null,
     };
@@ -418,15 +444,17 @@ export default {
       }
     },
 
-    hashBotSettings(settings) {
-      if (settings.bot === "tiltak-cloud") {
-        return Object.values(pick(settings, ["bot"])).join(",");
-      } else if (settings.bot === "tiltak") {
-        return settings.bot;
-      } else {
-        return Object.values(
-          pick(settings, ["bot", "depth", "timeBudget"])
-        ).join(",");
+    getBotSettingsKey(settings) {
+      // List only the properties that affect analysis
+      switch (settings.bot) {
+        case "topaz":
+          return Object.values([
+            settings.bot,
+            settings.topaz.depth,
+            settings.topaz.timeBudget,
+          ]).join(",");
+        default:
+          return settings.bot;
       }
     },
 
@@ -450,7 +478,7 @@ export default {
       );
     },
 
-    getEvalComments(ply, settingsHash) {
+    getEvalComments(ply, settingsKey, pvLimit = 0) {
       let comments = [];
       let positionBefore = this.positions[ply.tpsBefore];
       let positionAfter = this.positions[ply.tpsAfter];
@@ -464,7 +492,7 @@ export default {
           : 100 * (ply.result.winner === 1 ? 1 : -1);
       }
 
-      // Get evaulationBefore from existing eval comment of previous ply
+      // Get evaluationBefore from existing eval comment of previous ply
       let prevPly = this.plies.find(
         (prevPly) => prevPly.tpsAfter === ply.tpsBefore
       );
@@ -476,43 +504,49 @@ export default {
         }
       }
 
+      // Evaluation
       if (
         evaluationAfter !== null ||
-        (positionAfter && settingsHash in positionAfter)
+        (positionAfter && settingsKey in positionAfter)
       ) {
+        let evaluationComment = "";
+
         evaluationAfter =
           Math.round(
             100 *
               (evaluationAfter !== null
                 ? evaluationAfter
-                : positionAfter[settingsHash][0].evaluation)
+                : positionAfter[settingsKey][0].evaluation)
           ) / 1e4;
-        let evaluationComment = `${
-          evaluationAfter >= 0 ? "+" : ""
-        }${evaluationAfter}`;
-
-        if (positionBefore && settingsHash in positionBefore) {
-          let position = positionBefore[settingsHash][0];
-          if (position && position.ply) {
-            let pv = [position.ply, ...position.followingPlies]
-              .slice(0, 3)
-              .map((ply) => ply.ptn);
-            evaluationComment += `, pv ${pv.join(" ")}`;
+        if (!isNaN(evaluationAfter)) {
+          evaluationComment += `${
+            evaluationAfter >= 0 ? "+" : ""
+          }${evaluationAfter}`;
+
+          // Find existing eval comment index
+          if (ply.id in this.game.comments.notes) {
+            const index = this.game.comments.notes[ply.id].findIndex(
+              (comment) => comment.evaluation !== null
+            );
+            if (index >= 0) {
+              evaluationComment = `!r${index}:${evaluationComment}`;
+            }
           }
-        }
 
-        comments.push(evaluationComment);
+          comments.push(evaluationComment);
+        }
 
+        // Annotation marks
         if (
           evaluationBefore !== null ||
-          (positionBefore && settingsHash in positionBefore)
+          (positionBefore && settingsKey in positionBefore)
         ) {
           evaluationBefore =
             Math.round(
               100 *
                 (evaluationBefore !== null
                   ? evaluationBefore
-                  : positionBefore[settingsHash][0].evaluation)
+                  : positionBefore[settingsKey][0].evaluation)
             ) / 1e4;
           const scoreLoss =
             (ply.player === 1
@@ -531,9 +565,59 @@ export default {
           }
         }
       }
+
+      // PV
+      if (positionBefore && settingsKey in positionBefore) {
+        let position = positionBefore[settingsKey][0];
+        if (position && position.ply) {
+          let pv = [position.ply, ...position.followingPlies];
+          if (pvLimit) {
+            pv = pv.slice(0, pvLimit);
+          }
+          pv = pv.map((ply) => ply.ptn);
+          let pvComment = `pv ${pv.join(" ")}`;
+
+          // Find existing pv comment index
+          if (ply.id in this.game.comments.notes) {
+            const index = this.game.comments.notes[ply.id].findIndex(
+              (comment) =>
+                comment.pv !== null &&
+                comment.pv.every(
+                  (cpv) =>
+                    cpv.every((ply, i) => ply === pv[i]) ||
+                    pv.every((ply, i) => ply === cpv[i])
+                )
+            );
+            if (index >= 0) {
+              pvComment = `!r${index}:${pvComment}`;
+            }
+          }
+
+          comments.push(pvComment);
+        }
+      }
       return comments;
     },
 
+    saveEvalComments(
+      pvLimit = 0,
+      plies = this.plies,
+      settingsKey = this.botSettingsKey
+    ) {
+      const messages = {};
+      plies.forEach((ply) => {
+        const notes = [];
+        const evaluations = this.getEvalComments(ply, settingsKey, pvLimit);
+        if (evaluations.length) {
+          notes.push(...evaluations);
+        }
+        if (notes.length) {
+          messages[ply.id] = notes;
+        }
+      });
+      this.$store.dispatch("game/ADD_NOTES", messages);
+    },
+
     goToAnalysisPly() {
       if (this.analyzingPly) {
         this.$store.dispatch("game/GO_TO_PLY", {
@@ -557,7 +641,7 @@ export default {
         const komi = this.game.config.komi;
         const secondsToThinkPerPly = this.botThinkBudgetInSeconds.short;
         const plies = this.plies.filter((ply) => !this.plyHasEvalComment(ply));
-        const settingsHash = this.botSettingsHash;
+        const settingsKey = this.botSettingsKey;
         let positions = plies.map((ply) => ply.tpsBefore);
         plies.forEach((ply) => {
           if (!ply.result || ply.result.type === "1") {
@@ -566,7 +650,7 @@ export default {
         });
         positions = uniq(positions).filter(
           (tps) =>
-            !(tps in this.positions) || !(settingsHash in this.positions[tps])
+            !(tps in this.positions) || !(settingsKey in this.positions[tps])
         );
         let total = positions.length;
         let completed = 0;
@@ -576,12 +660,12 @@ export default {
             secondsToThinkPerPly,
             tps,
             komi,
-            settingsHash
+            settingsKey
           ).catch((error) => {
             console.error("Failed to query position", {
               tps,
               komi,
-              secondsToThink,
+              secondsToThinkPerPly,
               error,
             });
           })
@@ -589,16 +673,11 @@ export default {
           this.progressTiltakAnalysis = (100 * ++completed) / total;
         }
         // Insert comments
-        let messages = {};
-        plies.forEach((ply) => {
-          let notes = [];
-          let evaluations = this.getEvalComments(ply, settingsHash);
-          if (evaluations.length) {
-            notes.push(...evaluations);
-          }
-          messages[ply.id] = notes;
-        });
-        this.$store.dispatch("game/ADD_NOTES", messages);
+        this.saveEvalComments(
+          this.botSettings["tiltak-cloud"].pvLimit,
+          plies,
+          settingsKey
+        );
       } catch (error) {
         this.notifyError(error);
       } finally {
@@ -629,7 +708,7 @@ export default {
       secondsToThink,
       tps,
       komi,
-      settingsHash = this.botSettingsHash
+      settingsKey = this.botSettingsKey
     ) {
       if (this.isOffline) {
         this.notifyError("Offline");
@@ -689,7 +768,7 @@ export default {
       deepFreeze(result);
       this.$set(this.positions, tps, {
         ...(this.positions[tps] || {}),
-        [settingsHash]: result,
+        [settingsKey]: result,
       });
       return result;
     },
@@ -865,7 +944,7 @@ export default {
       if (!this.tiltakInteractive.tps) {
         this.tiltakInteractive.tps = this.tps;
       }
-      const id = this.hashBotSettings({ bot: "tiltak" });
+      const id = this.getBotSettingsKey({ bot: "tiltak" });
       const tps = this.tiltakInteractive.tps;
 
       // Update time and nps
@@ -959,17 +1038,17 @@ export default {
       this.loadingTopazMoves = true;
       this.progressTopazAnalysis = 0;
       const startTime = new Date().getTime();
-      const timeBudget = this.botSettings.timeBudget * 10;
+      const timeBudget = this.botSettings.topaz.timeBudget * 10;
       this.topazTimer = setInterval(() => {
         this.progressTopazAnalysis =
           (new Date().getTime() - startTime) / timeBudget;
       }, 1000);
       this.topazWorker.postMessage({
-        ...this.botSettings,
+        ...this.botSettings.topaz,
         size: this.game.config.size,
         komi: this.game.config.komi,
         tps: this.tps,
-        id: this.botSettingsHash,
+        id: this.botSettingsKey,
       });
     },
 
@@ -1067,8 +1146,8 @@ export default {
     },
     botPosition(position) {
       if (position) {
-        if (this.botSettingsHash in position) {
-          this.suggestions = position[this.botSettingsHash] || [];
+        if (this.botSettingsKey in position) {
+          this.suggestions = position[this.botSettingsKey] || [];
         } else {
           this.suggestions = [];
         }
@@ -1084,9 +1163,9 @@ export default {
         this.$store.dispatch("game/SET_EVAL", null);
       }
     },
-    botSettingsHash(hash) {
-      if (this.botPosition && hash in this.botPosition) {
-        this.suggestions = this.botPosition[hash] || [];
+    botSettingsKey(key) {
+      if (this.botPosition && key in this.botPosition) {
+        this.suggestions = this.botPosition[key] || [];
       } else {
         this.suggestions = [];
       }
@@ -1102,8 +1181,8 @@ export default {
         // Save preferences
         this.$store.dispatch("ui/SET_UI", ["botSettings", settings]);
 
-        // Update current position/bot hash
-        this.botSettingsHash = this.hashBotSettings(settings);
+        // Update current position/bot key
+        this.botSettingsKey = this.getBotSettingsKey(settings);
 
         // Stop interactive analysis when switching bots
         if (settings.bot !== "tiltak" && this.tiltakInteractive.isEnabled) {
diff --git a/src/i18n/en-us/about.md b/src/i18n/en-us/about.md
index b4cdc566..bc538ee5 100644
--- a/src/i18n/en-us/about.md
+++ b/src/i18n/en-us/about.md
@@ -1,6 +1,6 @@
 # PTN Ninja
 
-**Version [3.4.21](https://github.com/gruppler/PTN-Ninja/releases)**
+**Version [3.4.22](https://github.com/gruppler/PTN-Ninja/releases)**
 
 This is an editor and viewer for [Portable Tak Notation (PTN)](https://ustak.org/portable-tak-notation/). It aims to be...
 
diff --git a/src/i18n/en-us/index.js b/src/i18n/en-us/index.js
index e13cb268..579b7328 100644
--- a/src/i18n/en-us/index.js
+++ b/src/i18n/en-us/index.js
@@ -198,6 +198,7 @@ export default {
   "Rotate Right": "Rotate Right",
   Round: "Round",
   Save: "Save",
+  "Save to Notes": "Save to Notes",
   "Scroll threshold": "Scroll threshold",
   "Scrub Bar": "Scrub Bar",
   "Scrub with scroll wheel": "Scrub with scroll wheel",
@@ -480,7 +481,8 @@ export default {
     "No suggested moves": "No suggested moves",
     nodes: "1 node | {count} nodes",
     nps: "nps",
-    seconds_unit: "sec",
+    pvLimit: "Plies",
+    secondsUnit: "sec",
     timeBudget: "Seconds to Think",
     "Top Games from Position": "Top Games from Position",
     tournamentGame: "Tournament Game",
diff --git a/src/layouts/Main.vue b/src/layouts/Main.vue
index b69dcc79..dd796a1b 100644
--- a/src/layouts/Main.vue
+++ b/src/layouts/Main.vue
@@ -113,10 +113,16 @@
           active-color="primary"
           indicator-color="primary"
           align="justify"
+          inline-label
         >
-          <q-tab name="notes">{{ $t("Notes") }}</q-tab>
-          <q-tab name="analysis">{{ $t("Analysis") }}</q-tab>
-          <q-tab v-if="hasChat" name="chat">{{ $t("Chat") }}</q-tab>
+          <q-tab name="notes" icon="notes" :label="$t('Notes')" />
+          <q-tab
+            v-if="hasAnalysis"
+            name="analysis"
+            icon="analysis"
+            :label="$t('Analysis')"
+          />
+          <q-tab v-if="hasChat" name="chat" icon="chat" :label="$t('Chat')" />
         </q-tabs>
         <q-tab-panels
           class="col-grow bg-transparent"
@@ -127,12 +133,12 @@
           <q-tab-panel name="notes">
             <Notes ref="notes" class="fit" recess />
           </q-tab-panel>
+          <q-tab-panel name="analysis">
+            <Analysis v-if="hasAnalysis" ref="analysis" class="fit" recess />
+          </q-tab-panel>
           <q-tab-panel v-if="hasChat" name="chat">
             <Chat ref="chat" class="fit" recess />
           </q-tab-panel>
-          <q-tab-panel name="analysis">
-            <Analysis ref="analysis" class="fit" recess />
-          </q-tab-panel>
         </q-tab-panels>
       </div>
       <div class="gt-xs absolute-fit inset-shadow no-pointer-events" />
@@ -249,6 +255,10 @@ export default {
     isOnline() {
       return this.gameExists ? this.$store.state.game.config.isOnline : false;
     },
+    hasAnalysis() {
+      return !this.isOnline;
+      // TODO: Allow for ended games and spectators? And online analyses.
+    },
     hasChat() {
       return (
         this.isOnline ||
diff --git a/src/store/ui/state.js b/src/store/ui/state.js
index 58136319..296aaeb5 100644
--- a/src/store/ui/state.js
+++ b/src/store/ui/state.js
@@ -1,5 +1,5 @@
 import { LocalStorage, Platform } from "quasar";
-import { pick } from "lodash";
+import { cloneDeep, pick } from "lodash";
 import { THEMES } from "../../themes";
 
 let defaults = {
@@ -22,9 +22,18 @@ let defaults = {
   },
   botSettings: {
     bot: "tiltak-cloud",
-    maxSuggestedMoves: 8,
-    depth: 12,
-    timeBudget: 30,
+    tiltak: {
+      pvLimit: 5,
+    },
+    "tiltak-cloud": {
+      maxSuggestedMoves: 8,
+      pvLimit: 3,
+    },
+    topaz: {
+      depth: 12,
+      timeBudget: 30,
+      pvLimit: 3,
+    },
   },
   animateBoard: true,
   animateScrub: false,
@@ -151,9 +160,10 @@ let state = {
   thumbnails: {},
   shortLinks: {},
   defaults,
-  ...defaults,
+  ...cloneDeep(defaults),
 };
 
+// Load from LocalStorage
 const load = (key, initial) =>
   LocalStorage.has(key) ? LocalStorage.getItem(key) : initial;
 
@@ -163,4 +173,22 @@ if (!state.embed && !LocalStorage.isEmpty()) {
   }
 }
 
+// Backward compatibility
+if (
+  !(state.botSettings.bot in state.botSettings) &&
+  state.botSettings.bot in defaults.botSettings
+) {
+  const botSettings = cloneDeep(defaults.botSettings);
+  for (const bot in botSettings) {
+    if (bot === "bot") {
+      continue;
+    }
+    Object.assign(
+      botSettings[bot],
+      pick(state.botSettings, Object.keys(botSettings[bot]))
+    );
+  }
+  state.botSettings = botSettings;
+}
+
 export default state;