diff --git a/zone/bot_commands/blocked_buffs.cpp b/zone/bot_commands/blocked_buffs.cpp
index 1a873b176..0b029ba58 100644
--- a/zone/bot_commands/blocked_buffs.cpp
+++ b/zone/bot_commands/blocked_buffs.cpp
@@ -55,7 +55,7 @@ void bot_command_blocked_buffs(Client* c, const Seperator* sep)
 
 		std::vector<std::string> actionables =
 		{
-			"target, byname, ownergroup, ownerraid, targetgroup, namesgroup, healrotationtargets mmr, byclass, byrace, spawned"
+			"target, byname, ownergroup, ownerraid, targetgroup, namesgroup, healrotationtargets, mmr, byclass, byrace, spawned"
 		};
 
 		std::vector<std::string> options = { };
@@ -313,7 +313,7 @@ void bot_command_blocked_pet_buffs(Client* c, const Seperator* sep)
 
 		std::vector<std::string> actionables =
 		{
-			"target, byname, ownergroup, ownerraid, targetgroup, namesgroup, healrotationtargets mmr, byclass, byrace, spawned"
+			"target, byname, ownergroup, ownerraid, targetgroup, namesgroup, healrotationtargets, mmr, byclass, byrace, spawned"
 		};
 
 		std::vector<std::string> options = { };
diff --git a/zone/bot_commands/bot_settings.cpp b/zone/bot_commands/bot_settings.cpp
index 4dc9babdf..d42df0b07 100644
--- a/zone/bot_commands/bot_settings.cpp
+++ b/zone/bot_commands/bot_settings.cpp
@@ -4,6 +4,8 @@ void bot_command_bot_settings(Client* c, const Seperator* sep)
 {
 	std::list<const char*> subcommand_list;
 	subcommand_list.push_back("behindmob");
+	subcommand_list.push_back("blockedbuffs");
+	subcommand_list.push_back("blockedpetbuffs");
 	subcommand_list.push_back("distanceranged");
 	subcommand_list.push_back("copysettings");
 	subcommand_list.push_back("defaultsettings");
diff --git a/zone/bot_commands/cast.cpp b/zone/bot_commands/cast.cpp
index 2b721913a..6b3a201a9 100644
--- a/zone/bot_commands/cast.cpp
+++ b/zone/bot_commands/cast.cpp
@@ -68,7 +68,7 @@ void bot_command_cast(Client* c, const Seperator* sep)
 
 		std::vector<std::string> actionables =
 		{
-			"target, byname, ownergroup, ownerraid, targetgroup, namesgroup, healrotationtargets mmr, byclass, byrace, spawned"
+			"target, byname, ownergroup, ownerraid, targetgroup, namesgroup, healrotationtargets, mmr, byclass, byrace, spawned"
 		};
 
 		std::vector<std::string> options = { };
diff --git a/zone/bot_commands/copy_settings.cpp b/zone/bot_commands/copy_settings.cpp
index 359ac8c22..34a5cfcd2 100644
--- a/zone/bot_commands/copy_settings.cpp
+++ b/zone/bot_commands/copy_settings.cpp
@@ -50,18 +50,12 @@ void bot_command_copy_settings(Client* c, const Seperator* sep)
 
 		std::vector<std::string> actionables =
 		{
-			"target, byname, ownergroup, ownerraid",
-			"targetgroup, namesgroup, healrotationtargets",
-			"mmr, byclass, byrace, spawned"
+			"target, byname, ownergroup, ownerraid, targetgroup, namesgroup, healrotationtargets, mmr, byclass, byrace, spawned"
 		};
 
 		std::vector<std::string> options =
 		{
-			"all, misc, spellsettings, spelltypesettings",
-			"holds, delays, minthresholds, maxthresholds",
-			"minmanapct, maxmanapct, minhppct, maxhppct",
-			"idlepriority, engagedpriority, pursuepriority",
-			"aggrochecks, targetcounts"
+			"all, misc, spellsettings, spelltypesettings, spellholds, spelldelays, spellminthresholds, spellmaxthresholds, spellminmanapct, spellmaxmanapct, spellminhppct, spellmaxhppct, spellidlepriority, spellengagedpriority, spellpursuepriority, spellaggrochecks, spelltargetcounts, showhelm, followd, stopmeleelevel, enforcespellsettings, bottoggleranged, petsettype, behindmob, distanceranged, illusionblock, sitincombat, sithppercent, sitmanapercent, blockedbuffs, blockedpetbuffs"
 		};
 		std::vector<std::string> options_one =
 		{
@@ -72,10 +66,7 @@ void bot_command_copy_settings(Client* c, const Seperator* sep)
 		std::vector<std::string> options_two =
 		{
 			"[misc] copies all miscellaneous options such as:",
-			"- ^showhelm, ^followd, ^stopmeleelevel",
-			"- ^enforcespellsettings, ^bottoggleranged, ^petsettype",
-			"- ^behindmob, ^distanceranged, ^illusionblock",
-			"- ^sitincombat, ^sithppercent and ^sitmanapercent",
+			"- ^showhelm, ^followd, ^stopmeleelevel, ^enforcespellsettings, ^bottoggleranged, ^petsettype, ^behindmob, ^distanceranged, ^illusionblock, ^sitincombat, ^sithppercent, ^sitmanapercent, ^blockedbuffs, ^blockedpetbuffs",
 
 		};
 		std::vector<std::string> options_three =
@@ -120,22 +111,36 @@ void bot_command_copy_settings(Client* c, const Seperator* sep)
 	std::vector<std::string> options =
 	{
 		"all",
-		"misc"
+		"misc",
 		"spellsettings",
 		"spelltypesettings",
-		"holds",
-		"delays",
-		"minthresholds",
-		"maxthresholds",
-		"aggrochecks",
-		"minmanapct",
-		"maxmanapct",
-		"minhppct",
-		"maxhppct",
-		"idlepriority",
-		"engagedpriority",
-		"pursuepriority",
-		"targetcounts"
+		"spellholds",
+		"spelldelays",
+		"spellminthresholds",
+		"spellmaxthresholds",
+		"spellminmanapct",
+		"spellmaxmanapct",
+		"spellminhppct",
+		"spellmaxhppct",
+		"spellidlepriority",
+		"spellengagedpriority",
+		"spellpursuepriority",
+		"spellaggrochecks",
+		"spelltargetcounts",
+		"showhelm",
+		"followd",
+		"stopmeleelevel",
+		"enforcespellsettings",
+		"bottoggleranged",
+		"petsettype",
+		"behindmob",
+		"distanceranged",
+		"illusionblock",
+		"sitincombat",
+		"sithppercent",
+		"sitmanapercent",
+		"blockedbuffs",
+		"blockedpetbuffs"
 	};
 
 	for (int i = 0; i < options.size(); i++) {
diff --git a/zone/bot_commands/default_settings.cpp b/zone/bot_commands/default_settings.cpp
index b12e183b4..506607401 100644
--- a/zone/bot_commands/default_settings.cpp
+++ b/zone/bot_commands/default_settings.cpp
@@ -50,7 +50,7 @@ void bot_command_default_settings(Client* c, const Seperator* sep)
 
 		std::vector<std::string> actionables =
 		{
-			"target, byname, ownergroup, ownerraid, targetgroup, namesgroup, healrotationtargets mmr, byclass, byrace, spawned"
+			"target, byname, ownergroup, ownerraid, targetgroup, namesgroup, healrotationtargets, mmr, byclass, byrace, spawned"
 		};
 
 		std::vector<std::string> options =
diff --git a/zone/bot_commands/depart.cpp b/zone/bot_commands/depart.cpp
index 1facaef1f..e7c50156a 100644
--- a/zone/bot_commands/depart.cpp
+++ b/zone/bot_commands/depart.cpp
@@ -48,7 +48,7 @@ void bot_command_depart(Client* c, const Seperator* sep)
 
 		std::vector<std::string> actionables =
 		{
-			"target, byname, ownergroup, ownerraid, targetgroup, namesgroup, healrotationtargets mmr, byclass, byrace, spawned"
+			"target, byname, ownergroup, ownerraid, targetgroup, namesgroup, healrotationtargets, mmr, byclass, byrace, spawned"
 		};
 
 		std::vector<std::string> options = { };
diff --git a/zone/bot_commands/spell_aggro_checks.cpp b/zone/bot_commands/spell_aggro_checks.cpp
index 0be650d69..c1b824101 100644
--- a/zone/bot_commands/spell_aggro_checks.cpp
+++ b/zone/bot_commands/spell_aggro_checks.cpp
@@ -70,7 +70,7 @@ void bot_command_spell_aggro_checks(Client* c, const Seperator* sep)
 
 		std::vector<std::string> actionables =
 		{
-			"target, byname, ownergroup, ownerraid, targetgroup, namesgroup, healrotationtargets mmr, byclass, byrace, spawned"
+			"target, byname, ownergroup, ownerraid, targetgroup, namesgroup, healrotationtargets, mmr, byclass, byrace, spawned"
 		};
 
 		std::vector<std::string> options = { };
diff --git a/zone/bot_commands/spell_delays.cpp b/zone/bot_commands/spell_delays.cpp
index d1fb2d664..165770cbc 100644
--- a/zone/bot_commands/spell_delays.cpp
+++ b/zone/bot_commands/spell_delays.cpp
@@ -76,7 +76,7 @@ void bot_command_spell_delays(Client* c, const Seperator* sep)
 
 		std::vector<std::string> actionables =
 		{
-			"target, byname, ownergroup, ownerraid targetgroup, namesgroup, healrotationtargets mmr, byclass, byrace, spawned"
+			"target, byname, ownergroup, ownerraid targetgroup, namesgroup, healrotationtargets, mmr, byclass, byrace, spawned"
 		};
 
 		std::vector<std::string> options = { };