diff --git a/poe-client.js b/poe-client.js
index 086c20233..c89c53a3b 100644
--- a/poe-client.js
+++ b/poe-client.js
@@ -457,6 +457,10 @@ class Client {
                 }
 
                 const message = message_data["payload"]["data"]["messageAdded"]
+
+                if (!message) {
+                    return;
+                }
         
                 const copiedDict = Object.assign({}, this.active_messages);
                 for (const [key, value] of Object.entries(copiedDict)) {
diff --git a/public/index.html b/public/index.html
index b8bd16e8c..b0f393eac 100644
--- a/public/index.html
+++ b/public/index.html
@@ -1824,7 +1824,7 @@
                 <textarea id="send_textarea" placeholder="Not connected to API!" name="text"></textarea>
                 <div id="send_but_sheld">
                     <div id="loading_mes">
-                        <div alt="" class="fa-solid fa-fade fa-hourglass-half"></div>
+                        <div alt="" class="fa-solid fa-hourglass-half"></div>
                     </div>
                     <div id="send_but" class="fa-solid fa-feather-pointed"></div>
                 </div>
diff --git a/public/scripts/extensions/caption/index.js b/public/scripts/extensions/caption/index.js
index e1528d33c..29a137cc8 100644
--- a/public/scripts/extensions/caption/index.js
+++ b/public/scripts/extensions/caption/index.js
@@ -17,7 +17,7 @@ async function setImageIcon() {
     try {
         const sendButton = document.getElementById('send_picture');
         sendButton.classList.add('fa-image');
-        sendButton.classList.remove('fa-hourglass-half', 'fa-fade');
+        sendButton.classList.remove('fa-hourglass-half');
     }
     catch (error) {
         console.log(error);
@@ -28,7 +28,7 @@ async function setSpinnerIcon() {
     try {
         const sendButton = document.getElementById('send_picture');
         sendButton.classList.remove('fa-image');
-        sendButton.classList.add('fa-hourglass-half', 'fa-fade');
+        sendButton.classList.add('fa-hourglass-half');
     }
     catch (error) {
         console.log(error);
diff --git a/public/scripts/extensions/expressions/index.js b/public/scripts/extensions/expressions/index.js
index 0ad0246eb..77171f183 100644
--- a/public/scripts/extensions/expressions/index.js
+++ b/public/scripts/extensions/expressions/index.js
@@ -202,7 +202,7 @@ async function setExpression(character, expression, force) {
 
     if (!debugImageStatus && !force) {
         validateImages();
-        setTimeout(() => setExpression(character, expression, true), 500);
+        setTimeout(() => setExpression(character, expression, false), 2000);
         return;
     }
 
diff --git a/public/scripts/openai.js b/public/scripts/openai.js
index b7af112cf..36e459ab3 100644
--- a/public/scripts/openai.js
+++ b/public/scripts/openai.js
@@ -421,7 +421,7 @@ function getSystemPrompt(nsfw_toggle_prompt, enhance_definitions_prompt, wiBefor
     let whole_prompt = [];
 
     if (isImpersonate) {
-        whole_prompt = [nsfw_toggle_prompt, enhance_definitions_prompt, "\n\n", wiBefore, wiAfter, extensionPrompt];
+        whole_prompt = [nsfw_toggle_prompt, enhance_definitions_prompt, "\n\n", wiBefore, storyString, wiAfter, extensionPrompt];
     }
     else {
         // If it's toggled, NSFW prompt goes first.
diff --git a/public/style.css b/public/style.css
index fa800c9a8..59fc37cec 100644
--- a/public/style.css
+++ b/public/style.css
@@ -988,7 +988,7 @@ input[type=search]:focus::-webkit-search-cancel-button {
     margin-top: 5px;
     display: flex;
     flex-wrap: wrap;
-    width: calc(var(--sheldWidth) - 100px);
+    width: calc(var(--sheldWidth) - 10px);
     max-width: 100svw;
     justify-content: space-evenly;
 }