diff --git a/mpq/arr/images.datex b/mpq/arr/images.datex
index e6847b8e..215dff86 100644
Binary files a/mpq/arr/images.datex and b/mpq/arr/images.datex differ
diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex
index 01f29470..48c48588 100644
Binary files a/mpq/arr/units.datex and b/mpq/arr/units.datex differ
diff --git a/mpq/arr/units.txt b/mpq/arr/units.txt
index 33c0f8e2..7e5265da 100644
--- a/mpq/arr/units.txt
+++ b/mpq/arr/units.txt
@@ -373,7 +373,7 @@ Terran Matador (Cinder Mode)
 Terran Cuirass (Trench Mode)
 Matador Turret (Tank Mode)
 Matador Turret (Cinder Mode)
-Police Priestess
+Lobotomy Mine
 Wyvern Turret
 Extended Unit #150
 Extended Unit #151
diff --git a/mpq/arr/weapons.datex b/mpq/arr/weapons.datex
index fc5fa141..94452742 100644
Binary files a/mpq/arr/weapons.datex and b/mpq/arr/weapons.datex differ
diff --git a/mpq/arr/weapons.txt b/mpq/arr/weapons.txt
index a056865a..d7fd628f 100644
--- a/mpq/arr/weapons.txt
+++ b/mpq/arr/weapons.txt
@@ -87,7 +87,7 @@ Hollowed Spores (Liiralisk)
 Phase Spear (Legionnaire)
 Harrying Talons (Akistrokor)
 Discoid Railgun (Savant)
-Lobotomy Mine (unused)
+Electromagnetic Explosion (Lobotomy Mine)
 Celestial Cannons (Star Sovereign)
 Intervention Missiles (Star Sovereign behavior)
 Spores (Sovroleth)
diff --git a/mpq/datreq/Buttons.graft b/mpq/datreq/Buttons.graft
index 8656c454..4f592685 100644
Binary files a/mpq/datreq/Buttons.graft and b/mpq/datreq/Buttons.graft differ
diff --git a/mpq/rez/stat_txt.tbl b/mpq/rez/stat_txt.tbl
index 0efa312d..e4225baa 100644
Binary files a/mpq/rez/stat_txt.tbl and b/mpq/rez/stat_txt.tbl differ
diff --git a/mpq/rez/unitnames.tbl b/mpq/rez/unitnames.tbl
index 4f257785..a8da08cf 100644
Binary files a/mpq/rez/unitnames.tbl and b/mpq/rez/unitnames.tbl differ
diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt
index b8eddc53..e5004215 100644
--- a/mpq/scripts/iscript.txt
+++ b/mpq/scripts/iscript.txt
@@ -6871,13 +6871,13 @@ Init          	SpiderMineInit
 Death         	SpiderMineDeath
 GndAttkInit   	[NONE]
 AirAttkInit   	[NONE]
-Unused1       	SpiderMineUnused1
+Unused1       	[NONE]
 GndAttkRpt    	[NONE]
 AirAttkRpt    	[NONE]
 CastSpell     	[NONE]
 GndAttkToIdle 	[NONE]
 AirAttkToIdle 	[NONE]
-Unused2       	[NONE]
+Unused2       	SpiderMineUnused2
 Walking       	SpiderMineWalking
 WalkingToIdle 	SpiderMineWalkingToIdle
 SpecialState1 	SpiderMineSpecialState1
@@ -6964,7 +6964,7 @@ SpiderMineSpecialState1:
 	imgol             	429 0 0 # Spider Mine Death (thingy\tmnExplo.grp)
 	goto              	SpiderMineLocal00
 	
-SpiderMineUnused1:
+SpiderMineUnused2:
 	fireweapon			89
 	sigorder          	1
 	imgol             	429 0 0 # Spider Mine Death (thingy\tmnExplo.grp)
@@ -24612,7 +24612,7 @@ MadrigalUnused1:
 	wait				1
 	nobrkcodestart
 	playsnd           	1699
-	sprol				744 0 0
+	sprol				744 0 0 # Large Orange Explosion Reversed
 	wait				12
 	setfldirect			13
 	nobrkcodeend
@@ -24621,19 +24621,13 @@ MadrigalUnused1:
 MadrigalGndAttkInit:
 	wait				1
 	nobrkcodestart
-	playfram			0x55
+	playfram			0x00
 	wait				1
-	playfram			0x66
+	playfram			0x20
 	playsndbtwn			1208 1211 # Madrigal weaponfire 01, 02, 03, 04
 	attack
 	wait				1
-	playfram			0x77
-	wait				1
-	playfram			0x88
-	wait				1
-	playfram			0x99
-	wait				1
-	playfram			0xaa
+	playfram			0x00
 	wait				1
 	nobrkcodeend
 	gotorepeatattk
@@ -24642,18 +24636,12 @@ MadrigalGndAttkInit:
 MadrigalSpecialState1:
 	wait				1
 	nobrkcodestart
-	playfram			0x55
+	playfram			0x00
 	wait				1
-	playfram			0x66
+	playfram			0x20
 	attack
 	wait				1
-	playfram			0x77
-	wait				1
-	playfram 			0x88
-	wait				1
-	playfram 			0x99
-	wait				1
-	playfram 			0xaa
+	playfram			0x00
 	wait				1
 	nobrkcodeend
 	gotorepeatattk
@@ -24661,20 +24649,7 @@ MadrigalSpecialState1:
 
 MadrigalWalking:
 	setvertpos			0
-	goto				MadrigalLocal02
-
-MadrigalLocal02:
-	wait				1
-	playfram			0x11
-	wait				1
-	playfram			0x22
-	wait				1
-	playfram			0x33
-	wait				1
-	playfram			0x44
-	wait				1
-	playfram			0x00
-	goto              	MadrigalLocal02
+	goto				MadrigalLocal01
 
 MadrigalLocal01:
 	wait              	125 
diff --git a/mpq/unit/cm/terran/madrigal.grp b/mpq/unit/cm/terran/madrigal.grp
index aaf38006..46816842 100644
Binary files a/mpq/unit/cm/terran/madrigal.grp and b/mpq/unit/cm/terran/madrigal.grp differ
diff --git a/mpq/unit/cmdbtns/cmdicons.grp b/mpq/unit/cmdbtns/cmdicons.grp
index 032b1be7..ee38a32c 100644
Binary files a/mpq/unit/cmdbtns/cmdicons.grp and b/mpq/unit/cmdbtns/cmdicons.grp differ
diff --git a/mpq/unit/cmdbtns/uniticons.grp b/mpq/unit/cmdbtns/uniticons.grp
index f4991b64..a576bd35 100644
Binary files a/mpq/unit/cmdbtns/uniticons.grp and b/mpq/unit/cmdbtns/uniticons.grp differ
diff --git a/mpq/unit/wirefram/wirefram.grp b/mpq/unit/wirefram/wirefram.grp
index 7f3069b2..d49eefb2 100644
Binary files a/mpq/unit/wirefram/wirefram.grp and b/mpq/unit/wirefram/wirefram.grp differ
diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp
index 35ecf5e1..ad9c2934 100644
Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ