diff --git a/public/index.html b/public/index.html
index 14327cb34..f2688ac2d 100644
--- a/public/index.html
+++ b/public/index.html
@@ -2981,7 +2981,10 @@
                             </div>
                             <div>
                                 <h4 data-i18n="Persona Description">Persona Description</h4>
-                                <textarea id="persona_description" name="persona_description" placeholder="Example:&#10;[{{user}} is a 28-year-old Romanian cat girl.]" class="text_pole textarea_compact" maxlength="5000" value="" autocomplete="off" rows="4"></textarea>
+                                <textarea id="persona_description" name="persona_description" placeholder="Example:&#10;[{{user}} is a 28-year-old Romanian cat girl.]" class="text_pole textarea_compact" maxlength="5000" value="" autocomplete="off" rows="8"></textarea>
+                                <div class="extension_token_counter">
+                                    Tokens: <span id="persona_description_token_count">0</span>
+                                </div>
                                 <label for="persona_description_position" data-i18n="Position:">Position:</label>
                                 <select id="persona_description_position">
                                     <option value="0" data-i18n="In Story String / Chat Completion: Before Character Card">In Story String / Chat Completion: Before Character Card</option>
diff --git a/public/script.js b/public/script.js
index 8ef9ec9a5..8109976ad 100644
--- a/public/script.js
+++ b/public/script.js
@@ -543,6 +543,12 @@ function getTokenizerBestMatch() {
     return power_user.NONE;
 }
 
+/**
+ * Gets the token count for a string using the current model tokenizer.
+ * @param {string} str String to tokenize
+ * @param {number | undefined} padding Optional padding tokens. Defaults to 0.
+ * @returns {number} Token count.
+ */
 function getTokenCount(str, padding = undefined) {
     if (typeof str !== 'string' || !str?.length) {
         return 0;
@@ -4520,6 +4526,7 @@ function setPersonaDescription() {
         .val(power_user.persona_description_position)
         .find(`option[value='${power_user.persona_description_position}']`)
         .attr("selected", true);
+    countPersonaDescriptionTokens();
 }
 
 function onPersonaDescriptionPositionInput() {
@@ -4544,8 +4551,18 @@ function onPersonaDescriptionPositionInput() {
     saveSettingsDebounced();
 }
 
+/**
+ * Counts the number of tokens in a persona description.
+ */
+const countPersonaDescriptionTokens = debounce(() => {
+    const description = String($("#persona_description").val());
+    const count = getTokenCount(description);
+    $("#persona_description_token_count").text(String(count));
+}, durationSaveEdit);
+
 function onPersonaDescriptionInput() {
     power_user.persona_description = String($("#persona_description").val());
+    countPersonaDescriptionTokens();
 
     if (power_user.personas[user_avatar]) {
         let object = power_user.persona_descriptions[user_avatar];
diff --git a/public/scripts/RossAscends-mods.js b/public/scripts/RossAscends-mods.js
index ac8f4e6b1..222451067 100644
--- a/public/scripts/RossAscends-mods.js
+++ b/public/scripts/RossAscends-mods.js
@@ -197,7 +197,7 @@ export function RA_CountCharTokens() {
     $('[data-token-counter]').each(function () {
         const counter = $(this);
         const input = $(document.getElementById(counter.data('token-counter')));
-        const value = input.val();
+        const value = String(input.val());
 
         if (input.length === 0) {
             counter.text('Invalid input reference');
diff --git a/public/scripts/extensions/stable-diffusion/index.js b/public/scripts/extensions/stable-diffusion/index.js
index 646fa0495..27fff7b23 100644
--- a/public/scripts/extensions/stable-diffusion/index.js
+++ b/public/scripts/extensions/stable-diffusion/index.js
@@ -14,7 +14,7 @@ import {
 import { getApiUrl, getContext, extension_settings, doExtrasFetch, modules } from "../../extensions.js";
 import { selected_group } from "../../group-chats.js";
 import { stringFormat, initScrollHeight, resetScrollHeight, timestampToMoment, getCharaFilename, saveBase64AsFile } from "../../utils.js";
-import { humanizedDateTime } from "../../RossAscends-mods.js";
+import { getMessageTimeStamp, humanizedDateTime } from "../../RossAscends-mods.js";
 export { MODULE_NAME };
 
 // Wraps a string into monospace font-face span
@@ -755,11 +755,10 @@ async function sendMessage(prompt, image) {
     const messageText = `[${context.name2} sends a picture that contains: ${prompt}]`;
     const message = {
         name: context.groupId ? systemUserName : context.name2,
-        is_system: context.groupId ? true : false,
         is_user: false,
         is_system: true,
         is_name: true,
-        send_date: timestampToMoment(Date.now()).format('LL LT'),
+        send_date: getMessageTimeStamp(),
         mes: context.groupId ? p(messageText) : messageText,
         extra: {
             image: image,