diff --git a/Source/Client/VGUI.c b/Source/Client/VGUI.c
index d1f48d94..4e87452c 100755
--- a/Source/Client/VGUI.c
+++ b/Source/Client/VGUI.c
@@ -56,7 +56,7 @@ void CSQC_VGUI_Draw( void ) {
 		return;
 	}
 	
-	setcursormode( TRUE );
+	setcursormode( TRUE, "gfx/cursor", '0 0 0', 1.0f );
 
 	// Align the window to the center
 	vVGUIWindowPos_x = ( vVideoResolution_x / 2 ) - 320;
diff --git a/Source/Client/VGUIObjects.c b/Source/Client/VGUIObjects.c
index 02539703..8fd6386f 100755
--- a/Source/Client/VGUIObjects.c
+++ b/Source/Client/VGUIObjects.c
@@ -55,19 +55,19 @@ void VGUI_Window( string sTitle, vector vPos, vector vSize ) {
 	vector v1, v2, v3;
 
 	// Draw the background
-	drawfill( vPos + '1 1', vSize - '2 2', VGUI_WINDOW_BGCOLOR, VGUI_WINDOW_BGALPHA );
+	drawfill( vPos, vSize, VGUI_WINDOW_BGCOLOR, VGUI_WINDOW_BGALPHA );
 	
 	// Draw the outline START
 	v1_x = vPos_x + vSize_x;
-	v1_y = vPos_y;
-	drawline( 1.0, vPos - '1 0 0', v1, vVGUIColor, VGUI_WINDOW_FGALPHA, DRAWFLAG_ADDITIVE );
+	v1_y = vPos_y + 1;
+	drawline( 1.0, vPos, v1, vVGUIColor, VGUI_WINDOW_FGALPHA, DRAWFLAG_ADDITIVE );
 	
 	v2_x = vPos_x;
 	v2_y = vPos_y + vSize_y;
 	drawline( 1.0, vPos, v2, vVGUIColor, VGUI_WINDOW_FGALPHA, DRAWFLAG_ADDITIVE );
 
 	v3 = vPos + vSize;
-	drawline( 1.0, v1, v3, vVGUIColor, VGUI_WINDOW_FGALPHA, DRAWFLAG_ADDITIVE );
+	drawline( 1.0, v1 - '1 0', v3 - '1 0', vVGUIColor, VGUI_WINDOW_FGALPHA, DRAWFLAG_ADDITIVE );
 	drawline( 1.0, v2, v3, vVGUIColor, VGUI_WINDOW_FGALPHA, DRAWFLAG_ADDITIVE );
 	// Draw the outline END
 
@@ -81,19 +81,19 @@ void VGUI_WindowSmall( string sTitle, vector vPos, vector vSize ) {
 	vector v1, v2, v3;
 
 	// Draw the background
-	drawfill( vPos + '1 1', vSize - '2 2', VGUI_WINDOW_BGCOLOR, VGUI_WINDOW_BGALPHA );
+	drawfill( vPos, vSize, VGUI_WINDOW_BGCOLOR, VGUI_WINDOW_BGALPHA );
 	
 	// Draw the outline START
 	v1_x = vPos_x + vSize_x;
-	v1_y = vPos_y;
-	drawline( 1.0, vPos - '1 0 0', v1, vVGUIColor, VGUI_WINDOW_FGALPHA, DRAWFLAG_ADDITIVE );
+	v1_y = vPos_y + 1;
+	drawline( 1.0, vPos, v1, vVGUIColor, VGUI_WINDOW_FGALPHA, DRAWFLAG_ADDITIVE );
 	
 	v2_x = vPos_x;
 	v2_y = vPos_y + vSize_y;
 	drawline( 1.0, vPos, v2, vVGUIColor, VGUI_WINDOW_FGALPHA, DRAWFLAG_ADDITIVE );
 
 	v3 = vPos + vSize;
-	drawline( 1.0, v1, v3, vVGUIColor, VGUI_WINDOW_FGALPHA, DRAWFLAG_ADDITIVE );
+	drawline( 1.0, v1 - '1 0', v3 - '1 0', vVGUIColor, VGUI_WINDOW_FGALPHA, DRAWFLAG_ADDITIVE );
 	drawline( 1.0, v2, v3, vVGUIColor, VGUI_WINDOW_FGALPHA, DRAWFLAG_ADDITIVE );
 	// Draw the outline END
 
@@ -108,15 +108,15 @@ float VGUI_Button( string sLabel, void() vFunction, vector vPos, vector vSize )
 	
 	// Draw the outline START
 	v1_x = vPos_x + vSize_x;
-	v1_y = vPos_y;
-	drawline( 1.0, vPos - '1 0 0', v1, vVGUIColor, VGUI_WINDOW_FGALPHA, DRAWFLAG_ADDITIVE );
+	v1_y = vPos_y + 1;
+	drawline( 1.0, vPos, v1, vVGUIColor, VGUI_WINDOW_FGALPHA, DRAWFLAG_ADDITIVE );
 	
 	v2_x = vPos_x;
 	v2_y = vPos_y + vSize_y;
 	drawline( 1.0, vPos, v2, vVGUIColor, VGUI_WINDOW_FGALPHA, DRAWFLAG_ADDITIVE );
 
 	v3 = vPos + vSize;
-	drawline( 1.0, v1, v3, vVGUIColor, VGUI_WINDOW_FGALPHA, DRAWFLAG_ADDITIVE );
+	drawline( 1.0, v1 - '1 0', v3 - '1 0', vVGUIColor, VGUI_WINDOW_FGALPHA, DRAWFLAG_ADDITIVE );
 	drawline( 1.0, v2, v3, vVGUIColor, VGUI_WINDOW_FGALPHA, DRAWFLAG_ADDITIVE );
 	// Draw the outline END
 
@@ -145,16 +145,16 @@ void VGUI_FakeButton( string sLabel, vector vPos, vector vSize ) {
 	
 	// Draw the outline START
 	v1_x = vPos_x + vSize_x;
-	v1_y = vPos_y;
-	drawline( 1.0, vPos - '1 0 0', v1, vVGUIColor, VGUI_WINDOW_FGALPHA * 0.5, DRAWFLAG_ADDITIVE );
+	v1_y = vPos_y + 1;
+	drawline( 1.0, vPos, v1, vVGUIColor, VGUI_WINDOW_FGALPHA, DRAWFLAG_ADDITIVE );
 	
 	v2_x = vPos_x;
 	v2_y = vPos_y + vSize_y;
-	drawline( 1.0, vPos, v2, vVGUIColor, VGUI_WINDOW_FGALPHA * 0.5, DRAWFLAG_ADDITIVE );
+	drawline( 1.0, vPos, v2, vVGUIColor, VGUI_WINDOW_FGALPHA, DRAWFLAG_ADDITIVE );
 
 	v3 = vPos + vSize;
-	drawline( 1.0, v1, v3, vVGUIColor, VGUI_WINDOW_FGALPHA * 0.5, DRAWFLAG_ADDITIVE );
-	drawline( 1.0, v2, v3, vVGUIColor, VGUI_WINDOW_FGALPHA * 0.5, DRAWFLAG_ADDITIVE );
+	drawline( 1.0, v1 - '1 0', v3 - '1 0', vVGUIColor, VGUI_WINDOW_FGALPHA, DRAWFLAG_ADDITIVE );
+	drawline( 1.0, v2, v3, vVGUIColor, VGUI_WINDOW_FGALPHA, DRAWFLAG_ADDITIVE );
 	// Draw the outline END
 
 	// Draw the button label
diff --git a/Source/Client/VGUIScoreboard.c b/Source/Client/VGUIScoreboard.c
index 90d41a85..1c628941 100755
--- a/Source/Client/VGUIScoreboard.c
+++ b/Source/Client/VGUIScoreboard.c
@@ -115,20 +115,20 @@ void VGUI_Scores_Show( void ) {
 	vMainPos_y = 56;
 		
 	// Draw the background
-	drawfill( vMainPos + '1 1', vSize - '2 2', VGUI_WINDOW_BGCOLOR, VGUI_WINDOW_BGALPHA );
+	drawfill( vMainPos, vSize, VGUI_WINDOW_BGCOLOR, VGUI_WINDOW_BGALPHA );
 	
 	// Draw the outline START
 	v1_x = vMainPos_x + vSize_x;
-	v1_y = vMainPos_y;
-	drawline( 1.0, vMainPos - '1 0 0', v1, '0.75 0.75 0.75', 0.5, DRAWFLAG_ADDITIVE );
+	v1_y = vMainPos_y + 1;
+	drawline( 1.0, vMainPos, v1, '0.35 0.35 0.35', 1, DRAWFLAG_NORMAL );
 	
 	v2_x = vMainPos_x;
 	v2_y = vMainPos_y + vSize_y;
-	drawline( 1.0, vMainPos, v2, '0.75 0.75 0.75', 0.5, DRAWFLAG_ADDITIVE );
+	drawline( 1.0, vMainPos, v2, '0.35 0.35 0.35', 1, DRAWFLAG_NORMAL );
 
 	v3 = vMainPos + vSize;
-	drawline( 1.0, v1, v3, '0.75 0.75 0.75', 0.5, DRAWFLAG_ADDITIVE );
-	drawline( 1.0, v2, v3, '0.75 0.75 0.75', 0.5, DRAWFLAG_ADDITIVE );
+	drawline( 1.0, v1 - '1 0', v3 - '1 0', '0.35 0.35 0.35', 1, DRAWFLAG_NORMAL );
+	drawline( 1.0, v2, v3, '0.35 0.35 0.35', 1, DRAWFLAG_NORMAL );
 	// Draw the outline END
 	
 	// Server title
diff --git a/Source/Menu/Input.c b/Source/Menu/Input.c
index 51b197c9..3a4e9912 100755
--- a/Source/Menu/Input.c
+++ b/Source/Menu/Input.c
@@ -97,7 +97,7 @@ void m_display( void ) {
 	iMenuActive = TRUE;
 	setkeydest( KEY_MENU );
 	setmousetarget( TARGET_MENU );
-	setcursormode( TRUE, "gfx/cursor" );
+	setcursormode( TRUE, "gfx/cursor", '0 0 0', 1.0f );
 }
 
 void m_hide( void ) {
diff --git a/Source/Server/Client.c b/Source/Server/Client.c
index 19f9cc59..b73cbaad 100755
--- a/Source/Server/Client.c
+++ b/Source/Server/Client.c
@@ -18,29 +18,6 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
-/*
-=================
-SpectatorConnect
-
-Called when a spectator joins the game
-=================
-*/
-void SpectatorConnect( void ) {
-	Spawn_MakeSpectator();
-	Spawn_ObserverCam();
-}
-	
-/*
-=================
-SpectatorDisconnect
-
-Called when a spectator leaves the game
-=================
-*/
-void SpectatorDisconnect( void ) {
-	
-}
-
 /*
 =================
 SpectatorThink
@@ -70,6 +47,31 @@ Run whenever a new client joins
 */
 void ClientConnect( void ) {}
 
+/*
+=================
+SpectatorConnect
+
+Called when a spectator joins the game
+=================
+*/
+void SpectatorConnect( void ) {
+	//Spawn_MakeSpectator();
+	//Spawn_ObserverCam();
+	ClientConnect();
+	PutClientInServer();
+}
+
+/*
+=================
+SpectatorDisconnect
+
+Called when a spectator leaves the game
+=================
+*/
+void SpectatorDisconnect( void ) {
+	
+}
+
 /*
 =================
 ClientDisconnect
diff --git a/Source/Server/FuncPushable.c b/Source/Server/FuncPushable.c
index 198367db..7d94dd43 100755
--- a/Source/Server/FuncPushable.c
+++ b/Source/Server/FuncPushable.c
@@ -51,6 +51,7 @@ void func_pushable( void ) {
 		input_movevalues = [ self.movedir_x, self.movedir_y, 0 ];
 		input_impulse = input_buttons = 0;
 		input_angles = self.v_angle;
+		input_timelength = frametime;
 		self.movedir = '0 0 0';
 		
 		runstandardplayerphysics( self );
diff --git a/Source/Server/Main.c b/Source/Server/Main.c
index efacd853..d758610c 100755
--- a/Source/Server/Main.c
+++ b/Source/Server/Main.c
@@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 void main( void ) {}
 void SetNewParms( void ) {}
+
 void SetChangeParms( void ) {}
 
 void SV_PausedTic( float fDuration ) {
diff --git a/freecs/csprogs.dat b/freecs/csprogs.dat
index 6d2cbdc0..9a9c9899 100644
Binary files a/freecs/csprogs.dat and b/freecs/csprogs.dat differ
diff --git a/freecs/gfx/cursor.tga b/freecs/gfx/cursor.tga
index 356b04ed..4d556946 100755
Binary files a/freecs/gfx/cursor.tga and b/freecs/gfx/cursor.tga differ
diff --git a/freecs/menu.dat b/freecs/menu.dat
index 8973d568..820f730f 100755
Binary files a/freecs/menu.dat and b/freecs/menu.dat differ
diff --git a/freecs/progs.dat b/freecs/progs.dat
index 4119c654..07ca0757 100644
Binary files a/freecs/progs.dat and b/freecs/progs.dat differ