diff --git a/GC_prepare.bat b/GC_prepare.bat
deleted file mode 100644
index 94553f6..0000000
--- a/GC_prepare.bat
+++ /dev/null
@@ -1,4 +0,0 @@
-echo cp Makefile.gc Makefile
-cp Makefile.gc Makefile
-echo cp ./source/gcmm-bk.gc ./source/gcmm-bk.s
-cp ./source/gcmm-bk.gc ./source/gcmm-bk.s
\ No newline at end of file
diff --git a/Makefile.gc b/Makefile.gc
index da7b4cd..17c6bd9 100644
--- a/Makefile.gc
+++ b/Makefile.gc
@@ -100,12 +100,12 @@ export OUTPUT	:=	$(CURDIR)/$(TARGET)
 #---------------------------------------------------------------------------------
 $(BUILD):
 	@[ -d $@ ] || mkdir -p $@
-	@make --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
+	@make --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile.gc
 
 #---------------------------------------------------------------------------------
 clean:
 	@echo clean ...
-	@rm -fr $(BUILD) $(OUTPUT).elf $(OUTPUT).dol
+	@rm -fr $(BUILD) $(OUTPUT).elf $(OUTPUT).dol $(SOURCES)/gcmm-bk.s
 
 #---------------------------------------------------------------------------------
 run:
diff --git a/Makefile.wii b/Makefile.wii
index 2e55c1f..a803b7a 100644
--- a/Makefile.wii
+++ b/Makefile.wii
@@ -100,12 +100,12 @@ export OUTPUT	:=	$(CURDIR)/$(TARGET)
 #---------------------------------------------------------------------------------
 $(BUILD):
 	@[ -d $@ ] || mkdir -p $@
-	@make --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
+	@make --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile.wii
 
 #---------------------------------------------------------------------------------
 clean:
 	@echo clean ...
-	@rm -fr $(BUILD) $(OUTPUT).elf $(OUTPUT).dol
+	@rm -fr $(BUILD) $(OUTPUT).elf $(OUTPUT).dol $(SOURCES)/gcmm-bk.s
 
 #---------------------------------------------------------------------------------
 run:
diff --git a/Wii_prepare.bat b/Wii_prepare.bat
deleted file mode 100644
index acab7f9..0000000
--- a/Wii_prepare.bat
+++ /dev/null
@@ -1,4 +0,0 @@
-echo cp Makefile.wii Makefile
-cp Makefile.wii Makefile
-echo cp ./source/gcmm-bk.wii ./source/gcmm-bk.s
-cp ./source/gcmm-bk.wii ./source/gcmm-bk.s
\ No newline at end of file
diff --git a/source/main.c b/source/main.c
index 75afda3..5548742 100644
--- a/source/main.c
+++ b/source/main.c
@@ -117,7 +117,7 @@ Initialise (void)
 		// 576 lines (PAL 50Hz)
 		// display should be centered vertically (borders)
 		//Make all video modes the same size so menus doesn't screw up
-		vmode = &TVPal574IntDfScale;
+		vmode = &TVPal576IntDfScale;
 		vmode->xfbHeight = 480;
 		vmode->viYOrigin = (VI_MAX_HEIGHT_PAL - 480)/2;
 		vmode->viHeight = 480;
diff --git a/source/mcard.c b/source/mcard.c
index c89dc31..65b2f41 100644
--- a/source/mcard.c
+++ b/source/mcard.c
@@ -15,6 +15,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
+
 #include "mcard.h"
 #include "gci.h"
 #include "freetype.h"
@@ -65,7 +67,7 @@ int MountCard(int cslot)
 	char msg[64];
 
 	// Mount the card, try several times as they are tricky
-	while ( tries < 10 && ret !< 0)
+	while ( (tries < 10) && (ret < 0))
 	{
 		/*** We already initialized the Memory Card subsystem with CARD_Init() in select_memcard_slot(). Let's reset the
 		EXI subsystem, just to make sure we have no problems mounting the card ***/
@@ -73,13 +75,13 @@ int MountCard(int cslot)
 
 		/*** Mount the card ***/
 		ret = CARD_Mount (cslot, SysArea, card_removed);
-		if (ret !<0) break;
+		if (ret >= 0) break;
 		
 		VIDEO_WaitVSync ();
 		tries++;
 	}
 			/*** Make sure the card is really mounted ***/
-	isMounted = CARD_ProbeEx(cslot, memzise, sectsize);
+	isMounted = CARD_ProbeEx(cslot, &memsize, &sectsize);
 	if (memsize > 0 && sectsize > 0)//then we really mounted de card
 	{
 		/*** It was a false positive. Weird ***/
@@ -88,7 +90,7 @@ int MountCard(int cslot)
 	sprintf(msg, "%d blocks (%d sectorsize)", memsize, sectsize);
 	writeStatusBar("Card mounted",msg);
 	ShowScreen();	
-	sleep(1)
+	sleep(1);
 	writeStatusBar("","");	
 	/*** If this point is reached, everything went fine ***/
 	return ret;
diff --git a/source/sdsupp.c b/source/sdsupp.c
index b0ee522..9571072 100644
--- a/source/sdsupp.c
+++ b/source/sdsupp.c
@@ -33,12 +33,13 @@ extern int OFFSET;
 
 bool file_exists(const char * filename)
 {
-    if (FILE * file = fopen(filename, "r"))
-    {
-        fclose(file);
-        return true;
-    }
-    return false;
+	FILE * file = fopen(filename, "r");
+	if (file)
+	{
+		fclose(file);
+		return true;
+	}
+	return false;
 }
 
 int SDSaveMCImage ()