diff --git a/binaries/data/mods/official/entities/gaia/geology_stone_greek.xml b/binaries/data/mods/official/entities/gaia/geology_stone_greek.xml
index 2d72e199c2..20dd1577f2 100644
--- a/binaries/data/mods/official/entities/gaia/geology_stone_greek.xml
+++ b/binaries/data/mods/official/entities/gaia/geology_stone_greek.xml
@@ -6,7 +6,7 @@
  		<Anchor>
  			<Type>Ground</Type>
 		<!-- If negative or > 90.0, entity will always conform to terrain (assuming traits.pitch allows it) -->
-			<ConformX>0</ConformX>
+			<ConformX>3.141592</ConformX>
 			<ConformZ>3.141592</ConformZ>
  		</Anchor>
 	</Traits>
diff --git a/binaries/data/mods/official/entities/gaia/geology_stone_light.xml b/binaries/data/mods/official/entities/gaia/geology_stone_light.xml
index b3881732df..78dd6b8ced 100644
--- a/binaries/data/mods/official/entities/gaia/geology_stone_light.xml
+++ b/binaries/data/mods/official/entities/gaia/geology_stone_light.xml
@@ -6,7 +6,7 @@
  		<Anchor>
  			<Type>Ground</Type>
 		<!-- If negative or > 90.0, entity will always conform to terrain (assuming traits.pitch allows it) -->
-			<ConformX>0</ConformX>
+			<ConformX>3.141592</ConformX>
 			<ConformZ>3.141592</ConformZ>
  		</Anchor>
 	</Traits>
diff --git a/binaries/data/mods/official/entities/template_entity.xml b/binaries/data/mods/official/entities/template_entity.xml
index 6242866c9a..5c3ac42f90 100755
--- a/binaries/data/mods/official/entities/template_entity.xml
+++ b/binaries/data/mods/official/entities/template_entity.xml
@@ -71,7 +71,7 @@
 
 		<Pitch>
 			<Sectors>7</Sectors>
-			<Value>.1</Value>
+			<Value>0.2</Value>
 		</Pitch>
 		
 		<IsTerritoryCentre>false</IsTerritoryCentre>
diff --git a/binaries/data/mods/official/entities/template_entity_full.xml b/binaries/data/mods/official/entities/template_entity_full.xml
index a687197871..0cf3e3e204 100644
--- a/binaries/data/mods/official/entities/template_entity_full.xml
+++ b/binaries/data/mods/official/entities/template_entity_full.xml
@@ -22,7 +22,6 @@
 	<Event On="Notification" Function="entityEventNotification" />
 	<Event On="Formation" Function="entityEventFormation" />
 	<Event On="Idle" Function="entityEventIdle" />
-	<Event On="Movement" Function="entityEventMovement" />
 	<Event On="Death" Function="entityDestroyed" />
 	<Event On="Initialize" Function="entityInit" />
 </Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/template_unit_cavalry.xml b/binaries/data/mods/official/entities/template_unit_cavalry.xml
index cfcb30b478..8eae8edc85 100644
--- a/binaries/data/mods/official/entities/template_unit_cavalry.xml
+++ b/binaries/data/mods/official/entities/template_unit_cavalry.xml
@@ -46,6 +46,11 @@
 		<Promotion>
 			<Req>900</Req>
 		</Promotion>
+		
+		<Anchor>
+			<ConformX>3.141592</ConformX>
+			<ConformZ>3.141592</ConformZ>
+		</Anchor>
 	</Traits>
 
 	<Actions>
diff --git a/binaries/data/mods/official/entities/template_unit_super_siege.xml b/binaries/data/mods/official/entities/template_unit_super_siege.xml
index 92b3ebb22b..3dbc1f055d 100644
--- a/binaries/data/mods/official/entities/template_unit_super_siege.xml
+++ b/binaries/data/mods/official/entities/template_unit_super_siege.xml
@@ -15,6 +15,11 @@
 		
 		</Id>
 		
+		<Anchor>
+			<ConformX>3.141592</ConformX>
+			<ConformZ>3.141592</ConformZ>
+		</Anchor>
+		
 	</Traits>
 
 </Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/scripts/entity_functions.js b/binaries/data/mods/official/scripts/entity_functions.js
index 700af46443..e33b55a7ff 100644
--- a/binaries/data/mods/official/scripts/entity_functions.js
+++ b/binaries/data/mods/official/scripts/entity_functions.js
@@ -1049,33 +1049,14 @@ function entityComplete()
 {
 	console.write( this + " is finished building." );
 }
+
 //=====================================================================
+
 function entityEventIdle( evt )
 {
 	//Use our own data for target; we aren't affecting anyone, so listeners want to know about us
 	this.forceCheckListeners( NOTIFY_IDLE, this );
 }
-//=====================================================================
-function entityEventMovement( evt )
-{
-	var divs = this.traits.pitch.sectors;
-	var sector = this.findSector( divs, evt.slope, 3.141592, true );
-	
-	if ( divs % 2 )
-	{	
-		sector += ((divs+1)/2 - sector)*2;
-		sector -= (divs+1)/2;
-		this.actions.move.speedCurr = this.actions.move.speed;
-		this.actions.move.speedCurr += 									this.actions.move.speed*this.traits.pitch.value*sector;
-	}
-	else
-	{
-		sector += ((divs)/2 - sector)*2;
-		sector -= (divs)/2;
-		this.actions.move.speedCurr = this.actions.move.speed;
-		this.actions.move.speedCurr += 						this.actions.move.speed*this.traits.pitch.value*sector;
-	}
-}	
 
 // ====================================================================