diff --git a/stepmania/src/Song.cpp b/stepmania/src/Song.cpp
index 28d80295e2..3c9d4f7120 100644
--- a/stepmania/src/Song.cpp
+++ b/stepmania/src/Song.cpp
@@ -636,12 +636,13 @@ void Song::ReCalulateRadarValuesAndLastBeat()
 	{
 		/* Ambiguous, so check artist.  Do this early; Riyu will be replaced later: */
 		ttab.push_back(TitleTrans("^Candy$", "", "^Luv.*", "Candy &whitestar;", "", "") );
-		ttab.push_back(TitleTrans("^Candy$", "", "^Riyu.*", "Candy &whiteheart;", "", "") );
+		ttab.push_back(TitleTrans("^Candy$", "", ".*Riyu.*", "Candy &whiteheart;", "", "") );
 
 		/* Make sure this appears after the above "Riyu" match, so it doesn't
 		 * break it.  I've seen both "Kosaku" and "Kosaka"; I think Kosaka is
 		 * correct, but handle both. */
 		ttab.push_back(TitleTrans("", "", "Riyu Kosak[au]", "", "", "&kosaka1;&kosaka2;&hri;&hyu;") );
+		ttab.push_back(TitleTrans("", "", "Kosak[au] Riyu", "", "", "&kosaka1;&kosaka2;&hri;&hyu;") );
 
 		/* This is fuzzy, so check the artist, too. */
 		ttab.push_back(TitleTrans(".*Japan.*", "", "(Re-Venge)|(RevenG)", "&matsuri; Japan", "", "") );
@@ -661,7 +662,7 @@ void Song::ReCalulateRadarValuesAndLastBeat()
 		ttab.push_back(TitleTrans("^Kakumei$", "", "", "&kakumei1;&kakumei2;", "", "") );
 		ttab.push_back(TitleTrans("^Sweet Sweet Love Magic$", "", "", "Sweet Sweet &whiteheart; Magic", "", "") );
 		ttab.push_back(TitleTrans("^Breakdown$", "", "", "Bre&flipped-a;kdown", "", "") );
-		/* サナ・ モレッテ・ ネ・ エンテ */
+		/* サナ・モレッテ・ネ・エンテ */
 		ttab.push_back(TitleTrans("^Sana Mollete Ne Ente", "", "", 
 			"&ksa;&kna;&kdot;&kmo;&kre;&kq;&kte;&kdot;&kne;&kdot;&ke;&kn;&kte;", "", ""));
 		ttab.push_back(TitleTrans("^Sobakasu$", "", "", "&hso;&hba;&hka;&hsu;", "", "") );
@@ -681,8 +682,8 @@ void Song::ReCalulateRadarValuesAndLastBeat()
 		/* ダンシン・オール・アローン */
 		ttab.push_back(TitleTrans("^Dancing Pompokolin$", "", "", "&kda;&kn;&ksi;&kn;&kdot;&ko;&kdash;&kru;&kdot;&ka;&kro;&kdash;&kn;", "", "") );
 
-		/* メキシコ民謡 XXX What's the English trans? (lit: mexico song) */
-		ttab.push_back(TitleTrans("^La Bamba$", "", "", "", "", "&kme;&kki;&ksi;&kko;&minyou1;&minyou2;") );
+		/* メキシコ民謡 */
+		ttab.push_back(TitleTrans("", "", "^Spanish Folk Music$", "", "", "&kme;&kki;&ksi;&kko;&minyou1;&minyou2;") );
 
 		/* 青い振動 XXX verify this title */
 		ttab.push_back(TitleTrans("^Blue Impulse$", "", "", "&aoi;&hi;&shoudou1;&shoudou2;", "", "") );
@@ -690,21 +691,34 @@ void Song::ReCalulateRadarValuesAndLastBeat()
 		/* XXX 大見解 verify this title (Night Line or Nightline or am I completely wrong?) */
 		ttab.push_back(TitleTrans("^Night ?Line$", "", "", "&ookii;&kenkai1;&kenkai2;", "", "") );
 
-		/* XXX 三毛猫ロック three-haired-cat rock? nyo!) (title) */
-		/* XXX &heart; LOVE&squared; シュガ→ &heart; (Love2 Sugar) */
-		/* XXX: "door of magic" (tobira no mahou) -> 魔法の扉 (title) */
-		/* XXX スペース★マコのテーマ (space * "mako"?'s team) (title or subtitle, not sure) */
+		/* ♡LOVE²シュガ→♡ */
+		ttab.push_back(TitleTrans("^Love Love Sugar$", "", "", "&whiteheart;LOVE&squared; &ksi;&kyus;&kga;→&whiteheart;", "", "") );
+
+		/* 三毛猫ロック */
+		ttab.push_back(TitleTrans("^Mikeneko Rock$", "", "", "&num-san;&hair;&neko;&kro;&kq;&kku;", "", "") );
+		
+		/* XXX: "door of magic" (tobira no mahou) -> 魔法の扉 */
+		/* XXX スペース★マコのテーマ (space? special? * "mako"?'s team) (title or subtitle, not sure) */
 
 		/* Subtitles: */
 		/* XXX それぞれの明日 (every tomorrow?) (subtitle) (title is Graduation) */
 
+
 		/* Artists: */
 		ttab.push_back(TitleTrans("", "", "Omega", "", "", "ω") );
 
-		/* XXX 亜熱帯マジ-SKA爆弾 (serious tropical ska bomb? ruh roh) */
-		// ttab.push_back(TitleTrans("", "", "", "", "", "&anettai2;&anettai2;&anettai3;&kma;&kji;-SKA&bakudan1;&bakudan2;") );
-		ttab.push_back(TitleTrans("", "", "Sanae Shintani", "", "", "&shintani1;&shintani2;&hsa;&hna;&he;") );
+		/* 亜熱帯マジ-SKA爆弾 (serious tropical ska bomb? ruh roh) */
+		ttab.push_back(TitleTrans("", "", "^Anettai Maji.*Ska (Bakudan|Bukuden)", "", "", "&anettai1;&anettai2;&anettai3;&kma;&kji;-SKA&bakudan1;&bakudan2;") );
+
+		/* 新谷さなえ (Sanae or incorrect Sana) */
+		ttab.push_back(TitleTrans("", "", "Sanae? Shintani", "", "", "&shintani1;&shintani2;&hsa;&hna;&he;") );
+
 		ttab.push_back(TitleTrans("", "", "dj TAKA feat. ?Noria", "", "", "dj TAKA feat. &hno;&hri;&ha;") );
+
+		/* くにたけみゆき */
+		ttab.push_back(TitleTrans("", "", "Miyuki Kunitake", "", "", "&hku;&hni;&hta;&hke;&hmi;&hyu;&hki;") );
+		ttab.push_back(TitleTrans("", "", "Kunitake Miyuki", "", "", "&hku;&hni;&hta;&hke;&hmi;&hyu;&hki;") );
+//		ttab.push_back(TitleTrans(".*Legend.*", "", "ZZ", "", "", "&zz;") );
 	}
 
 	for(i = 0; i < ttab.size(); ++i)