diff --git a/Source/Client/Draw.c b/Source/Client/Draw.c
index 877b9e79..8a57fe28 100755
--- a/Source/Client/Draw.c
+++ b/Source/Client/Draw.c
@@ -176,9 +176,6 @@ void CSQC_UpdateView( float fWinWidth, float fWinHeight, float fGameFocus ) {
 	Nightvision_PostDraw();
 	
 	if( fGameFocus == TRUE ) {
-		// temporary
-		vMousePos = getmousepos();
-		
 		// The spectator sees things... differently
 		if ( getplayerkeyvalue( player_localnum, "*spec" ) != "0" ) {
 			VGUI_DrawSpectatorHUD();
diff --git a/Source/Client/HUD.c b/Source/Client/HUD.c
index 76175e15..23f4c79e 100755
--- a/Source/Client/HUD.c
+++ b/Source/Client/HUD.c
@@ -42,7 +42,7 @@ float vHUDNumPos[10] = {
 };
 
 // Ditto
-vector vHUDCalPos[11] = {
+vector vHUDCalPos[15] = {
 	'0 0 0',
 	'0.09375 0.28125 0', 	// 50AE
 	'0.28125 0.28125 0', 	// 762MM
@@ -54,6 +54,10 @@ vector vHUDCalPos[11] = {
 	'0.375 0.28125 0', 		// 45ACP
 	'0.46875 0.28125 0', 	// 357SIG
 	'0.46875 0.375 0', 		// 57MM
+	'0.375 0.375',			// C4
+	'0.5625 0.375',			// SMOKE
+	'0.28125 0.375',		// HE
+	'0.1875 0.375',		// FLASH
 };
 
 /*
@@ -331,6 +335,9 @@ Draws the current clip, the amount of ammo for the caliber and a matching calibe
 void HUD_DrawAmmo( void ) {
 	static float fOldMag, fOldCal;
 	static float fAmmoAlpha;
+	static vector vAmmoMagPos;
+	static vector vAmmoCalPos;
+	
 	if ( getstatf( STAT_ACTIVEWEAPON ) == WEAPON_KNIFE || getstatf( STAT_ACTIVEWEAPON ) == WEAPON_C4BOMB ) {
 		return;
 	}
@@ -345,13 +352,18 @@ void HUD_DrawAmmo( void ) {
 		fAmmoAlpha = HUD_ALPHA;
 	}
 	
-	vector vAmmoMagPos = [ vVideoResolution_x - 142, vVideoResolution_y - 42 ];
-	HUD_DrawNums( getstatf( STAT_CURRENT_MAG ), vAmmoMagPos, fAmmoAlpha, vHUDColor );
-	
-	drawsubpic( [vVideoResolution_x - 118, vVideoResolution_y - 42], '3 25', HUD_NUMFILE_LAYER, [0.9375, 0], [ 0.01171875, 0.09765625 ], vHUDColor, fAmmoAlpha, DRAWFLAG_ADDITIVE );
-	
-	vector vAmmoCalPos = [ vVideoResolution_x - 64, vVideoResolution_y - 42 ];
-	HUD_DrawNums( getstatf( STAT_CURRENT_CALIBER ), vAmmoCalPos, fAmmoAlpha, vHUDColor );
+	if ( wptTable[ getstatf( STAT_ACTIVEWEAPON ) ].iCaliber < 11 ) {
+		vAmmoMagPos = [ vVideoResolution_x - 142, vVideoResolution_y - 42 ];
+		HUD_DrawNums( getstatf( STAT_CURRENT_MAG ), vAmmoMagPos, fAmmoAlpha, vHUDColor );
+		
+		drawsubpic( [vVideoResolution_x - 118, vVideoResolution_y - 42], '3 25', HUD_NUMFILE_LAYER, [0.9375, 0], [ 0.01171875, 0.09765625 ], vHUDColor, fAmmoAlpha, DRAWFLAG_ADDITIVE );
+		
+		vAmmoCalPos = [ vVideoResolution_x - 64, vVideoResolution_y - 42 ];
+		HUD_DrawNums( getstatf( STAT_CURRENT_CALIBER ), vAmmoCalPos, fAmmoAlpha, vHUDColor );
+	} else {
+		vAmmoMagPos = [ vVideoResolution_x - 64, vVideoResolution_y - 42 ];
+		HUD_DrawNums( getstatf( STAT_CURRENT_MAG ), vAmmoMagPos, fAmmoAlpha, vHUDColor );
+	}
 	
 	// Caliber icon
 	drawsubpic( vVideoResolution - '42 42', '24 24', HUD_NUMFILE_LAYER, vHUDCalPos[ wptTable[ getstatf( STAT_ACTIVEWEAPON ) ].iCaliber ], [ NUMSIZE_X, NUMSIZE_X ], vHUDColor, fAmmoAlpha, DRAWFLAG_ADDITIVE );
diff --git a/Source/Client/Makefile b/Source/Client/Makefile
new file mode 100644
index 00000000..d9a657d5
--- /dev/null
+++ b/Source/Client/Makefile
@@ -0,0 +1,4 @@
+CC=fteqcc
+
+all:
+	$(CC) 
diff --git a/Source/Globals.h b/Source/Globals.h
index d8b48217..68ce3516 100755
--- a/Source/Globals.h
+++ b/Source/Globals.h
@@ -133,7 +133,11 @@ enum {
 	CALIBER_BUCKSHOT,
 	CALIBER_45ACP,
 	CALIBER_357SIG,
-	CALIBER_57MM
+	CALIBER_57MM,
+	EXPLOSIVE_C4,
+	EXPLOSIVE_SMOKE,
+	EXPLOSIVE_HE,
+	EXPLOSIVE_FLASH,
 };
 
 .int iAmmo_50AE;
diff --git a/Source/Menu/Draw.c b/Source/Menu/Draw.c
index 66575cca..d2804fdf 100644
--- a/Source/Menu/Draw.c
+++ b/Source/Menu/Draw.c
@@ -43,9 +43,6 @@ void m_draw( vector vScreenSize ) {
 		return;
 	}
 	
-	// temporary
-	vMousePos = getmousepos();
-	
 	if ( vVideoSize != vScreenSize ) {
 		vVideoSize = vScreenSize;
 		vMenuOffset_x = vVideoSize_x / 2 - 320;
diff --git a/Source/Menu/Makefile b/Source/Menu/Makefile
new file mode 100644
index 00000000..d9a657d5
--- /dev/null
+++ b/Source/Menu/Makefile
@@ -0,0 +1,4 @@
+CC=fteqcc
+
+all:
+	$(CC) 
diff --git a/Source/Server/Makefile b/Source/Server/Makefile
new file mode 100644
index 00000000..d9a657d5
--- /dev/null
+++ b/Source/Server/Makefile
@@ -0,0 +1,4 @@
+CC=fteqcc
+
+all:
+	$(CC) 
diff --git a/Source/Shared/WeaponC4Bomb.c b/Source/Shared/WeaponC4Bomb.c
index 260c5c90..07aef777 100755
--- a/Source/Shared/WeaponC4Bomb.c
+++ b/Source/Shared/WeaponC4Bomb.c
@@ -29,7 +29,7 @@ weaponinfo_t wptC4BOMB = {
 	WEAPON_C4BOMB, 		// Identifier
 	SLOT_GRENADE,
 	0, 					// Price
-	CALIBER_50AE, 		// Caliber ID
+	EXPLOSIVE_C4, 		// Caliber ID
 	1.0, 				// Max Player Speed
 	0, 					// Bullets Per Shot
 	0, 					// Clip/MagSize
diff --git a/Source/Shared/WeaponFlashbang.c b/Source/Shared/WeaponFlashbang.c
index 567827f9..e1540fb3 100755
--- a/Source/Shared/WeaponFlashbang.c
+++ b/Source/Shared/WeaponFlashbang.c
@@ -30,7 +30,7 @@ weaponinfo_t wptFLASHBANG = {
 	WEAPON_FLASHBANG, 	// Identifier
 	SLOT_GRENADE,		// Slot
 	200, 				// Price
-	0, 					// Caliber ID
+	EXPLOSIVE_FLASH, 	// Caliber ID
 	1.0, 				// Max Player Speed
 	1, 					// Bullets Per Shot
 	1, 					// Clip/MagSize
diff --git a/Source/Shared/WeaponHEGrenade.c b/Source/Shared/WeaponHEGrenade.c
index c0f37448..19a3d216 100755
--- a/Source/Shared/WeaponHEGrenade.c
+++ b/Source/Shared/WeaponHEGrenade.c
@@ -30,7 +30,7 @@ weaponinfo_t wptHEGRENADE = {
 	WEAPON_HEGRENADE, 	// Identifier
 	SLOT_GRENADE,		// Slot
 	200, 				// Price
-	0, 					// Caliber ID
+	EXPLOSIVE_HE, 		// Caliber ID
 	1.0, 				// Max Player Speed
 	1, 					// Bullets Per Shot
 	1, 					// Clip/MagSize
@@ -101,9 +101,13 @@ void WeaponHEGRENADE_Throw( void ) {
 		remove( self );
 	}
 	static void Weapon_HEGRENADE_Touch( void ) {
+		if ( other == self.owner ) {
+			return;
+		}
 		if ( other.classname == "func_breakable" && other.material == MATERIAL_GLASS ) {
 			Damage_Apply( other, self, 10, self.origin );
 		}
+		
 		sound( self, CHAN_WEAPON, "weapons/he_bounce-1.wav", 1, ATTN_NORM );
 	}
 	
@@ -115,7 +119,7 @@ void WeaponHEGRENADE_Throw( void ) {
 	
 	vector vDir = aim ( self, 100000 );
 	eNade.owner = self;
-	eNade.solid = SOLID_TRIGGER;
+	eNade.solid = SOLID_TRIGGER; // This is so grenades will not get slowed down by windows they touch
 	eNade.angles = vectoangles( vDir );
 	eNade.velocity = ( vDir * 800 );
 	eNade.avelocity = ( v_forward * 600 );
@@ -147,4 +151,4 @@ void WeaponHEGRENADE_Release( void ) {
 		self.think = WeaponHEGRENADE_Throw;
 	}
 #endif
-}
\ No newline at end of file
+}
diff --git a/Source/Shared/WeaponSmokeGrenade.c b/Source/Shared/WeaponSmokeGrenade.c
index d555d728..687f77f1 100755
--- a/Source/Shared/WeaponSmokeGrenade.c
+++ b/Source/Shared/WeaponSmokeGrenade.c
@@ -30,7 +30,7 @@ weaponinfo_t wptSMOKEGRENADE = {
 	WEAPON_SMOKEGRENADE, 	// Identifier
 	SLOT_GRENADE,		// Slot
 	200, 				// Price
-	0, 					// Caliber ID
+	EXPLOSIVE_SMOKE, 	// Caliber ID
 	1.0, 				// Max Player Speed
 	1, 					// Bullets Per Shot
 	1, 					// Clip/MagSize
@@ -152,4 +152,4 @@ void WeaponSMOKEGRENADE_Release( void ) {
 		self.think = WeaponSMOKEGRENADE_Throw;
 	}
 #endif
-}
\ No newline at end of file
+}
diff --git a/freecs/csprogs.dat b/freecs/csprogs.dat
index f5b5892b..57d2cf29 100644
Binary files a/freecs/csprogs.dat and b/freecs/csprogs.dat differ
diff --git a/freecs/menu.dat b/freecs/menu.dat
index 614f3a32..3c226384 100755
Binary files a/freecs/menu.dat and b/freecs/menu.dat differ
diff --git a/freecs/progs.dat b/freecs/progs.dat
index 093027f3..32018350 100644
Binary files a/freecs/progs.dat and b/freecs/progs.dat differ