diff --git a/Source/Client/Draw.c b/Source/Client/Draw.c
index c0cba828..9dea980c 100644
--- a/Source/Client/Draw.c
+++ b/Source/Client/Draw.c
@@ -33,6 +33,7 @@ void CSQC_UpdateView( float fWinWidth, float fWinHeight, float fGameFocus ) {
 	if( fGameFocus == TRUE ) {
 		HUD_Draw();
 		CSQC_VGUI_Draw();
+		drawstring( '320 240 0 ', sprintf( "FRAMETIME: %f",eViewModel.frame1time ) , '8 8 0', '1 1 1', 1, 0 );
 	}
 }
 
diff --git a/Source/Client/HUD.c b/Source/Client/HUD.c
index abe3e067..d4cd3992 100644
--- a/Source/Client/HUD.c
+++ b/Source/Client/HUD.c
@@ -141,10 +141,10 @@ void HUD_Draw( void ) {
 	HUD_DrawNums( getstatf( STAT_MONEY ), vMoneyPos );
 	
 	// Ammo
-	vector vAmmoClipPos = [ vVideoResolution_x - 160, vVideoResolution_y - 42 ];
+	vector vAmmoClipPos = [ vVideoResolution_x - 136, vVideoResolution_y - 42 ];
 	HUD_DrawNums( getstatf( STAT_CURRENT_CLIP ), vAmmoClipPos );
 	
-	vector vAmmoCalPos = [ vVideoResolution_x - 88, vVideoResolution_y - 42 ];
+	vector vAmmoCalPos = [ vVideoResolution_x - 64, vVideoResolution_y - 42 ];
 	HUD_DrawNums( getstatf( STAT_CURRENT_CALIBER ), vAmmoCalPos );
 	
 	// Caliber icon
diff --git a/Source/Client/Project b/Source/Client/Project
index c2ec261c..53b4485f 100644
--- a/Source/Client/Project
+++ b/Source/Client/Project
@@ -28,11 +28,18 @@ long_line_behaviour=1
 long_line_column=72
 
 [files]
-current_page=1
-FILE_NAME_0=1317;C;0;EUTF-8;1;1;0;%2Fhome%2Feukara%2FProjects%2FOpenCS%2FSource%2FShared%2FWeaponUSP45.c;0;4
-FILE_NAME_1=3034;C;0;EUTF-8;1;1;0;%2Fhome%2Feukara%2FProjects%2FOpenCS%2FSource%2FShared%2FWeaponGlock18.c;0;4
-FILE_NAME_2=0;C;0;EUTF-8;1;1;0;%2Fhome%2Feukara%2FProjects%2FOpenCS%2FSource%2FServer%2FInput.c;0;4
-FILE_NAME_3=740;C;0;EUTF-8;1;1;0;%2Fhome%2Feukara%2FProjects%2FOpenCS%2FSource%2FClient%2FView.c;0;4
+current_page=10
+FILE_NAME_0=0;C;0;EUTF-8;1;1;0;%2Fhome%2Feukara%2FProjects%2FOpenCS%2FSource%2FClient%2FInit.c;0;4
+FILE_NAME_1=0;C;0;EUTF-8;1;1;0;%2Fhome%2Feukara%2FProjects%2FOpenCS%2FSource%2FServer%2FEntHostage.c;0;4
+FILE_NAME_2=1141;C;0;EUTF-8;1;1;0;%2Fhome%2Feukara%2FProjects%2FOpenCS%2FSource%2FShared%2FWeaponMP5.c;0;4
+FILE_NAME_3=1142;C;0;EUTF-8;1;1;0;%2Fhome%2Feukara%2FProjects%2FOpenCS%2FSource%2FShared%2FWeaponP90.c;0;4
+FILE_NAME_4=1149;C;0;EUTF-8;1;1;0;%2Fhome%2Feukara%2FProjects%2FOpenCS%2FSource%2FShared%2FWeaponSG550.c;0;4
+FILE_NAME_5=1150;C;0;EUTF-8;1;1;0;%2Fhome%2Feukara%2FProjects%2FOpenCS%2FSource%2FShared%2FWeaponSG552.c;0;4
+FILE_NAME_6=0;C;0;EUTF-8;1;1;0;%2Fhome%2Feukara%2FProjects%2FOpenCS%2FSource%2FShared%2FWeaponM3.c;0;4
+FILE_NAME_7=369;C;0;EUTF-8;1;1;0;%2Fhome%2Feukara%2FProjects%2FOpenCS%2FSource%2FShared%2FWeaponM4A1.c;0;4
+FILE_NAME_8=0;C;0;EUTF-8;1;1;0;%2Fhome%2Feukara%2FProjects%2FOpenCS%2FSource%2FShared%2FWeaponUSP45.c;0;4
+FILE_NAME_9=1222;C;0;EUTF-8;1;1;0;%2Fhome%2Feukara%2FProjects%2FOpenCS%2FSource%2FShared%2FWeaponElites.c;0;4
+FILE_NAME_10=1162;C;0;EUTF-8;1;1;0;%2Fhome%2Feukara%2FProjects%2FOpenCS%2FSource%2FShared%2FWeaponFiveSeven.c;0;4
 
 [VTE]
 last_dir=/home/eukara
diff --git a/Source/Server/.Client.c.un~ b/Source/Server/.Client.c.un~
deleted file mode 100644
index 483b946b..00000000
Binary files a/Source/Server/.Client.c.un~ and /dev/null differ
diff --git a/Source/Server/.Defs.h.un~ b/Source/Server/.Defs.h.un~
deleted file mode 100644
index 3463461f..00000000
Binary files a/Source/Server/.Defs.h.un~ and /dev/null differ
diff --git a/Source/Server/.Entities.c.un~ b/Source/Server/.Entities.c.un~
deleted file mode 100644
index 765d84c9..00000000
Binary files a/Source/Server/.Entities.c.un~ and /dev/null differ
diff --git a/Source/Server/.FuncBuyZone.c.un~ b/Source/Server/.FuncBuyZone.c.un~
deleted file mode 100644
index 6a1aa2df..00000000
Binary files a/Source/Server/.FuncBuyZone.c.un~ and /dev/null differ
diff --git a/Source/Server/.Main.c.un~ b/Source/Server/.Main.c.un~
deleted file mode 100644
index 328e5d79..00000000
Binary files a/Source/Server/.Main.c.un~ and /dev/null differ
diff --git a/Source/Server/.Timer.c.un~ b/Source/Server/.Timer.c.un~
deleted file mode 100644
index 2c983472..00000000
Binary files a/Source/Server/.Timer.c.un~ and /dev/null differ
diff --git a/Source/Server/.client.qc.un~ b/Source/Server/.client.qc.un~
deleted file mode 100644
index de51e47d..00000000
Binary files a/Source/Server/.client.qc.un~ and /dev/null differ
diff --git a/Source/Server/.main.qc.un~ b/Source/Server/.main.qc.un~
deleted file mode 100644
index 2b692de6..00000000
Binary files a/Source/Server/.main.qc.un~ and /dev/null differ
diff --git a/Source/Server/.progs.src.un~ b/Source/Server/.progs.src.un~
deleted file mode 100644
index b7cdb6ed..00000000
Binary files a/Source/Server/.progs.src.un~ and /dev/null differ
diff --git a/Source/Server/Input.c b/Source/Server/Input.c
index 565d7387..7cc2d209 100644
--- a/Source/Server/Input.c
+++ b/Source/Server/Input.c
@@ -28,12 +28,22 @@ void Input_Handle( void ) {
 		Weapon_SecondaryAttack( self.weapon );
 	}
 	
-	/*if( self.impulse == 10 ) { 
-		self.weapon++;
-	} 
-	if( self.impulse == 11 ) { 
-		self.weapon--;
-	} 
-
-	self.impulse = 0;  */
+	if ( cvar( "developer" ) == 1 ) {
+		if( self.impulse == 10 ) { 
+			if ( self.weapon < ( CS_WEAPON_COUNT - 1 ) ) {
+				dprint( "Weapon Cheat +\n" );
+				self.weapon++;
+				CSEv_GamePlayerBuy_f( self.weapon );
+			}
+		} 
+		if( self.impulse == 11 ) { 
+			if ( self.weapon > 1 ) {
+				dprint( "Weapon Cheat -\n" );
+				self.weapon--;
+				CSEv_GamePlayerBuy_f( self.weapon );
+			}
+		} 
+	}
+	
+	self.impulse = 0; 
 }
diff --git a/Source/Shared/WeaponAK47.c b/Source/Shared/WeaponAK47.c
index 49f84603..0e8b7b27 100644
--- a/Source/Shared/WeaponAK47.c
+++ b/Source/Shared/WeaponAK47.c
@@ -35,7 +35,7 @@ weaponinfo_t wptAK47 = {
 	0.98, 				// Range Modifier
 	TYPE_AUTO,
 	0.1, 				// Attack-Delay
-	3.0, 				// Reload-Delay
+	2.4, 				// Reload-Delay
 	iAmmo_762MM, 		// Caliber Pointer
 	iClip_AK47 		// Clip Pointer
 };
diff --git a/Source/Shared/WeaponAUG.c b/Source/Shared/WeaponAUG.c
index 0e1f4b98..221b8d43 100644
--- a/Source/Shared/WeaponAUG.c
+++ b/Source/Shared/WeaponAUG.c
@@ -35,7 +35,7 @@ weaponinfo_t wptAUG = {
 	0.96, 				// Range Modifier
 	TYPE_AUTO,
 	0.09, 				// Attack-Delay
-	3.0, 				// Reload-Delay
+	3.3, 				// Reload-Delay
 	iAmmo_762MM, 		// Caliber Pointer
 	iClip_AUG 		// Clip Pointer
 };
diff --git a/Source/Shared/WeaponAWP.c b/Source/Shared/WeaponAWP.c
index 531faa4d..dc6ed782 100644
--- a/Source/Shared/WeaponAWP.c
+++ b/Source/Shared/WeaponAWP.c
@@ -34,8 +34,8 @@ weaponinfo_t wptAWP = {
 	8192, 				// Bullet Range
 	0.99, 				// Range Modifier
 	TYPE_AUTO,
-	1.5, 				// Attack-Delay
-	3.0, 				// Reload-Delay
+	1.2, 				// Attack-Delay
+	2.9, 				// Reload-Delay
 	iAmmo_338MAG, 		// Caliber Pointer
 	iClip_AWP 		// Clip Pointer
 };
diff --git a/Source/Shared/WeaponDeagle.c b/Source/Shared/WeaponDeagle.c
index 111bb0af..395f24aa 100644
--- a/Source/Shared/WeaponDeagle.c
+++ b/Source/Shared/WeaponDeagle.c
@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 weaponinfo_t wptDEAGLE = { 
 	WEAPON_DEAGLE, 		// Identifier
 	SLOT_SECONDARY,
-	3500, 				// Price
+	650, 				// Price
 	CALIBER_50AE, 		// Caliber ID
 	650, 				// Max Player Speed
 	1, 					// Bullets Per Shot
@@ -35,7 +35,7 @@ weaponinfo_t wptDEAGLE = {
 	0.81, 				// Range Modifier
 	TYPE_SEMI,
 	0.15, 				// Attack-Delay
-	3.0, 				// Reload-Delay
+	2.1, 				// Reload-Delay
 	iAmmo_50AE, 		// Caliber Pointer
 	iClip_DEAGLE 		// Clip Pointer
 };
diff --git a/Source/Shared/WeaponElites.c b/Source/Shared/WeaponElites.c
index 14a3d095..62cfebb2 100644
--- a/Source/Shared/WeaponElites.c
+++ b/Source/Shared/WeaponElites.c
@@ -20,6 +20,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 .int iClip_ELITES;
 
+#ifdef QWSSQC
+.int iMode_ELITES;
+#else
+int iWeaponMode_ELITES;
+#endif
+
 // Weapon Info
 weaponinfo_t wptELITES = { 
 	WEAPON_ELITES, 		// Identifier
@@ -35,7 +41,93 @@ weaponinfo_t wptELITES = {
 	0.75, 				// Range Modifier
 	TYPE_SEMI,
 	0.15, 				// Attack-Delay
-	3.0, 				// Reload-Delay
+	4.6, 				// Reload-Delay
 	iAmmo_9MM, 			// Caliber Pointer
 	iClip_ELITES 		// Clip Pointer
 };
+
+// Anim Table
+enum {
+	ANIM_ELITES_IDLE,
+	ANIM_ELITES_IDLE_LEFTEMPTY,
+	ANIM_ELITES_SHOOT_LEFT1,
+	ANIM_ELITES_SHOOT_LEFT2,
+	ANIM_ELITES_SHOOT_LEFT3,
+	ANIM_ELITES_SHOOT_LEFT4,
+	ANIM_ELITES_SHOOT_LEFT5,
+	ANIM_ELITES_SHOOT_LEFTLAST,
+	ANIM_ELITES_SHOOT_RIGHT1,
+	ANIM_ELITES_SHOOT_RIGHT2,
+	ANIM_ELITES_SHOOT_RIGHT3,
+	ANIM_ELITES_SHOOT_RIGHT4,
+	ANIM_ELITES_SHOOT_RIGHT5,
+	ANIM_ELITES_SHOOT_RIGHTLAST,
+	ANIM_ELITES_RELOAD,
+	ANIM_ELITES_DRAW
+};
+
+void WeaponELITES_Draw( void ) {
+#ifdef QWSSQC
+	OpenCSGunBase_Draw();
+	sound( self, CHAN_WEAPON, "weapons/elite_deploy.wav", 1, ATTN_IDLE ); // TODO: Move to the client...?
+#else
+	View_PlayAnimation( ANIM_ELITES_DRAW );
+#endif
+}
+
+void WeaponELITES_PrimaryFire( void ) {
+#ifdef QWSSQC
+	if ( OpenCSGunBase_PrimaryFire() == TRUE ) {
+		// Play Sound
+		sound( self, CHAN_WEAPON, "weapons/elite_fire.wav", 1, ATTN_NORM );
+	}
+#else
+	int iRand = ceil( random() * 5 );
+	if ( iWeaponMode_ELITES == 0 ) {
+		if ( getstatf( STAT_CURRENT_CLIP ) == 1 ) {
+			View_PlayAnimation( ANIM_ELITES_SHOOT_LEFTLAST );
+		} else {
+			if ( iRand == 1 ) {
+				View_PlayAnimation( ANIM_ELITES_SHOOT_LEFT1 );
+			} else if ( iRand == 2 ) {
+				View_PlayAnimation( ANIM_ELITES_SHOOT_LEFT2 );
+			} else if ( iRand == 3 ) {
+				View_PlayAnimation( ANIM_ELITES_SHOOT_LEFT3 );
+			} else if ( iRand == 4 ) {
+				View_PlayAnimation( ANIM_ELITES_SHOOT_LEFT4 );
+			} else {
+				View_PlayAnimation( ANIM_ELITES_SHOOT_LEFT5 );
+			}
+		}
+	} else {
+		if ( getstatf( STAT_CURRENT_CLIP ) == 0 ) {
+			View_PlayAnimation( ANIM_ELITES_SHOOT_RIGHTLAST );
+		} else {
+			if ( iRand == 1 ) {
+				View_PlayAnimation( ANIM_ELITES_SHOOT_RIGHT1 );
+			} else if ( iRand == 2 ) {
+				View_PlayAnimation( ANIM_ELITES_SHOOT_RIGHT2 );
+			} else if ( iRand == 3 ) {
+				View_PlayAnimation( ANIM_ELITES_SHOOT_RIGHT3 );
+			} else if ( iRand == 4 ) {
+				View_PlayAnimation( ANIM_ELITES_SHOOT_RIGHT4 );
+			} else {
+				View_PlayAnimation( ANIM_ELITES_SHOOT_RIGHT5 );
+			}
+		}
+	}
+	
+	iWeaponMode_ELITES = 1 - iWeaponMode_ELITES;
+#endif
+}
+
+void WeaponELITES_Reload( void ) {
+#ifdef QWSSQC
+	if ( OpenCSGunBase_Reload() == TRUE ) {
+		// Play Sound
+	}
+#else
+	View_PlayAnimation( ANIM_ELITES_RELOAD );
+	iWeaponMode_ELITES = 0;
+#endif
+}
diff --git a/Source/Shared/WeaponFiveSeven.c b/Source/Shared/WeaponFiveSeven.c
index 0e54c3b0..9d8030e9 100644
--- a/Source/Shared/WeaponFiveSeven.c
+++ b/Source/Shared/WeaponFiveSeven.c
@@ -35,7 +35,7 @@ weaponinfo_t wptFIVESEVEN = {
 	0.885, 				// Range Modifier
 	TYPE_SEMI,
 	0.15, 				// Attack-Delay
-	3.0, 				// Reload-Delay
+	3.1, 				// Reload-Delay
 	iAmmo_57MM, 		// Caliber Pointer
 	iClip_FIVESEVEN 		// Clip Pointer
 };
diff --git a/Source/Shared/WeaponG3SG1.c b/Source/Shared/WeaponG3SG1.c
index 4795015d..17a0a946 100644
--- a/Source/Shared/WeaponG3SG1.c
+++ b/Source/Shared/WeaponG3SG1.c
@@ -35,7 +35,7 @@ weaponinfo_t wptG3SG1 = {
 	0.98, 				// Range Modifier
 	TYPE_AUTO,
 	0.25, 				// Attack-Delay
-	3.0, 				// Reload-Delay
+	4.6, 				// Reload-Delay
 	iAmmo_762MM, 		// Caliber Pointer
 	iClip_G3SG1 		// Clip Pointer
 };
diff --git a/Source/Shared/WeaponGlock18.c b/Source/Shared/WeaponGlock18.c
index 92844493..2201fd3f 100644
--- a/Source/Shared/WeaponGlock18.c
+++ b/Source/Shared/WeaponGlock18.c
@@ -41,7 +41,7 @@ weaponinfo_t wptGLOCK18 = {
 	0.75, 				// Range Modifier
 	TYPE_SEMI,
 	0.15, 				// Attack-Delay
-	3.0, 				// Reload-Delay
+	2.0, 				// Reload-Delay
 	iAmmo_9MM, 			// Caliber Pointer
 	iClip_GLOCK18 		// Clip Pointer
 };
diff --git a/Source/Shared/WeaponM4A1.c b/Source/Shared/WeaponM4A1.c
index d543e3f7..b37c30ec 100644
--- a/Source/Shared/WeaponM4A1.c
+++ b/Source/Shared/WeaponM4A1.c
@@ -41,7 +41,7 @@ weaponinfo_t wptM4A1 = {
 	0.97, 				// Range Modifier
 	TYPE_AUTO,
 	0.09, 				// Attack-Delay
-	3.0, 				// Reload-Delay
+	3.1, 				// Reload-Delay
 	iAmmo_556MM, 		// Caliber Pointer
 	iClip_M4A1 			// Clip Pointer
 };
diff --git a/Source/Shared/WeaponMP5.c b/Source/Shared/WeaponMP5.c
index c55629d4..19cce8c3 100644
--- a/Source/Shared/WeaponMP5.c
+++ b/Source/Shared/WeaponMP5.c
@@ -35,7 +35,7 @@ weaponinfo_t wptMP5 = {
 	0.84, 				// Range Modifier
 	TYPE_AUTO,
 	0.08, 				// Attack-Delay
-	3.0, 				// Reload-Delay
+	2.6, 				// Reload-Delay
 	iAmmo_9MM, 			// Caliber Pointer
 	iClip_MP5 			// Clip Pointer
 };
diff --git a/Source/Shared/WeaponMac10.c b/Source/Shared/WeaponMac10.c
index e2ecd511..1a066ac6 100644
--- a/Source/Shared/WeaponMac10.c
+++ b/Source/Shared/WeaponMac10.c
@@ -35,7 +35,7 @@ weaponinfo_t wptMAC10 = {
 	0.82, 				// Range Modifier
 	TYPE_AUTO,
 	0.075, 				// Attack-Delay
-	3.0, 				// Reload-Delay
+	3.2, 				// Reload-Delay
 	iAmmo_45ACP, 		// Caliber Pointer
 	iClip_MAC10 		// Clip Pointer
 };
diff --git a/Source/Shared/WeaponP228.c b/Source/Shared/WeaponP228.c
index 55d719f6..eab914a5 100644
--- a/Source/Shared/WeaponP228.c
+++ b/Source/Shared/WeaponP228.c
@@ -35,7 +35,7 @@ weaponinfo_t wptP228 = {
 	0.8, 				// Range Modifier
 	TYPE_SEMI,
 	0.15, 				// Attack-Delay
-	3.0, 				// Reload-Delay
+	2.7, 				// Reload-Delay
 	iAmmo_357SIG, 		// Caliber Pointer
 	iClip_P228 			// Clip Pointer
 };
diff --git a/Source/Shared/WeaponP90.c b/Source/Shared/WeaponP90.c
index ed97b6f8..aa668886 100644
--- a/Source/Shared/WeaponP90.c
+++ b/Source/Shared/WeaponP90.c
@@ -35,7 +35,7 @@ weaponinfo_t wptP90 = {
 	0.84, 				// Range Modifier
 	TYPE_AUTO,
 	0.07, 				// Attack-Delay
-	3.0, 				// Reload-Delay
+	3.3, 				// Reload-Delay
 	iAmmo_57MM, 		// Caliber Pointer
 	iClip_P90 			// Clip Pointer
 };
diff --git a/Source/Shared/WeaponSG550.c b/Source/Shared/WeaponSG550.c
index 185a86d2..48401b8b 100644
--- a/Source/Shared/WeaponSG550.c
+++ b/Source/Shared/WeaponSG550.c
@@ -35,7 +35,7 @@ weaponinfo_t wptSG550 = {
 	0.98, 				// Range Modifier
 	TYPE_AUTO,
 	0.25, 				// Attack-Delay
-	3.0, 				// Reload-Delay
+	3.8, 				// Reload-Delay
 	iAmmo_556MM, 		// Caliber Pointer
 	iClip_SG550 		// Clip Pointer
 };
diff --git a/Source/Shared/WeaponSG552.c b/Source/Shared/WeaponSG552.c
index 8cb5ced4..367671e3 100644
--- a/Source/Shared/WeaponSG552.c
+++ b/Source/Shared/WeaponSG552.c
@@ -35,7 +35,7 @@ weaponinfo_t wptSG552 = {
 	0.955, 				// Range Modifier
 	TYPE_AUTO,
 	0.09, 				// Attack-Delay
-	3.0, 				// Reload-Delay
+	3.2, 				// Reload-Delay
 	iAmmo_556MM, 		// Caliber Pointer
 	iClip_SG552 		// Clip Pointer
 };
diff --git a/Source/Shared/WeaponScout.c b/Source/Shared/WeaponScout.c
index 59f86ed7..1ab10d67 100644
--- a/Source/Shared/WeaponScout.c
+++ b/Source/Shared/WeaponScout.c
@@ -35,7 +35,7 @@ weaponinfo_t wptSCOUT = {
 	0.98, 				// Range Modifier
 	TYPE_AUTO,
 	1.25, 				// Attack-Delay
-	3.0, 				// Reload-Delay
+	2.0, 				// Reload-Delay
 	iAmmo_762MM, 		// Caliber Pointer
 	iClip_SCOUT 		// Clip Pointer
 };
diff --git a/Source/Shared/WeaponTMP.c b/Source/Shared/WeaponTMP.c
index facb0535..68b335fc 100644
--- a/Source/Shared/WeaponTMP.c
+++ b/Source/Shared/WeaponTMP.c
@@ -35,7 +35,7 @@ weaponinfo_t wptTMP = {
 	0.84, 				// Range Modifier
 	TYPE_AUTO,
 	0.07, 				// Attack-Delay
-	3.0, 				// Reload-Delay
+	2.1, 				// Reload-Delay
 	iAmmo_9MM, 		// Caliber Pointer
 	iClip_TMP 		// Clip Pointer
 };
diff --git a/Source/Shared/WeaponUMP45.c b/Source/Shared/WeaponUMP45.c
index c33983ed..2859a14e 100644
--- a/Source/Shared/WeaponUMP45.c
+++ b/Source/Shared/WeaponUMP45.c
@@ -35,7 +35,7 @@ weaponinfo_t wptUMP45 = {
 	0.82, 				// Range Modifier
 	TYPE_AUTO,
 	0.105, 				// Attack-Delay
-	3.0, 				// Reload-Delay
+	3.5, 				// Reload-Delay
 	iAmmo_45ACP, 		// Caliber Pointer
 	iClip_UMP45 		// Clip Pointer
 };
diff --git a/Source/Shared/WeaponUSP45.c b/Source/Shared/WeaponUSP45.c
index 538177ae..e31ffab6 100644
--- a/Source/Shared/WeaponUSP45.c
+++ b/Source/Shared/WeaponUSP45.c
@@ -41,7 +41,7 @@ weaponinfo_t wptUSP45 = {
 	0.79, 				// Range Modifier
 	TYPE_SEMI,
 	0.15, 				// Attack-Delay
-	3.0, 				// Reload-Delay
+	2.5, 				// Reload-Delay
 	iAmmo_45ACP, 		// Caliber Pointer
 	iClip_USP45 		// Clip Pointer
 };
diff --git a/Source/Shared/Weapons.c b/Source/Shared/Weapons.c
index 92a452ac..abb1ff20 100644
--- a/Source/Shared/Weapons.c
+++ b/Source/Shared/Weapons.c
@@ -27,7 +27,7 @@ weaponfunc_t wpnFuncTable[ CS_WEAPON_COUNT ] = {
 	{ WeaponGLOCK18_Draw, WeaponGLOCK18_PrimaryFire, WeaponGLOCK18_Secondary, WeaponGLOCK18_Reload },
 	{ WeaponDEAGLE_Draw, WeaponDEAGLE_PrimaryFire, Temp_Nothing, WeaponDEAGLE_Reload },
 	{ WeaponP228_Draw, WeaponP228_PrimaryFire, Temp_Nothing, WeaponP228_Reload },
-	{ WeaponUSP45_Draw, WeaponUSP45_PrimaryFire, Temp_Nothing, WeaponUSP45_Reload },
+	{ WeaponELITES_Draw, WeaponELITES_PrimaryFire, Temp_Nothing, WeaponELITES_Reload },
 	{ WeaponFIVESEVEN_Draw, WeaponFIVESEVEN_PrimaryFire, Temp_Nothing, WeaponFIVESEVEN_Reload },
 	#ifdef QWSSQC
 	{ WeaponM3_Draw, WeaponM3_PrimaryFire,  Temp_Nothing, WeaponM3_Reload },
@@ -43,7 +43,7 @@ weaponfunc_t wpnFuncTable[ CS_WEAPON_COUNT ] = {
 	{ WeaponTMP_Draw, WeaponTMP_PrimaryFire, Temp_Nothing, WeaponTMP_Reload },
 	{ WeaponAK47_Draw, WeaponAK47_PrimaryFire, Temp_Nothing, WeaponAK47_Reload },
 	{ WeaponSG552_Draw, WeaponSG552_PrimaryFire, Temp_Nothing, WeaponSG552_Reload },
-	{ WeaponM4A1_Draw, WeaponM4A1_PrimaryFire, Temp_Nothing, WeaponM4A1_Reload },
+	{ WeaponM4A1_Draw, WeaponM4A1_PrimaryFire, WeaponM4A1_Secondary, WeaponM4A1_Reload },
 	{ WeaponAUG_Draw, WeaponAUG_PrimaryFire, Temp_Nothing, WeaponAUG_Reload },
 	{ WeaponSCOUT_Draw, WeaponSCOUT_PrimaryFire, Temp_Nothing, WeaponSCOUT_Reload },
 	{ WeaponAWP_Draw, WeaponAWP_PrimaryFire, Temp_Nothing, WeaponAWP_Reload },
@@ -87,7 +87,6 @@ void Weapon_Reload( float fWeapon ) {
 }
 
 #ifdef QWSSQC
-
 void Weapon_UpdateCurrents( void ) {
 	self.iCurrentClip = self.(wptTable[ self.weapon ].iClipfld);
 	self.iCurrentCaliber = self.(wptTable[ self.weapon ].iCaliberfld);
@@ -129,5 +128,4 @@ void CSEv_GamePlayerBuy_f( float fWeapon ) {
 	self.fMoney -= wptTable[ fWeapon ].iPrice;
 	self.fAttackFinished = time + 1.0;
 }
-
 #endif