diff --git a/modeldef.chainsaw b/modeldef.chainsaw
index 61b59dd..d34dc1c 100644
--- a/modeldef.chainsaw
+++ b/modeldef.chainsaw
@@ -1,16 +1,3 @@
-Model "UTChainsaw"
-{
-	Path "models"
-	Model 1 "ChainSawPick_d.3d"
-	Skin 1 "JChainSawPick1.png"
-	Offset -10.5 -0.84 12
-	Scale 0.14 0.168 0.14
-	RollOffset -90
-	ROTATING
-
-	FrameIndex CSWP A 1 0
-}
-
 Model "UTChainsaw"
 {
 	Path "models"
@@ -21,6 +8,9 @@ Model "UTChainsaw"
 	RollOffset -90
 
 	FrameIndex CSWP B 1 0
+
+	ROTATING
+	FrameIndex CSWP A 1 0
 }
 
 Model "UTChainsaw"
diff --git a/modeldef.eightball b/modeldef.eightball
index ac2da89..f07c614 100644
--- a/modeldef.eightball
+++ b/modeldef.eightball
@@ -49,18 +49,6 @@ Model "UTRocket"
 	FrameIndex RCKT B 0 1
 }
 
-Model "UTRocketLauncher"
-{
-	Path "models"
-	Model 1 "Eight2Pick_d.3d"
-	Skin 1 "Eight_t.png"
-	Scale 0.24 0.24 0.288
-	AngleOffset 90
-	ZOffset 12
-	ROTATING
-
-	FrameIndex EBLP A 1 0
-}
 Model "UTRocketLauncher"
 {
 	Path "models"
@@ -71,6 +59,10 @@ Model "UTRocketLauncher"
 	ZOffset 6
 
 	FrameIndex EBLP B 1 0
+
+	ZOffset 12
+	ROTATING
+	FrameIndex EBLP A 1 0
 }
 
 Model "UTRocketLauncher"
diff --git a/modeldef.enforcer b/modeldef.enforcer
index 2c1c31d..fa2d7a9 100644
--- a/modeldef.enforcer
+++ b/modeldef.enforcer
@@ -31,75 +31,23 @@ Model "BulletImpact"
 {
 	Path "models"
 	Model 0 "BulletImpact_d.3d"
+	Scale 0.32 0.268 0.24
+	PitchOffset -90
+	USEACTORPITCH
+	USEACTORROLL
+	DONTCULLBACKFACES
 	Skin 0 "Impact_a00.png"
-	Scale 0.32 0.268 0.24
-	PitchOffset -90
-	USEACTORPITCH
-	USEACTORROLL
-	DONTCULLBACKFACES
 	FrameIndex BIMP A 0 0
-}
-Model "BulletImpact"
-{
-	Path "models"
-	Model 0 "BulletImpact_d.3d"
 	Skin 0 "Impact_a01.png"
-	Scale 0.32 0.268 0.24
-	PitchOffset -90
-	USEACTORPITCH
-	USEACTORROLL
-	DONTCULLBACKFACES
 	FrameIndex BIMP B 0 0
-}
-Model "BulletImpact"
-{
-	Path "models"
-	Model 0 "BulletImpact_d.3d"
 	Skin 0 "Impact_a02.png"
-	Scale 0.32 0.268 0.24
-	PitchOffset -90
-	USEACTORPITCH
-	USEACTORROLL
-	DONTCULLBACKFACES
 	FrameIndex BIMP C 0 0
-}
-Model "BulletImpact"
-{
-	Path "models"
-	Model 0 "BulletImpact_d.3d"
 	Skin 0 "Impact_a03.png"
-	Scale 0.32 0.268 0.24
-	PitchOffset -90
-	USEACTORPITCH
-	USEACTORROLL
-	DONTCULLBACKFACES
 	FrameIndex BIMP D 0 0
-}
-Model "BulletImpact"
-{
-	Path "models"
-	Model 0 "BulletImpact_d.3d"
 	Skin 0 "Impact_a04.png"
-	Scale 0.32 0.268 0.24
-	PitchOffset -90
-	USEACTORPITCH
-	USEACTORROLL
-	DONTCULLBACKFACES
 	FrameIndex BIMP E 0 0
 }
 
-Model "Enforcer"
-{
-	Path "models"
-	Model 1 "MagPick_d.3d"
-	Skin 1 "Jautot1.png"
-	Scale 0.1 0.1 0.12
-	AngleOffset 90
-	ZOffset 12
-	ROTATING
-
-	FrameIndex ENFP A 1 0
-}
 Model "Enforcer"
 {
 	Path "models"
@@ -110,6 +58,10 @@ Model "Enforcer"
 	ZOffset 6
 
 	FrameIndex ENFP B 1 0
+
+	ZOffset 12
+	ROTATING
+	FrameIndex ENFP A 1 0
 }
 
 Model "Enforcer"
@@ -123,38 +75,17 @@ Model "Enforcer"
 	Offset 10.4 -25.0 -2.9
 
 	FrameIndex EMUZ A 3 0
-}
-Model "Enforcer"
-{
-	Path "models"
-	Model 3 "Flat_d.3d"
-	Skin 3 "EMuz1.png"
-	AngleOffset 90
-	PitchOffset 90
+
 	Scale 0.04 0.04 0.04
 	Offset 1.9 -25.0 -9.3
 
 	FrameIndex EMUZ B 3 0
-}
-Model "Enforcer"
-{
-	Path "models"
-	Model 3 "Flat_d.3d"
-	Skin 3 "EMuz1.png"
-	AngleOffset 90
-	PitchOffset 90
+
 	Scale 0.04 0.04 0.04
 	Offset -10.4 -25.0 -2.9
 
 	FrameIndex EMUZ C 3 0
-}
-Model "Enforcer"
-{
-	Path "models"
-	Model 3 "Flat_d.3d"
-	Skin 3 "EMuz1.png"
-	AngleOffset 90
-	PitchOffset 90
+
 	Scale 0.04 0.04 0.04
 	Offset -1.9 -25.0 -9.3
 
diff --git a/modeldef.flak b/modeldef.flak
index 9b1bc2f..262a5b3 100644
--- a/modeldef.flak
+++ b/modeldef.flak
@@ -38,690 +38,114 @@ Model "FlakChunk"
 {
 	Path "models"
 	Model 0 "chunkm_d.3d"
+	Model 1 "chunk2m_d.3d"
+	Model 2 "chunk3m_d.3d"
+	Model 3 "chunk4m_d.3d"
+	Scale 0.06 0.06 0.072
+	ZOffset 2
+	USEACTORPITCH
+	USEACTORROLL
+	USEROTATIONCENTER
+	Rotation-Center 0 0 2
+
 	Skin 0 "chunk_a00.png"
-	Scale 0.06 0.06 0.072
-	ZOffset 2
-	USEACTORPITCH
-	USEACTORROLL
-	USEROTATIONCENTER
-	Rotation-Center 0 0 2
-
-	FrameIndex FCH1 A 0 0
-}
-Model "FlakChunk"
-{
-	Path "models"
-	Model 0 "chunkm_d.3d"
-	Skin 0 "chunk_a01.png"
-	Scale 0.06 0.06 0.072
-	ZOffset 2
-	USEACTORPITCH
-	USEACTORROLL
-	USEROTATIONCENTER
-	Rotation-Center 0 0 2
-
-	FrameIndex FCH1 B 0 0
-}
-Model "FlakChunk"
-{
-	Path "models"
-	Model 0 "chunkm_d.3d"
-	Skin 0 "chunk_a02.png"
-	Scale 0.06 0.06 0.072
-	ZOffset 2
-	USEACTORPITCH
-	USEACTORROLL
-	USEROTATIONCENTER
-	Rotation-Center 0 0 2
-
-	FrameIndex FCH1 C 0 0
-}
-Model "FlakChunk"
-{
-	Path "models"
-	Model 0 "chunkm_d.3d"
-	Skin 0 "chunk_a03.png"
-	Scale 0.06 0.06 0.072
-	ZOffset 2
-	USEACTORPITCH
-	USEACTORROLL
-	USEROTATIONCENTER
-	Rotation-Center 0 0 2
-
-	FrameIndex FCH1 D 0 0
-}
-Model "FlakChunk"
-{
-	Path "models"
-	Model 0 "chunkm_d.3d"
-	Skin 0 "chunk_a04.png"
-	Scale 0.06 0.06 0.072
-	ZOffset 2
-	USEACTORPITCH
-	USEACTORROLL
-	USEROTATIONCENTER
-	Rotation-Center 0 0 2
-
-	FrameIndex FCH1 E 0 0
-}
-Model "FlakChunk"
-{
-	Path "models"
-	Model 0 "chunkm_d.3d"
-	Skin 0 "chunk_a05.png"
-	Scale 0.06 0.06 0.072
-	ZOffset 2
-	USEACTORPITCH
-	USEACTORROLL
-	USEROTATIONCENTER
-	Rotation-Center 0 0 2
-
-	FrameIndex FCH1 F 0 0
-}
-Model "FlakChunk"
-{
-	Path "models"
-	Model 0 "chunkm_d.3d"
-	Skin 0 "chunk_a06.png"
-	Scale 0.06 0.06 0.072
-	ZOffset 2
-	USEACTORPITCH
-	USEACTORROLL
-	USEROTATIONCENTER
-	Rotation-Center 0 0 2
-
-	FrameIndex FCH1 G 0 0
-}
-Model "FlakChunk"
-{
-	Path "models"
-	Model 0 "chunkm_d.3d"
-	Skin 0 "chunk_a07.png"
-	Scale 0.06 0.06 0.072
-	ZOffset 2
-	USEACTORPITCH
-	USEACTORROLL
-	USEROTATIONCENTER
-	Rotation-Center 0 0 2
-
-	FrameIndex FCH1 H 0 0
-}
-Model "FlakChunk"
-{
-	Path "models"
-	Model 0 "chunkm_d.3d"
-	Skin 0 "chunk_a08.png"
-	Scale 0.06 0.06 0.072
-	ZOffset 2
-	USEACTORPITCH
-	USEACTORROLL
-	USEROTATIONCENTER
-	Rotation-Center 0 0 2
-
-	FrameIndex FCH1 I 0 0
-}
-Model "FlakChunk"
-{
-	Path "models"
-	Model 0 "chunkm_d.3d"
-	Skin 0 "chunk_a09.png"
-	Scale 0.06 0.06 0.072
-	ZOffset 2
-	USEACTORPITCH
-	USEACTORROLL
-	USEROTATIONCENTER
-	Rotation-Center 0 0 2
-
-	FrameIndex FCH1 J 0 0
-}
-Model "FlakChunk"
-{
-	Path "models"
-	Model 0 "chunkm_d.3d"
-	Skin 0 "chunk_a10.png"
-	Scale 0.06 0.06 0.072
-	ZOffset 2
-	USEACTORPITCH
-	USEACTORROLL
-	USEROTATIONCENTER
-	Rotation-Center 0 0 2
-
-	FrameIndex FCH1 K 0 0
-}
-Model "FlakChunk"
-{
-	Path "models"
-	Model 0 "chunkm_d.3d"
-	Skin 0 "chunk_a11.png"
-	Scale 0.06 0.06 0.072
-	ZOffset 2
-	USEACTORPITCH
-	USEACTORROLL
-	USEROTATIONCENTER
-	Rotation-Center 0 0 2
-
-	FrameIndex FCH1 L 0 0
-}
-
-Model "FlakChunk"
-{
-	Path "models"
-	Model 1 "chunk2m_d.3d"
 	Skin 1 "chunk_a00.png"
-	Scale 0.06 0.06 0.072
-	ZOffset 2
-	USEACTORPITCH
-	USEACTORROLL
-	USEROTATIONCENTER
-	Rotation-Center 0 0 2
-
-	FrameIndex FCH2 A 1 0
-}
-Model "FlakChunk"
-{
-	Path "models"
-	Model 1 "chunk2m_d.3d"
-	Skin 1 "chunk_a01.png"
-	Scale 0.06 0.06 0.072
-	ZOffset 2
-	USEACTORPITCH
-	USEACTORROLL
-	USEROTATIONCENTER
-	Rotation-Center 0 0 2
-
-	FrameIndex FCH2 B 1 0
-}
-Model "FlakChunk"
-{
-	Path "models"
-	Model 1 "chunk2m_d.3d"
-	Skin 1 "chunk_a02.png"
-	Scale 0.06 0.06 0.072
-	ZOffset 2
-	USEACTORPITCH
-	USEACTORROLL
-	USEROTATIONCENTER
-	Rotation-Center 0 0 2
-
-	FrameIndex FCH2 C 1 0
-}
-Model "FlakChunk"
-{
-	Path "models"
-	Model 1 "chunk2m_d.3d"
-	Skin 1 "chunk_a03.png"
-	Scale 0.06 0.06 0.072
-	ZOffset 2
-	USEACTORPITCH
-	USEACTORROLL
-	USEROTATIONCENTER
-	Rotation-Center 0 0 2
-
-	FrameIndex FCH2 D 1 0
-}
-Model "FlakChunk"
-{
-	Path "models"
-	Model 1 "chunk2m_d.3d"
-	Skin 1 "chunk_a04.png"
-	Scale 0.06 0.06 0.072
-	ZOffset 2
-	USEACTORPITCH
-	USEACTORROLL
-	USEROTATIONCENTER
-	Rotation-Center 0 0 2
-
-	FrameIndex FCH2 E 1 0
-}
-Model "FlakChunk"
-{
-	Path "models"
-	Model 1 "chunk2m_d.3d"
-	Skin 1 "chunk_a05.png"
-	Scale 0.06 0.06 0.072
-	ZOffset 2
-	USEACTORPITCH
-	USEACTORROLL
-	USEROTATIONCENTER
-	Rotation-Center 0 0 2
-
-	FrameIndex FCH2 F 1 0
-}
-Model "FlakChunk"
-{
-	Path "models"
-	Model 1 "chunk2m_d.3d"
-	Skin 1 "chunk_a06.png"
-	Scale 0.06 0.06 0.072
-	ZOffset 2
-	USEACTORPITCH
-	USEACTORROLL
-	USEROTATIONCENTER
-	Rotation-Center 0 0 2
-
-	FrameIndex FCH2 G 1 0
-}
-Model "FlakChunk"
-{
-	Path "models"
-	Model 1 "chunk2m_d.3d"
-	Skin 1 "chunk_a07.png"
-	Scale 0.06 0.06 0.072
-	ZOffset 2
-	USEACTORPITCH
-	USEACTORROLL
-	USEROTATIONCENTER
-	Rotation-Center 0 0 2
-
-	FrameIndex FCH2 H 1 0
-}
-Model "FlakChunk"
-{
-	Path "models"
-	Model 1 "chunk2m_d.3d"
-	Skin 1 "chunk_a08.png"
-	Scale 0.06 0.06 0.072
-	ZOffset 2
-	USEACTORPITCH
-	USEACTORROLL
-	USEROTATIONCENTER
-	Rotation-Center 0 0 2
-
-	FrameIndex FCH2 I 1 0
-}
-Model "FlakChunk"
-{
-	Path "models"
-	Model 1 "chunk2m_d.3d"
-	Skin 1 "chunk_a09.png"
-	Scale 0.06 0.06 0.072
-	ZOffset 2
-	USEACTORPITCH
-	USEACTORROLL
-	USEROTATIONCENTER
-	Rotation-Center 0 0 2
-
-	FrameIndex FCH2 J 1 0
-}
-Model "FlakChunk"
-{
-	Path "models"
-	Model 1 "chunk2m_d.3d"
-	Skin 1 "chunk_a10.png"
-	Scale 0.06 0.06 0.072
-	ZOffset 2
-	USEACTORPITCH
-	USEACTORROLL
-	USEROTATIONCENTER
-	Rotation-Center 0 0 2
-
-	FrameIndex FCH2 K 1 0
-}
-Model "FlakChunk"
-{
-	Path "models"
-	Model 1 "chunk2m_d.3d"
-	Skin 1 "chunk_a11.png"
-	Scale 0.06 0.06 0.072
-	ZOffset 2
-	USEACTORPITCH
-	USEACTORROLL
-	USEROTATIONCENTER
-	Rotation-Center 0 0 2
-
-	FrameIndex FCH2 L 1 0
-}
-
-Model "FlakChunk"
-{
-	Path "models"
-	Model 2 "chunk3m_d.3d"
 	Skin 2 "chunk_a00.png"
-	Scale 0.06 0.06 0.072
-	ZOffset 2
-	USEACTORPITCH
-	USEACTORROLL
-	USEROTATIONCENTER
-	Rotation-Center 0 0 2
-
-	FrameIndex FCH3 A 2 0
-}
-Model "FlakChunk"
-{
-	Path "models"
-	Model 2 "chunk3m_d.3d"
-	Skin 2 "chunk_a01.png"
-	Scale 0.06 0.06 0.072
-	ZOffset 2
-	USEACTORPITCH
-	USEACTORROLL
-	USEROTATIONCENTER
-	Rotation-Center 0 0 2
-
-	FrameIndex FCH3 B 2 0
-}
-Model "FlakChunk"
-{
-	Path "models"
-	Model 2 "chunk3m_d.3d"
-	Skin 2 "chunk_a02.png"
-	Scale 0.06 0.06 0.072
-	ZOffset 2
-	USEACTORPITCH
-	USEACTORROLL
-	USEROTATIONCENTER
-	Rotation-Center 0 0 2
-
-	FrameIndex FCH3 C 2 0
-}
-Model "FlakChunk"
-{
-	Path "models"
-	Model 2 "chunk3m_d.3d"
-	Skin 2 "chunk_a03.png"
-	Scale 0.06 0.06 0.072
-	ZOffset 2
-	USEACTORPITCH
-	USEACTORROLL
-	USEROTATIONCENTER
-	Rotation-Center 0 0 2
-
-	FrameIndex FCH3 D 2 0
-}
-Model "FlakChunk"
-{
-	Path "models"
-	Model 2 "chunk3m_d.3d"
-	Skin 2 "chunk_a04.png"
-	Scale 0.06 0.06 0.072
-	ZOffset 2
-	USEACTORPITCH
-	USEACTORROLL
-	USEROTATIONCENTER
-	Rotation-Center 0 0 2
-
-	FrameIndex FCH3 E 2 0
-}
-Model "FlakChunk"
-{
-	Path "models"
-	Model 2 "chunk3m_d.3d"
-	Skin 2 "chunk_a05.png"
-	Scale 0.06 0.06 0.072
-	ZOffset 2
-	USEACTORPITCH
-	USEACTORROLL
-	USEROTATIONCENTER
-	Rotation-Center 0 0 2
-
-	FrameIndex FCH3 F 2 0
-}
-Model "FlakChunk"
-{
-	Path "models"
-	Model 2 "chunk3m_d.3d"
-	Skin 2 "chunk_a06.png"
-	Scale 0.06 0.06 0.072
-	ZOffset 2
-	USEACTORPITCH
-	USEACTORROLL
-	USEROTATIONCENTER
-	Rotation-Center 0 0 2
-
-	FrameIndex FCH3 G 2 0
-}
-Model "FlakChunk"
-{
-	Path "models"
-	Model 2 "chunk3m_d.3d"
-	Skin 2 "chunk_a07.png"
-	Scale 0.06 0.06 0.072
-	ZOffset 2
-	USEACTORPITCH
-	USEACTORROLL
-	USEROTATIONCENTER
-	Rotation-Center 0 0 2
-
-	FrameIndex FCH3 H 2 0
-}
-Model "FlakChunk"
-{
-	Path "models"
-	Model 2 "chunk3m_d.3d"
-	Skin 2 "chunk_a08.png"
-	Scale 0.06 0.06 0.072
-	ZOffset 2
-	USEACTORPITCH
-	USEACTORROLL
-	USEROTATIONCENTER
-	Rotation-Center 0 0 2
-
-	FrameIndex FCH3 I 2 0
-}
-Model "FlakChunk"
-{
-	Path "models"
-	Model 2 "chunk3m_d.3d"
-	Skin 2 "chunk_a09.png"
-	Scale 0.06 0.06 0.072
-	ZOffset 2
-	USEACTORPITCH
-	USEACTORROLL
-	USEROTATIONCENTER
-	Rotation-Center 0 0 2
-
-	FrameIndex FCH3 J 2 0
-}
-Model "FlakChunk"
-{
-	Path "models"
-	Model 2 "chunk3m_d.3d"
-	Skin 2 "chunk_a10.png"
-	Scale 0.06 0.06 0.072
-	ZOffset 2
-	USEACTORPITCH
-	USEACTORROLL
-	USEROTATIONCENTER
-	Rotation-Center 0 0 2
-
-	FrameIndex FCH3 K 2 0
-}
-Model "FlakChunk"
-{
-	Path "models"
-	Model 2 "chunk3m_d.3d"
-	Skin 2 "chunk_a11.png"
-	Scale 0.06 0.06 0.072
-	ZOffset 2
-	USEACTORPITCH
-	USEACTORROLL
-	USEROTATIONCENTER
-	Rotation-Center 0 0 2
-
-	FrameIndex FCH3 L 2 0
-}
-
-Model "FlakChunk"
-{
-	Path "models"
-	Model 3 "chunk4m_d.3d"
 	Skin 3 "chunk_a00.png"
-	Scale 0.06 0.06 0.072
-	ZOffset 2
-	USEACTORPITCH
-	USEACTORROLL
-	USEROTATIONCENTER
-	Rotation-Center 0 0 2
-
+	FrameIndex FCH1 A 0 0
+	FrameIndex FCH2 A 1 0
+	FrameIndex FCH3 A 2 0
 	FrameIndex FCH4 A 3 0
-}
-Model "FlakChunk"
-{
-	Path "models"
-	Model 3 "chunk4m_d.3d"
+	Skin 0 "chunk_a01.png"
+	Skin 1 "chunk_a01.png"
+	Skin 2 "chunk_a01.png"
 	Skin 3 "chunk_a01.png"
-	Scale 0.06 0.06 0.072
-	ZOffset 2
-	USEACTORPITCH
-	USEACTORROLL
-	USEROTATIONCENTER
-	Rotation-Center 0 0 2
-
+	FrameIndex FCH1 B 0 0
+	FrameIndex FCH2 B 1 0
+	FrameIndex FCH3 B 2 0
 	FrameIndex FCH4 B 3 0
-}
-Model "FlakChunk"
-{
-	Path "models"
-	Model 3 "chunk4m_d.3d"
+	Skin 0 "chunk_a02.png"
+	Skin 1 "chunk_a02.png"
+	Skin 2 "chunk_a02.png"
 	Skin 3 "chunk_a02.png"
-	Scale 0.06 0.06 0.072
-	ZOffset 2
-	USEACTORPITCH
-	USEACTORROLL
-	USEROTATIONCENTER
-	Rotation-Center 0 0 2
-
+	FrameIndex FCH1 C 0 0
+	FrameIndex FCH2 C 1 0
+	FrameIndex FCH3 C 2 0
 	FrameIndex FCH4 C 3 0
-}
-Model "FlakChunk"
-{
-	Path "models"
-	Model 3 "chunk4m_d.3d"
+	Skin 0 "chunk_a03.png"
+	Skin 1 "chunk_a03.png"
+	Skin 2 "chunk_a03.png"
 	Skin 3 "chunk_a03.png"
-	Scale 0.06 0.06 0.072
-	ZOffset 2
-	USEACTORPITCH
-	USEACTORROLL
-	USEROTATIONCENTER
-	Rotation-Center 0 0 2
-
+	FrameIndex FCH1 D 0 0
+	FrameIndex FCH2 D 1 0
+	FrameIndex FCH3 D 2 0
 	FrameIndex FCH4 D 3 0
-}
-Model "FlakChunk"
-{
-	Path "models"
-	Model 3 "chunk4m_d.3d"
+	Skin 0 "chunk_a04.png"
+	Skin 1 "chunk_a04.png"
+	Skin 2 "chunk_a04.png"
 	Skin 3 "chunk_a04.png"
-	Scale 0.06 0.06 0.072
-	ZOffset 2
-	USEACTORPITCH
-	USEACTORROLL
-	USEROTATIONCENTER
-	Rotation-Center 0 0 2
-
+	FrameIndex FCH1 E 0 0
+	FrameIndex FCH2 E 1 0
+	FrameIndex FCH3 E 2 0
 	FrameIndex FCH4 E 3 0
-}
-Model "FlakChunk"
-{
-	Path "models"
-	Model 3 "chunk4m_d.3d"
+	Skin 0 "chunk_a05.png"
+	Skin 1 "chunk_a05.png"
+	Skin 2 "chunk_a05.png"
 	Skin 3 "chunk_a05.png"
-	Scale 0.06 0.06 0.072
-	ZOffset 2
-	USEACTORPITCH
-	USEACTORROLL
-	USEROTATIONCENTER
-	Rotation-Center 0 0 2
-
+	FrameIndex FCH1 F 0 0
+	FrameIndex FCH2 F 1 0
+	FrameIndex FCH3 F 2 0
 	FrameIndex FCH4 F 3 0
-}
-Model "FlakChunk"
-{
-	Path "models"
-	Model 3 "chunk4m_d.3d"
+	Skin 0 "chunk_a06.png"
+	Skin 1 "chunk_a06.png"
+	Skin 2 "chunk_a06.png"
 	Skin 3 "chunk_a06.png"
-	Scale 0.06 0.06 0.072
-	ZOffset 2
-	USEACTORPITCH
-	USEACTORROLL
-	USEROTATIONCENTER
-	Rotation-Center 0 0 2
-
+	FrameIndex FCH1 G 0 0
+	FrameIndex FCH2 G 1 0
+	FrameIndex FCH3 G 2 0
 	FrameIndex FCH4 G 3 0
-}
-Model "FlakChunk"
-{
-	Path "models"
-	Model 3 "chunk4m_d.3d"
+	Skin 0 "chunk_a07.png"
+	Skin 1 "chunk_a07.png"
+	Skin 2 "chunk_a07.png"
 	Skin 3 "chunk_a07.png"
-	Scale 0.06 0.06 0.072
-	ZOffset 2
-	USEACTORPITCH
-	USEACTORROLL
-	USEROTATIONCENTER
-	Rotation-Center 0 0 2
-
+	FrameIndex FCH1 H 0 0
+	FrameIndex FCH2 H 1 0
+	FrameIndex FCH3 H 2 0
 	FrameIndex FCH4 H 3 0
-}
-Model "FlakChunk"
-{
-	Path "models"
-	Model 3 "chunk4m_d.3d"
+	Skin 0 "chunk_a08.png"
+	Skin 1 "chunk_a08.png"
+	Skin 2 "chunk_a08.png"
 	Skin 3 "chunk_a08.png"
-	Scale 0.06 0.06 0.072
-	ZOffset 2
-	USEACTORPITCH
-	USEACTORROLL
-	USEROTATIONCENTER
-	Rotation-Center 0 0 2
-
+	FrameIndex FCH1 I 0 0
+	FrameIndex FCH2 I 1 0
+	FrameIndex FCH3 I 2 0
 	FrameIndex FCH4 I 3 0
-}
-Model "FlakChunk"
-{
-	Path "models"
-	Model 3 "chunk4m_d.3d"
+	Skin 0 "chunk_a09.png"
+	Skin 1 "chunk_a09.png"
+	Skin 2 "chunk_a09.png"
 	Skin 3 "chunk_a09.png"
-	Scale 0.06 0.06 0.072
-	ZOffset 2
-	USEACTORPITCH
-	USEACTORROLL
-	USEROTATIONCENTER
-	Rotation-Center 0 0 2
-
+	FrameIndex FCH1 J 0 0
+	FrameIndex FCH2 J 1 0
+	FrameIndex FCH3 J 2 0
 	FrameIndex FCH4 J 3 0
-}
-Model "FlakChunk"
-{
-	Path "models"
-	Model 3 "chunk4m_d.3d"
+	Skin 0 "chunk_a10.png"
+	Skin 1 "chunk_a10.png"
+	Skin 2 "chunk_a10.png"
 	Skin 3 "chunk_a10.png"
-	Scale 0.06 0.06 0.072
-	ZOffset 2
-	USEACTORPITCH
-	USEACTORROLL
-	USEROTATIONCENTER
-	Rotation-Center 0 0 2
-
+	FrameIndex FCH1 K 0 0
+	FrameIndex FCH2 K 1 0
+	FrameIndex FCH3 K 2 0
 	FrameIndex FCH4 K 3 0
-}
-Model "FlakChunk"
-{
-	Path "models"
-	Model 3 "chunk4m_d.3d"
+	Skin 0 "chunk_a11.png"
+	Skin 1 "chunk_a11.png"
+	Skin 2 "chunk_a11.png"
 	Skin 3 "chunk_a11.png"
-	Scale 0.06 0.06 0.072
-	ZOffset 2
-	USEACTORPITCH
-	USEACTORROLL
-	USEROTATIONCENTER
-	Rotation-Center 0 0 2
-
+	FrameIndex FCH1 L 0 0
+	FrameIndex FCH2 L 1 0
+	FrameIndex FCH3 L 2 0
 	FrameIndex FCH4 L 3 0
 }
 
-Model "FlakCannon"
-{
-	Path "models"
-	Model 1 "flak2pick_d.3d"
-	Skin 1 "flak_t.png"
-	AngleOffset 90
-	Scale 0.14 0.14 0.168
-	Offset 18.9 0 12
-	ROTATING
-
-	FrameIndex FPCK A 1 0
-}
 Model "FlakCannon"
 {
 	Path "models"
@@ -732,6 +156,9 @@ Model "FlakCannon"
 	Offset 18.9 0 12
 
 	FrameIndex FPCK B 1 0
+
+	ROTATING
+	FrameIndex FPCK A 1 0
 }
 
 Model "FlakCannon"
diff --git a/modeldef.ges b/modeldef.ges
index 0812f81..4223f5d 100644
--- a/modeldef.ges
+++ b/modeldef.ges
@@ -227,18 +227,6 @@ Model "BioGlob"
 	FrameIndex GELX L 0 55
 }
 
-Model "BioRifle"
-{
-	Path "models"
-	Model 1 "BRifle2Pick_d.3d"
-	Skin 1 "JBRifle2.png"
-	Scale 0.1 0.1 0.12
-	AngleOffset 90
-	ZOffset 12
-	ROTATING
-
-	FrameIndex BIOP A 1 0
-}
 Model "BioRifle"
 {
 	Path "models"
@@ -249,6 +237,10 @@ Model "BioRifle"
 	ZOffset 10
 
 	FrameIndex BIOP B 1 0
+
+	ZOffset 12
+	ROTATING
+	FrameIndex BIOP A 1 0
 }
 
 Model "BioRifle"
diff --git a/modeldef.impact b/modeldef.impact
index b0f3ae3..d0c67a8 100644
--- a/modeldef.impact
+++ b/modeldef.impact
@@ -1,15 +1,4 @@
-Model "ImpactHammer"
-{
-	Path "models"
-	Model 1 "ImpPick_d.3d"
-	Skin 1 "JImpPick1.png"
-	Scale 0.2 0.24 0.2
-	RollOffset -90
-	ZOffset 12
-	ROTATING
 
-	FrameIndex IMPP A 1 0
-}
 Model "ImpactHammer"
 {
 	Path "models"
@@ -20,6 +9,10 @@ Model "ImpactHammer"
 	ZOffset 9
 
 	FrameIndex IMPP B 1 0
+
+	ZOffset 12
+	ROTATING
+	FrameIndex IMPP A 1 0
 }
 
 Model "ImpactHammer"
diff --git a/modeldef.minigun b/modeldef.minigun
index 6f960f3..ab51339 100644
--- a/modeldef.minigun
+++ b/modeldef.minigun
@@ -23,18 +23,6 @@ Model "MinigunTracer"
 	FrameIndex TRAC A 0 0
 }
 
-Model "Minigun"
-{
-	Path "models"
-	Model 1 "MinigunPick_d.3d"
-	Skin 1 "Mini_t.png"
-	Scale 0.2 0.2 0.24
-	AngleOffset 90
-	ZOffset 12
-	ROTATING
-
-	FrameIndex MGNP A 1 0
-}
 Model "Minigun"
 {
 	Path "models"
@@ -45,114 +33,38 @@ Model "Minigun"
 	ZOffset 6
 
 	FrameIndex MGNP B 1 0
+
+	ZOffset 12
+	ROTATING
+	FrameIndex MGNP A 1 0
 }
 
 Model "Minigun"
 {
 	Path "models"
 	Model 2 "Flat_d.3d"
+	Scale 0.08 0.08 0.08
+	Offset 5.0 -32.0 -8.0
+	AngleOffset 90
+	PitchOffset 90
+
 	Skin 2 "Muz1.png"
-	Scale 0.08 0.08 0.08
-	Offset 5.0 -32.0 -8.0
-	AngleOffset 90
-	PitchOffset 90
-
 	FrameIndex MMUZ A 2 0
-}
-Model "Minigun"
-{
-	Path "models"
-	Model 2 "Flat_d.3d"
 	Skin 2 "Muz2.png"
-	Scale 0.08 0.08 0.08
-	Offset 5.0 -32.0 -8.0
-	AngleOffset 90
-	PitchOffset 90
-
 	FrameIndex MMUZ B 2 0
-}
-Model "Minigun"
-{
-	Path "models"
-	Model 2 "Flat_d.3d"
 	Skin 2 "Muz3.png"
-	Scale 0.08 0.08 0.08
-	Offset 5.0 -32.0 -8.0
-	AngleOffset 90
-	PitchOffset 90
-
 	FrameIndex MMUZ C 2 0
-}
-Model "Minigun"
-{
-	Path "models"
-	Model 2 "Flat_d.3d"
 	Skin 2 "Muz4.png"
-	Scale 0.08 0.08 0.08
-	Offset 5.0 -32.0 -8.0
-	AngleOffset 90
-	PitchOffset 90
-
 	FrameIndex MMUZ D 2 0
-}
-Model "Minigun"
-{
-	Path "models"
-	Model 2 "Flat_d.3d"
 	Skin 2 "Muz5.png"
-	Scale 0.08 0.08 0.08
-	Offset 5.0 -32.0 -8.0
-	AngleOffset 90
-	PitchOffset 90
-
 	FrameIndex MMUZ E 2 0
-}
-Model "Minigun"
-{
-	Path "models"
-	Model 2 "Flat_d.3d"
 	Skin 2 "Muz6.png"
-	Scale 0.08 0.08 0.08
-	Offset 5.0 -32.0 -8.0
-	AngleOffset 90
-	PitchOffset 90
-
 	FrameIndex MMUZ F 2 0
-}
-Model "Minigun"
-{
-	Path "models"
-	Model 2 "Flat_d.3d"
 	Skin 2 "Muz7.png"
-	Scale 0.08 0.08 0.08
-	Offset 5.0 -32.0 -8.0
-	AngleOffset 90
-	PitchOffset 90
-
 	FrameIndex MMUZ G 2 0
-}
-Model "Minigun"
-{
-	Path "models"
-	Model 2 "Flat_d.3d"
 	Skin 2 "Muz8.png"
-	Scale 0.08 0.08 0.08
-	Offset 5.0 -32.0 -8.0
-	AngleOffset 90
-	PitchOffset 90
-
 	FrameIndex MMUZ H 2 0
-}
-Model "Minigun"
-{
-	Path "models"
-	Model 2 "Flat_d.3d"
 	Skin 2 "Muz9.png"
-	Scale 0.08 0.08 0.08
-	Offset 5.0 -32.0 -8.0
-	AngleOffset 90
-	PitchOffset 90
-
 	FrameIndex MMUZ I 2 0
 }
 
diff --git a/modeldef.pulse b/modeldef.pulse
index b3d6076..c8e14df 100644
--- a/modeldef.pulse
+++ b/modeldef.pulse
@@ -13,70 +13,22 @@ Model "PulseBolt"
 {
 	Path "models"
 	Model 0 "PBolt_d.3d"
+	Offset 20.25 0 0
+	Scale 0.2025 0.10125 0.1215
+	AngleOffset 90
+	DONTCULLBACKFACES
+	USEACTORPITCH
+	USEACTORROLL
+
 	Skin 0 "pbolt0.png"
-	Offset 20.25 0 0
-	Scale 0.2025 0.10125 0.1215
-	AngleOffset 90
-	DONTCULLBACKFACES
-	USEACTORPITCH
-	USEACTORROLL
-
 	FrameIndex PBLT A 0 0
-}
-Model "PulseBolt"
-{
-	Path "models"
-	Model 0 "PBolt_d.3d"
 	Skin 0 "pbolt1.png"
-	Offset 20.25 0 0
-	Scale 0.2025 0.10125 0.1215
-	AngleOffset 90
-	DONTCULLBACKFACES
-	USEACTORPITCH
-	USEACTORROLL
-
 	FrameIndex PBLT B 0 0
-}
-Model "PulseBolt"
-{
-	Path "models"
-	Model 0 "PBolt_d.3d"
 	Skin 0 "pbolt2.png"
-	Offset 20.25 0 0
-	Scale 0.2025 0.10125 0.1215
-	AngleOffset 90
-	DONTCULLBACKFACES
-	USEACTORPITCH
-	USEACTORROLL
-
 	FrameIndex PBLT C 0 0
-}
-Model "PulseBolt"
-{
-	Path "models"
-	Model 0 "PBolt_d.3d"
 	Skin 0 "pbolt3.png"
-	Offset 20.25 0 0
-	Scale 0.2025 0.10125 0.1215
-	AngleOffset 90
-	DONTCULLBACKFACES
-	USEACTORPITCH
-	USEACTORROLL
-
 	FrameIndex PBLT D 0 0
-}
-Model "PulseBolt"
-{
-	Path "models"
-	Model 0 "PBolt_d.3d"
 	Skin 0 "pbolt4.png"
-	Offset 20.25 0 0
-	Scale 0.2025 0.10125 0.1215
-	AngleOffset 90
-	DONTCULLBACKFACES
-	USEACTORPITCH
-	USEACTORROLL
-
 	FrameIndex PBLT E 0 0
 }
 
@@ -84,84 +36,25 @@ Model "StarterBolt"
 {
 	Path "models"
 	Model 0 "PBolt_d.3d"
+	Offset 20.25 0 0
+	Scale 0.2025 0.10125 0.1215
+	AngleOffset 90
+	DONTCULLBACKFACES
+	USEACTORPITCH
+	USEACTORROLL
+
 	Skin 0 "sbolt0.png"
-	Offset 20.25 0 0
-	Scale 0.2025 0.10125 0.1215
-	AngleOffset 90
-	DONTCULLBACKFACES
-	USEACTORPITCH
-	USEACTORROLL
-
 	FrameIndex PBLT A 0 0
-}
-Model "StarterBolt"
-{
-	Path "models"
-	Model 0 "PBolt_d.3d"
 	Skin 0 "sbolt1.png"
-	Offset 20.25 0 0
-	Scale 0.2025 0.10125 0.1215
-	AngleOffset 90
-	DONTCULLBACKFACES
-	USEACTORPITCH
-	USEACTORROLL
-
 	FrameIndex PBLT B 0 0
-}
-Model "StarterBolt"
-{
-	Path "models"
-	Model 0 "PBolt_d.3d"
 	Skin 0 "sbolt2.png"
-	Offset 20.25 0 0
-	Scale 0.2025 0.10125 0.1215
-	AngleOffset 90
-	DONTCULLBACKFACES
-	USEACTORPITCH
-	USEACTORROLL
-
 	FrameIndex PBLT C 0 0
-}
-Model "StarterBolt"
-{
-	Path "models"
-	Model 0 "PBolt_d.3d"
 	Skin 0 "sbolt3.png"
-	Offset 20.25 0 0
-	Scale 0.2025 0.10125 0.1215
-	AngleOffset 90
-	DONTCULLBACKFACES
-	USEACTORPITCH
-	USEACTORROLL
-
 	FrameIndex PBLT D 0 0
-}
-Model "StarterBolt"
-{
-	Path "models"
-	Model 0 "PBolt_d.3d"
 	Skin 0 "sbolt4.png"
-	Offset 20.25 0 0
-	Scale 0.2025 0.10125 0.1215
-	AngleOffset 90
-	DONTCULLBACKFACES
-	USEACTORPITCH
-	USEACTORROLL
-
 	FrameIndex PBLT E 0 0
 }
 
-Model "PulseGun"
-{
-	Path "models"
-	Model 1 "PulsePickup_d.3d"
-	Skin 1 "JPulsePickup_01.png"
-	Scale 0.16 0.16 0.192
-	ZOffset 12
-	ROTATING
-
-	FrameIndex PGNP A 1 0
-}
 Model "PulseGun"
 {
 	Path "models"
@@ -171,6 +64,10 @@ Model "PulseGun"
 	ZOffset 8
 
 	FrameIndex PGNP B 1 0
+
+	ZOffset 12
+	ROTATING
+	FrameIndex PGNP A 1 0
 }
 
 Model "PulseGun"
diff --git a/modeldef.rifle b/modeldef.rifle
index 47497e6..1cc3e08 100644
--- a/modeldef.rifle
+++ b/modeldef.rifle
@@ -20,18 +20,6 @@ Model "RifleAmmo2"
 	FrameIndex SRND A 0 0
 }
 
-Model "SniperRifle"
-{
-	Path "models"
-	Model 1 "RiflePick_d.3d"
-	Skin 1 "JRifle2.png"
-	Scale 0.2 0.2 0.24
-	AngleOffset 90
-	ZOffset 12
-	ROTATING
-
-	FrameIndex SRFP A 1 0
-}
 Model "SniperRifle"
 {
 	Path "models"
@@ -42,6 +30,10 @@ Model "SniperRifle"
 	ZOffset 6
 
 	FrameIndex SRFP B 1 0
+
+	ZOffset 12
+	ROTATING
+	FrameIndex SRFP A 1 0
 }
 Model "SniperRifle"
 {
diff --git a/modeldef.ripper b/modeldef.ripper
index 5aff58e..601bad3 100644
--- a/modeldef.ripper
+++ b/modeldef.ripper
@@ -9,18 +9,6 @@ Model "RipperAmmo"
 	FrameIndex BHOP A 0 0
 }
 
-Model "Ripper2"
-{
-	Path "models"
-	Model 1 "RazPick2_d.3d"
-	Skin 1 "JRazorw.png"
-	Scale 0.2 0.2 0.24
-	AngleOffset 90
-	ZOffset 12
-	ROTATING
-
-	FrameIndex RZRP A 1 0
-}
 Model "Ripper2"
 {
 	Path "models"
@@ -31,6 +19,10 @@ Model "Ripper2"
 	ZOffset 10
 
 	FrameIndex RZRP B 1 0
+
+	ZOffset 12
+	ROTATING
+	FrameIndex RZRP A 1 0
 }
 
 Model "Razor2"
diff --git a/modeldef.shock b/modeldef.shock
index e96e87c..821d553 100644
--- a/modeldef.shock
+++ b/modeldef.shock
@@ -132,18 +132,6 @@ Model "SuperShockBlastRing"
 	FrameIndex SRNG I 0 8
 }
 
-Model "ShockRifle"
-{
-	Path "models"
-	Model 1 "asmd2pick_d.3d"
-	Skin 1 "asmd_t.png"
-	AngleOffset 90
-	Scale 0.14 0.14 0.18
-	ZOffset 12
-	ROTATING
-
-	FrameIndex ASMP A 1 0
-}
 Model "ShockRifle"
 {
 	Path "models"
@@ -154,6 +142,10 @@ Model "ShockRifle"
 	ZOffset 4
 
 	FrameIndex ASMP B 1 0
+
+	ZOffset 12
+	ROTATING
+	FrameIndex ASMP A 1 0
 }
 
 Model "ShockRifle"
diff --git a/modeldef.transloc b/modeldef.transloc
index 622ce32..a4f09d6 100644
--- a/modeldef.transloc
+++ b/modeldef.transloc
@@ -12,19 +12,6 @@ Model "TranslocatorModule"
 	FrameIndex TMOD C 0 2
 }
 
-Model "Translocator"
-{
-	Path "models"
-	Model 1 "Trans3loc_d.3d"
-	SurfaceSkin 1 0 "tloc1_.png"
-	SurfaceSkin 1 1 "tloc2_.png"
-	Scale 0.046 0.046 0.0552
-	AngleOffset -90
-	ZOffset 12
-	ROTATING
-
-	FrameIndex TLCP A 1 0
-}
 Model "Translocator"
 {
 	Path "models"
@@ -36,6 +23,10 @@ Model "Translocator"
 	ZOffset 1
 
 	FrameIndex TLCP B 1 0
+
+	ZOffset 12
+	ROTATING
+	FrameIndex TLCP A 1 0
 }
 
 Model "Translocator"
diff --git a/modeldef.warhead b/modeldef.warhead
index b967b14..7f5e670 100644
--- a/modeldef.warhead
+++ b/modeldef.warhead
@@ -48,18 +48,6 @@ Model "GuidedWarShell"
 	FrameIndex WMIS A 0 0
 }
 
-Model "WarheadLauncher"
-{
-	Path "models"
-	Model 1 "whpick_d.3d"
-	Skin 1 "jwhpick1.png"
-	Scale 0.2 0.24 0.2
-	ZOffset 12
-	RollOffset -90
-	ROTATING
-
-	FrameIndex RDMP A 1 0
-}
 Model "WarheadLauncher"
 {
 	Path "models"
@@ -70,6 +58,10 @@ Model "WarheadLauncher"
 	ZOffset 11
 
 	FrameIndex RDMP B 1 0
+
+	ZOffset 12
+	ROTATING
+	FrameIndex RDMP A 1 0
 }
 
 Model "WarheadLauncher"