diff --git a/source/maps/fgd/hl-nzp.fgd b/source/maps/fgd/hl-nzp.fgd
index 0554a27..582f5bc 100644
--- a/source/maps/fgd/hl-nzp.fgd
+++ b/source/maps/fgd/hl-nzp.fgd
@@ -65,15 +65,249 @@
 @baseclass base(Appearflags) size(-16 -16 -32, 16 16 40) 
 	color(0 255 0) = PlayerClass []
 
-@PointClass base(PlayerClass) studio("models/player.mdl") = info_player_start : "Player 1 start" []
-
-
-@PointClass base(PlayerClass) color(0 102 0) studio("models/player.mdl") = info_player_tank : "Tank Dempsey" []
-@PointClass base(PlayerClass) color(0 102 0) studio("models/player.mdl") = info_player_doctor : "Edward Richtofen" []
-@PointClass base(PlayerClass) color(0 102 0) studio("models/player.mdl") = info_player_takeo : "Takeo Masaki" []
-@PointClass base(PlayerClass) color(0 102 0) studio("models/player.mdl") = info_player_nikolai : "Nikolai Belinski" []
-
-
+@PointClass base(PlayerClass) color(255 255 255) studio("models/player.mdl") = info_player_1_start : "Player 1 Spawn Point" [
+	weapon(choices) : "Weapon" : 0 = 
+	[
+		1: "Colt M1911"
+		2: "Kar 98k"
+		3: "Thompson"
+		4: ".357 Magnum"
+		5: "BAR"
+		6: "Ballistic Knife"
+		7: "Browning M1919"
+		8: "Double-Barreled Shotgun"
+		9: "FG42"
+		10: "Gewehr 43"
+		11: "Scoped Kar 98k"
+		12: "M1 Garand"
+		13: "M1A1 Carbine"
+		14: "M2 Flamethrower"
+		15: "MP40"
+		16: "MG42"
+		17: "Panzerschrek"
+		18: "PPSh-41"
+		19: "PTRS-41"
+		20: "Ray Gun"
+		21: "Sawed-Off Shotgun"
+		22: "STG-44"
+		23: "M1897 Trench Gun"
+		24: "Type 100"
+		54: "MP5K"
+		58: "Springfield"
+		56: "Wunderwaffe DG-2"
+		28: "Mustang & Sally (Colt M1911)"
+		36: "Armageddon (Kar 98k)"
+		38: "Gibs-O-Matic (Thompson)"
+		29: ".357 Plus 1 K1L-u (.357 Magnum)"
+		52: "The Widow Maker (BAR)"
+		46: "B115 Accelerator (Browning M1919)"
+		43: "24 Bore Long Range (Double-Barreled Shotgun)"
+		44: "420 Impeller (FG42)"
+		30: "G115 Compressor (Gewehr)"
+		49: "Headcracker (Scoped Kar 98k)"
+		31: "M1000 (M1 Garand)"
+		34: "Widdershins RC-1 (M1A1 Carbine)"
+		35: "F1W Nitrogen Cooled (M2 Flamethrower)"
+		40: "The Afterburner (MP40)"
+		45: "Barracuda FU-A11 (MG42)"
+		50: "Longinus (Panzerschreck)"
+		48: "The Reaper (PPSh-41)"
+		51: "The Penetrator (PTRS-41)"
+		33: "Porter's X2 Ray Gun (Ray Gun)"
+		42: "The Snuff Box (Sawed-Off Shotgun)"
+		41: "Spatz-447 + (Stg-44)"
+		47: "Gut Shot (M1897 Trench Gun)"
+		39: "1001 Samurais (Type 100)"
+		32: "MP115 Kollider (MP5K)"
+		59: "Pulverizer (Springfield)"
+		57: "Wunderwaffe DG-3 JZ (Wunderwaffe DG-2)"
+	]
+	currentmag(integer) : "Starting Magazine" : 0
+	currentammo(integer) : "Starting Reserve Ammunition" : 0
+]
+	
+@PointClass base(PlayerClass) color(2 118 181) studio("models/player.mdl") = info_player_2_start : "Player 2 Spawn Point" [
+	weapon(choices) : "Weapon" : 0 = 
+	[
+		1: "Colt M1911"
+		2: "Kar 98k"
+		3: "Thompson"
+		4: ".357 Magnum"
+		5: "BAR"
+		6: "Ballistic Knife"
+		7: "Browning M1919"
+		8: "Double-Barreled Shotgun"
+		9: "FG42"
+		10: "Gewehr 43"
+		11: "Scoped Kar 98k"
+		12: "M1 Garand"
+		13: "M1A1 Carbine"
+		14: "M2 Flamethrower"
+		15: "MP40"
+		16: "MG42"
+		17: "Panzerschrek"
+		18: "PPSh-41"
+		19: "PTRS-41"
+		20: "Ray Gun"
+		21: "Sawed-Off Shotgun"
+		22: "STG-44"
+		23: "M1897 Trench Gun"
+		24: "Type 100"
+		54: "MP5K"
+		58: "Springfield"
+		56: "Wunderwaffe DG-2"
+		28: "Mustang & Sally (Colt M1911)"
+		36: "Armageddon (Kar 98k)"
+		38: "Gibs-O-Matic (Thompson)"
+		29: ".357 Plus 1 K1L-u (.357 Magnum)"
+		52: "The Widow Maker (BAR)"
+		46: "B115 Accelerator (Browning M1919)"
+		43: "24 Bore Long Range (Double-Barreled Shotgun)"
+		44: "420 Impeller (FG42)"
+		30: "G115 Compressor (Gewehr)"
+		49: "Headcracker (Scoped Kar 98k)"
+		31: "M1000 (M1 Garand)"
+		34: "Widdershins RC-1 (M1A1 Carbine)"
+		35: "F1W Nitrogen Cooled (M2 Flamethrower)"
+		40: "The Afterburner (MP40)"
+		45: "Barracuda FU-A11 (MG42)"
+		50: "Longinus (Panzerschreck)"
+		48: "The Reaper (PPSh-41)"
+		51: "The Penetrator (PTRS-41)"
+		33: "Porter's X2 Ray Gun (Ray Gun)"
+		42: "The Snuff Box (Sawed-Off Shotgun)"
+		41: "Spatz-447 + (Stg-44)"
+		47: "Gut Shot (M1897 Trench Gun)"
+		39: "1001 Samurais (Type 100)"
+		32: "MP115 Kollider (MP5K)"
+		59: "Pulverizer (Springfield)"
+		57: "Wunderwaffe DG-3 JZ (Wunderwaffe DG-2)"
+	]
+	currentmag(integer) : "Starting Magazine" : 0
+	currentammo(integer) : "Starting Reserve Ammunition" : 0
+]
+	
+@PointClass base(PlayerClass) color(235 189 0) studio("models/player.mdl") = info_player_3_start : "Player 3 Spawn Point" [
+	weapon(choices) : "Weapon" : 0 = 
+	[
+		1: "Colt M1911"
+		2: "Kar 98k"
+		3: "Thompson"
+		4: ".357 Magnum"
+		5: "BAR"
+		6: "Ballistic Knife"
+		7: "Browning M1919"
+		8: "Double-Barreled Shotgun"
+		9: "FG42"
+		10: "Gewehr 43"
+		11: "Scoped Kar 98k"
+		12: "M1 Garand"
+		13: "M1A1 Carbine"
+		14: "M2 Flamethrower"
+		15: "MP40"
+		16: "MG42"
+		17: "Panzerschrek"
+		18: "PPSh-41"
+		19: "PTRS-41"
+		20: "Ray Gun"
+		21: "Sawed-Off Shotgun"
+		22: "STG-44"
+		23: "M1897 Trench Gun"
+		24: "Type 100"
+		54: "MP5K"
+		58: "Springfield"
+		56: "Wunderwaffe DG-2"
+		28: "Mustang & Sally (Colt M1911)"
+		36: "Armageddon (Kar 98k)"
+		38: "Gibs-O-Matic (Thompson)"
+		29: ".357 Plus 1 K1L-u (.357 Magnum)"
+		52: "The Widow Maker (BAR)"
+		46: "B115 Accelerator (Browning M1919)"
+		43: "24 Bore Long Range (Double-Barreled Shotgun)"
+		44: "420 Impeller (FG42)"
+		30: "G115 Compressor (Gewehr)"
+		49: "Headcracker (Scoped Kar 98k)"
+		31: "M1000 (M1 Garand)"
+		34: "Widdershins RC-1 (M1A1 Carbine)"
+		35: "F1W Nitrogen Cooled (M2 Flamethrower)"
+		40: "The Afterburner (MP40)"
+		45: "Barracuda FU-A11 (MG42)"
+		50: "Longinus (Panzerschreck)"
+		48: "The Reaper (PPSh-41)"
+		51: "The Penetrator (PTRS-41)"
+		33: "Porter's X2 Ray Gun (Ray Gun)"
+		42: "The Snuff Box (Sawed-Off Shotgun)"
+		41: "Spatz-447 + (Stg-44)"
+		47: "Gut Shot (M1897 Trench Gun)"
+		39: "1001 Samurais (Type 100)"
+		32: "MP115 Kollider (MP5K)"
+		59: "Pulverizer (Springfield)"
+		57: "Wunderwaffe DG-3 JZ (Wunderwaffe DG-2)"
+	]
+	currentmag(integer) : "Starting Magazine" : 0
+	currentammo(integer) : "Starting Reserve Ammunition" : 0
+]
+	
+@PointClass base(PlayerClass) color(0 230 34) studio("models/player.mdl") = info_player_4_start : "Player 4 Spawn Point" [
+	weapon(choices) : "Weapon" : 0 = 
+	[
+		1: "Colt M1911"
+		2: "Kar 98k"
+		3: "Thompson"
+		4: ".357 Magnum"
+		5: "BAR"
+		6: "Ballistic Knife"
+		7: "Browning M1919"
+		8: "Double-Barreled Shotgun"
+		9: "FG42"
+		10: "Gewehr 43"
+		11: "Scoped Kar 98k"
+		12: "M1 Garand"
+		13: "M1A1 Carbine"
+		14: "M2 Flamethrower"
+		15: "MP40"
+		16: "MG42"
+		17: "Panzerschrek"
+		18: "PPSh-41"
+		19: "PTRS-41"
+		20: "Ray Gun"
+		21: "Sawed-Off Shotgun"
+		22: "STG-44"
+		23: "M1897 Trench Gun"
+		24: "Type 100"
+		54: "MP5K"
+		58: "Springfield"
+		56: "Wunderwaffe DG-2"
+		28: "Mustang & Sally (Colt M1911)"
+		36: "Armageddon (Kar 98k)"
+		38: "Gibs-O-Matic (Thompson)"
+		29: ".357 Plus 1 K1L-u (.357 Magnum)"
+		52: "The Widow Maker (BAR)"
+		46: "B115 Accelerator (Browning M1919)"
+		43: "24 Bore Long Range (Double-Barreled Shotgun)"
+		44: "420 Impeller (FG42)"
+		30: "G115 Compressor (Gewehr)"
+		49: "Headcracker (Scoped Kar 98k)"
+		31: "M1000 (M1 Garand)"
+		34: "Widdershins RC-1 (M1A1 Carbine)"
+		35: "F1W Nitrogen Cooled (M2 Flamethrower)"
+		40: "The Afterburner (MP40)"
+		45: "Barracuda FU-A11 (MG42)"
+		50: "Longinus (Panzerschreck)"
+		48: "The Reaper (PPSh-41)"
+		51: "The Penetrator (PTRS-41)"
+		33: "Porter's X2 Ray Gun (Ray Gun)"
+		42: "The Snuff Box (Sawed-Off Shotgun)"
+		41: "Spatz-447 + (Stg-44)"
+		47: "Gut Shot (M1897 Trench Gun)"
+		39: "1001 Samurais (Type 100)"
+		32: "MP115 Kollider (MP5K)"
+		59: "Pulverizer (Springfield)"
+		57: "Wunderwaffe DG-3 JZ (Wunderwaffe DG-2)"
+	]
+	currentmag(integer) : "Starting Magazine" : 0
+	currentammo(integer) : "Starting Reserve Ammunition" : 0
+]
 
 @PointClass = info_null : "info_null (spotlight target)"
 [
diff --git a/source/maps/fgd/tb-nzp.fgd b/source/maps/fgd/tb-nzp.fgd
index d9a7af6..5fcf843 100644
--- a/source/maps/fgd/tb-nzp.fgd
+++ b/source/maps/fgd/tb-nzp.fgd
@@ -65,15 +65,249 @@
 @baseclass base(Appearflags) size(-16 -16 -32, 16 16 40) 
 	color(0 255 0) = PlayerClass []
 
-@PointClass base(PlayerClass) model("models/player.mdl") = info_player_start : "Player 1 start" []
+@PointClass base(PlayerClass) color(255 255 255) model("models/player.mdl") = info_player_1_start : "Player 1 Spawn Point" [
+	weapon(choices) : "Weapon" : 0 = 
+	[
+		1: "Colt M1911"
+		2: "Kar 98k"
+		3: "Thompson"
+		4: ".357 Magnum"
+		5: "BAR"
+		6: "Ballistic Knife"
+		7: "Browning M1919"
+		8: "Double-Barreled Shotgun"
+		9: "FG42"
+		10: "Gewehr 43"
+		11: "Scoped Kar 98k"
+		12: "M1 Garand"
+		13: "M1A1 Carbine"
+		14: "M2 Flamethrower"
+		15: "MP40"
+		16: "MG42"
+		17: "Panzerschrek"
+		18: "PPSh-41"
+		19: "PTRS-41"
+		20: "Ray Gun"
+		21: "Sawed-Off Shotgun"
+		22: "STG-44"
+		23: "M1897 Trench Gun"
+		24: "Type 100"
+		54: "MP5K"
+		58: "Springfield"
+		56: "Wunderwaffe DG-2"
+		28: "Mustang & Sally (Colt M1911)"
+		36: "Armageddon (Kar 98k)"
+		38: "Gibs-O-Matic (Thompson)"
+		29: ".357 Plus 1 K1L-u (.357 Magnum)"
+		52: "The Widow Maker (BAR)"
+		46: "B115 Accelerator (Browning M1919)"
+		43: "24 Bore Long Range (Double-Barreled Shotgun)"
+		44: "420 Impeller (FG42)"
+		30: "G115 Compressor (Gewehr)"
+		49: "Headcracker (Scoped Kar 98k)"
+		31: "M1000 (M1 Garand)"
+		34: "Widdershins RC-1 (M1A1 Carbine)"
+		35: "F1W Nitrogen Cooled (M2 Flamethrower)"
+		40: "The Afterburner (MP40)"
+		45: "Barracuda FU-A11 (MG42)"
+		50: "Longinus (Panzerschreck)"
+		48: "The Reaper (PPSh-41)"
+		51: "The Penetrator (PTRS-41)"
+		33: "Porter's X2 Ray Gun (Ray Gun)"
+		42: "The Snuff Box (Sawed-Off Shotgun)"
+		41: "Spatz-447 + (Stg-44)"
+		47: "Gut Shot (M1897 Trench Gun)"
+		39: "1001 Samurais (Type 100)"
+		32: "MP115 Kollider (MP5K)"
+		59: "Pulverizer (Springfield)"
+		57: "Wunderwaffe DG-3 JZ (Wunderwaffe DG-2)"
+	]
+	currentmag(integer) : "Starting Magazine" : 0
+	currentammo(integer) : "Starting Reserve Ammunition" : 0
+]
 
+@PointClass base(PlayerClass) color(2 118 181) model("models/player.mdl") = info_player_2_start : "Player 2 Spawn Point" [
+	weapon(choices) : "Weapon" : 0 = 
+	[
+		1: "Colt M1911"
+		2: "Kar 98k"
+		3: "Thompson"
+		4: ".357 Magnum"
+		5: "BAR"
+		6: "Ballistic Knife"
+		7: "Browning M1919"
+		8: "Double-Barreled Shotgun"
+		9: "FG42"
+		10: "Gewehr 43"
+		11: "Scoped Kar 98k"
+		12: "M1 Garand"
+		13: "M1A1 Carbine"
+		14: "M2 Flamethrower"
+		15: "MP40"
+		16: "MG42"
+		17: "Panzerschrek"
+		18: "PPSh-41"
+		19: "PTRS-41"
+		20: "Ray Gun"
+		21: "Sawed-Off Shotgun"
+		22: "STG-44"
+		23: "M1897 Trench Gun"
+		24: "Type 100"
+		54: "MP5K"
+		58: "Springfield"
+		56: "Wunderwaffe DG-2"
+		28: "Mustang & Sally (Colt M1911)"
+		36: "Armageddon (Kar 98k)"
+		38: "Gibs-O-Matic (Thompson)"
+		29: ".357 Plus 1 K1L-u (.357 Magnum)"
+		52: "The Widow Maker (BAR)"
+		46: "B115 Accelerator (Browning M1919)"
+		43: "24 Bore Long Range (Double-Barreled Shotgun)"
+		44: "420 Impeller (FG42)"
+		30: "G115 Compressor (Gewehr)"
+		49: "Headcracker (Scoped Kar 98k)"
+		31: "M1000 (M1 Garand)"
+		34: "Widdershins RC-1 (M1A1 Carbine)"
+		35: "F1W Nitrogen Cooled (M2 Flamethrower)"
+		40: "The Afterburner (MP40)"
+		45: "Barracuda FU-A11 (MG42)"
+		50: "Longinus (Panzerschreck)"
+		48: "The Reaper (PPSh-41)"
+		51: "The Penetrator (PTRS-41)"
+		33: "Porter's X2 Ray Gun (Ray Gun)"
+		42: "The Snuff Box (Sawed-Off Shotgun)"
+		41: "Spatz-447 + (Stg-44)"
+		47: "Gut Shot (M1897 Trench Gun)"
+		39: "1001 Samurais (Type 100)"
+		32: "MP115 Kollider (MP5K)"
+		59: "Pulverizer (Springfield)"
+		57: "Wunderwaffe DG-3 JZ (Wunderwaffe DG-2)"
+	]
+	currentmag(integer) : "Starting Magazine" : 0
+	currentammo(integer) : "Starting Reserve Ammunition" : 0
+]
 
-@PointClass base(PlayerClass) color(0 102 0) model("models/player.mdl") = info_player_tank : "Tank Dempsey" []
-@PointClass base(PlayerClass) color(0 102 0) model("models/player.mdl") = info_player_doctor : "Edward Richtofen" []
-@PointClass base(PlayerClass) color(0 102 0) model("models/player.mdl") = info_player_takeo : "Takeo Masaki" []
-@PointClass base(PlayerClass) color(0 102 0) model("models/player.mdl") = info_player_nikolai : "Nikolai Belinski" []
-
+@PointClass base(PlayerClass) color(235 189 0) model("models/player.mdl") = info_player_3_start : "Player 3 Spawn Point" [
+	weapon(choices) : "Weapon" : 0 = 
+	[
+		1: "Colt M1911"
+		2: "Kar 98k"
+		3: "Thompson"
+		4: ".357 Magnum"
+		5: "BAR"
+		6: "Ballistic Knife"
+		7: "Browning M1919"
+		8: "Double-Barreled Shotgun"
+		9: "FG42"
+		10: "Gewehr 43"
+		11: "Scoped Kar 98k"
+		12: "M1 Garand"
+		13: "M1A1 Carbine"
+		14: "M2 Flamethrower"
+		15: "MP40"
+		16: "MG42"
+		17: "Panzerschrek"
+		18: "PPSh-41"
+		19: "PTRS-41"
+		20: "Ray Gun"
+		21: "Sawed-Off Shotgun"
+		22: "STG-44"
+		23: "M1897 Trench Gun"
+		24: "Type 100"
+		54: "MP5K"
+		58: "Springfield"
+		56: "Wunderwaffe DG-2"
+		28: "Mustang & Sally (Colt M1911)"
+		36: "Armageddon (Kar 98k)"
+		38: "Gibs-O-Matic (Thompson)"
+		29: ".357 Plus 1 K1L-u (.357 Magnum)"
+		52: "The Widow Maker (BAR)"
+		46: "B115 Accelerator (Browning M1919)"
+		43: "24 Bore Long Range (Double-Barreled Shotgun)"
+		44: "420 Impeller (FG42)"
+		30: "G115 Compressor (Gewehr)"
+		49: "Headcracker (Scoped Kar 98k)"
+		31: "M1000 (M1 Garand)"
+		34: "Widdershins RC-1 (M1A1 Carbine)"
+		35: "F1W Nitrogen Cooled (M2 Flamethrower)"
+		40: "The Afterburner (MP40)"
+		45: "Barracuda FU-A11 (MG42)"
+		50: "Longinus (Panzerschreck)"
+		48: "The Reaper (PPSh-41)"
+		51: "The Penetrator (PTRS-41)"
+		33: "Porter's X2 Ray Gun (Ray Gun)"
+		42: "The Snuff Box (Sawed-Off Shotgun)"
+		41: "Spatz-447 + (Stg-44)"
+		47: "Gut Shot (M1897 Trench Gun)"
+		39: "1001 Samurais (Type 100)"
+		32: "MP115 Kollider (MP5K)"
+		59: "Pulverizer (Springfield)"
+		57: "Wunderwaffe DG-3 JZ (Wunderwaffe DG-2)"
+	]
+	currentmag(integer) : "Starting Magazine" : 0
+	currentammo(integer) : "Starting Reserve Ammunition" : 0
+]
 
+@PointClass base(PlayerClass) color(0 230 34) model("models/player.mdl") = info_player_4_start : "Player 4 Spawn Point" [
+	weapon(choices) : "Weapon" : 0 = 
+	[
+		1: "Colt M1911"
+		2: "Kar 98k"
+		3: "Thompson"
+		4: ".357 Magnum"
+		5: "BAR"
+		6: "Ballistic Knife"
+		7: "Browning M1919"
+		8: "Double-Barreled Shotgun"
+		9: "FG42"
+		10: "Gewehr 43"
+		11: "Scoped Kar 98k"
+		12: "M1 Garand"
+		13: "M1A1 Carbine"
+		14: "M2 Flamethrower"
+		15: "MP40"
+		16: "MG42"
+		17: "Panzerschrek"
+		18: "PPSh-41"
+		19: "PTRS-41"
+		20: "Ray Gun"
+		21: "Sawed-Off Shotgun"
+		22: "STG-44"
+		23: "M1897 Trench Gun"
+		24: "Type 100"
+		54: "MP5K"
+		58: "Springfield"
+		56: "Wunderwaffe DG-2"
+		28: "Mustang & Sally (Colt M1911)"
+		36: "Armageddon (Kar 98k)"
+		38: "Gibs-O-Matic (Thompson)"
+		29: ".357 Plus 1 K1L-u (.357 Magnum)"
+		52: "The Widow Maker (BAR)"
+		46: "B115 Accelerator (Browning M1919)"
+		43: "24 Bore Long Range (Double-Barreled Shotgun)"
+		44: "420 Impeller (FG42)"
+		30: "G115 Compressor (Gewehr)"
+		49: "Headcracker (Scoped Kar 98k)"
+		31: "M1000 (M1 Garand)"
+		34: "Widdershins RC-1 (M1A1 Carbine)"
+		35: "F1W Nitrogen Cooled (M2 Flamethrower)"
+		40: "The Afterburner (MP40)"
+		45: "Barracuda FU-A11 (MG42)"
+		50: "Longinus (Panzerschreck)"
+		48: "The Reaper (PPSh-41)"
+		51: "The Penetrator (PTRS-41)"
+		33: "Porter's X2 Ray Gun (Ray Gun)"
+		42: "The Snuff Box (Sawed-Off Shotgun)"
+		41: "Spatz-447 + (Stg-44)"
+		47: "Gut Shot (M1897 Trench Gun)"
+		39: "1001 Samurais (Type 100)"
+		32: "MP115 Kollider (MP5K)"
+		59: "Pulverizer (Springfield)"
+		57: "Wunderwaffe DG-3 JZ (Wunderwaffe DG-2)"
+	]
+	currentmag(integer) : "Starting Magazine" : 0
+	currentammo(integer) : "Starting Reserve Ammunition" : 0
+]
 
 @PointClass = info_null : "info_null (spotlight target)"
 [