diff --git a/src/client/entry.c b/src/client/entry.c
index 8c4fddf0..3538a20e 100644
--- a/src/client/entry.c
+++ b/src/client/entry.c
@@ -88,7 +88,6 @@ CSQC_Init(float apilevel, string enginename, float engineversion)
 
 	/* Effects */
 	Effects_Init();
-	precache_sound("misc/talk.wav");
 
 	precache_sound("common/wpn_hudon.wav");
 	precache_sound("common/wpn_hudoff.wav");
diff --git a/src/client/obituary.c b/src/client/obituary.c
index 0bd13c42..5d4f5042 100644
--- a/src/client/obituary.c
+++ b/src/client/obituary.c
@@ -41,10 +41,9 @@ Obituary_KillIcon(int id, float w)
 #ifdef VALVE
 	vector spr_size;
 
+	/* fill in the entries and calculate some in advance */
 	if (w > 0) {
 		spr_size = drawgetimagesize(g_weapons[w].ki_spr);
-		print(sprintf("Weapon death: %d\n", w));
-		/* fill in the entries and calculate some in advance */
 		g_obituary[id].strImage = g_weapons[w].ki_spr;
 		g_obituary[id].vecPos = g_weapons[w].ki_xy;
 		g_obituary[id].vecSize = g_weapons[w].ki_size;
@@ -53,7 +52,6 @@ Obituary_KillIcon(int id, float w)
 		g_obituary[id].vecWH[0] = g_weapons[w].ki_size[0] / spr_size[0];
 		g_obituary[id].vecWH[1] = g_weapons[w].ki_size[1] / spr_size[1];
 	} else {
-		/* fill in the entries and calculate some in advance */
 		g_obituary[id].strImage = "sprites/640hud1.spr_0.tga";
 		g_obituary[id].vecPos = [192,224];
 		g_obituary[id].vecSize = [32,16];
@@ -98,7 +96,8 @@ Obituary_Add(string attacker, string victim, float weapon, float flags)
 	g_obituary_time = OBITUARY_TIME;
 }
 
-void Obituary_Draw(void)
+void
+Obituary_Draw(void)
 {
 	int i;
 	vector vecPos;
@@ -142,9 +141,18 @@ void Obituary_Draw(void)
 		v = g_obituary[i].strVictim;
 		drawstring_r(vecItem + [0,2], v, [12,12], [1,1,1], 1.0f, 0);
 		vecItem[0] -= stringwidth(v, TRUE, [12,12]) + 4;
-		
 		vecItem[0] -= g_obituary[i].vecSize[0];
-		drawsubpic(vecItem, g_obituary[i].vecSize, g_obituary[i].strImage, g_obituary[i].vecXY, g_obituary[i].vecWH, g_hud_color, 1.0f, DRAWFLAG_ADDITIVE);
+
+		drawsubpic(
+			vecItem,
+			g_obituary[i].vecSize,
+			g_obituary[i].strImage,
+			g_obituary[i].vecXY,
+			g_obituary[i].vecWH,
+			g_hud_color,
+			1.0f,
+			DRAWFLAG_ADDITIVE
+		);
 
 		a = g_obituary[i].strAttacker;
 		drawstring_r(vecItem + [-4,2], a, [12,12], [1,1,1], 1.0f, 0);
diff --git a/src/client/voice.c b/src/client/voice.c
index a3b25f82..7097790f 100644
--- a/src/client/voice.c
+++ b/src/client/voice.c
@@ -24,20 +24,21 @@ Draws a little notification for anyone using voice chat
 void Voice_DrawHUD(void) {
 	vector pos = video_mins + [video_res[0] - 160, video_res[1] - 136];
 
-	/*for (int i = -1; i > -32; i--) {
+	for (int i = -1; i > -32; i--) {
 		if (getplayerkeyfloat(i, INFOKEY_P_VOIPSPEAKING) == 1) {
-			drawfill(pos, [144,24], VGUI_WINDOW_BGCOLOR, VGUI_WINDOW_BGALPHA);
-			drawfill(pos, [144, 1], vVGUIColor, VGUI_WINDOW_FGALPHA);
-			drawfill([pos[0], pos[1] + 23], [144, 1], vVGUIColor, VGUI_WINDOW_FGALPHA);
-			drawfill(pos, [1, 24], vVGUIColor, VGUI_WINDOW_FGALPHA);
-			drawfill([pos[0] + 143, pos[1]], [1, 24], vVGUIColor, VGUI_WINDOW_FGALPHA);
+			drawfill(pos, [144,24], [0,0,0], 0.5f);
+			drawfill(pos, [144, 1], UI_MAINCOLOR, 1.0f);
+			drawfill([pos[0], pos[1] + 23], [144, 1], UI_MAINCOLOR, 1.0f);
+			drawfill(pos, [1, 24], UI_MAINCOLOR, 1.0f);
+			drawfill([pos[0] + 143, pos[1]], [1, 24], UI_MAINCOLOR, 1.0f);
 
-			CSQC_DrawText([pos[0] + 28, pos[1] + 8], getplayerkeyvalue(i, "name"), [12,12], vVGUIColor, VGUI_WINDOW_FGALPHA, DRAWFLAG_NORMAL, FONT_CON);
+			drawfont = FONT_CON;
+			drawstring([pos[0] + 28, pos[1] + 8], getplayerkeyvalue(i, "name"), [12,12], UI_MAINCOLOR, 1.0f, DRAWFLAG_NORMAL);
 
-			drawpic(pos + [2,0], "gfx/vgui/icntlk_sv.tga", [24,24], vVGUIColor, 1, DRAWFLAG_NORMAL);
+			drawpic(pos + [2,0], "gfx/vgui/icntlk_sv.tga", [24,24], UI_MAINCOLOR, 1, DRAWFLAG_NORMAL);
 			pos[1] -= 32;
 		}
-	}*/
+	}
 }
 
 
@@ -52,10 +53,10 @@ void Voice_Draw3D(entity t)
 		vector vpos = t.origin + [0,0,48];
 		makevectors(view_angles);
 		R_BeginPolygon("gfx/vgui/icntlk_pl");
-		R_PolygonVertex(vpos + v_right*16 - v_up*16, '1 1', [1,1,1], 1);
-		R_PolygonVertex(vpos - v_right*16 - v_up*16, '0 1', [1,1,1], 1);
-		R_PolygonVertex(vpos - v_right*16 + v_up*16, '0 0', [1,1,1], 1);
-		R_PolygonVertex(vpos + v_right*16 + v_up*16, '1 0', [1,1,1], 1);
+		R_PolygonVertex(vpos + v_right*8 - v_up*8, '1 1', [1,1,1], 1);
+		R_PolygonVertex(vpos - v_right*8 - v_up*8, '0 1', [1,1,1], 1);
+		R_PolygonVertex(vpos - v_right*8 + v_up*8, '0 0', [1,1,1], 1);
+		R_PolygonVertex(vpos + v_right*8 + v_up*8, '1 0', [1,1,1], 1);
 		R_EndPolygon();
 	}
 }
diff --git a/src/gs-entbase/server/func_healthcharger.cpp b/src/gs-entbase/server/func_healthcharger.cpp
index 78a25e7c..f4e50c43 100644
--- a/src/gs-entbase/server/func_healthcharger.cpp
+++ b/src/gs-entbase/server/func_healthcharger.cpp
@@ -80,7 +80,7 @@ void func_healthcharger::customphysics(void)
 	}
 
 	if (m_eUser) {
-		sound(this, CHAN_ITEM, "misc/null.wav", 1.0, ATTN_NORM);
+		sound(this, CHAN_ITEM, "common/null.wav", 1.0, ATTN_NORM);
 		m_eUser = world;
 	}
 }
diff --git a/src/gs-entbase/server/func_recharge.cpp b/src/gs-entbase/server/func_recharge.cpp
index b5821976..70404c3a 100644
--- a/src/gs-entbase/server/func_recharge.cpp
+++ b/src/gs-entbase/server/func_recharge.cpp
@@ -79,7 +79,7 @@ void func_recharge::customphysics(void)
 		return;
 	}
 	if (m_eUser) {
-		sound(this, CHAN_ITEM, "misc/null.wav", 1.0, ATTN_NORM);
+		sound(this, CHAN_ITEM, "common/null.wav", 1.0, ATTN_NORM);
 		m_eUser = world;
 	}
 }
diff --git a/src/server/cstrike/main.c b/src/server/cstrike/main.c
index 129144c4..6aa5b6b0 100644
--- a/src/server/cstrike/main.c
+++ b/src/server/cstrike/main.c
@@ -239,7 +239,6 @@ void Game_Worldspawn(void)
 	precache_model("models/player/vip/vip.mdl");
 	precache_model("models/w_c4.mdl");
 
-	precache_sound("misc/null.wav");
 	precache_sound("hostage/hos1.wav");
 	precache_sound("hostage/hos2.wav");
 	precache_sound("hostage/hos3.wav");
diff --git a/src/server/entry.c b/src/server/entry.c
index 64d89b08..88dc8905 100644
--- a/src/server/entry.c
+++ b/src/server/entry.c
@@ -171,11 +171,6 @@ void initents(void)
 	precache_sound("player/pl_grate3.wav");
 	precache_sound("player/pl_grate4.wav");
 
-	precache_sound("player/pl_snow1.wav");
-	precache_sound("player/pl_snow2.wav");
-	precache_sound("player/pl_snow3.wav");
-	precache_sound("player/pl_snow4.wav");
-
 	precache_sound("player/pl_step1.wav");
 	precache_sound("player/pl_step2.wav");
 	precache_sound("player/pl_step3.wav");
@@ -187,6 +182,8 @@ void initents(void)
 	precache_sound("common/wpn_denyselect.wav");
 	precache_sound("player/sprayer.wav");
 	precache_sound("items/flashlight1.wav");
+	precache_sound("common/null.wav");
+
 	Game_Worldspawn();
 	Decals_Init();
 }
diff --git a/src/server/scihunt/server.c b/src/server/scihunt/server.c
index fd117036..8e743289 100644
--- a/src/server/scihunt/server.c
+++ b/src/server/scihunt/server.c
@@ -27,21 +27,19 @@ float Game_ConsoleCmd(string cmd)
 void Game_Worldspawn(void)
 {
 	precache_model("models/player.mdl");
-    precache_model("models/w_weaponbox.mdl");
+	precache_model("models/w_weaponbox.mdl");
+	precache_sound("fvox/flatline.wav");
 
-    precache_sound("misc/null.wav");
-    precache_sound("fvox/flatline.wav");
-
-    /* TODO: Scan and precache models/player/.mdl */
-    precache_model("models/player/barney/barney.mdl");
-    precache_model("models/player/gman/gman.mdl");
-    precache_model("models/player/gordon/gordon.mdl");
-    precache_model("models/player/hgrunt/hgrunt.mdl");
-    precache_model("models/player/scientist/scientist.mdl");
-    precache_model("models/player/zombie/zombie.mdl");
-    precache_model("models/player/helmet/helmet.mdl");
-    precache_model("models/player/recon/recon.mdl");
-    precache_model("models/player/robo/robo.mdl");
-    Weapons_Init();
+	/* TODO: Scan and precache models/player/.mdl */
+	precache_model("models/player/barney/barney.mdl");
+	precache_model("models/player/gman/gman.mdl");
+	precache_model("models/player/gordon/gordon.mdl");
+	precache_model("models/player/hgrunt/hgrunt.mdl");
+	precache_model("models/player/scientist/scientist.mdl");
+	precache_model("models/player/zombie/zombie.mdl");
+	precache_model("models/player/helmet/helmet.mdl");
+	precache_model("models/player/recon/recon.mdl");
+	precache_model("models/player/robo/robo.mdl");
+	Weapons_Init();
 	SHData_Parse(mapname);
 }
diff --git a/src/server/valve/server.c b/src/server/valve/server.c
index d4e592e8..2629d319 100644
--- a/src/server/valve/server.c
+++ b/src/server/valve/server.c
@@ -28,8 +28,6 @@ void Game_Worldspawn(void)
 {
 	precache_model("models/player.mdl");
 	precache_model("models/w_weaponbox.mdl");
-
-	precache_sound("misc/null.wav");
 	precache_sound("fvox/flatline.wav");
 	
 	/* TODO: Scan and precache models/player/.mdl */
diff --git a/src/shared/effects.c b/src/shared/effects.c
index 1391547d..b87e4d1c 100755
--- a/src/shared/effects.c
+++ b/src/shared/effects.c
@@ -37,7 +37,7 @@ void Effects_Init(void)
 	precache_model("models/computergibs.mdl");
 	precache_model("models/rockgibs.mdl");
 	precache_model("models/cindergibs.mdl");
-	
+
 	precache_sound("debris/bustglass1.wav");
 	precache_sound("debris/bustglass2.wav");
 	precache_sound("debris/bustglass3.wav");
@@ -60,7 +60,6 @@ void Effects_Init(void)
 	precache_sound("buttons/spark4.wav");
 	precache_sound("buttons/spark5.wav");
 	precache_sound("buttons/spark6.wav");
-	precache_sound("weapons/knife_hitwall1.wav");
 	precache_sound("weapons/ric1.wav");
 	precache_sound("weapons/ric2.wav");
 	precache_sound("weapons/ric3.wav");
@@ -78,6 +77,7 @@ void Effects_Init(void)
 	precache_sound("weapons/ric_metal-2.wav");
 	precache_sound("weapons/ric_conc-1.wav");
 	precache_sound("weapons/ric_conc-2.wav");
+	precache_sound("weapons/knife_hitwall1.wav");
 #endif
 
 }
diff --git a/src/shared/valve/w_handgrenade.c b/src/shared/valve/w_handgrenade.c
index deda3c94..f63493fc 100644
--- a/src/shared/valve/w_handgrenade.c
+++ b/src/shared/valve/w_handgrenade.c
@@ -28,7 +28,11 @@ enum
 
 void w_handgrenade_precache(void)
 {
-	precache_sound("weapons/grenade/land.wav");
+	precache_sound("weapons/g_bounce1.wav");
+	precache_sound("weapons/g_bounce2.wav");
+	precache_sound("weapons/g_bounce3.wav");
+	precache_sound("weapons/g_bounce4.wav");
+	precache_sound("weapons/g_bounce5.wav");
 	precache_model("models/v_grenade.mdl");
 	precache_model("models/w_grenade.mdl");
 	precache_model("models/p_grenade.mdl");
@@ -77,7 +81,9 @@ void w_handgrenade_throw(void)
 		if (other.takedamage == DAMAGE_YES) {
 			Damage_Apply(other, self.owner, 15, self.origin, FALSE);
 		}
-		sound( self, CHAN_BODY, "weapons/grenade/land.wav", 1, ATTN_NORM );
+		int r = floor(random(0,6));
+		string sample = sprintf("weapons/g_bounce%i.wav", r);
+		sound( self, CHAN_BODY, sample, 1, ATTN_NORM );
 		self.frame = 0;
 	}