diff --git a/gp2x/buttonmap.txt b/gp2x/buttonmap.txt
index 75a9194d7..45eced77d 100644
--- a/gp2x/buttonmap.txt
+++ b/gp2x/buttonmap.txt
@@ -2,41 +2,41 @@ DXX-REBIRTH BUTTONMAP
 
 MOVEMENT
 
-PITCH FORWARD		STICK UP
-PITCH BACKWARD		STICK DOWN
-TURN LEFT		STICK LEFT
-TURN RIGHT		STICK RIGHT
-ACCELERATE		Y
-REVERSE			X
-SLIDE ON		B
-BANK ON			A
-AFTERBURNER*		B + Y
+PITCH FORWARD           STICK UP
+PITCH BACKWARD          STICK DOWN
+TURN LEFT               STICK LEFT
+TURN RIGHT              STICK RIGHT
+ACCELERATE              Y
+REVERSE                 X
+SLIDE ON                B
+BANK ON                 A
+AFTERBURNER*            B + Y
 
 
 WEAPONS
 
-FIRE PRIMARY		R
-FIRE SECONDARY		L
-CYCLE PRIMARY		SELECT + R
-CYCLE SECONDARY		SELECT + L
-FIRE FLARE		A + R
-DROP BOMB		A + B
+FIRE PRIMARY            R
+FIRE SECONDARY          L
+CYCLE PRIMARY           SELECT + R
+CYCLE SECONDARY         SELECT + L
+FIRE FLARE              A + R
+DROP BOMB               A + B
 
 
 MISC
 
-AUTOMAP			A + X
-HEADLIGHT*		SELECT + STICK LEFT
-ENERGY->SHIELD*		SELECT + STICK RIGHT
-REAR/CYCLE VIEW*	SELECT + STICK DOWN
-SAVE GAME		SELECT + START
-MAIN MENU/PAUSE		START
-VOL-/+			IN-/DECREASE VOLUME
+AUTOMAP                 A + X
+HEADLIGHT*              SELECT + STICK LEFT
+ENERGY->SHIELD*         SELECT + STICK RIGHT
+REAR/CYCLE VIEW*        SELECT + STICK DOWN
+SAVE GAME               SELECT + START
+MAIN MENU/PAUSE         START
+VOL-/+                  IN-/DECREASE VOLUME
 
 
 MENU
 
-MAKE SELECTION		B
-CANCEL/PREVIOUS MENU	START
+MAKE SELECTION          B
+CANCEL/PREVIOUS MENU    START
 
-				* DESCENT][ ONLY
\ No newline at end of file
+                             * DESCENT][ ONLY
\ No newline at end of file
diff --git a/gp2x/dxx-rebirth_buttonmap.pdf b/gp2x/dxx-rebirth_buttonmap.pdf
index bf9325da0..f16e1d99b 100644
Binary files a/gp2x/dxx-rebirth_buttonmap.pdf and b/gp2x/dxx-rebirth_buttonmap.pdf differ
diff --git a/gp2x/notes.txt b/gp2x/notes.txt
index 070949110..67f67cdfc 100644
--- a/gp2x/notes.txt
+++ b/gp2x/notes.txt
@@ -1,12 +1,16 @@
 D1X-Rebirth
+===========
+
 http://www.dxx-rebirth.de
 zico@unixboard.de
 
+
 Install
 
 * Copy all the files from the archive to a directory of your SD card
 * Copy the files "descent.hog" and "descent.pig" from your Descent CD to this directory as well
   (please note these files MUST be lowercase)
+* The files need to be v1.4. If you own v1.0, download a patch for Windows or Linux at the DXX-Rebirth homepage
 * Run d1x-rebirth_cockpit or d1x-rebirth_fullscreen to run the game
 * See buttonmap.txt for a list of keys and combos
 
@@ -18,7 +22,7 @@ cpu speed from the main menu. Be aware that this value will not be saved.
 
 If you save a game please quit the game normally or your save state may be corrupted.
 
-Please report any bugs to zicounixboard.de or the DXX-Forum found at http://www.dxx-rebirth.de.
+Please report any bugs to zico@unixboard.de or the DXX-Forum found at http://www.dxx-rebirth.de.
 
 Have fun :)
              -zico
\ No newline at end of file
diff --git a/main/kconfig.c b/main/kconfig.c
index 63de84b58..03dff135e 100755
--- a/main/kconfig.c
+++ b/main/kconfig.c
@@ -2351,10 +2351,9 @@ if (!keyd_pressed[ KEY_LALT ])
 {
 	if (kc_keyboard[24].value < 255 ) Controls.fire_primary_down_count += key_down_count(kc_keyboard[24].value);
 	if (kc_keyboard[25].value < 255 ) Controls.fire_primary_down_count += key_down_count(kc_keyboard[25].value);
-}
 	if ((use_joystick)&&(kc_joystick[0].value < 255 )) Controls.fire_primary_down_count += joy_get_button_down_cnt(kc_joystick[0].value);
 	if ((use_mouse)&&(kc_mouse[0].value < 255 )) Controls.fire_primary_down_count += mouse_button_down_count(kc_mouse[0].value);
-
+}
 #ifdef NETWORK
 	if(use_alt_vulcanfire)
 	{
@@ -2496,9 +2495,9 @@ if ((Config_control_type != 5) || !mouselook || (Game_mode & GM_MULTI) ) {
 #endif
 
 #ifdef GP2X
-	if (keyd_pressed[ KEY_LALT ] && keyd_pressed[ KEY_R ]) // SELECT + R = cycle primary
+	if (keyd_pressed[ KEY_LALT ] && key_down_count( KEY_R )) // SELECT + R = cycle primary
 		Controls.cycle_primary_down_count = 1;
-	if (keyd_pressed[ KEY_LALT ] && keyd_pressed[ KEY_L ]) // SELECT + L = cycle seconday
+	if (keyd_pressed[ KEY_LALT ] && key_down_count( KEY_L )) // SELECT + L = cycle seconday
 		Controls.cycle_secondary_down_count = 1;
 	if (keyd_pressed[ KEY_A ] && keyd_pressed[ KEY_R ]) // A + R = fire flare
 		Controls.fire_flare_down_count = 1;
@@ -2510,20 +2509,20 @@ if ((Config_control_type != 5) || !mouselook || (Game_mode & GM_MULTI) ) {
 		Controls.drop_bomb_down_count = 1;
 	if (!slide_on) {
 		if (keyd_pressed[ KEY_PAD1 ]) {
-			Controls.pitch_time = -FrameTime/3;
-			Controls.heading_time = -FrameTime/3;
+			Controls.pitch_time = -FrameTime/2;
+			Controls.heading_time = -FrameTime/2;
 		}
 		if (keyd_pressed[ KEY_PAD3 ]) {
-			Controls.pitch_time = -FrameTime/3;
-			Controls.heading_time = FrameTime/3;
+			Controls.pitch_time = -FrameTime/2;
+			Controls.heading_time = FrameTime/2;
 		}
 		if (keyd_pressed[ KEY_PAD7 ]) {
-			Controls.pitch_time = FrameTime/3;
-			Controls.heading_time = -FrameTime/3;
+			Controls.pitch_time = FrameTime/2;
+			Controls.heading_time = -FrameTime/2;
 		}
 		if (keyd_pressed[ KEY_PAD9 ]) {
-			Controls.pitch_time = FrameTime/3;
-			Controls.heading_time = FrameTime/3;
+			Controls.pitch_time = FrameTime/2;
+			Controls.heading_time = FrameTime/2;
 		}
 	} else {
 		if (keyd_pressed[ KEY_PAD1 ]) {