diff --git a/binaries/data/mods/official/entities/template_entity.xml b/binaries/data/mods/official/entities/template_entity.xml
index 5ee5f25d45..a86db51e5b 100755
--- a/binaries/data/mods/official/entities/template_entity.xml
+++ b/binaries/data/mods/official/entities/template_entity.xml
@@ -26,6 +26,9 @@
 		<Health> 
 			<Bar_Height>-1.0</Bar_Height>
 			<Bar_Size>20</Bar_Size>
+			<Regen_Rate>30.0</Regen_Rate>
+			<Regen_Start>15.0</Regen_Start>
+			<Decay_Rate>30.0</Decay_Rate>
 		</Health>
 		<Stamina>
 			<Bar_Height>-1.0</Bar_Height>
diff --git a/binaries/data/mods/official/entities/template_entity_script.js b/binaries/data/mods/official/entities/template_entity_script.js
index 795d8397d2..e5f442b390 100644
--- a/binaries/data/mods/official/entities/template_entity_script.js
+++ b/binaries/data/mods/official/entities/template_entity_script.js
@@ -557,14 +557,19 @@ function entityEventNotification( evt )
 	{
 		case NOTIFY_GOTO:
 			this.Order( ORDER_GENERIC, evt.location.x, evt.location.y );
+			break;
 		case NOTIFY_ATTACK:
 		case NOTIFY_DAMAGE:
 			this.Order( ORDER_GENERIC, evt.target, ACTION_ATTACK);
+			break;
 		case NOTIFY_HEAL:
 			this.Order( ORDER_GENERIC, evt.target, ACTION_HEAL );
+			break;
 		case NOTIFY_GATHER:
 			this.Order( ORDER_GENERIC, evt.target, ACTION_GATHER );
-			
+			break;
+		default:
+			console.wrote( "Unknown notification request" + evt.type );
 	}
 }		
 // ====================================================================
@@ -580,9 +585,12 @@ function entityEventTargetChanged( evt )
 	
 	evt.defaultOrder = NMT_Goto;
 	evt.defaultCursor = "arrow-default";
-	evt.secondaryOrder = NMT_Run;
+	
 	evt.secondaryCursor = "arrow-default";
-
+	if ( this.actions.run && this.actions.run.speed > 0 )
+	{
+		evt.secondaryOrder = NMT_Run;
+	}
 	if( evt.target && this.actions )
 	{
 		if( this.actions.attack && 
diff --git a/binaries/data/mods/official/entities/template_unit.xml b/binaries/data/mods/official/entities/template_unit.xml
index e99514f7a6..b4c6cc468b 100644
--- a/binaries/data/mods/official/entities/template_unit.xml
+++ b/binaries/data/mods/official/entities/template_unit.xml
@@ -31,11 +31,12 @@
 			<Max>100</Max>
 			<Bar_Height>5.0</Bar_Height>
 			<Bar_Size>20</Bar_Size>
+
 		</Health>
 		
 		<Stamina>
 			<Max>5.0</Max>
-			<Bar_Height>5.2</Bar_Height>
+			<Bar_Height>5.3</Bar_Height>
 			<Bar_Size>20</Bar_Size>
 		</Stamina>
 
diff --git a/binaries/data/mods/official/gui/test/functions_sim_entity.js b/binaries/data/mods/official/gui/test/functions_sim_entity.js
index afdfdf4593..e6556a9370 100644
--- a/binaries/data/mods/official/gui/test/functions_sim_entity.js
+++ b/binaries/data/mods/official/gui/test/functions_sim_entity.js
@@ -78,6 +78,8 @@ function worldClickHandler(event)
 	
 	if (event.clicks == 2)
 		triggerSelectionRun();
+	else
+		setSelectionRun();
 
 	issueCommand (selection, cmd, args[0], args[1]);
 }
@@ -174,6 +176,14 @@ function triggerSelectionRun()
 		 selection[i].triggerRun();
 	}
 }
+function setSelectionRun()
+{
+	for ( i=0; i< selection.length; i++ )
+	{
+		 selection[i].setRun( false );
+	}
+}
+