diff --git a/ProtoNotes.md b/ProtoNotes.md
index 848d9d6..e9ac6a3 100644
--- a/ProtoNotes.md
+++ b/ProtoNotes.md
@@ -1,4 +1,4 @@
-### Unnamed Weapon / Bigman Gun
+### Unnamed Weapon / Bigman Gun / Demolisher
 
  - Undocumented, shape-wise it's reminiscent of the Bigman's guns, so I'm
    going to repurpose it as pretty much that.
@@ -6,26 +6,30 @@
    various overlays from Mine.utx just for kicks.
  - It's big. Pretty much as big as a Redeemer, so you need two hands to use it.
  - Fires exploding boolets. Altfire is a rapid fire mode with a lot of recoil.
+ - Came up with a name for it.
+ - Ammo models were improvised by editing the unused sconce part of the Jclip1
+   texture.
 
-### Bonesaw?
+### Bonesaw? / Razorclaw
 
  - The closest thing to whatever was described in the Unreal bible. Original
    model looked like it could spin, so I did just that.
  - Has "stab" (grab) and "slice" (spin) animations, close enough.
  - Bible describes a "Skaarj Blade" upgrade, guess since I'm using the
    Razorjack texture for them then it's already upgraded.
+ - Also came up with a name for it.
 
-### Flame Gun
+### Flame Gun / Fireblaster
 
  - Changed up to not make it redundant since the Flamethrower is in too. It
    shoots fireballs, so it's more of a long range single shot weapon compared
    to the medium range dps barrage that is the flamethrower.
  - Altfire is a three-shot burst in a horizontal arc. Kinda like the "spray"
    attack mercs do.
- - The original was supposed to have 900 max ammo, give 100 per pickup and use
-   10 per shot. This is dumb so I'm dividing all of that by 10.
  - The model had no UV mapping so I improvised a lot. Thankfully Blender's
    texture paint helped for most of it.
+ - New name given, "flame gun" sounds too placeholder-y.
+ - Uses same ammo as flamethrower.
 
 ### Flamethrower / Napalm Gun
 
@@ -43,6 +47,7 @@
  - Actually I made an alternate model with the old texture. It had some shape
    changes to accomodate for it. I still think the texture sucks. It should be
    switchable, just like how you can change weapon sprites in Smooth Doom.
+ - Ammo is just a recolored explosive barrel.
 
 ### Quadshot
 
@@ -71,25 +76,26 @@
    with an electricity texture.
  - The weapon will use two ammo types. One for individual gems, and another for
    the total charge of each gem (which will be used for the altfire).
+ - This weapon is kind of OP, so it needs to be in the BFG replacement pool.
+ - Supposedly meant to use the same ammo as the stinger, but... I'm giving it
+   a separate one.
 
 ### Stunner
 
  - This one can be used as-is.
  - Made a separate pickup model with holes filled.
+ - Has a similar regenerating ammo as the dispersion pistol.
 
 ### "Teleport gun"
 
  - Them teleport capsules.
  - Although I can leave this as-is I think I should change the hand.
- - Might also use the UT 220 model just for kicks, since it has an automag
-   hand already. Would do it as an alternate skin, like the Flamethrower.
 
-### Old Automag
+### Old Automag / Proto Automag
 
- - Gotta decide on which version of the skin to use. I personally prefer the
-   black one, as it'll difference it from the standard automag.
- - May want to change the hand (which will involve re-animating the gun, welp).
-   At least doing that I have an excuse to fix some holes in the mesh.
+ - Gun is re-animated in order to use the same hand as the final automag.
+ - Uses the old black skin, but the off-hand gun when dual wielding will use
+   the newer skin.
 
 ### Sentry
 
@@ -114,3 +120,4 @@
    barrel one by one like it. Plus an alt-fire that shoots all four, of course.
  - This will be the Redeemer equivalent, so it needs to be powerful as heck but
    have a low ammo count.
+ - No ammo pickups.
diff --git a/Readme.md b/Readme.md
index 743afc3..057329b 100644
--- a/Readme.md
+++ b/Readme.md
@@ -18,27 +18,33 @@ This mod requires GZDoom 4.1.0 or later, and runs on top of Doom Tournament.
 
 ## Planned
 
+ - Implement Stinger behavior described in the Unreal Bible.
  - Dispersion Pistol (slot 1) (replaces fist)
    - Dispersion Pistol Powerup (replaces Berserk)
  - Automag (slot 2) (replaces pistol)
+   - Dual Automags
  - ASMD (slot 4) (replaces shotgun)
  - Eightball (slot 5) (replaces rocket launcher)
  - Razorjack (slot 7) (replaces chaingun)
+   - Make altfire actually seek where player is aiming
  - GES Bio Rifle (slot 8) (replaces plasma rifle)
  - Rifle (slot 9) (replaces plasma rifle)
+   - Restored rapid fire
+   - Restored flashlight
  - Minigun (slot 0) (replaces chaingun)
 
  - Stunner (slot 1) (replaces chainsaw)
- - "Bonesaw" (slot 1) (replaces chainsaw)
- - Translocator (slot 1)
- - Old Automag (slot 2) (replaces pistol)
+ - Razorclaw (slot 1) (replaces chainsaw)
+ - Teleport Capsule (slot 1)
+ - Proto Automag (slot 2) (replaces pistol)
+   - Dual Protomags
  - Quadshot (slot 3) (replaces super shotgun)
  - Peacemaker (slot 5) (rare spawn near backpack)
- - Impaler (slot 4) (replaces bfg9000)
- - Flamethrower (slot 8) (replaces bfg9000)
- - Flame Gun (slot 7) (replaces bfg9000)
- - Bigman Handgun (slot 5) (replaces bfg9000)
- - Autocannon (slot 7) (replaces bfg9000)
+ - Impaler (slot 4) (replaces plasma rifle)
+ - Flamethrower (slot 8) (replaces plasma rifle)
+ - Fireblaster (slot 7) (replaces rocket launcher)
+ - Demolisher (slot 9) (replaces bfg9000)
+ - Autocannon (slot 0) (replaces bfg9000)
 
  - Amplifier (replaces berserk)
  - Armor (replaces blue armor)
@@ -62,7 +68,6 @@ This mod requires GZDoom 4.1.0 or later, and runs on top of Doom Tournament.
  - Dampener (rare spawn near backpack)
 
  - Motion Detector (replaces computer map)
- - Light/Dark Flare (given at start, infinite use)
  - Minigun Sentry (rare spawn near backpack)
 
 ## Known bugs
diff --git a/language.txt b/language.txt
index 6785224..19ad9ab 100644
--- a/language.txt
+++ b/language.txt
@@ -51,7 +51,7 @@ STING_CBIZ = "Biz:";
 O_STINGER = "%o fue perforad@[ao_esp] por el Arma Aguijón de %k.";
 /* Pickup messages */
 I_STINGERAMMOL = "Has recogido ";
-I_STINGERAMMOR = " Fragmentos de Tarydium.";
+I_STINGERAMMOR = " fragmentos de Tarydium.";
 I_STINGER = "Has obtenido el Arma Aguijón.";
 I_TRANSLATOR = "Has obtenido el Traductor Universal.";
 /* Tags */
diff --git a/menudef.txt b/menudef.txt
index 9f5d4ac..0fc097c 100644
--- a/menudef.txt
+++ b/menudef.txt
@@ -46,7 +46,7 @@ OptionMenu "UnrealCreditsMenu"
 	StaticText "Zard1084, Jonathan Nemo, NekoMithos, 3d0xp0xy", "White"
 	StaticText " "
 	StaticText "$STING_CTHANK", "Gold"
-	StaticText "KynikossDragonn, The Cutting Room Floor", "White"
+	StaticText "KynikossDragonn, Raffine52, The Cutting Room Floor", "White"
 	StaticText " "
 	StaticText "Unreal", "Red"
 	StaticText " "
diff --git a/models/BigGAmmoBox_a.3d b/models/BigGAmmoBox_a.3d
new file mode 100644
index 0000000..c75b648
Binary files /dev/null and b/models/BigGAmmoBox_a.3d differ
diff --git a/models/BigGAmmoBox_d.3d b/models/BigGAmmoBox_d.3d
new file mode 100644
index 0000000..542c80d
Binary files /dev/null and b/models/BigGAmmoBox_d.3d differ
diff --git a/models/BigGAmmoSingle_a.3d b/models/BigGAmmoSingle_a.3d
new file mode 100644
index 0000000..6f72c54
Binary files /dev/null and b/models/BigGAmmoSingle_a.3d differ
diff --git a/models/BigGAmmoSingle_d.3d b/models/BigGAmmoSingle_d.3d
new file mode 100644
index 0000000..e078f56
Binary files /dev/null and b/models/BigGAmmoSingle_d.3d differ
diff --git a/models/BigGAmmo_a.3d b/models/BigGAmmo_a.3d
new file mode 100644
index 0000000..b255226
Binary files /dev/null and b/models/BigGAmmo_a.3d differ
diff --git a/models/BigGAmmo_d.3d b/models/BigGAmmo_d.3d
new file mode 100644
index 0000000..f91acda
Binary files /dev/null and b/models/BigGAmmo_d.3d differ
diff --git a/models/BigGShellC_a.3d b/models/BigGShellC_a.3d
new file mode 100644
index 0000000..b1b3fdb
Binary files /dev/null and b/models/BigGShellC_a.3d differ
diff --git a/models/BigGShellC_d.3d b/models/BigGShellC_d.3d
new file mode 100644
index 0000000..c17cb59
Binary files /dev/null and b/models/BigGShellC_d.3d differ
diff --git a/models/Jclip1.png b/models/Jclip1.png
index 6e03dda..ab8c598 100644
Binary files a/models/Jclip1.png and b/models/Jclip1.png differ
diff --git a/models/OldAutoMag_a.3d b/models/OldAutoMag_a.3d
index a2736e4..492a82c 100644
Binary files a/models/OldAutoMag_a.3d and b/models/OldAutoMag_a.3d differ
diff --git a/models/OldAutoMag_d.3d b/models/OldAutoMag_d.3d
index d353865..67ff117 100644
Binary files a/models/OldAutoMag_d.3d and b/models/OldAutoMag_d.3d differ
diff --git a/models/OldAutomag.blend b/models/OldAutomag.blend
new file mode 100644
index 0000000..1bc32e2
Binary files /dev/null and b/models/OldAutomag.blend differ
diff --git a/models/OldAutomag.blend1 b/models/OldAutomag.blend1
new file mode 100644
index 0000000..eb297ce
Binary files /dev/null and b/models/OldAutomag.blend1 differ
diff --git a/sounds/OldASel.ogg b/sounds/OldASel.ogg
new file mode 100644
index 0000000..d02d457
Binary files /dev/null and b/sounds/OldASel.ogg differ
diff --git a/sounds/OldMag.ogg b/sounds/OldMag.ogg
index da6d734..cda422a 100644
Binary files a/sounds/OldMag.ogg and b/sounds/OldMag.ogg differ
diff --git a/sounds/StunChrg.ogg b/sounds/StunChrg.ogg
new file mode 100644
index 0000000..70b5659
Binary files /dev/null and b/sounds/StunChrg.ogg differ
diff --git a/sounds/StunFire.ogg b/sounds/StunFire.ogg
new file mode 100644
index 0000000..301a14f
Binary files /dev/null and b/sounds/StunFire.ogg differ
diff --git a/sounds/StunSel.ogg b/sounds/StunSel.ogg
new file mode 100644
index 0000000..cb9d52c
Binary files /dev/null and b/sounds/StunSel.ogg differ
diff --git a/sounds/beam.ogg b/sounds/beam.ogg
deleted file mode 100644
index d29e91b..0000000
Binary files a/sounds/beam.ogg and /dev/null differ
diff --git a/zmapinfo.txt b/zmapinfo.txt
index ad74b68..8a90a43 100644
--- a/zmapinfo.txt
+++ b/zmapinfo.txt
@@ -1,7 +1,7 @@
 GameInfo
 {
 	AddEventHandlers = "UnrealMainHandler", "UnrealStaticHandler"
-	PlayerClasses = "UPlayerMale1", "UPlayerMale2", "UPlayerMale3", "UPlayerFemale1", "UPlayerFemale2"
+	PlayerClasses = "UPlayerFemale1", "UPlayerFemale2", "UPlayerMale1", "UPlayerMale2", "UPlayerMale3"
 	StatusBarClass = "UnrealHud"
 	BorderFlat = "Border"
 	BackpackType = "UnrealBackpack"
diff --git a/zscript/unrealcommon.zsc b/zscript/unrealcommon.zsc
index a016e58..61bfd8d 100644
--- a/zscript/unrealcommon.zsc
+++ b/zscript/unrealcommon.zsc
@@ -158,6 +158,28 @@ Class UPlayer : UTPlayer
 	}
 }
 
+Class UPlayerFemale1 : UPlayer
+{
+	Default
+	{
+		Player.SoundClass "ufemale";
+		Player.DisplayName "$N_FEMALE1";
+		Player.Portrait "";
+		UTPlayer.VoiceType VOICE_FemaleTwo;
+		-NOMENU;
+	}
+}
+Class UPlayerFemale2 : UPlayer
+{
+	Default
+	{
+		Player.SoundClass "ufemale";
+		Player.DisplayName "$N_FEMALE2";
+		Player.Portrait "";
+		UTPlayer.VoiceType VOICE_FemaleOne;
+		-NOMENU;
+	}
+}
 Class UPlayerMale1 : UPlayer
 {
 	Default
@@ -191,28 +213,6 @@ Class UPlayerMale3 : UPlayer
 		-NOMENU;
 	}
 }
-Class UPlayerFemale1 : UPlayer
-{
-	Default
-	{
-		Player.SoundClass "ufemale";
-		Player.DisplayName "$N_FEMALE1";
-		Player.Portrait "";
-		UTPlayer.VoiceType VOICE_FemaleTwo;
-		-NOMENU;
-	}
-}
-Class UPlayerFemale2 : UPlayer
-{
-	Default
-	{
-		Player.SoundClass "ufemale";
-		Player.DisplayName "$N_FEMALE2";
-		Player.Portrait "";
-		UTPlayer.VoiceType VOICE_FemaleOne;
-		-NOMENU;
-	}
-}
 
 Class UnrealInventory : Inventory
 {
@@ -315,14 +315,14 @@ Class UnrealMainHandler : EventHandler
 	{
 		if ( (e.Replacee == 'Shotgun') || (e.Replacee == 'SuperShotgun') || (e.Replacee == 'Crossbow') )
 		{
-			/*if ( !Random[Replacements](0,3) ) e.Replacement = 'Enforcer';
+			/*if ( !Random[Replacements](0,3) ) e.Replacement = 'Automag';
 			else if ( Random[Replacements](0,1) ) */e.Replacement = 'Stinger';
-			/*else e.Replacement = 'ShockRifle';*/
+			/*else e.Replacement = 'ASMD';*/
 		}
 		else if ( (e.Replacee == 'RocketLauncher') || (e.Replacee == 'PhoenixRod') )
 		{
 			/*if ( Random[Replacements](0,1) ) */e.Replacement = 'UFlakCannon';
-			/*else e.Replacement = 'UTRocketLauncher';*/
+			/*else e.Replacement = 'Eightball';*/
 		}
 		else if ( e.Replacee == 'Backpack' ) e.Replacement = 'UnrealBackpack';
 	}