diff --git a/Makefile b/Makefile
index 6cbb3b7..ae1b7a0 100644
--- a/Makefile
+++ b/Makefile
@@ -128,6 +128,14 @@ dist: $(BUILD)
 	touch $@/fbzx-wii/microdrives/dummy
 	cd $@ && tar -czf ../fbzx-wii-bin.tar.gz *
 
+distsource:
+	cd .. && cp -r fbzx-wii fbzx-wii-v
+	cd ../fbzx-wii-v && find . -name ".svn" | xargs rm -rf
+	cd .. && tar -czf fbzx-wii-v.tar.gz fbzx-wii-v
+	cd .. && rm -fr fbzx-wii-v
+	
+	
+
 #---------------------------------------------------------------------------------
 run:
 	wiiload $(TARGET).dol
diff --git a/src/cargador.c b/src/cargador.c
index 38e28ed..d09c89b 100644
--- a/src/cargador.c
+++ b/src/cargador.c
@@ -434,7 +434,7 @@ int load_sna(char *filename) {
 		snap.ay_regs[loop]=0;
 	snap.ay_latch=0;
 	snap.issue=3;
-	snap.joystick=0;
+	snap.joystick=1; //kempston
 	
 	printf("Loading SNA file\n");
 	
diff --git a/src/computer.c b/src/computer.c
index e2e7405..3f60675 100644
--- a/src/computer.c
+++ b/src/computer.c
@@ -80,8 +80,8 @@ void computer_init () {
 	ordenador.port254 = 0;
 	ordenador.issue = 3;
 	ordenador.mode128k = 0;
-	ordenador.joystick[0] = 2; //Sinclair 1
-	ordenador.joystick[1] = 3; //Sinclair 2
+	ordenador.joystick[0] = 1; //Kemposton
+	ordenador.joystick[1] = 0; // Cursor
 
 	ordenador.tape_readed = 0;
 	ordenador.pause = 1;	// tape stop
@@ -943,7 +943,8 @@ inline void read_keyboard () {
 			if (ordenador.joy_fire[loop]) ordenador.k12|= 1;
 		break;
 		}
-					
+	}	
+			
 	if (ordenador.key[SDLK_SPACE]) ordenador.k15|=1;
 	if (ordenador.key[SDLK_RCTRL]) ordenador.k15|=2;
 	if (ordenador.key[SDLK_LCTRL]) ordenador.k15|=2;
diff --git a/src/emulator.c b/src/emulator.c
index cb23495..08cd7db 100644
--- a/src/emulator.c
+++ b/src/emulator.c
@@ -68,7 +68,6 @@ char *filenames[5];
 int load_zxspectrum_picture()
 {
 SDL_Surface *image;
-SDL_Rect dest;
 
 image=IMG_Load("/fbzx-wii/fbzx/ZXSpectrum48k.png");
 
@@ -707,6 +706,9 @@ int main(int argc,char *argv[]) {
 
 	ordenador.screenbuffer=ordenador.screen->pixels;
 	ordenador.screen_width=ordenador.screen->w;
+	
+	//Load the splash screen
+	if (load_zxspectrum_picture()) sleep(3);
 
 	// assign initial values for PATH variables
 
@@ -721,8 +723,6 @@ int main(int argc,char *argv[]) {
 	strcat(path_mdrs,"microdrives");
 	
 	ordenador.current_tap[0]=0;
-	
-	if (load_zxspectrum_picture()) sleep(5);
 
 	// assign random values to the memory before start execution