diff --git a/source/language.c b/source/language.c
index 97125e19..1dab16dc 100644
--- a/source/language.c
+++ b/source/language.c
@@ -196,7 +196,11 @@ void language_set(char *name, char *val)
 {
 	cfg_name = name;
 	cfg_val = val;
-	
+
+	if (strcmp(name, "t3Covers") == 0) {
+		strcopy(LANGUAGE.t3Covers, val, sizeof(LANGUAGE.t3Covers));
+		return;
+	}
 	if (strcmp(name, "Specialthanksto") == 0) {
 		strcopy(LANGUAGE.Specialthanksto, val, sizeof(LANGUAGE.Specialthanksto));
 		return;
@@ -445,7 +449,7 @@ void language_set(char *name, char *val)
 		strcopy(LANGUAGE.FlipX, val, sizeof(LANGUAGE.FlipX));
 		return;
 	}
-	if (strcmp(name, "for") == 0) {
+	if (strcmp(name, "For") == 0) {
 		strcopy(LANGUAGE.For, val, sizeof(LANGUAGE.For));
 		return;
 	}
@@ -709,7 +713,7 @@ void language_set(char *name, char *val)
 		strcopy(LANGUAGE.Specialthanksto, val, sizeof(LANGUAGE.Specialthanksto));
 		return;
 	}
-	if (strcmp(name, "theUSBLoaderandreleasingthesourcecode") == 0) {
+	if (strcmp(name, "theUSBLoaderandreleasingthesourcecodethe") == 0) {
 		strcopy(LANGUAGE.theUSBLoaderandreleasingthesourcecode, val, sizeof(LANGUAGE.theUSBLoaderandreleasingthesourcecode));
 		return;
 	}
@@ -877,6 +881,6 @@ void language_set(char *name, char *val)
 		strcopy(LANGUAGE.Korean, val, sizeof(LANGUAGE.Korean));
 		return;
 	}
-	
+
 }
 
diff --git a/source/menu.cpp b/source/menu.cpp
index 1a284e16..dab76f45 100644
--- a/source/menu.cpp
+++ b/source/menu.cpp
@@ -708,7 +708,7 @@ int GameWindowPrompt()
 	btn1.SetState(STATE_SELECTED);
 	//btn1.SetEffectGrow(); just commented it out if anybody wants to use it again.
 
-	GuiText btn2Txt("Back", 22, (GXColor){0, 0, 0, 255});
+	GuiText btn2Txt(LANGUAGE.Back, 22, (GXColor){0, 0, 0, 255});
 	GuiImage btn2Img(&btnOutline);
 	if (Settings.wsprompt == yes){
 	btn2Img.SetWidescreen(CFG.widescreen);}///////////
@@ -3059,10 +3059,12 @@ static int MenuDiscList()
 					char entered[40];
 					snprintf(entered, sizeof(entered), "%s", get_title(header));
 					entered[39] = '\0';
-					OnScreenKeyboard(entered, 40,0);
+					int result = OnScreenKeyboard(entered, 40,0);
+					if (result == 1) {
 					WBFS_RenameGame(header->id, entered);
 					__Menu_GetEntries();
 					menu = MENU_DISCLIST;
+					}
 				}
 
 
@@ -3744,7 +3746,7 @@ static int MenuSettings()
 
 				if (Settings.xflip == no) sprintf (options2.value[2],"%s/%s",LANGUAGE.Right,LANGUAGE.Next);
 				else if (Settings.xflip == yes) sprintf (options2.value[2],"%s/%s",LANGUAGE.Left,LANGUAGE.Prev);
-				else if (Settings.xflip == sysmenu) sprintf (options2.value[2],"Like SysMenu");
+				else if (Settings.xflip == sysmenu) sprintf (options2.value[2],"%s", LANGUAGE.LikeSysMenu);
 				else if (Settings.xflip == wtf) sprintf (options2.value[2],"%s/%s",LANGUAGE.Right,LANGUAGE.Prev);
 
 				if (Settings.qboot == no) sprintf (options2.value[3],"%s",LANGUAGE.No);