diff --git a/gldefs.txt b/gldefs.txt
index ef36e1b..cc1da9c 100644
--- a/gldefs.txt
+++ b/gldefs.txt
@@ -530,10 +530,6 @@ HardwareShader Texture "models/JTranslator1.png"
 {
 	Shader "shaders/glsl/AmbientGlow_Brightmapped.fp"
 }
-HardwareShader Texture "models/ShieldSuit.png"
-{
-	Shader "shaders/glsl/AmbientGlow.fp"
-}
 /*Brightmap Texture "models/JBigFlash1.png"
 {
 	Map "brightmaps/JBigFlash1.png"
diff --git a/modeldef.chainsaw b/modeldef.chainsaw
index 0e40780..faf11c1 100644
--- a/modeldef.chainsaw
+++ b/modeldef.chainsaw
@@ -3,9 +3,9 @@ Model "UTChainsaw"
 	Path "models"
 	Model 1 "ChainSawPick_d.3d"
 	Skin 1 "JChainSawPick1.png"
-	Offset -1.68 -4 12
-	Scale -0.168 0.14 0.14
-	AngleOffset 180
+	Offset -10.5 -0.84 12
+	Scale 0.14 0.168 0.14
+	RollOffset -90
 	ROTATING
 
 	FrameIndex CSWP A 1 0
@@ -16,9 +16,9 @@ Model "UTChainsaw"
 	Path "models"
 	Model 1 "ChainSawPick_d.3d"
 	Skin 1 "JChainSawPick1.png"
-	Offset -1.68 -4 6
-	Scale -0.168 0.14 0.14
-	AngleOffset 180
+	Offset -10.5 -0.84 12
+	Scale 0.14 0.168 0.14
+	RollOffset -90
 
 	FrameIndex CSWP B 1 0
 }
@@ -31,10 +31,12 @@ Model "UTChainsaw"
 	SurfaceSkin 0 1 "Jchainsaw2.png"
 	SurfaceSkin 0 2 "Jchainsaw3.png"
 	SurfaceSkin 0 3 "Jchainsaw4.png"
-	Scale 0.2 0.16 0.18
-	Offset 3.5 -12.8 -7.2
-	AngleOffset 268
-	PitchOffset 90
+	Scale -0.24 0.12 0.24
+	Offset 5.6 -14.8 -7.2
+	// these adjustments are my own so it looks right, otherwise it just clips through the screen
+	// this kinda happens in UT too, since it was made without widescreen in mind
+	AngleOffset 5
+	PitchOffset 10
 
 	// select
 	FrameIndex CSWS A 0 2
diff --git a/modeldef.eightball b/modeldef.eightball
index 1aa2365..279660c 100644
--- a/modeldef.eightball
+++ b/modeldef.eightball
@@ -3,9 +3,9 @@ Model "UTRocketAmmo"
 	Path "models"
 	Model 0 "RocketPackMesh_d.3d"
 	Skin 0 "JRocketPack1.png"
-	Scale 0.072 -0.0864 0.072
-	AngleOffset 270
-	ZOffset 6
+	Scale 0.072 0.0864 0.072
+	RollOffset -90
+	ZOffset 7
 
 	FrameIndex RPAK A 0 0
 }
@@ -15,8 +15,9 @@ Model "UTRocketAmmo2"
 	Path "models"
 	Model 0 "UTRocket_d.3d"
 	Skin 0 "JuRocket1_.png"
-	Scale -0.0822 0.0685 0.07
+	Scale 0.0822 0.09864 0.07
 	ZOffset 6
+	RollOffset -90
 
 	FrameIndex RCKT A 0 0
 }
@@ -26,10 +27,9 @@ Model "UTRocketLauncher"
 	Path "models"
 	Model 1 "Eight2Pick_d.3d"
 	Skin 1 "Eight_t.png"
-	Offset 0 4 12
-	Scale -0.24 0.288 0.24
-	PitchOffset 90
+	Scale 0.24 0.24 0.288
 	AngleOffset 90
+	ZOffset 12
 	ROTATING
 
 	FrameIndex EBLP A 1 0
@@ -39,10 +39,9 @@ Model "UTRocketLauncher"
 	Path "models"
 	Model 1 "Eight2Pick_d.3d"
 	Skin 1 "Eight_t.png"
-	Offset 0 4 6
-	Scale -0.24 0.288 0.24
-	PitchOffset 90
+	Scale 0.24 0.24 0.288
 	AngleOffset 90
+	ZOffset 6
 
 	FrameIndex EBLP B 1 0
 }
diff --git a/modeldef.enforcer b/modeldef.enforcer
index ec1a99c..8e07c80 100644
--- a/modeldef.enforcer
+++ b/modeldef.enforcer
@@ -3,8 +3,7 @@ Model "EClip"
 	Path "models"
 	Model 0 "EClipM_d.3d"
 	Skin 0 "JEClip.png"
-	Scale -0.0864 0.072 0.072
-	PitchOffset 90
+	Scale 0.072 0.072 0.0864
 	ZOffset 2.5
 
 	FrameIndex ECLP A 0 0
@@ -15,7 +14,9 @@ Model "UTCasing"
 	Path "models"
 	Model 0 "Shellc_d.3d"
 	Skin 0 "Shellcase1.png"
-	Scale -0.014 0.014 0.0168
+	Scale 0.0168 0.014 0.014
+	AngleOffset 270
+	RollOffset 90
 	ZOffset 1
 	USEACTORPITCH
 	USEACTORROLL
@@ -31,9 +32,8 @@ Model "Enforcer"
 	Path "models"
 	Model 1 "MagPick_d.3d"
 	Skin 1 "Jautot1.png"
-	Scale -0.1 0.12 0.1
-	PitchOffset 90
-	AngleOffset 270
+	Scale 0.1 0.1 0.12
+	AngleOffset 90
 	ZOffset 12
 	ROTATING
 
@@ -44,9 +44,8 @@ Model "Enforcer"
 	Path "models"
 	Model 1 "MagPick_d.3d"
 	Skin 1 "Jautot1.png"
-	Scale -0.1 0.12 0.1
-	PitchOffset 90
-	AngleOffset 270
+	Scale 0.1 0.1 0.12
+	AngleOffset 90
 	ZOffset 6
 
 	FrameIndex ENFP B 1 0
@@ -57,6 +56,7 @@ 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
@@ -68,6 +68,7 @@ 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
@@ -79,6 +80,7 @@ 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
@@ -90,6 +92,7 @@ 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
@@ -105,9 +108,9 @@ Model "Enforcer"
 	SurfaceSkin 0 1 "Jtutot2.png"
 	SurfaceSkin 0 2 "Jtutot3.png"
 	SurfaceSkin 0 3 "Jtutot4.png"
-	Scale 0.14 0.08 0.12
+	Scale 0.14 -0.08 0.12
 	Offset 8.6 -12.8 -13.5
-	PitchOffset 90
+	AngleOffset 90
 
 	// Fire
 	FrameIndex ENFF A 0 6
@@ -252,9 +255,9 @@ Model "Enforcer"
 	SurfaceSkin 2 1 "Jtutot2.png"
 	SurfaceSkin 2 2 "Jtutot3.png"
 	SurfaceSkin 2 3 "Jtutot4.png"
-	Scale 0.14 0.08 0.12
+	Scale 0.14 -0.08 0.12
 	Offset -8.8 -12.8 -13.5
-	PitchOffset 90
+	AngleOffset 90
 
 	// Fire
 	FrameIndex 2NFF A 2 6
diff --git a/modeldef.flak b/modeldef.flak
index 04a6dfd..19b578a 100644
--- a/modeldef.flak
+++ b/modeldef.flak
@@ -1,11 +1,10 @@
 Model "FlakAmmo"
 {
 	Path "models"
-	Model 0 "flakammom_d.3d"
+	Model 0 "FlakAmmoM_d.3d"
 	Skin 0 "jfa1.png"
-	PitchOffset 90
-	Scale 0.12 0.1 0.1
-	ZOffset 4
+	Scale 0.1 0.1 0.12
+	ZOffset 4.5
 
 	FrameIndex FAMO A 0 0
 }
@@ -15,8 +14,8 @@ Model "FlakAmmo2"
 	Path "models"
 	Model 0 "flakslugm_d.3d"
 	Skin 0 "jflakslugel1_.png"
-	PitchOffset 90
-	Scale 0.048 0.04 0.04
+	Scale 0.04 0.04 0.048
+	AngleOffset 180
 	ZOffset 2
 
 	FrameIndex FSLG A 0 0
@@ -27,8 +26,9 @@ Model "FlakSlug"
 	Path "models"
 	Model 0 "flakslugm_d.3d"
 	Skin 0 "jflakslugel1.png"
-	RollOffset 90
-	Scale 0.048 0.04 0.04
+	Scale 0.048 0.048 0.04
+	AngleOffset 180
+	PitchOffset 90
 	PITCHFROMMOMENTUM
 
 	FrameIndex FSLG A 0 0
@@ -39,7 +39,7 @@ Model "FlakChunk"
 	Path "models"
 	Model 0 "chunkm_d.3d"
 	Skin 0 "chunk_a00.png"
-	Scale 0.06 0.06 0.06
+	Scale 0.06 0.06 0.072
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
@@ -53,7 +53,7 @@ Model "FlakChunk"
 	Path "models"
 	Model 0 "chunkm_d.3d"
 	Skin 0 "chunk_a01.png"
-	Scale 0.06 0.06 0.06
+	Scale 0.06 0.06 0.072
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
@@ -67,7 +67,7 @@ Model "FlakChunk"
 	Path "models"
 	Model 0 "chunkm_d.3d"
 	Skin 0 "chunk_a02.png"
-	Scale 0.06 0.06 0.06
+	Scale 0.06 0.06 0.072
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
@@ -81,7 +81,7 @@ Model "FlakChunk"
 	Path "models"
 	Model 0 "chunkm_d.3d"
 	Skin 0 "chunk_a03.png"
-	Scale 0.06 0.06 0.06
+	Scale 0.06 0.06 0.072
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
@@ -95,7 +95,7 @@ Model "FlakChunk"
 	Path "models"
 	Model 0 "chunkm_d.3d"
 	Skin 0 "chunk_a04.png"
-	Scale 0.06 0.06 0.06
+	Scale 0.06 0.06 0.072
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
@@ -109,7 +109,7 @@ Model "FlakChunk"
 	Path "models"
 	Model 0 "chunkm_d.3d"
 	Skin 0 "chunk_a05.png"
-	Scale 0.06 0.06 0.06
+	Scale 0.06 0.06 0.072
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
@@ -123,7 +123,7 @@ Model "FlakChunk"
 	Path "models"
 	Model 0 "chunkm_d.3d"
 	Skin 0 "chunk_a06.png"
-	Scale 0.06 0.06 0.06
+	Scale 0.06 0.06 0.072
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
@@ -137,7 +137,7 @@ Model "FlakChunk"
 	Path "models"
 	Model 0 "chunkm_d.3d"
 	Skin 0 "chunk_a07.png"
-	Scale 0.06 0.06 0.06
+	Scale 0.06 0.06 0.072
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
@@ -151,7 +151,7 @@ Model "FlakChunk"
 	Path "models"
 	Model 0 "chunkm_d.3d"
 	Skin 0 "chunk_a08.png"
-	Scale 0.06 0.06 0.06
+	Scale 0.06 0.06 0.072
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
@@ -165,7 +165,7 @@ Model "FlakChunk"
 	Path "models"
 	Model 0 "chunkm_d.3d"
 	Skin 0 "chunk_a09.png"
-	Scale 0.06 0.06 0.06
+	Scale 0.06 0.06 0.072
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
@@ -179,7 +179,7 @@ Model "FlakChunk"
 	Path "models"
 	Model 0 "chunkm_d.3d"
 	Skin 0 "chunk_a10.png"
-	Scale 0.06 0.06 0.06
+	Scale 0.06 0.06 0.072
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
@@ -193,7 +193,7 @@ Model "FlakChunk"
 	Path "models"
 	Model 0 "chunkm_d.3d"
 	Skin 0 "chunk_a11.png"
-	Scale 0.06 0.06 0.06
+	Scale 0.06 0.06 0.072
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
@@ -208,7 +208,7 @@ Model "FlakChunk"
 	Path "models"
 	Model 1 "chunk2m_d.3d"
 	Skin 1 "chunk_a00.png"
-	Scale 0.06 0.06 0.06
+	Scale 0.06 0.06 0.072
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
@@ -222,7 +222,7 @@ Model "FlakChunk"
 	Path "models"
 	Model 1 "chunk2m_d.3d"
 	Skin 1 "chunk_a01.png"
-	Scale 0.06 0.06 0.06
+	Scale 0.06 0.06 0.072
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
@@ -236,7 +236,7 @@ Model "FlakChunk"
 	Path "models"
 	Model 1 "chunk2m_d.3d"
 	Skin 1 "chunk_a02.png"
-	Scale 0.06 0.06 0.06
+	Scale 0.06 0.06 0.072
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
@@ -250,7 +250,7 @@ Model "FlakChunk"
 	Path "models"
 	Model 1 "chunk2m_d.3d"
 	Skin 1 "chunk_a03.png"
-	Scale 0.06 0.06 0.06
+	Scale 0.06 0.06 0.072
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
@@ -264,7 +264,7 @@ Model "FlakChunk"
 	Path "models"
 	Model 1 "chunk2m_d.3d"
 	Skin 1 "chunk_a04.png"
-	Scale 0.06 0.06 0.06
+	Scale 0.06 0.06 0.072
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
@@ -278,7 +278,7 @@ Model "FlakChunk"
 	Path "models"
 	Model 1 "chunk2m_d.3d"
 	Skin 1 "chunk_a05.png"
-	Scale 0.06 0.06 0.06
+	Scale 0.06 0.06 0.072
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
@@ -292,7 +292,7 @@ Model "FlakChunk"
 	Path "models"
 	Model 1 "chunk2m_d.3d"
 	Skin 1 "chunk_a06.png"
-	Scale 0.06 0.06 0.06
+	Scale 0.06 0.06 0.072
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
@@ -306,7 +306,7 @@ Model "FlakChunk"
 	Path "models"
 	Model 1 "chunk2m_d.3d"
 	Skin 1 "chunk_a07.png"
-	Scale 0.06 0.06 0.06
+	Scale 0.06 0.06 0.072
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
@@ -320,7 +320,7 @@ Model "FlakChunk"
 	Path "models"
 	Model 1 "chunk2m_d.3d"
 	Skin 1 "chunk_a08.png"
-	Scale 0.06 0.06 0.06
+	Scale 0.06 0.06 0.072
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
@@ -334,7 +334,7 @@ Model "FlakChunk"
 	Path "models"
 	Model 1 "chunk2m_d.3d"
 	Skin 1 "chunk_a09.png"
-	Scale 0.06 0.06 0.06
+	Scale 0.06 0.06 0.072
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
@@ -348,7 +348,7 @@ Model "FlakChunk"
 	Path "models"
 	Model 1 "chunk2m_d.3d"
 	Skin 1 "chunk_a10.png"
-	Scale 0.06 0.06 0.06
+	Scale 0.06 0.06 0.072
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
@@ -362,7 +362,7 @@ Model "FlakChunk"
 	Path "models"
 	Model 1 "chunk2m_d.3d"
 	Skin 1 "chunk_a11.png"
-	Scale 0.06 0.06 0.06
+	Scale 0.06 0.06 0.072
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
@@ -377,7 +377,7 @@ Model "FlakChunk"
 	Path "models"
 	Model 2 "chunk3m_d.3d"
 	Skin 2 "chunk_a00.png"
-	Scale 0.06 0.06 0.06
+	Scale 0.06 0.06 0.072
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
@@ -391,7 +391,7 @@ Model "FlakChunk"
 	Path "models"
 	Model 2 "chunk3m_d.3d"
 	Skin 2 "chunk_a01.png"
-	Scale 0.06 0.06 0.06
+	Scale 0.06 0.06 0.072
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
@@ -405,7 +405,7 @@ Model "FlakChunk"
 	Path "models"
 	Model 2 "chunk3m_d.3d"
 	Skin 2 "chunk_a02.png"
-	Scale 0.06 0.06 0.06
+	Scale 0.06 0.06 0.072
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
@@ -419,7 +419,7 @@ Model "FlakChunk"
 	Path "models"
 	Model 2 "chunk3m_d.3d"
 	Skin 2 "chunk_a03.png"
-	Scale 0.06 0.06 0.06
+	Scale 0.06 0.06 0.072
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
@@ -433,7 +433,7 @@ Model "FlakChunk"
 	Path "models"
 	Model 2 "chunk3m_d.3d"
 	Skin 2 "chunk_a04.png"
-	Scale 0.06 0.06 0.06
+	Scale 0.06 0.06 0.072
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
@@ -447,7 +447,7 @@ Model "FlakChunk"
 	Path "models"
 	Model 2 "chunk3m_d.3d"
 	Skin 2 "chunk_a05.png"
-	Scale 0.06 0.06 0.06
+	Scale 0.06 0.06 0.072
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
@@ -461,7 +461,7 @@ Model "FlakChunk"
 	Path "models"
 	Model 2 "chunk3m_d.3d"
 	Skin 2 "chunk_a06.png"
-	Scale 0.06 0.06 0.06
+	Scale 0.06 0.06 0.072
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
@@ -475,7 +475,7 @@ Model "FlakChunk"
 	Path "models"
 	Model 2 "chunk3m_d.3d"
 	Skin 2 "chunk_a07.png"
-	Scale 0.06 0.06 0.06
+	Scale 0.06 0.06 0.072
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
@@ -489,7 +489,7 @@ Model "FlakChunk"
 	Path "models"
 	Model 2 "chunk3m_d.3d"
 	Skin 2 "chunk_a08.png"
-	Scale 0.06 0.06 0.06
+	Scale 0.06 0.06 0.072
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
@@ -503,7 +503,7 @@ Model "FlakChunk"
 	Path "models"
 	Model 2 "chunk3m_d.3d"
 	Skin 2 "chunk_a09.png"
-	Scale 0.06 0.06 0.06
+	Scale 0.06 0.06 0.072
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
@@ -517,7 +517,7 @@ Model "FlakChunk"
 	Path "models"
 	Model 2 "chunk3m_d.3d"
 	Skin 2 "chunk_a10.png"
-	Scale 0.06 0.06 0.06
+	Scale 0.06 0.06 0.072
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
@@ -531,7 +531,7 @@ Model "FlakChunk"
 	Path "models"
 	Model 2 "chunk3m_d.3d"
 	Skin 2 "chunk_a11.png"
-	Scale 0.06 0.06 0.06
+	Scale 0.06 0.06 0.072
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
@@ -546,7 +546,7 @@ Model "FlakChunk"
 	Path "models"
 	Model 3 "chunk4m_d.3d"
 	Skin 3 "chunk_a00.png"
-	Scale 0.06 0.06 0.06
+	Scale 0.06 0.06 0.072
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
@@ -560,7 +560,7 @@ Model "FlakChunk"
 	Path "models"
 	Model 3 "chunk4m_d.3d"
 	Skin 3 "chunk_a01.png"
-	Scale 0.06 0.06 0.06
+	Scale 0.06 0.06 0.072
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
@@ -574,7 +574,7 @@ Model "FlakChunk"
 	Path "models"
 	Model 3 "chunk4m_d.3d"
 	Skin 3 "chunk_a02.png"
-	Scale 0.06 0.06 0.06
+	Scale 0.06 0.06 0.072
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
@@ -588,7 +588,7 @@ Model "FlakChunk"
 	Path "models"
 	Model 3 "chunk4m_d.3d"
 	Skin 3 "chunk_a03.png"
-	Scale 0.06 0.06 0.06
+	Scale 0.06 0.06 0.072
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
@@ -602,7 +602,7 @@ Model "FlakChunk"
 	Path "models"
 	Model 3 "chunk4m_d.3d"
 	Skin 3 "chunk_a04.png"
-	Scale 0.06 0.06 0.06
+	Scale 0.06 0.06 0.072
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
@@ -616,7 +616,7 @@ Model "FlakChunk"
 	Path "models"
 	Model 3 "chunk4m_d.3d"
 	Skin 3 "chunk_a05.png"
-	Scale 0.06 0.06 0.06
+	Scale 0.06 0.06 0.072
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
@@ -630,7 +630,7 @@ Model "FlakChunk"
 	Path "models"
 	Model 3 "chunk4m_d.3d"
 	Skin 3 "chunk_a06.png"
-	Scale 0.06 0.06 0.06
+	Scale 0.06 0.06 0.072
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
@@ -644,7 +644,7 @@ Model "FlakChunk"
 	Path "models"
 	Model 3 "chunk4m_d.3d"
 	Skin 3 "chunk_a07.png"
-	Scale 0.06 0.06 0.06
+	Scale 0.06 0.06 0.072
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
@@ -658,7 +658,7 @@ Model "FlakChunk"
 	Path "models"
 	Model 3 "chunk4m_d.3d"
 	Skin 3 "chunk_a08.png"
-	Scale 0.06 0.06 0.06
+	Scale 0.06 0.06 0.072
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
@@ -672,7 +672,7 @@ Model "FlakChunk"
 	Path "models"
 	Model 3 "chunk4m_d.3d"
 	Skin 3 "chunk_a09.png"
-	Scale 0.06 0.06 0.06
+	Scale 0.06 0.06 0.072
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
@@ -686,7 +686,7 @@ Model "FlakChunk"
 	Path "models"
 	Model 3 "chunk4m_d.3d"
 	Skin 3 "chunk_a10.png"
-	Scale 0.06 0.06 0.06
+	Scale 0.06 0.06 0.072
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
@@ -700,7 +700,7 @@ Model "FlakChunk"
 	Path "models"
 	Model 3 "chunk4m_d.3d"
 	Skin 3 "chunk_a11.png"
-	Scale 0.06 0.06 0.06
+	Scale 0.06 0.06 0.072
 	ZOffset 2
 	USEACTORPITCH
 	USEACTORROLL
@@ -716,10 +716,8 @@ Model "FlakCannon"
 	Model 1 "flak2pick_d.3d"
 	Skin 1 "flak_t.png"
 	AngleOffset 90
-	PitchOffset 90
-	Scale 0.14 0.168 0.14
-	Offset 0 -18.9 0
-	ZOffset 12
+	Scale 0.14 0.14 0.168
+	Offset 18.9 0 12
 	ROTATING
 
 	FrameIndex FPCK A 1 0
@@ -730,10 +728,8 @@ Model "FlakCannon"
 	Model 1 "flak2pick_d.3d"
 	Skin 1 "flak_t.png"
 	AngleOffset 90
-	PitchOffset 90
-	Scale 0.14 0.168 0.14
-	Offset 0 -18.9 0
-	ZOffset 11
+	Scale 0.14 0.14 0.168
+	Offset 18.9 0 12
 
 	FrameIndex FPCK B 1 0
 }
@@ -743,9 +739,10 @@ Model "FlakCannon"
 	Path "models"
 	Model 2 "Flat_d.3d"
 	Skin 2 "Flakmuz.png"
+	AngleOffset 90
 	PitchOffset 90
 	Scale 0.08 0.08 0.08
-	Offset 4.0 -25.0 -7.5
+	Offset 7.4 -25.0 -7.5
 
 	FrameIndex FMUZ A 2 0
 }
@@ -759,10 +756,11 @@ Model "FlakCannon"
 	SurfaceSkin 0 2 "flak_t3.png"
 	SurfaceSkin 0 3 "flak_t4.png"
 	SurfaceSkin 0 4 "flakammoledbase.png"
-	AngleOffset 180
-	PitchOffset 90
-	Scale 0.2 0.1 0.2
-	Offset 5.6 -7.6 -10.4
+	AngleOffset 90
+	PitchOffset 180
+	RollOffset 174.35
+	Scale 0.28 -0.12 0.28
+	Offset 8.6 -10.4 -12.8
 
 	// select
 	FrameIndex FLKS A 0 0
diff --git a/modeldef.ges b/modeldef.ges
index af5918a..a748699 100644
--- a/modeldef.ges
+++ b/modeldef.ges
@@ -3,8 +3,9 @@ Model "BioAmmo"
 	Path "models"
 	Model 0 "BioAmmoM_d.3d"
 	Skin 0 "Jbammo1.png"
-	Scale -0.08 0.096 0.08
-	AngleOffset 270
+	Scale 0.08 0.096 0.08
+	PitchOffset 180
+	RollOffset 90
 	ZOffset 4
 
 	FrameIndex BIOA A 0 0
@@ -16,7 +17,7 @@ Model "BioGel"
 	Model 0 "BioGelm_d.3d"
 	Skin 0 "Jgreen.png"
 	Scale 0.08 0.096 0.08
-	RollOffset 90
+	PitchOffset -90
 	USEACTORPITCH
 	USEACTORROLL
 
@@ -88,7 +89,7 @@ Model "BioSplash"
 	Model 0 "BioGelm_d.3d"
 	Skin 0 "Jgreen.png"
 	Scale 0.08 0.096 0.08
-	RollOffset 90
+	PitchOffset -90
 	USEACTORPITCH
 	USEACTORROLL
 
@@ -160,7 +161,7 @@ Model "BioGlob"
 	Model 0 "BioGelm_d.3d"
 	Skin 0 "Jgreen.png"
 	Scale 0.08 0.096 0.08
-	RollOffset 90
+	PitchOffset -90
 	USEACTORPITCH
 	USEACTORROLL
 
@@ -231,9 +232,8 @@ Model "BioRifle"
 	Path "models"
 	Model 1 "BRifle2Pick_d.3d"
 	Skin 1 "JBRifle2.png"
-	Scale -0.1 0.12 0.1
-	PitchOffset 90
-	AngleOffset 270
+	Scale 0.1 0.1 0.12
+	AngleOffset 90
 	ZOffset 12
 	ROTATING
 
@@ -244,9 +244,8 @@ Model "BioRifle"
 	Path "models"
 	Model 1 "BRifle2Pick_d.3d"
 	Skin 1 "JBRifle2.png"
-	Scale -0.1 0.12 0.1
-	PitchOffset 90
-	AngleOffset 270
+	Scale 0.1 0.1 0.12
+	AngleOffset 90
 	ZOffset 10
 
 	FrameIndex BIOP B 1 0
@@ -260,9 +259,9 @@ Model "BioRifle"
 	SurfaceSkin 0 1 "JBRifle22.png"
 	SurfaceSkin 0 2 "JBRifle23.png"
 	SurfaceSkin 0 3 "JBRifle24.png"
-	RollOffset -8.4375
-	PitchOffset 94.21875
-	Scale 0.125 0.06 0.125
+	AngleOffset 94.21875
+	RollOffset 8.4375
+	Scale 0.125 -0.06 0.125
 	Offset 9.8 -17.6 -10.4
 
 	// select
diff --git a/modeldef.impact b/modeldef.impact
index fc4d106..8a80ec7 100644
--- a/modeldef.impact
+++ b/modeldef.impact
@@ -3,8 +3,8 @@ Model "ImpactHammer"
 	Path "models"
 	Model 1 "ImpPick_d.3d"
 	Skin 1 "JImpPick1.png"
-	Scale -0.2 0.24 0.2
-	AngleOffset 270
+	Scale 0.2 0.24 0.2
+	RollOffset -90
 	ZOffset 12
 	ROTATING
 
@@ -15,8 +15,8 @@ Model "ImpactHammer"
 	Path "models"
 	Model 1 "ImpPick_d.3d"
 	Skin 1 "JImpPick1.png"
-	Scale -0.2 0.24 0.2
-	AngleOffset 270
+	Scale 0.2 0.24 0.2
+	RollOffset -90
 	ZOffset 9
 
 	FrameIndex IMPP B 1 0
@@ -30,8 +30,9 @@ Model "ImpactHammer"
 	SurfaceSkin 0 1 "JImpactHammer2.png"
 	SurfaceSkin 0 2 "JImpactHammer3.png"
 	SurfaceSkin 0 3 "JImpactHammer4.png"
-	PitchOffset 5
-	Scale 0.1 0.05 0.1
+	AngleOffset 90
+	RollOffset -85
+	Scale 0.1 -0.05 0.1
 	Offset 5.8 -12.8 -7.7
 
 	// select
diff --git a/modeldef.minigun b/modeldef.minigun
index 7289484..fcfb3ee 100644
--- a/modeldef.minigun
+++ b/modeldef.minigun
@@ -5,9 +5,7 @@ Model "MiniAmmo"
 	Model 0 "MiniAmmom_d.3d"
 	Skin 0 "JM21.png"
 	Offset 2 0 8
-	PitchOffset 90
-	AngleOffset 90
-	Scale 0.12 -0.134 0.12
+	Scale 0.12 0.12 0.134
 
 	FrameIndex MAMO A 0 0
 }
@@ -17,9 +15,8 @@ Model "Minigun"
 	Path "models"
 	Model 1 "MinigunPick_d.3d"
 	Skin 1 "Mini_t.png"
-	Scale -0.2 0.24 0.2
-	PitchOffset 90
-	AngleOffset 270
+	Scale 0.2 0.2 0.24
+	AngleOffset 90
 	ZOffset 12
 	ROTATING
 
@@ -30,9 +27,8 @@ Model "Minigun"
 	Path "models"
 	Model 1 "MinigunPick_d.3d"
 	Skin 1 "Mini_t.png"
-	Scale -0.2 0.24 0.2
-	PitchOffset 90
-	AngleOffset 270
+	Scale 0.2 0.2 0.24
+	AngleOffset 90
 	ZOffset 6
 
 	FrameIndex MGNP B 1 0
diff --git a/modeldef.misc b/modeldef.misc
index 3018f42..2211ebd 100644
--- a/modeldef.misc
+++ b/modeldef.misc
@@ -3,8 +3,7 @@ Model "UTTeleportFog"
 	Path "models"
 	Model 0 "Tele2_d.3d"
 	Skin 0 "JTele2_01.png"
-	Scale 0.24 0.2 0.2
-	PitchOffset 90
+	Scale 0.2 0.2 0.24
 	ZOffset 10
 	DONTCULLBACKFACES
 
@@ -51,9 +50,9 @@ Model "UTHealthPack"
 	Model 0 "hbox_d.3d"
 	SurfaceSkin 0 0 "jhbox1.png"
 	SurfaceSkin 0 1 "FIZZHP00"
-	Scale -0.2 0.2 0.2
-	AngleOffset 90
-	ZOffset 14
+	Scale 0.2 0.24 0.2
+	RollOffset -90
+	ZOffset 16
 
 	FrameIndex HBOX A 0 0
 }
@@ -65,8 +64,7 @@ Model "UTHealthBox"
 	SurfaceSkin 0 0 "jhboxbeta1.png"
 	SurfaceSkin 0 1 "FIZZHP10"
 	SurfaceSkin 0 2 "FIZZHP10"
-	Scale -0.096 0.08 0.08
-	PitchOffset 90
+	Scale 0.08 0.08 0.096
 	ZOffset 4
 
 	FrameIndex HBOX B 0 0
@@ -78,8 +76,7 @@ Model "UTMedBox"
 	Model 0 "MedBox_d.3d"
 	SurfaceSkin 0 0 "JMedBox1.png"
 	SurfaceSkin 0 1 "FIZZHP10"
-	Scale -0.072 0.06 0.06
-	PitchOffset 90
+	Scale 0.06 0.06 0.072
 	ZOffset 5
 
 	FrameIndex HBOX C 0 0
@@ -92,8 +89,7 @@ Model "UTHealthBonus"
 	SurfaceSkin 0 0 "JVial0.png"
 	SurfaceSkin 0 1 "FIZZHP20"
 	SurfaceSkin 0 2 "FIZZHP20"
-	Scale -0.048 0.04 0.04
-	PitchOffset 90
+	Scale 0.04 0.04 0.048
 	ZOffset 8
 	DONTCULLBACKFACES
 
@@ -105,10 +101,10 @@ Model "UTArmorBonus"
 	Path "models"
 	Model 0 "bossheadm_d.3d"
 	Skin 0 "bossheadT.png"
-	Scale -0.072 0.072 0.06
-	AngleOffset 180
-	PitchOffset 110
-	ZOffset 6
+	Scale 0.06 0.06 0.072
+	AngleOffset -90
+	RollOffset 12
+	ZOffset 5.5
 
 	FrameIndex XANH A 0 0
 }
@@ -118,8 +114,7 @@ Model "UTThighPads"
 	Path "models"
 	Model 0 "ThighPads_d.3d"
 	Skin 0 "JThighPads_01.png"
-	Scale -0.096 0.08 0.08
-	PitchOffset 90
+	Scale 0.08 0.08 0.096
 	ZOffset 12
 	ROTATING
 
@@ -131,8 +126,7 @@ Model "UTBodyArmor"
 	Path "models"
 	Model 0 "Armor2M_d.3d"
 	Skin 0 "Jarmor2.png"
-	Scale -0.134 0.134 0.12
-	PitchOffset 90
+	Scale 0.12 0.12 0.134
 	ZOffset 12
 
 	FrameIndex UARM A 0 0
@@ -143,9 +137,8 @@ Model "UTShieldBelt"
 	Path "models"
 	Model 0 "ShieldBeltMeshM_d.3d"
 	Skin 0 "AUbelt1.png"
-	Scale -0.12 0.1 0.1
-	AngleOffset 180
-	PitchOffset 90
+	Scale 0.1 0.1 0.12
+	AngleOffset -90
 	ZOffset 4
 
 	FrameIndex BELT A 0 0
@@ -156,8 +149,7 @@ Model "UDamage"
 	Path "models"
 	Model 0 "UDamage_d.3d"
 	Skin 0 "GoldSkin2.png"
-	Scale 0.192 0.16 0.16
-	PitchOffset 90
+	Scale 0.16 0.16 0.192
 	ZOffset 24
 	ROTATING
 
@@ -168,8 +160,7 @@ Model "UDamage"
 	Path "models"
 	Model 1 "UDamageB_d.3d"
 	Skin 1 "Judamage1.png"
-	Scale 0.192 0.16 0.16
-	PitchOffset 90
+	Scale 0.16 0.16 0.192
 	ZOffset 24
 	ROTATING
 
@@ -181,8 +172,8 @@ Model "UTRedSkull"
 	Path "models"
 	Model 0 "RelicSkull_d.3d"
 	Skin 0 "JRelicSkull_01r.png"
-	Scale 0.12 0.1 0.1
-	PitchOffset 90
+	Scale 0.1 0.1 0.12
+	AngleOffset -90	// relic of death faces to the side originally
 	ZOffset 12
 	ROTATING
 
@@ -193,8 +184,8 @@ Model "UTGoldSkull"
 	Path "models"
 	Model 0 "RelicSkull_d.3d"
 	Skin 0 "JRelicSkull_01g.png"
-	Scale 0.12 0.1 0.1
-	PitchOffset 90
+	Scale 0.1 0.1 0.12
+	AngleOffset -90	// relic of death faces to the side originally
 	ZOffset 12
 	ROTATING
 
@@ -205,8 +196,8 @@ Model "UTBlueSkull"
 	Path "models"
 	Model 0 "RelicSkull_d.3d"
 	Skin 0 "JRelicSkull_01b.png"
-	Scale 0.12 0.1 0.1
-	PitchOffset 90
+	Scale 0.1 0.1 0.12
+	AngleOffset -90	// relic of death faces to the side originally
 	ZOffset 12
 	ROTATING
 
@@ -217,8 +208,7 @@ Model "UTRedKey"
 	Path "models"
 	Model 0 "DomR_d.3d"
 	Skin 0 "RedSkin2.png"
-	Scale 0.048 0.04 0.04
-	PitchOffset 90
+	Scale 0.04 0.04 0.048
 	ZOffset 16
 	ROTATING
 
@@ -229,8 +219,7 @@ Model "UTGoldKey"
 	Path "models"
 	Model 0 "MercSymbol_d.3d"
 	Skin 0 "GoldSkin2.png"
-	Scale 0.096 0.08 0.08
-	PitchOffset 90
+	Scale 0.08 0.08 0.096
 	ZOffset 16
 	ROTATING
 
@@ -241,8 +230,7 @@ Model "UTBlueKey"
 	Path "models"
 	Model 0 "DomB_d.3d"
 	Skin 0 "BlueSkin2.png"
-	Scale 0.048 0.04 0.04
-	PitchOffset 90
+	Scale 0.04 0.04 0.048
 	ZOffset 16
 	ROTATING
 
@@ -252,10 +240,12 @@ Model "UTBlueKey"
 Model "UTBackpack"
 {
 	Path "models"
-	Model 0 "Backpack2_d.3d"	// cheaply edited out of SelectionMale1 (offsets weren't even readjusted)
+	Model 0 "Backpack2_d.3d"	// cheaply edited out of SelectionMale1 (offsets weren't even readjusted, so I have to do it here)
 	Skin 0 "bpak.png"
-	Offset -20 12 -16
-	Scale -0.36 0.3 0.3
+	Offset -15.795 13.1625 -16	// calculating the X and Y offsets was hard, but I'm glad I added the "estimated center" feature in umeshinfo now
+	Scale 0.36 0.3 0.3
+	AngleOffset 90
+	RollOffset -90
 	ROTATING
 
 	FrameIndex BPAK A 0 0
@@ -266,8 +256,7 @@ Model "UTInvisibility"
 	Path "models"
 	Model 0 "invis2M_d.3d"
 	SurfaceSkin 0 0 "jinvis.png"
-	Scale -0.12 0.1 0.1
-	PitchOffset 90
+	Scale 0.1 0.1 0.12
 	ZOffset 9
 
 	FrameIndex INVS A 0 0
@@ -277,8 +266,7 @@ Model "UTInvisibilityX"
 	Path "models"
 	Model 0 "invis2M_d.3d"
 	SurfaceSkin 0 1 "invis00"
-	Scale -0.12 0.1 0.1
-	PitchOffset 90
+	Scale 0.1 0.1 0.12
 	ZOffset 9
 
 	FrameIndex INVS A 0 0
@@ -289,24 +277,21 @@ Model "UTMapRevealer"
 	Path "models"
 	Model 0 "TranslatorMesh_d.3d"
 	Skin 0 "JTranslator1.png"
-	Scale -0.096 0.08 0.08
-	PitchOffset 90
+	Scale 0.08 0.08 0.096
 	ZOffset 4
 
 	FrameIndex TRNS A 0 0
 }
 
-Model "ShieldingSuit"
+Model "UTJumpBoots"
 {
 	Path "models"
-	Model 0 "ToxSuit_d.3d"
-	Skin 0 "ShieldSuit.png"
-	Scale -0.12 0.12 0.134
-	PitchOffset 180
-	ZOffset 24
-	ROTATING
+	Model 0 "jboot_d.3d"
+	Skin 0 "Jlboot2.png"
+	Scale 0.09 0.09 0.108
+	ZOffset 7
 
-	FrameIndex SSUT A 0 0
+	FrameIndex JBUT A 0 0
 }
 
 Model "Searchlight"
@@ -314,9 +299,8 @@ Model "Searchlight"
 	Path "models"
 	Model 0 "BigFlash_d.3d"
 	Skin 0 "JBigFlash1.png"
-	Scale -0.084 0.084 0.07
-	PitchOffset 90
-	AngleOffset 180
+	Scale 0.07 0.07 0.084
+	AngleOffset -90
 	ZOffset 9
 
 	FrameIndex SLIT A 0 0
@@ -327,7 +311,7 @@ Model "UTChip"
 	Path "models"
 	Model 0 "ChipM_d.3d"
 	Skin 0 "Chip1.png"
-	Scale -0.134 0.12 0.12
+	Scale 0.12 0.12 0.134
 	USEACTORPITCH
 	USEACTORROLL
 	USEROTATIONCENTER
diff --git a/modeldef.pulse b/modeldef.pulse
index e21553c..42a5bbc 100644
--- a/modeldef.pulse
+++ b/modeldef.pulse
@@ -3,8 +3,7 @@ Model "PulseAmmo"
 	Path "models"
 	Model 0 "PAmmo_d.3d"
 	Skin 0 "JPammo_01.png"
-	Scale -0.072 0.06 0.06
-	PitchOffset 90
+	Scale 0.06 0.06 0.072
 	ZOffset 6
 
 	FrameIndex PAMO A 0 0
@@ -15,9 +14,7 @@ Model "PulseGun"
 	Path "models"
 	Model 1 "PulsePickup_d.3d"
 	Skin 1 "JPulsePickup_01.png"
-	AngleOffset 270
-	PitchOffset 90
-	Scale -0.16 0.192 0.16
+	Scale 0.16 0.16 0.192
 	ZOffset 12
 	ROTATING
 
@@ -28,9 +25,7 @@ Model "PulseGun"
 	Path "models"
 	Model 1 "PulsePickup_d.3d"
 	Skin 1 "JPulsePickup_01.png"
-	AngleOffset 270
-	PitchOffset 90
-	Scale -0.16 0.192 0.16
+	Scale 0.16 0.16 0.192
 	ZOffset 8
 
 	FrameIndex PGNP B 1 0
@@ -41,6 +36,7 @@ Model "PulseGun"
 	Path "models"
 	Model 2 "Flat_d.3d"
 	Skin 2 "MuzzyPulse.png"
+	AngleOffset 90
 	PitchOffset 90
 	Scale 0.08 0.08 0.08
 	Offset 8.5 -25.0 -4.5
@@ -55,8 +51,8 @@ Model "PulseGun"
 	SurfaceSkin 0 0 "AmmoLedBase.png"
 	SurfaceSkin 0 1 "JPulseGun_02.png"
 	SurfaceSkin 0 2 "JPulseGun_03.png"
-	PitchOffset 90
-	Scale 0.26 0.195 0.26
+	AngleOffset 90
+	Scale 0.26 -0.195 0.26
 	Offset 0.0 -7.5 -8.0
 
 	// Select
diff --git a/modeldef.rifle b/modeldef.rifle
index bc55b01..22f4f8b 100644
--- a/modeldef.rifle
+++ b/modeldef.rifle
@@ -3,9 +3,7 @@ Model "RifleAmmo"
 	Path "models"
 	Model 0 "BulletBoxM_d.3d"
 	Skin 0 "BulletBoxT.png"
-	Scale -0.084 0.07 0.07
-	PitchOffset 90
-	AngleOffset 180
+	Scale 0.07 0.07 0.084
 	ZOffset 3
 
 	FrameIndex SBOX A 0 0
@@ -16,8 +14,7 @@ Model "RifleAmmo2"
 	Path "models"
 	Model 0 "RifleRoundM_d.3d"
 	Skin 0 "RifleR1.png"
-	Scale -0.024 0.02 0.02
-	PitchOffset 90
+	Scale 0.02 0.02 0.024
 	ZOffset 4
 
 	FrameIndex SRND A 0 0
@@ -28,9 +25,8 @@ Model "SniperRifle"
 	Path "models"
 	Model 1 "RiflePick_d.3d"
 	Skin 1 "JRifle2.png"
-	Scale -0.2 0.24 0.2
-	PitchOffset 90
-	AngleOffset 270
+	Scale 0.2 0.2 0.24
+	AngleOffset 90
 	ZOffset 12
 	ROTATING
 
@@ -41,9 +37,8 @@ Model "SniperRifle"
 	Path "models"
 	Model 1 "RiflePick_d.3d"
 	Skin 1 "JRifle2.png"
-	Scale -0.2 0.24 0.2
-	PitchOffset 90
-	AngleOffset 270
+	Scale 0.2 0.2 0.24
+	AngleOffset 90
 	ZOffset 6
 
 	FrameIndex SRFP B 1 0
diff --git a/modeldef.ripper b/modeldef.ripper
index 40a17cf..22050d7 100644
--- a/modeldef.ripper
+++ b/modeldef.ripper
@@ -3,8 +3,7 @@ Model "RipperAmmo"
 	Path "models"
 	Model 0 "BladeHopperM_d.3d"
 	Skin 0 "BladeHopperT.png"
-	PitchOffset 90
-	Scale -0.12 0.1 0.1
+	Scale 0.1 0.1 0.12
 	ZOffset 10
 
 	FrameIndex BHOP A 0 0
@@ -15,8 +14,8 @@ Model "Ripper2"
 	Path "models"
 	Model 1 "RazPick2_d.3d"
 	Skin 1 "JRazorw.png"
-	Scale -0.24 0.2 0.2
-	PitchOffset 90
+	Scale 0.2 0.2 0.24
+	AngleOffset 90
 	ZOffset 12
 	ROTATING
 
@@ -27,8 +26,8 @@ Model "Ripper2"
 	Path "models"
 	Model 1 "RazPick2_d.3d"
 	Skin 1 "JRazorw.png"
-	Scale -0.24 0.2 0.2
-	PitchOffset 90
+	Scale 0.2 0.2 0.24
+	AngleOffset 90
 	ZOffset 6
 
 	FrameIndex RZRP B 1 0
@@ -40,9 +39,8 @@ Model "Razor2"
 	Model 0 "RazorBlade_d.3d"
 	SurfaceSkin 0 0 "RazSkin.png"
 	Offset -9.5 0 0
-	Scale 0.216 0.18 0.18
-	PitchOffset 90
-	AngleOffset 180
+	Scale 0.18 0.18 0.216
+	AngleOffset 90
 	USEACTORPITCH
 	USEACTORROLL
 
@@ -55,9 +53,8 @@ Model "Razor2Trail"
 	Model 0 "RazorBlade_d.3d"
 	SurfaceSkin 0 1 "RazTrail.png"
 	Offset -19 0 0
-	Scale 0.432 0.18 0.18
-	PitchOffset 90
-	AngleOffset 180
+	Scale 0.36 0.18 0.216
+	AngleOffset 90
 	USEACTORPITCH
 	USEACTORROLL
 	DONTCULLBACKFACES
@@ -71,9 +68,8 @@ Model "Razor2Alt"
 	Model 0 "RazorBlade_d.3d"
 	SurfaceSkin 0 0 "RazSkin.png"
 	Offset -9.5 0 0
-	Scale 0.216 0.18 0.18
-	PitchOffset 90
-	AngleOffset 180
+	Scale 0.18 0.18 0.216
+	AngleOffset 90
 	USEACTORPITCH
 	USEACTORROLL
 
@@ -89,9 +85,9 @@ Model "Ripper2"
 	SurfaceSkin 0 2 "JRazor4.png"
 	SurfaceSkin 0 3 "JRazor5.png"
 	SurfaceSkin 0 4 "JRazor3.png"
-	Scale 0.16 0.08 0.16
+	Scale 0.16 -0.08 0.16
 	Offset 7.4 -10.8 -8.9
-	PitchOffset 90
+	AngleOffset 90
 
 	// Select
 	FrameIndex RZRS A 0 0
diff --git a/modeldef.shock b/modeldef.shock
index a85252f..23a1cf1 100644
--- a/modeldef.shock
+++ b/modeldef.shock
@@ -3,8 +3,7 @@ Model "ShockAmmo"
 	Path "models"
 	Model 0 "ShockCoreM_d.3d"
 	Skin 0 "JShockCore.png"
-	PitchOffset 90
-	Scale -0.132 0.11 0.11
+	Scale 0.11 0.11 0.132
 	ZOffset 12
 
 	FrameIndex SHOA A 0 0
@@ -15,8 +14,7 @@ Model "EnhancedShockAmmo"
 	Path "models"
 	Model 0 "ShockCoreM_d.3d"
 	Skin 0 "JSShockCore.png"
-	PitchOffset 90
-	Scale -0.132 0.11 0.11
+	Scale 0.11 0.11 0.132
 	ZOffset 12
 
 	FrameIndex SHOA A 0 0
@@ -27,6 +25,8 @@ Model "ShockRifleWave"
 	Path "models"
 	Model 0 "shockrwm_d.3d"
 	Skin 0 "shocktt1.png"
+	Scale 1.2 1.0 1.0
+	PitchOffset 90
 
 	FrameIndex SWAV A 0 0
 	FrameIndex SWAV B 0 1
@@ -37,6 +37,8 @@ Model "SuperShockRifleWave"
 	Path "models"
 	Model 0 "shockrwm_d.3d"
 	Skin 0 "sshocktt1.png"
+	Scale 1.2 1.0 1.0
+	PitchOffset 90
 
 	FrameIndex SWAV A 0 0
 	FrameIndex SWAV B 0 1
@@ -47,10 +49,11 @@ Model "ShockBeamRing"
 	Path "models"
 	Model 0 "utringex_d.3d"
 	Skin 0 "asaring.png"
+	Scale 1.2 1.0 1.0
+	PitchOffset 90
 	DONTCULLBACKFACES
 	USEACTORPITCH
 	USEACTORROLL
-	Scale 1.2 1.0 1.0
 
 	FrameIndex SRNG A 0 0
 	FrameIndex SRNG B 0 1
@@ -68,10 +71,11 @@ Model "SuperShockBeamRing"
 	Path "models"
 	Model 0 "utringex_d.3d"
 	Skin 0 "ASasRing.png"
+	Scale 1.2 1.0 1.0
+	PitchOffset 90
 	DONTCULLBACKFACES
 	USEACTORPITCH
 	USEACTORROLL
-	Scale 1.2 1.0 1.0
 
 	FrameIndex SRNG A 0 0
 	FrameIndex SRNG B 0 1
@@ -89,10 +93,11 @@ Model "ShockBlastRing"
 	Path "models"
 	Model 0 "utringex_d.3d"
 	Skin 0 "ppurplering.png"
+	Scale 1.2 1.0 1.0
+	PitchOffset 90
 	DONTCULLBACKFACES
 	USEACTORPITCH
 	USEACTORROLL
-	Scale 1.2 1.0 1.0
 
 	FrameIndex SRNG A 0 0
 	FrameIndex SRNG B 0 1
@@ -110,10 +115,11 @@ Model "SuperShockBlastRing"
 	Path "models"
 	Model 0 "utringex_d.3d"
 	Skin 0 "ASasRing.png"
+	Scale 1.2 1.0 1.0
+	PitchOffset 90
 	DONTCULLBACKFACES
 	USEACTORPITCH
 	USEACTORROLL
-	Scale 1.2 1.0 1.0
 
 	FrameIndex SRNG A 0 0
 	FrameIndex SRNG B 0 1
@@ -131,9 +137,8 @@ Model "ShockRifle"
 	Path "models"
 	Model 1 "asmd2pick_d.3d"
 	Skin 1 "asmd_t.png"
-	AngleOffset 270
-	PitchOffset 90
-	Scale -0.14 0.18 0.14
+	AngleOffset 90
+	Scale 0.14 0.14 0.18
 	ZOffset 12
 	ROTATING
 
@@ -144,9 +149,8 @@ Model "ShockRifle"
 	Path "models"
 	Model 1 "asmd2pick_d.3d"
 	Skin 1 "asmd_t.png"
-	AngleOffset 270
-	PitchOffset 90
-	Scale -0.14 0.18 0.14
+	AngleOffset 90
+	Scale 0.14 0.14 0.18
 	ZOffset 4
 
 	FrameIndex ASMP B 1 0
@@ -161,8 +165,8 @@ Model "ShockRifle"
 	SurfaceSkin 0 2 "asmd_t3.png"
 	SurfaceSkin 0 3 "asmd_t3.png"
 	SurfaceSkin 0 4 "asmd_t4.png"
-	PitchOffset 90
-	Scale 0.15 0.12 0.15
+	AngleOffset 90
+	Scale 0.15 -0.12 0.15
 	Offset 4.9 -16.6 -7.1
 
 	// select
@@ -220,9 +224,8 @@ Model "EnhancedShockRifle"
 	Path "models"
 	Model 1 "asmd2pick_d.3d"
 	Skin 1 "sasmd_t.png"
-	AngleOffset 270
-	PitchOffset 90
-	Scale -0.14 0.18 0.14
+	AngleOffset 90
+	Scale 0.14 0.14 0.18
 	ZOffset 12
 	ROTATING
 
@@ -233,9 +236,8 @@ Model "EnhancedShockRifle"
 	Path "models"
 	Model 1 "asmd2pick_d.3d"
 	Skin 1 "sasmd_t.png"
-	AngleOffset 270
-	PitchOffset 90
-	Scale -0.14 0.18 0.14
+	AngleOffset 90
+	Scale 0.14 0.14 0.18
 	ZOffset 4
 
 	FrameIndex ASMP B 1 0
@@ -250,8 +252,8 @@ Model "EnhancedShockRifle"
 	SurfaceSkin 0 2 "sasmd_t3.png"
 	SurfaceSkin 0 3 "sasmd_t3.png"
 	SurfaceSkin 0 4 "sasmd_t4.png"
-	PitchOffset 90
-	Scale 0.15 0.12 0.15
+	AngleOffset 90
+	Scale 0.15 -0.12 0.15
 	Offset 4.9 -16.6 -7.1
 
 	// select
diff --git a/modeldef.transloc b/modeldef.transloc
index 8f7f071..4c64280 100644
--- a/modeldef.transloc
+++ b/modeldef.transloc
@@ -3,8 +3,7 @@ Model "TranslocatorModule"
 	Path "models"
 	Model 0 "Module_d.3d"
 	Skin 0 "tloc2_.png"
-	Scale -0.0672 0.056 0.056
-	PitchOffset 90
+	Scale 0.056 0.056 0.0672
 	ZOffset 6
 	USEACTORPITCH
 
@@ -19,9 +18,8 @@ Model "Translocator"
 	Model 1 "Trans3loc_d.3d"
 	SurfaceSkin 1 0 "tloc1_.png"
 	SurfaceSkin 1 1 "tloc2_.png"
-	Scale -0.0552 0.046 0.046
-	AngleOffset 180
-	PitchOffset 90
+	Scale 0.046 0.046 0.0552
+	AngleOffset -90
 	ZOffset 12
 	ROTATING
 
@@ -33,9 +31,8 @@ Model "Translocator"
 	Model 1 "Trans3loc_d.3d"
 	SurfaceSkin 1 0 "tloc1_.png"
 	SurfaceSkin 1 1 "tloc2_.png"
-	Scale -0.0552 0.046 0.046
-	AngleOffset 180
-	PitchOffset 90
+	Scale 0.046 0.046 0.0552
+	AngleOffset -90
 	ZOffset 6
 
 	FrameIndex TLCP B 1 0
@@ -49,11 +46,10 @@ Model "Translocator"
 	SurfaceSkin 0 1 "tloc2.png"
 	SurfaceSkin 0 2 "tloc3.png"
 	SurfaceSkin 0 3 "tloc4.png"
-	Scale 0.11 0.055 0.11
-	Offset -17.8 -22.8 -33.2
-	PitchOffset 87
-	RollOffset 5
-	AngleOffset 183
+	Scale 0.11 -0.055 0.11
+	Offset -19.8 -22.8 -33.2
+	AngleOffset -94.21875
+	PitchOffset 3.55555555556
 
 	// select
 	FrameIndex TLCS A 0 18
diff --git a/modeldef.warhead b/modeldef.warhead
index 40cbf14..c7e3866 100644
--- a/modeldef.warhead
+++ b/modeldef.warhead
@@ -3,8 +3,7 @@ Model "WarheadAmmo"
 	Path "models"
 	Model 0 "missile_d.3d"
 	Skin 0 "jmissile_01_.png"
-	Scale -0.21 0.2 0.2
-	PitchOffset 90
+	Scale 0.2 0.2 0.24
 	ZOffset 21
 
 	FrameIndex WMIS A 0 0
@@ -15,6 +14,8 @@ Model "ShockWave"
 	Path "models"
 	Model 0 "shockwavem_d.3d"
 	Skin 0 "shockt1.png"
+	Scale 1.2 1.0 1.0
+	PitchOffset 90
 
 	FrameIndex RWAV A 0 0
 	FrameIndex RWAV B 0 1
@@ -25,9 +26,9 @@ Model "WarShell"
 	Path "models"
 	Model 0 "missile_d.3d"
 	Skin 0 "jmissile_01.png"
-	Scale -0.21 0.2 0.2
+	Scale 0.24 0.2 0.2
 	Offset -13 0 0
-	AngleOffset 180
+	PitchOffset -90
 	USEACTORPITCH
 	USEACTORROLL
 
@@ -38,9 +39,9 @@ Model "GuidedWarShell"
 	Path "models"
 	Model 0 "missile_d.3d"
 	Skin 0 "jmissile_01.png"
-	Scale -0.21 0.2 0.2
+	Scale 0.24 0.2 0.2
 	Offset -13 0 0
-	AngleOffset 180
+	PitchOffset -90
 	USEACTORPITCH
 	USEACTORROLL
 
@@ -52,9 +53,9 @@ Model "WarheadLauncher"
 	Path "models"
 	Model 1 "whpick_d.3d"
 	Skin 1 "jwhpick1.png"
-	Scale -0.2 0.24 0.24
+	Scale 0.2 0.24 0.2
 	ZOffset 12
-	AngleOffset 180
+	RollOffset -90
 	ROTATING
 
 	FrameIndex RDMP A 1 0
@@ -64,8 +65,8 @@ Model "WarheadLauncher"
 	Path "models"
 	Model 1 "whpick_d.3d"
 	Skin 1 "jwhpick1.png"
-	Scale -0.2 0.24 0.24
-	AngleOffset 180
+	Scale 0.2 0.24 0.2
+	RollOffset -90
 	ZOffset 11
 
 	FrameIndex RDMP B 1 0
@@ -79,9 +80,10 @@ Model "WarheadLauncher"
 	SurfaceSkin 0 1 "jwarhead2.png"
 	SurfaceSkin 0 2 "jwarhead3.png"
 	SurfaceSkin 0 3 "jwarhead4.png"
-	Scale 0.2 0.12 0.2
-	PitchOffset 2.8125
-	RollOffset 22.5
+	Scale 0.2 -0.12 0.2
+	AngleOffset 90
+	PitchOffset 22.5
+	RollOffset -87.1875
 	Offset 7.9 -15.6 -9.2
 
 	// select
diff --git a/models/ShieldSuit.png b/models/ShieldSuit.png
deleted file mode 100644
index 7cd843c..0000000
Binary files a/models/ShieldSuit.png and /dev/null differ
diff --git a/models/ToxSuit_a.3d b/models/ToxSuit_a.3d
deleted file mode 100644
index c1d33cb..0000000
Binary files a/models/ToxSuit_a.3d and /dev/null differ
diff --git a/models/ToxSuit_d.3d b/models/ToxSuit_d.3d
deleted file mode 100644
index 77262b0..0000000
Binary files a/models/ToxSuit_d.3d and /dev/null differ
diff --git a/readme.txt b/readme.txt
index 51a699d..a74e2fd 100644
--- a/readme.txt
+++ b/readme.txt
@@ -26,7 +26,6 @@ Currently implemented:
   - Shield Belt (megasphere)
  - Invisibility (blursphere)
  - Computer Map (computer area map)
- - Shielding Suit (hybrid of U1 asbestos/toxin suits, radsuit)
  - Searchlight (light amplification visor)
  - Enhanced Shock Rifle (slot 4, limited ammo, invulnerability sphere)
  - UT HUD
@@ -35,14 +34,14 @@ Currently implemented:
  - Translocator (slot 1)
  - Enforcer (slot 2)
    - Dual Enforcers (slot 2)
+ - Ripper (slot 6)
+ - Jump Boots (radsuit, has "iron boots" powerup effect to compensate)
 
 In progress:
 
- - Ripper (slot 6)
  - Minigun (slot 7)
  - Rocket Launcher (slot 9)
  - Sniper Rifle (slot 0)
- - Jump Boots (radsuit, has "iron boots" powerup effect to compensate, will full replace Shielding Suit when implemented)
 
 Things to do eventually:
 
diff --git a/sndinfo.txt b/sndinfo.txt
index aea1402..4c10500 100644
--- a/sndinfo.txt
+++ b/sndinfo.txt
@@ -112,7 +112,6 @@ udamage/fire1	ampfire
 udamage/fire2	ampfire2
 udamage/drain	ampout
 trans/pickup	voicesnd
-suit/pickup	suitsnd
 misc/gibbed1	gib1
 misc/gibbed2	gib2
 misc/gibbed3	gib3
diff --git a/textures.misc b/textures.misc
index 41cefcb..a30c59c 100644
--- a/textures.misc
+++ b/textures.misc
@@ -139,7 +139,7 @@ Sprite "UDAMB0",1,1{}
 Sprite "BPAKA0",1,1{}
 Sprite "INVSA0",1,1{}
 Sprite "TRNSA0",1,1{}
-Sprite "SSUTA0",1,1{}
+Sprite "JBUTA0",1,1{}
 Sprite "SLITA0",1,1{}
 Sprite "CHIPA0",1,1{}
 Sprite "CHIPB0",1,1{}
diff --git a/zscript/biorifle.zsc b/zscript/biorifle.zsc
index 93c3716..ddace81 100644
--- a/zscript/biorifle.zsc
+++ b/zscript/biorifle.zsc
@@ -257,7 +257,7 @@ Class BioGel : Actor
 			}
 			angle = atan2(normal.y,normal.x);
 			pitch = 0;
-			roll = 0;
+			roll = 180;	// otherwise it slides upwards (UT changes roll like this too)
 			LineTrace(angle+180,172,0,TRF_THRUACTORS,data:d);
 			SetOrigin(d.HitLocation+normal*0.5,false);
 			if ( waterlevel > 0 ) hittype = HIT_FLOOR;
diff --git a/zscript/enforcer.zsc b/zscript/enforcer.zsc
index 2fe71e4..5add0a3 100644
--- a/zscript/enforcer.zsc
+++ b/zscript/enforcer.zsc
@@ -157,15 +157,11 @@ Class Enforcer : UTWeapon replaces Pistol
 		else Screen.DrawText(confont,Font.CR_GREEN,Screen.GetWidth()*0.01,Screen.GetHeight()*0.88,String.Format("Clip: % 2d / 20",clipcount));
 	}
 
-	override bool HandlePickup (Inventory item)
+	override bool HandlePickup( Inventory item )
 	{
 		if ( item.GetClass() == GetClass() )
 		{
-			if ( item.Amount == 1 )
-			{
-				item.bPickupGood = true;
-				item.SetTag("Dual Enforcers");
-			}
+			SetTag("Dual Enforcers");
 			return Super.HandlePickup(item);
 		}
 		return false;
@@ -199,7 +195,7 @@ Class Enforcer : UTWeapon replaces Pistol
 		if ( !weap || !player ) return;
 		if ( slave )
 		{
-			if ( invoker.slaveclipcount < 5 ) A_PlaySound("enforcer/click",CHAN_7);
+			if ( CVar.GetCVar('flak_enforcerreload').GetBool() && (invoker.slaveclipcount < 5) ) A_PlaySound("enforcer/click",CHAN_7);
 			if ( (invoker.slaveclipcount <= 0) || (weap.Ammo1.Amount <= 0) )
 			{
 				invoker.slaverefire = 0;
@@ -226,7 +222,7 @@ Class Enforcer : UTWeapon replaces Pistol
 		}
 		else
 		{
-			if ( invoker.clipcount < 5 ) A_PlaySound("enforcer/click",CHAN_WEAPON);
+			if ( CVar.GetCVar('flak_enforcerreload').GetBool() && (invoker.clipcount < 5) ) A_PlaySound("enforcer/click",CHAN_WEAPON);
 			if ( (invoker.clipcount <= 0) || (weap.Ammo1.Amount <= 0) )
 			{
 				A_ClearRefire();
diff --git a/zscript/flakcannon.zsc b/zscript/flakcannon.zsc
index fb23324..7f46831 100644
--- a/zscript/flakcannon.zsc
+++ b/zscript/flakcannon.zsc
@@ -145,8 +145,8 @@ Class FlakChunk : Actor
 	Default
 	{
 		Obituary "%o was ripped to shreds by %k's Flak Cannon.";
-		Radius 4;
-		Height 4;
+		Radius 2;
+		Height 2;
 		Speed 50;
 		DamageFunction Random[Flak](12,18);
 		DamageType 'Shredded';
diff --git a/zscript/powerups.zsc b/zscript/powerups.zsc
index 7d81cb4..8f4048c 100644
--- a/zscript/powerups.zsc
+++ b/zscript/powerups.zsc
@@ -294,43 +294,78 @@ Class UTMapRevealer : MapRevealer replaces Allmap
 	}
 }
 
-
-Class ShieldingSuit : PowerupGiver replaces RadSuit
+Class UTJumpBoots : Inventory replaces RadSuit
 {
 	Default
 	{
-		Tag "Shielding Suit";
+		Tag "AntiGrav Boots";
 		+INVENTORY.AUTOACTIVATE;
 		+INVENTORY.ALWAYSPICKUP;
-		Inventory.MaxAmount 0;
-		Powerup.Type "PowerShieldingSuit";
-		Inventory.PickupMessage "You got the Shielding Suit.";
-		Inventory.PickupSound "suit/pickup";
-		Inventory.RespawnTics 2100;
+		Inventory.Amount 3;
+		Inventory.MaxAmount 3;
+		Inventory.PickupMessage "You picked up the AntiGrav boots.";
+		Inventory.PickupSound "boot/pickup";
+		Inventory.RespawnTics 1050;
+	}
+	override bool Use( bool pickup )
+	{
+		if ( pickup )
+		{
+			Owner.GiveInventory("PowerJumpBoots_HighJump",1);
+			Owner.GiveInventory("PowerJumpBoots_IronFeet",1);
+		}
+		return false;
+	}
+	override void Tick()
+	{
+		Super.Tick();
+		if ( !Owner || !Owner.player ) return;
+		if ( owner.player.jumptics == -1 )
+		{
+			Amount--;
+			Owner.A_PlaySound("boot/jump",CHAN_BODY);
+			if ( Amount <= 0 )
+			{
+				PrintPickupMessage(true,"The AntiGrav Boots have drained.");
+				DepleteOrDestroy();
+			}
+		}
+	}
+	override void DetachFromOwner()
+	{
+		Super.DetachFromOwner();
+		Owner.TakeInventory("PowerJumpBoots_HighJump",1);
+		Owner.TakeInventory("PowerJumpBoots_IronFeet",1);
 	}
 	States
 	{
 	Spawn:
-		SSUT A -1;
+		JBUT A -1;
 		Stop;
 	}
 }
 
-Class PowerShieldingSuit : PowerIronFeet
+Class PowerJumpBoots_HighJump : PowerHighJump
 {
 	Default
 	{
-		Powerup.Duration -60;
-		Powerup.Color "C0FFEE", 0.35;
+		Powerup.Strength 3;
+		Powerup.Duration int.max;
+	}
+}
+Class PowerJumpBoots_IronFeet : PowerIronFeet
+{
+	Default
+	{
+		Powerup.Duration int.max;
+		Powerup.Color "00 00 00", 0.0;
 	}
 	override void AbsorbDamage( int damage, Name damageType, out int newdamage )
 	{
-		if ( (damageType == 'Slime') || (damageType == 'Fire') || (damageType == 'Ice') || (damageType == 'Poison') )
-			newdamage = 0;
 	}
-	override void EndEffect()
+	override void DoEffect()
 	{
-		PrintPickupMessage(true,"Air supply in the Shielding Suit has expired.");
+		Powerup.DoEffect();
 	}
 }
 
diff --git a/zscript/uthud.zsc b/zscript/uthud.zsc
index 27fa896..c2bc192 100644
--- a/zscript/uthud.zsc
+++ b/zscript/uthud.zsc
@@ -242,12 +242,12 @@ Class UTHud : BaseStatusBar
 		Color dollcolor = tintcolor;
 		DamageAmplifier d;
 		UTArmor b, a, t, s;
-		//UTJumpBoots j;
+		UTJumpBoots j;
 		d = DamageAmplifier(CPlayer.mo.FindInventory("DamageAmplifier"));
 		b = UTArmor(CPlayer.mo.FindInventory("UTArmorBonus"));
 		a = UTArmor(CPlayer.mo.FindInventory("UTBodyArmor"));
 		t = UTArmor(CPlayer.mo.FindInventory("UTThighPads"));
-		//b = CPlayer.mo.FindInventory("UTJumpBoots"));
+		j = UTJumpBoots(CPlayer.mo.FindInventory("UTJumpBoots"));
 		s = UTArmor(CPlayer.mo.FindInventory("UTShieldBelt"));
 		if ( d && !d.isBlinking() ) dollcolor = d.BlendColor;
 		if ( CPlayer.GetGender() == 1 )
@@ -256,7 +256,7 @@ Class UTHud : BaseStatusBar
 			DrawColor = dollcolor;
 			if ( a ) UTDrawColorTex(Woman[1],1.0,a.Amount/double(a.MaxAmount));
 			if ( t ) UTDrawColorTex(Woman[2],1.0,t.Amount/double(t.MaxAmount));
-			//if ( j ) UTDrawColorTex(Woman[3],1.0,b.Amount/double(b.MaxAmount));
+			if ( j ) UTDrawColorTex(Woman[3],1.0,j.Amount/double(j.MaxAmount));
 			DrawColor = GoldColor;
 			if ( s ) UTDrawColorTex(Woman[4],1.0,s.Amount/double(s.MaxAmount));
 		}
@@ -266,7 +266,7 @@ Class UTHud : BaseStatusBar
 			DrawColor = dollcolor;
 			if ( a ) UTDrawColorTex(Man[1],1.0,a.Amount/double(a.MaxAmount));
 			if ( t ) UTDrawColorTex(Man[2],1.0,t.Amount/double(t.MaxAmount));
-			//if ( j ) UTDrawColorTex(Man[3],1.0,b.Amount/double(b.MaxAmount));
+			if ( j ) UTDrawColorTex(Man[3],1.0,j.Amount/double(j.MaxAmount));
 			DrawColor = GoldColor;
 			if ( s ) UTDrawColorTex(Man[4],1.0,s.Amount/double(s.MaxAmount));
 		}