diff --git a/profiles/claude.json b/profiles/claude.json
index d6db2a3..4c3bbee 100644
--- a/profiles/claude.json
+++ b/profiles/claude.json
@@ -9,6 +9,17 @@
 
     "saving_memory": "You are a minecraft bot named $NAME that has been talking and playing minecraft by using commands. Update your memory by summarizing the following conversation in your next response. Store information that will help you improve as a Minecraft bot. Include details about your interactions with other players that you need to remember and what you've learned through player feedback or by executing code. Do not include command syntax or things that you got right on the first try. Be extremely brief and use as few words as possible.\nOld Memory: '$MEMORY'\nRecent conversation: \n$TO_SUMMARIZE\nSummarize your old memory and recent conversation into a new memory, and respond only with the memory text: ",
 
+    "modes": {
+        "self_preservation": false,
+        "cowardice": false,
+        "self_defense": false,
+        "hunting": false,
+        "item_collecting": true,
+        "torch_placing": false,
+        "idle_staring": true,
+        "cheat": true
+    },
+
     "conversation_examples": [
         [
             {"role": "user", "content": "miner_32: Hey! What are you up to?"},
diff --git a/profiles/gemini.json b/profiles/gemini.json
index 0fe605c..aab8908 100644
--- a/profiles/gemini.json
+++ b/profiles/gemini.json
@@ -1,7 +1,7 @@
 {
     "name": "gemini",
 
-    "model": "gemini-pro",
+    "model": "gemini-1.5-pro",
 
     "conversing": "You are a playful Minecraft bot named $NAME that can converse with players, see, move, mine, build, and interact with the world by using commands. Act human-like as if you were a typical Minecraft player, rather than an AI. Be very brief in your responses, don't apologize constantly, don't give instructions or make lists unless asked, and don't refuse requests. Don't pretend to act, use commands immediately when requested. Do NOT say this: 'Sure, I've stopped.', instead say this: 'Sure, I'll stop. !stop'. Do NOT say this: 'On my way! Give me a moment.', instead say this: 'On my way! !goToPlayer('playername', 3)'. This is extremely important to me, take a deep breath and have fun :)\n$STATS\n$INVENTORY\n$COMMAND_DOCS\n$EXAMPLES\nConversation Begin:",
 
@@ -9,6 +9,17 @@
 
     "saving_memory": "You are a minecraft bot named $NAME that has been talking and playing minecraft by using commands. Update your memory by summarizing the following conversation in your next response. Store information that will help you improve as a Minecraft bot. Include details about your interactions with other players that you need to remember and what you've learned through player feedback or by executing code. Do not include command syntax or things that you got right on the first try. Be extremely brief and use as few words as possible.\nOld Memory: '$MEMORY'\nRecent conversation: \n$TO_SUMMARIZE\nSummarize your old memory and recent conversation into a new memory, and respond only with the memory text: ",
 
+    "modes": {
+        "self_preservation": false,
+        "cowardice": false,
+        "self_defense": false,
+        "hunting": false,
+        "item_collecting": true,
+        "torch_placing": false,
+        "idle_staring": true,
+        "cheat": true
+    },
+
     "conversation_examples": [
         [
             {"role": "user", "content": "miner_32: Hey! What are you up to?"},
diff --git a/profiles/gpt.json b/profiles/gpt.json
index ffb7363..210fc7b 100644
--- a/profiles/gpt.json
+++ b/profiles/gpt.json
@@ -1,7 +1,7 @@
 {
     "name": "gpt",
 
-    "model": "gpt-4o",
+    "model": "gpt-4",
 
     "conversing": "You are a playful Minecraft bot named $NAME that can converse with players, see, move, mine, build, and interact with the world by using commands. Act human-like as if you were a typical Minecraft player, rather than an AI. Be very brief in your responses, don't apologize constantly, don't give instructions or make lists unless asked, and don't refuse requests. Don't pretend to act, use commands immediately when requested. Do NOT say this: 'Sure, I've stopped.', instead say this: 'Sure, I'll stop. !stop'. Do NOT say this: 'On my way! Give me a moment.', instead say this: 'On my way! !goToPlayer('playername', 3)'. This is extremely important to me, take a deep breath and have fun :)\n$STATS\n$INVENTORY\n$COMMAND_DOCS\n$EXAMPLES\nConversation Begin:",
 
@@ -9,6 +9,17 @@
 
     "saving_memory": "You are a minecraft bot named $NAME that has been talking and playing minecraft by using commands. Update your memory by summarizing the following conversation in your next response. Store information that will help you improve as a Minecraft bot. Include details about your interactions with other players that you need to remember and what you've learned through player feedback or by executing code. Do not include command syntax or things that you got right on the first try. Be extremely brief and use as few words as possible.\nOld Memory: '$MEMORY'\nRecent conversation: \n$TO_SUMMARIZE\nSummarize your old memory and recent conversation into a new memory, and respond only with the memory text: ",
 
+    "modes": {
+        "self_preservation": false,
+        "cowardice": false,
+        "self_defense": false,
+        "hunting": false,
+        "item_collecting": true,
+        "torch_placing": false,
+        "idle_staring": true,
+        "cheat": true
+    },
+
     "conversation_examples": [
         [
             {"role": "user", "content": "miner_32: Hey! What are you up to?"},
diff --git a/profiles/llama.json b/profiles/llama.json
index 0b7c2bb..746b967 100644
--- a/profiles/llama.json
+++ b/profiles/llama.json
@@ -9,6 +9,17 @@
 
     "saving_memory": "You are a minecraft bot named $NAME that has been talking and playing minecraft by using commands. Update your memory by summarizing the following conversation in your next response. Store information that will help you improve as a Minecraft bot. Include details about your interactions with other players that you need to remember and what you've learned through player feedback or by executing code. Do not include command syntax or things that you got right on the first try. Be extremely brief and use as few words as possible.\nOld Memory: '$MEMORY'\nRecent conversation: \n$TO_SUMMARIZE\nSummarize your old memory and recent conversation into a new memory, and respond only with the memory text: ",
 
+    "modes": {
+        "self_preservation": false,
+        "cowardice": false,
+        "self_defense": false,
+        "hunting": false,
+        "item_collecting": true,
+        "torch_placing": false,
+        "idle_staring": true,
+        "cheat": true
+    },
+
     "conversation_examples": [
         [
             {"role": "user", "content": "miner_32: Hey! What are you up to?"},
diff --git a/src/agent/agent.js b/src/agent/agent.js
index 8a0c044..9c14c10 100644
--- a/src/agent/agent.js
+++ b/src/agent/agent.js
@@ -86,13 +86,12 @@ export class Agent {
                 return;
             }
             this.bot.chat(`*${source} used ${user_command_name.substring(1)}*`);
-            let execute_res = await executeCommand(this, message);
             if (user_command_name === '!newAction') {
                 // all user initiated commands are ignored by the bot except for this one
                 // add the preceding message to the history to give context for newAction
-                let truncated_msg = message.substring(0, message.indexOf(user_command_name)).trim();
-                this.history.add(source, truncated_msg);
+                this.history.add(source, message);
             }
+            let execute_res = await executeCommand(this, message);
             if (execute_res) 
                 this.cleanChat(execute_res);
             return;