diff --git a/zpak001.pk3dir/decls/def/items/battery.def b/zpak001.pk3dir/decls/def/items/battery.def
index df54600..98ef707 100644
--- a/zpak001.pk3dir/decls/def/items/battery.def
+++ b/zpak001.pk3dir/decls/def/items/battery.def
@@ -8,4 +8,5 @@ entityDef item_battery
 	"snd_respawn"	"item.respawn"
 	"inv_armor"		"skill:battery"
 	"requires"		"item_suit"
+	"inv_carry"		"1"
 }
diff --git a/zpak001.pk3dir/decls/def/monsters.def b/zpak001.pk3dir/decls/def/monsters.def
index 4ce70d8..9af2ea5 100644
--- a/zpak001.pk3dir/decls/def/monsters.def
+++ b/zpak001.pk3dir/decls/def/monsters.def
@@ -38,6 +38,7 @@
 #include "monsters/sitting_scientist.def"
 #include "monsters/skeleton_dead.def"
 #include "monsters/snapbug.def"
+#include "monsters/snark.def"
 #include "monsters/stukabat.def"
 #include "monsters/tentacle.def"
 #include "monsters/tentaclemaw.def"
diff --git a/zpak001.pk3dir/decls/def/monsters/alien_controller.def b/zpak001.pk3dir/decls/def/monsters/alien_controller.def
index 7ef672d..1d57583 100644
--- a/zpak001.pk3dir/decls/def/monsters/alien_controller.def
+++ b/zpak001.pk3dir/decls/def/monsters/alien_controller.def
@@ -1,19 +1,19 @@
 entityDef monster_alien_controller
 {
 	"spawnclass"		"NSTalkMonster"
-	"model"		"models/controller.mdl"
-	"netname"		"Alien Controller"
-	"health"		"skill:controller_health"
-	"mins"		"-32 -32 0"
-	"maxs"		"32 32 64"
+	"model"				"models/controller.mdl"
+	"netname"			"Alien Controller"
+	"health"			"skill:controller_health"
+	"mins"				"-32 -32 0"
+	"maxs"				"32 32 64"
 	"eye_height"		"64"
-	"team"		"2"
-	"propdata"		"actor_alien"
+	"team"				"2"
+	"propdata"			"actor_alien"
 
-	"speed_walk"		"100"
-	"speed_run"		"500"
-	"flying"		"1"
-	"fly_offset"	"128"
+	"speed_walk"			"100"
+	"speed_run"				"500"
+	"flying"				"1"
+	"fly_offset"			"128"
 	"attack_ranged_range"	"1024"
 
 	events {
diff --git a/zpak001.pk3dir/decls/def/monsters/alien_grunt.def b/zpak001.pk3dir/decls/def/monsters/alien_grunt.def
index 38270a5..00dc940 100644
--- a/zpak001.pk3dir/decls/def/monsters/alien_grunt.def
+++ b/zpak001.pk3dir/decls/def/monsters/alien_grunt.def
@@ -62,7 +62,7 @@ entityDef ranged_agrunt_shot_red
 	"health"				"0"
 	"velocity"				"600"
 	"fuse"					"10"
-	"detonate_on_fuse"		"0"
+	"detonate_on_fuse"		"1"
 	"detonate_on_death"		"0"
 	"detonate_on_world"		"0"
 	"detonate_on_actor"		"1"
@@ -81,7 +81,7 @@ entityDef ranged_agrunt_shot_orange
 	"health"				"0"
 	"velocity"				"800"
 	"fuse"					"10"
-	"detonate_on_fuse"		"0"
+	"detonate_on_fuse"		"1"
 	"detonate_on_death"		"0"
 	"detonate_on_world"		"0"
 	"detonate_on_actor"		"1"
diff --git a/zpak001.pk3dir/decls/def/monsters/headcrab.def b/zpak001.pk3dir/decls/def/monsters/headcrab.def
index 8be3b70..8ba9d82 100644
--- a/zpak001.pk3dir/decls/def/monsters/headcrab.def
+++ b/zpak001.pk3dir/decls/def/monsters/headcrab.def
@@ -1,22 +1,22 @@
 entityDef monster_headcrab
 {
 	"spawnclass"		"NSMonster"
-	"model"		"models/headcrab.mdl"
-	"netname"		"Headcrab"
-	"health"		"skill:headcrab_health"
-	"mins"		"-16 -16 0"
-	"maxs"		"16 16 72"
+	"model"				"models/headcrab.mdl"
+	"netname"			"Headcrab"
+	"health"			"skill:headcrab_health"
+	"mins"				"-16 -16 0"
+	"maxs"				"16 16 72"
 	"eye_height"		"12"
-	"team"		"2"
-	"propdata"		"actor_alien"
+	"team"				"2"
+	"propdata"			"actor_alien"
 	"speed_walk"		"32"
-	"speed_run"		"72"
+	"speed_run"			"72"
 
 	"attack_ranged_range"	"180" // needs launch attack
 
-	"snd_idle"		"monster_headcrab.idle"
-	"snd_pain"		"monster_headcrab.pain"
-	"snd_death"		"monster_headcrab.death"
+	"snd_idle"			"monster_headcrab.idle"
+	"snd_pain"			"monster_headcrab.pain"
+	"snd_death"			"monster_headcrab.death"
 	"leap_damage"		"skill:headcrab_dmg_bite"
 
 	events {
diff --git a/zpak001.pk3dir/decls/def/monsters/snark.def b/zpak001.pk3dir/decls/def/monsters/snark.def
index 9949426..dd82612 100644
--- a/zpak001.pk3dir/decls/def/monsters/snark.def
+++ b/zpak001.pk3dir/decls/def/monsters/snark.def
@@ -1,30 +1,30 @@
 entityDef monster_snark
 {
 	"spawnclass"		"NSMonster"
-	"model"		"models/w_squeak.mdl"
-	"netname"		"Snark"
-	"health"		"skill:snark_health"
-	"mins"		"-16 -16 0"
-	"maxs"		"16 16 72"
+	"model"				"models/w_squeak.mdl"
+	"netname"			"Snark"
+	"health"			"skill:snark_health"
+	"mins"				"-16 -16 0"
+	"maxs"				"16 16 72"
 	"eye_height"		"12"
-	"team"		"2"
-	"propdata"		"actor_alien"
-	"speed_walk"		"32"
-	"speed_run"		"72"
+	"team"				"$ALLIANCE_ROGUE"
+	"propdata"			"actor_alien"
+	"speed_walk"		"128"
+	"speed_run"			"128"
+	"act_idle"			"0"
+	"act_rangeAttack1"	"2"
+	"act_walk"			"3"
+	"act_run"			"3"
 
-	"attack_ranged_range"	"180" // needs launch attack
+	"attack_ranged_range"	"96" // needs launch attack
 
-	"snd_idle"		"monster_snark.idle"
-	"snd_pain"		"monster_snark.pain"
-	"snd_death"		"monster_snark.death"
+	"snd_idle"			"monster_snark.idle"
+	"snd_pain"			"monster_snark.pain"
+	"snd_death"			"monster_snark.death"
 	"leap_damage"		"skill:snark_dmg_bite"
 
 	events {
 		jump "AddVelocity" "512 0 250"
 		jump "StartSoundDef" "monster_snark.attack"
-		jump_variation1 "AddVelocity" "512 0 350"
-		jump_variation1 "StartSoundDef" "monster_snark.attack"
-		jump_variation2 "AddVelocity" "512 0 350"
-		jump_variation2 "StartSoundDef" "monster_snark.attack"
 	}
 }
\ No newline at end of file
diff --git a/zpak001.pk3dir/decls/def/weapons/gauss.def b/zpak001.pk3dir/decls/def/weapons/gauss.def
index a756db3..5d82059 100644
--- a/zpak001.pk3dir/decls/def/weapons/gauss.def
+++ b/zpak001.pk3dir/decls/def/weapons/gauss.def
@@ -68,5 +68,5 @@ entityDef fireInfo_gausscharge
 	"act_release"		"5,6"
 	"act_delay"			"3"
 	"act_loop"			"4"
-	"knockbackRelease"	"1024"
+	"knockbackRelease"	"384"
 }
diff --git a/zpak001.pk3dir/decls/def/weapons/handgrenade.def b/zpak001.pk3dir/decls/def/weapons/handgrenade.def
index 34ac0fe..a8fe164 100644
--- a/zpak001.pk3dir/decls/def/weapons/handgrenade.def
+++ b/zpak001.pk3dir/decls/def/weapons/handgrenade.def
@@ -1,4 +1,3 @@
-
 entityDef weapon_handgrenade
 {
 	"editor_color"			".3 .3 1"
@@ -15,7 +14,7 @@ entityDef weapon_handgrenade
 
 	"inv_name"				"Hand Grenade"
 	"inv_weapon"			"weapon_handgrenade"
-	"inv_ammo_handgrenade"	"5"
+	"inv_ammo_handgrenade"	"1"
 	"def_onRelease"			"projectile_handgrenade"
 	"def_onFire"			"projectile_handgrenade"
 
diff --git a/zpak001.pk3dir/decls/def/weapons/hornetgun.def b/zpak001.pk3dir/decls/def/weapons/hornetgun.def
index e186649..7394bdd 100644
--- a/zpak001.pk3dir/decls/def/weapons/hornetgun.def
+++ b/zpak001.pk3dir/decls/def/weapons/hornetgun.def
@@ -9,39 +9,60 @@ entityDef weapon_hornetgun
 	"spawnclass"		"HLWeapon"
 	"model"				"models/w_hgun.mdl"
 	"model_view"		"models/v_hgun.mdl"
-	"snd_acquire"		"weapon.pickup"
+	"snd_acquire"		"Player.PickupWeapon"
 	"snd_respawn"		"item.respawn"
 
 	// weapon specific
 	"def_fireInfo"		"fireInfo_hornetgun"
+	"def_altFireInfo"	"fireInfo_hornetgunAlt"
 	"inv_name"			"Hornet Gun"
 	"inv_ammo_hornet"	"8"
 
-	"act_fire"		"5"
-	"act_holster"	"3"
-	"act_draw"		"4"
-	"act_idle"		"0,1,2"
+	"act_fire"			"5"
+	"act_holster"		"3"
+	"act_draw"			"4"
+	"act_idle"			"0,1,2"
 
-	"snd_fire"		"Weapon_Hornetgun.Single"
+	"snd_fire"			"Weapon_Hornetgun.Single"
 
 	// HLWeapon specific
-	"hudSlot"		"3"
-	"hudSlotPos"	"3"
-	"weight"		"10"
+	"hudSlot"			"3"
+	"hudSlotPos"		"3"
+	"weight"			"10"
+	"regenAmmo"			"1"
+	"regenRate"			"0.7"
 }
 
 entityDef projectile_hornet
 {
-	"spawnclass" "NSProjectile"
+	"inherit" 	"ranged_agrunt_shot_orange
"
 	"damage"	"10"
+	"offset"	"24 8 -16"
+}
+
+entityDef projectile_hornet_red
+{
+	"inherit" 	"ranged_agrunt_shot_red
"
+	"damage"	"10"
+	"offset"	"24 8 -16"
 }
 
 entityDef fireInfo_hornetgun
 {
-	"def_onFire"	"projectile_hornet"
+	"def_onFire"		"projectile_hornet"
 	"ammoType"			"ammo_hornet"
 	"ammoRequired"		"1"
 	"ammoPerShot"		"1"
 	"fireRate"			"1.0"
 	"punchAngle"		"-1 0 0"
 }
+
+entityDef fireInfo_hornetgunAlt
+{
+	"def_onFire"		"projectile_hornet_red"
+	"ammoType"			"ammo_hornet"
+	"ammoRequired"		"1"
+	"ammoPerShot"		"1"
+	"fireRate"			"0.2"
+	"punchAngle"		"-1 0 0"
+}
diff --git a/zpak001.pk3dir/decls/def/weapons/rpg.def b/zpak001.pk3dir/decls/def/weapons/rpg.def
index 7525727..38d8dcf 100644
--- a/zpak001.pk3dir/decls/def/weapons/rpg.def
+++ b/zpak001.pk3dir/decls/def/weapons/rpg.def
@@ -37,6 +37,7 @@ entityDef weapon_rpg
 	"hudSlotPos"	"0"
 	"weight"		"20"
 	"altLaser"		"1"
+	"altMode"			"1"
 }
 
 entityDef projectile_rocket
diff --git a/zpak001.pk3dir/decls/def/weapons/satchel.def b/zpak001.pk3dir/decls/def/weapons/satchel.def
index 235e920..d9418c0 100644
--- a/zpak001.pk3dir/decls/def/weapons/satchel.def
+++ b/zpak001.pk3dir/decls/def/weapons/satchel.def
@@ -15,20 +15,20 @@ entityDef weapon_satchel
 	"ammoType"			"ammo_satchel"
 	"inv_ammo_satchel"	"1"
 	"ammoRequired"		"1"
-	"def_onFire"	"projectile_satchel"
+	"def_onFire"		"projectile_satchel"
 	"detonateOnFire"	"projectile_satchel"
 	"fireRate"			"1.0"
-	"removeOnEmpty" "1"
+	"removeOnEmpty" 	"1"
 
 	"act_idle"			"0,1"
 	"act_draw"			"2"
 	"act_fire"			"3"
 
 	// HLWeapon specific
-	"hudSlot"		"4"
-	"hudSlotPos"	"1"
-	"weight"		"-20"
-	"crosshair"		"none"
+	"hudSlot"			"4"
+	"hudSlotPos"		"1"
+	"weight"			"-20"
+	"crosshair"			"none"
 }
 
 entityDef projectile_satchel
diff --git a/zpak001.pk3dir/decls/def/weapons/snark.def b/zpak001.pk3dir/decls/def/weapons/snark.def
index 10284f6..f1db195 100644
--- a/zpak001.pk3dir/decls/def/weapons/snark.def
+++ b/zpak001.pk3dir/decls/def/weapons/snark.def
@@ -37,5 +37,8 @@ entityDef weapon_snark
 
 entityDef projectile_snark
 {
-	"spawnclass"		"monster_snark"
+	"spawnclass"		"NSAttack"
+	"def_drop"			"monster_snark"
+	"dropDistance"		"24"
+	"dropOffset"		"8"
 }