diff --git a/binaries/data/mods/official/entities/structures/celt_fortress.xml b/binaries/data/mods/official/entities/structures/celt_fortress.xml
deleted file mode 100644
index a742cbfcea..0000000000
--- a/binaries/data/mods/official/entities/structures/celt_fortress.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-
-<Entity
-	Parent="template_structure_military_fortress"
->
-	<Traits>
-	
-		<Id>
-
-			<Specific>Broch</Specific>
-
-			<Civ>Celts</Civ>
-
-			<History>(Insert history here)</History>
-		
-		</Id>
-
-	</Traits>
-
-	<Actor>structures/celts/fortress.xml</Actor>
-
-</Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/structures/celt_fortress_b.xml b/binaries/data/mods/official/entities/structures/celt_fortress_b.xml
new file mode 100644
index 0000000000..9983f1aa73
--- /dev/null
+++ b/binaries/data/mods/official/entities/structures/celt_fortress_b.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+
+<Entity
+	Parent="template_structure_military_fortress"
+>
+	<Traits>
+	
+		<Id>
+
+			<Specific>Broch</Specific>
+
+			<Civ>Celts</Civ>
+
+			<History>The Broch is an Iron Age round tower fortification type unique to Scotland.  The origin of brochs remains a mystery. Some archaeologists believed the brochs were built by an influx of broch builders who had been displaced and pushed northward during the Roman invasion of Britain. However, this theory has been largely disproven and current thought is that they were built by itinerant (travelling) craftsmen since so many were built to almost the same exact design. </History>
+		
+		</Id>
+
+	</Traits>
+
+	<Actor>structures/celts/fortress_briton.xml</Actor>
+
+</Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/structures/celt_fortress_g.xml b/binaries/data/mods/official/entities/structures/celt_fortress_g.xml
new file mode 100644
index 0000000000..45417e16bc
--- /dev/null
+++ b/binaries/data/mods/official/entities/structures/celt_fortress_g.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+
+<Entity
+	Parent="template_structure_military_fortress"
+>
+	<Traits>
+	
+		<Id>
+
+			<Specific>Dun</Specific>
+
+			<Civ>Celts</Civ>
+
+			<History>Dun comes from the Brythonic Din and Gaelic Dun, meaning fort, and is now used as a general term for small stone built strongholds. Duns appear to have arrived with the Brythonic Celts in about the 7th century BC, associated with their Iron age culture of warrior tribes and petty chieftains. Early Duns had near vertical ramparts constructed of stone laced with timber, and where this was set on fire (accidentally or on purpose) it forms the vitrified forts where stones have been partly melted, an effect that is still clearly visible. Use of Duns continued in some cases into the medieval period.</History>
+		
+		</Id>
+
+	</Traits>
+
+	<Actor>structures/celts/fortress_gallic.xml</Actor>
+
+</Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/units/celt_cavalry_spearman_a.xml b/binaries/data/mods/official/entities/units/celt_cavalry_spearman_a.xml
index 0826746464..0d6a3f997f 100644
--- a/binaries/data/mods/official/entities/units/celt_cavalry_spearman_a.xml
+++ b/binaries/data/mods/official/entities/units/celt_cavalry_spearman_a.xml
@@ -3,5 +3,5 @@
 <Entity
 	Parent="celt_cavalry_spearman_b"
 >
-	<Actor>units/celts/cavalry_javelinist_a.xml</Actor>
+	<Actor>units/celts/cavalry_spearman_a.xml</Actor>
 </Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/units/celt_cavalry_spearman_b.xml b/binaries/data/mods/official/entities/units/celt_cavalry_spearman_b.xml
index 44dd8716d3..c514f6dc9d 100644
--- a/binaries/data/mods/official/entities/units/celt_cavalry_spearman_b.xml
+++ b/binaries/data/mods/official/entities/units/celt_cavalry_spearman_b.xml
@@ -17,5 +17,5 @@
 		
 	</Traits>
 
-	<Actor>units/celts/cavalry_javelinist_b.xml</Actor>
+	<Actor>units/celts/cavalry_spearman_b.xml</Actor>
 </Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/units/celt_cavalry_spearman_e.xml b/binaries/data/mods/official/entities/units/celt_cavalry_spearman_e.xml
index 2cce6aa1c0..c757928922 100644
--- a/binaries/data/mods/official/entities/units/celt_cavalry_spearman_e.xml
+++ b/binaries/data/mods/official/entities/units/celt_cavalry_spearman_e.xml
@@ -3,5 +3,5 @@
 <Entity
 	Parent="celt_cavalry_spearman_a"
 >
-	<Actor>units/celts/cavalry_javelinist_e.xml</Actor>
+	<Actor>units/celts/cavalry_spearman_e.xml</Actor>
 </Entity>
\ No newline at end of file