diff --git a/scripts/commands/me_buff_health_1.py b/scripts/commands/me_buff_health_1.py
index 1bbefb27..1e41c9ae 100644
--- a/scripts/commands/me_buff_health_1.py
+++ b/scripts/commands/me_buff_health_1.py
@@ -4,5 +4,16 @@ def setup(core, actor, buff):
 	return
 	
 def run(core, actor, target, commandString):
-	core.buffService.addGroupBuff(actor, 'me_buff_health')
-	return
\ No newline at end of file
+
+	group = core.objectService.getObject(actor.getGroupId())
+	
+	if target:
+		if group and target in group.getMemberList():
+			core.buffService.addGroupBuff(actor, 'me_buff_health')
+		else:
+			core.buffService.addBuffToCreature(target, 'me_buff_health')
+	else:
+		core.buffService.addGroupBuff(actor, 'me_buff_health')
+		
+	return
+	
\ No newline at end of file
diff --git a/scripts/commands/me_buff_health_2.py b/scripts/commands/me_buff_health_2.py
index dad03f73..117444bb 100644
--- a/scripts/commands/me_buff_health_2.py
+++ b/scripts/commands/me_buff_health_2.py
@@ -4,5 +4,16 @@ def setup(core, actor, buff):
 	return
 	
 def run(core, actor, target, commandString):
-	core.buffService.addGroupBuff(actor, 'me_buff_health_2')
-	return
\ No newline at end of file
+
+	group = core.objectService.getObject(actor.getGroupId())
+	
+	if target:
+		if group and target in group.getMemberList():
+			core.buffService.addGroupBuff(actor, 'me_buff_health_2')
+		else:
+			core.buffService.addBuffToCreature(target, 'me_buff_health_2')
+	else:
+		core.buffService.addGroupBuff(actor, 'me_buff_health_2')
+		
+	return
+	
\ No newline at end of file
diff --git a/scripts/commands/me_buff_health_3.py b/scripts/commands/me_buff_health_3.py
index 7dce8f50..29a22740 100644
--- a/scripts/commands/me_buff_health_3.py
+++ b/scripts/commands/me_buff_health_3.py
@@ -4,5 +4,16 @@ def setup(core, actor, buff):
 	return
 	
 def run(core, actor, target, commandString):
-	core.buffService.addGroupBuff(actor, 'me_buff_health_3')
-	return
\ No newline at end of file
+
+	group = core.objectService.getObject(actor.getGroupId())
+	
+	if target:
+		if group and target in group.getMemberList():
+			core.buffService.addGroupBuff(actor, 'me_buff_health_3')
+		else:
+			core.buffService.addBuffToCreature(target, 'me_buff_health_3')
+	else:
+		core.buffService.addGroupBuff(actor, 'me_buff_health_3')
+		
+	return
+	
\ No newline at end of file
diff --git a/scripts/commands/me_enhance_action_1.py b/scripts/commands/me_enhance_action_1.py
index db09845c..0b065ab5 100644
--- a/scripts/commands/me_enhance_action_1.py
+++ b/scripts/commands/me_enhance_action_1.py
@@ -4,6 +4,16 @@ def setup(core, actor, buff):
 	return
 	
 def run(core, actor, target, commandString):
-	core.buffService.addGroupBuff(actor, 'me_buff_action_1')
+
+	group = core.objectService.getObject(actor.getGroupId())
+	
+	if target:
+		if group and target in group.getMemberList():
+			core.buffService.addGroupBuff(actor, 'me_buff_action_1')
+		else:
+			core.buffService.addBuffToCreature(target, 'me_buff_action_1')
+	else:
+		core.buffService.addGroupBuff(actor, 'me_buff_action_1')
+		
 	return
 	
\ No newline at end of file
diff --git a/scripts/commands/me_enhance_action_2.py b/scripts/commands/me_enhance_action_2.py
index cc476e94..a076dfdd 100644
--- a/scripts/commands/me_enhance_action_2.py
+++ b/scripts/commands/me_enhance_action_2.py
@@ -4,6 +4,16 @@ def setup(core, actor, buff):
 	return
 	
 def run(core, actor, target, commandString):
-	core.buffService.addGroupBuff(actor, 'me_buff_action_2')
+
+	group = core.objectService.getObject(actor.getGroupId())
+	
+	if target:
+		if group and target in group.getMemberList():
+			core.buffService.addGroupBuff(actor, 'me_buff_action_2')
+		else:
+			core.buffService.addBuffToCreature(target, 'me_buff_action_2')
+	else:
+		core.buffService.addGroupBuff(actor, 'me_buff_action_2')
+		
 	return
 	
\ No newline at end of file
diff --git a/scripts/commands/me_enhance_action_3.py b/scripts/commands/me_enhance_action_3.py
index e945d92c..1108c400 100644
--- a/scripts/commands/me_enhance_action_3.py
+++ b/scripts/commands/me_enhance_action_3.py
@@ -4,6 +4,16 @@ def setup(core, actor, buff):
 	return
 	
 def run(core, actor, target, commandString):
-	core.buffService.addGroupBuff(actor, 'me_buff_action_3')
+
+	group = core.objectService.getObject(actor.getGroupId())
+	
+	if target:
+		if group and target in group.getMemberList():
+			core.buffService.addGroupBuff(actor, 'me_buff_action_3')
+		else:
+			core.buffService.addBuffToCreature(target, 'me_buff_action_3')
+	else:
+		core.buffService.addGroupBuff(actor, 'me_buff_action_3')
+		
 	return
 	
\ No newline at end of file
diff --git a/scripts/commands/me_enhance_agility_1.py b/scripts/commands/me_enhance_agility_1.py
index 5f489803..24e2c05b 100644
--- a/scripts/commands/me_enhance_agility_1.py
+++ b/scripts/commands/me_enhance_agility_1.py
@@ -4,6 +4,16 @@ def setup(core, actor, buff):
 	return
 	
 def run(core, actor, target, commandString):
-	core.buffService.addGroupBuff(actor, 'me_buff_agility_1')
+
+	group = core.objectService.getObject(actor.getGroupId())
+	
+	if target:
+		if group and target in group.getMemberList():
+			core.buffService.addGroupBuff(actor, 'me_buff_agility_1')
+		else:
+			core.buffService.addBuffToCreature(target, 'me_buff_agility_1')
+	else:
+		core.buffService.addGroupBuff(actor, 'me_buff_agility_1')
+		
 	return
 	
\ No newline at end of file
diff --git a/scripts/commands/me_enhance_agility_2.py b/scripts/commands/me_enhance_agility_2.py
index f3935dcb..63474e3f 100644
--- a/scripts/commands/me_enhance_agility_2.py
+++ b/scripts/commands/me_enhance_agility_2.py
@@ -1,9 +1,19 @@
 import sys
 
 def setup(core, actor, buff):
-		return
+	return
 	
 def run(core, actor, target, commandString):
-	core.buffService.addGroupBuff(actor, 'me_buff_agility_2')
+
+	group = core.objectService.getObject(actor.getGroupId())
+	
+	if target:
+		if group and target in group.getMemberList():
+			core.buffService.addGroupBuff(actor, 'me_buff_agility_2')
+		else:
+			core.buffService.addBuffToCreature(target, 'me_buff_agility_2')
+	else:
+		core.buffService.addGroupBuff(actor, 'me_buff_agility_2')
+		
 	return
 	
\ No newline at end of file
diff --git a/scripts/commands/me_enhance_agility_3.py b/scripts/commands/me_enhance_agility_3.py
index e1dfd7fd..4d665fc3 100644
--- a/scripts/commands/me_enhance_agility_3.py
+++ b/scripts/commands/me_enhance_agility_3.py
@@ -4,5 +4,16 @@ def setup(core, actor, buff):
 	return
 	
 def run(core, actor, target, commandString):
-	core.buffService.addGroupBuff(actor, 'me_buff_agility_3')
-	return
\ No newline at end of file
+
+	group = core.objectService.getObject(actor.getGroupId())
+	
+	if target:
+		if group and target in group.getMemberList():
+			core.buffService.addGroupBuff(actor, 'me_buff_agility_3')
+		else:
+			core.buffService.addBuffToCreature(target, 'me_buff_agility_3')
+	else:
+		core.buffService.addGroupBuff(actor, 'me_buff_agility_3')
+		
+	return
+	
\ No newline at end of file
diff --git a/scripts/commands/me_enhance_block_1.py b/scripts/commands/me_enhance_block_1.py
index c2758143..d4ef98b6 100644
--- a/scripts/commands/me_enhance_block_1.py
+++ b/scripts/commands/me_enhance_block_1.py
@@ -4,5 +4,16 @@ def setup(core, actor, buff):
 	return
 	
 def run(core, actor, target, commandString):
-	core.buffService.addGroupBuff(actor, 'me_buff_melee_gb_1')
-	return
\ No newline at end of file
+
+	group = core.objectService.getObject(actor.getGroupId())
+	
+	if target:
+		if group and target in group.getMemberList():
+			core.buffService.addGroupBuff(actor, 'me_buff_melee_gb_1')
+		else:
+			core.buffService.addBuffToCreature(target, 'me_buff_melee_gb_1')
+	else:
+		core.buffService.addGroupBuff(actor, 'me_buff_melee_gb_1')
+		
+	return
+	
\ No newline at end of file
diff --git a/scripts/commands/me_enhance_dodge_1.py b/scripts/commands/me_enhance_dodge_1.py
index bb1a034e..537d2875 100644
--- a/scripts/commands/me_enhance_dodge_1.py
+++ b/scripts/commands/me_enhance_dodge_1.py
@@ -4,5 +4,16 @@ def setup(core, actor, buff):
 	return
 	
 def run(core, actor, target, commandString):
-	core.buffService.addGroupBuff(actor, 'me_buff_ranged_gb_1')
-	return
\ No newline at end of file
+
+	group = core.objectService.getObject(actor.getGroupId())
+	
+	if target:
+		if group and target in group.getMemberList():
+			core.buffService.addGroupBuff(actor, 'me_buff_ranged_gb_1')
+		else:
+			core.buffService.addBuffToCreature(target, 'me_buff_ranged_gb_1')
+	else:
+		core.buffService.addGroupBuff(actor, 'me_buff_ranged_gb_1')
+		
+	return
+	
\ No newline at end of file
diff --git a/scripts/commands/me_enhance_precision_1.py b/scripts/commands/me_enhance_precision_1.py
index 398e39fa..d20c423a 100644
--- a/scripts/commands/me_enhance_precision_1.py
+++ b/scripts/commands/me_enhance_precision_1.py
@@ -4,5 +4,16 @@ def setup(core, actor, buff):
 	return
 	
 def run(core, actor, target, commandString):
-	core.buffService.addGroupBuff(actor, 'me_buff_precision_1')
-	return
\ No newline at end of file
+
+	group = core.objectService.getObject(actor.getGroupId())
+	
+	if target:
+		if group and target in group.getMemberList():
+			core.buffService.addGroupBuff(actor, 'me_buff_precision_1')
+		else:
+			core.buffService.addBuffToCreature(target, 'me_buff_precision_1')
+	else:
+		core.buffService.addGroupBuff(actor, 'me_buff_precision_1')
+		
+	return
+	
\ No newline at end of file
diff --git a/scripts/commands/me_enhance_precision_2.py b/scripts/commands/me_enhance_precision_2.py
index a9bba8a5..a7b808ed 100644
--- a/scripts/commands/me_enhance_precision_2.py
+++ b/scripts/commands/me_enhance_precision_2.py
@@ -4,5 +4,16 @@ def setup(core, actor, buff):
 	return
 	
 def run(core, actor, target, commandString):
-	core.buffService.addGroupBuff(actor, 'me_buff_precision_2')
-	return
\ No newline at end of file
+
+	group = core.objectService.getObject(actor.getGroupId())
+	
+	if target:
+		if group and target in group.getMemberList():
+			core.buffService.addGroupBuff(actor, 'me_buff_precision_2')
+		else:
+			core.buffService.addBuffToCreature(target, 'me_buff_precision_2')
+	else:
+		core.buffService.addGroupBuff(actor, 'me_buff_precision_2')
+		
+	return
+	
\ No newline at end of file
diff --git a/scripts/commands/me_enhance_precision_3.py b/scripts/commands/me_enhance_precision_3.py
index 8f218b1c..76594fce 100644
--- a/scripts/commands/me_enhance_precision_3.py
+++ b/scripts/commands/me_enhance_precision_3.py
@@ -4,5 +4,16 @@ def setup(core, actor, buff):
 	return
 	
 def run(core, actor, target, commandString):
-	core.buffService.addGroupBuff(actor, 'me_buff_precision_3')
-	return
\ No newline at end of file
+
+	group = core.objectService.getObject(actor.getGroupId())
+	
+	if target:
+		if group and target in group.getMemberList():
+			core.buffService.addGroupBuff(actor, 'me_buff_precision_3')
+		else:
+			core.buffService.addBuffToCreature(target, 'me_buff_precision_3')
+	else:
+		core.buffService.addGroupBuff(actor, 'me_buff_precision_3')
+		
+	return
+	
\ No newline at end of file
diff --git a/scripts/commands/me_enhance_strength_1.py b/scripts/commands/me_enhance_strength_1.py
index 6ed252e5..1ab00983 100644
--- a/scripts/commands/me_enhance_strength_1.py
+++ b/scripts/commands/me_enhance_strength_1.py
@@ -4,5 +4,16 @@ def setup(core, actor, buff):
 	return
 	
 def run(core, actor, target, commandString):
-	core.buffService.addGroupBuff(actor, 'me_buff_strength_1')
-	return
\ No newline at end of file
+
+	group = core.objectService.getObject(actor.getGroupId())
+	
+	if target:
+		if group and target in group.getMemberList():
+			core.buffService.addGroupBuff(actor, 'me_buff_strength_1')
+		else:
+			core.buffService.addBuffToCreature(target, 'me_buff_strength_1')
+	else:
+		core.buffService.addGroupBuff(actor, 'me_buff_strength_1')
+		
+	return
+	
\ No newline at end of file
diff --git a/scripts/commands/me_enhance_strength_2.py b/scripts/commands/me_enhance_strength_2.py
index b56331fe..e8b21cd0 100644
--- a/scripts/commands/me_enhance_strength_2.py
+++ b/scripts/commands/me_enhance_strength_2.py
@@ -4,5 +4,16 @@ def setup(core, actor, buff):
 	return
 	
 def run(core, actor, target, commandString):
-	core.buffService.addGroupBuff(actor, 'me_buff_strength_3')
-	return
\ No newline at end of file
+
+	group = core.objectService.getObject(actor.getGroupId())
+	
+	if target:
+		if group and target in group.getMemberList():
+			core.buffService.addGroupBuff(actor, 'me_buff_strength_2')
+		else:
+			core.buffService.addBuffToCreature(target, 'me_buff_strength_2')
+	else:
+		core.buffService.addGroupBuff(actor, 'me_buff_strength_2')
+		
+	return
+	
\ No newline at end of file
diff --git a/scripts/commands/me_enhance_strength_3.py b/scripts/commands/me_enhance_strength_3.py
index b56331fe..e51c7bbc 100644
--- a/scripts/commands/me_enhance_strength_3.py
+++ b/scripts/commands/me_enhance_strength_3.py
@@ -4,5 +4,16 @@ def setup(core, actor, buff):
 	return
 	
 def run(core, actor, target, commandString):
-	core.buffService.addGroupBuff(actor, 'me_buff_strength_3')
-	return
\ No newline at end of file
+
+	group = core.objectService.getObject(actor.getGroupId())
+	
+	if target:
+		if group and target in group.getMemberList():
+			core.buffService.addGroupBuff(actor, 'me_buff_strength_3')
+		else:
+			core.buffService.addBuffToCreature(target, 'me_buff_strength_3')
+	else:
+		core.buffService.addGroupBuff(actor, 'me_buff_strength_3')
+		
+	return
+	
\ No newline at end of file