diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb
index 4ff7685..d59cd06 100644
Binary files a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb and b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb differ
diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo
index 0dbb163..fd63dca 100644
Binary files a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo and b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo differ
diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/AssemblyInfo.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/AssemblyInfo.cpp
index 12c8087..497d1f7 100644
--- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/AssemblyInfo.cpp
+++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/AssemblyInfo.cpp
@@ -31,7 +31,7 @@ using namespace System::Security::Permissions;
 // すべての値を指定するか、下のように '*' を使ってリビジョンおよびビルド番号を
 // 既定値にすることができます:
 
-[assembly:AssemblyVersionAttribute("1.6.*")];
+[assembly:AssemblyVersionAttribute("1.7.*")];
 
 [assembly:ComVisible(false)];
 
diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm
index 586e49d..7b8073a 100644
Binary files a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm and b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm differ
diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h
index e1d178f..e1551cc 100644
--- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h
+++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h
@@ -3431,7 +3431,7 @@ private: System::Windows::Forms::TextBox^  tboxWarningChinaRating;
 		{
 			System::Reflection::Assembly ^ass = System::Reflection::Assembly::GetEntryAssembly();
 			System::Version ^ver =  ass->GetName()->Version;
-			return ( ver->Major.ToString() + "." + ver->Minor.ToString() + "a" );
+			return ( ver->Major.ToString() + "." + ver->Minor.ToString() );
 		}
 
 		// SRLに登録されないROM仕様のフォーム入力を
diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_srl.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_srl.cpp
index a738a03..595622c 100644
--- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_srl.cpp
+++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_srl.cpp
@@ -259,6 +259,11 @@ void Form1::setSrlForms(void)
 				System::Int32 last = this->gridLibrary->Rows->Count - 2;
 				this->gridLibrary->Rows[ last ]->DefaultCellStyle->ForeColor = System::Drawing::Color::Red;
 			}
+			if( lic->Publisher->Equals( "NINTENDO" ) && lic->Name->StartsWith( "DEBUG DWC" ) )
+			{
+				System::Int32 last = this->gridLibrary->Rows->Count - 2;
+				this->gridLibrary->Rows[ last ]->DefaultCellStyle->ForeColor = System::Drawing::Color::Red;
+			}
 		}
 	}
 	this->gridLibrary->CurrentCell = nullptr;
diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp
index 335b8b3..bb7ab04 100644
--- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp
+++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp
@@ -238,6 +238,15 @@ ECSrlResult RCSrl::mrcTWL( FILE *fp )
 		this->hErrorList->Add( this->makeMrcError("RomStartAddress") );
 	}
 
+	// ダイジェスト範囲よりもファイルサイズが小さいときエラー
+	fseek( fp, 0, SEEK_END );
+	u32 fileend = ftell(fp);
+	if( (fileend < (this->pRomHeader->s.twl_digest_area_rom_offset + this->pRomHeader->s.twl_digest_area_size)) ||
+		(fileend < (this->pRomHeader->s.twl_digest_area_rom_offset + this->pRomHeader->s.twl_digest_area_size)) )
+	{
+		this->hErrorList->Add( this->makeMrcError("DigestArea") );
+	}
+
 	// NANDアプリがHYBRIDとなるのはクローンブートのときのみ
 	if( this->IsMediaNand )
 	{
diff --git a/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_e.xml b/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_e.xml
index d8ba3c9..6d563c1 100644
Binary files a/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_e.xml and b/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_e.xml differ
diff --git a/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_j.xml b/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_j.xml
index e633078..be04f5e 100644
--- a/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_j.xml
+++ b/build/tools/MasterEditor/MasterEditorTWL/resource/mrc_msg_j.xml
@@ -3,13 +3,76 @@
 
 <!-- 闍ｱ險ｳ萓晞�ｼ 縺薙％縺九ｉ (ver.1.7 霑ｽ蜉�繝｡繝�繧ｻ繝ｼ繧ｸ) -->
 
-	<!-- RomStart Address CW -->
+	<!-- TWL Rom Info -->
 	<RomStartAddress>
 		<name>繧ｹ繧ｿ繝ｼ繝医い繝峨Ξ繧ｹ</name>
 		<sentence>ROM縺ｮ繧ｹ繧ｿ繝ｼ繝医い繝峨Ξ繧ｹ縺ｯ縲�0x02004000莉･髯阪〒縺ｪ縺代ｌ縺ｰ縺ｪ繧翫∪縺帙ｓ縲�</sentence>
 		<begin>28</begin><end>2b</end><modify>False</modify><affect>True</affect>
 	</RomStartAddress>
 
+	<DebugDwc>
+		<name>DWC繝ｩ繧､繝悶Λ繝ｪ</name>
+		<sentence>髢狗匱逕ｨ繧ｵ繝ｼ繝舌↓繧｢繧ｯ繧ｻ繧ｹ縺吶ｋ髢｢謨ｰ縺御ｽｿ逕ｨ縺輔ｌ縺ｦ縺�縺ｾ縺吶��</sentence>
+		<begin>28</begin><end>2b</end><modify>False</modify><affect>True</affect>
+	</DebugDwc>
+
+	<DigestArea>
+		<name>繝�繧､繧ｸ繧ｧ繧ｹ繝�</name>
+		<sentence>繝輔ぃ繧､繝ｫ繧ｵ繧､繧ｺ縺後ム繧､繧ｸ繧ｧ繧ｹ繝医�ｮ蟇ｾ雎｡遽�蝗ｲ繧医ｊ繧ょｰ上＆縺上↑縺｣縺ｦ縺�縺ｾ縺吶�３OM譛ｫ蟆ｾ縺ｮ繝代ョ繧｣繝ｳ繧ｰ繧СOM縺ｮ荳�驛ｨ縺悟炎髯､縺輔ｌ縺ｦ縺�繧句庄閭ｽ諤ｧ縺後≠繧翫∪縺吶��</sentence>
+		<begin>1e0</begin><end>1ef</end><modify>False</modify><affect>True</affect>
+	</DigestArea>
+
+	<!-- For China -->
+	<ChinaAllRatingFree>
+		<name>繝ｬ繝ｼ繝�繧｣繝ｳ繧ｰ(荳ｭ蝗ｽ迚亥ｯｾ蠢�)</name>
+		<sentence>荳ｭ蝗ｽ縺ｫ縺ｯ繝ｬ繝ｼ繝�繧｣繝ｳ繧ｰ蟇ｩ譟ｻ蝗｣菴薙′蟄伜惠縺励∪縺帙ｓ縺ｮ縺ｧ縲∽ｸｭ蝗ｽ蜷代¢繧ｽ繝輔ヨ縺ｫ蟇ｾ縺励※縺ｯ縲∝推蟇ｩ譟ｻ蝗｣菴薙�ｮ繝ｬ繝ｼ繝�繧｣繝ｳ繧ｰ蛟､繧定ｨｭ螳壹☆繧句ｿ�隕√�ｯ縺ゅｊ縺ｾ縺帙ｓ縲�(閾ｪ蜍慕噪縺ｫ繝槭せ繧ｿ繝ｼ繧ｨ繝�繧｣繧ｿ縺悟�､繧偵そ繝�繝医＠縺ｾ縺吶�ｮ縺ｧ縲∵悽隴ｦ蜻翫ｒ辟｡隕悶＠縺ｦ縺�縺溘□縺�縺ｦ縺九∪縺�縺ｾ縺帙ｓ縲�)</sentence>
+		<begin>2f0</begin><end>2ff</end><modify>True</modify><affect>True</affect>
+	</ChinaAllRatingFree>
+
+	<!-- For DS Station -->
+	<DSStationTmpJump>
+		<name>DS Station蟇ｾ蠢�</name>
+		<sentence>DS Station逕ｨROM縺ｧ縺ｯtmp繧ｸ繝｣繝ｳ繝励�ｯ險ｱ蜿ｯ縺輔ｌ縺ｦ縺�縺ｾ縺帙ｓ縲�</sentence>
+		<begin>1d</begin><end>1d</end><modify>False</modify><affect>True</affect>
+	</DSStationTmpJump>
+
+	<DSStationRomSize>
+		<name>DS Station蟇ｾ蠢�</name>
+		<sentence>DS Station逕ｨROM縺ｮ繝輔ぃ繧､繝ｫ繧ｵ繧､繧ｺ縺ｯ768Mbit莉･荳九〒縺ｪ縺代ｌ縺ｰ縺ｪ繧翫∪縺帙ｓ縲�</sentence>
+		<begin>0</begin><end>0</end><modify>False</modify><affect>True</affect>
+	</DSStationRomSize>
+
+	<DSStationLib>
+		<name>DS Station蟇ｾ蠢�</name>
+		<sentence>蠎鈴�ｭ隧ｦ驕雁床逕ｨ繝ｩ繧､繝悶Λ繝ｪ縺御ｽｿ逕ｨ縺輔ｌ縺ｦ縺�縺ｾ縺帙ｓ縲�</sentence>
+		<begin>0</begin><end>0</end><modify>False</modify><affect>True</affect>
+	</DSStationLib>
+
+	<!-- For Nintendo Zone -->
+	<ZoneTmpJump>
+		<name>繝�繧ｦ繝ｳ繝ｭ繝ｼ繝峨し繝ｼ繝薙せ蟇ｾ蠢�</name>
+		<sentence>繝�繧ｦ繝ｳ繝ｭ繝ｼ繝峨し繝ｼ繝薙せ逕ｨ縺ｮROM縺ｧ縺ｯ縲》mp繧ｸ繝｣繝ｳ繝励ｒ險ｱ蜿ｯ縺吶ｋ蠢�隕√′縺ゅｊ縺ｾ縺吶�３SF繝輔ぃ繧､繝ｫ縺ｮPermitLandingTmpJump繝励Ο繝代ユ繧｣繧定ｨｭ螳壹＠縺ｦ縺上□縺輔＞縲�</sentence>
+		<begin>1d</begin><end>1d</end><modify>False</modify><affect>True</affect>
+	</ZoneTmpJump>
+
+	<ZoneHybrid>
+		<name>繝�繧ｦ繝ｳ繝ｭ繝ｼ繝峨し繝ｼ繝薙せ蟇ｾ蠢�</name>
+		<sentence>繝�繧ｦ繝ｳ繝ｭ繝ｼ繝峨し繝ｼ繝薙せ逕ｨ繧｢繝励Μ繧辿YBRID迚医→縺励※菴懈�舌☆繧九％縺ｨ縺ｯ險ｱ蜿ｯ縺輔ｌ縺ｦ縺�縺ｾ縺帙ｓ縲�</sentence>
+		<begin>12</begin><end>12</end><modify>False</modify><affect>True</affect>
+	</ZoneHybrid>
+
+	<ZoneLimited>
+		<name>繝�繧ｦ繝ｳ繝ｭ繝ｼ繝峨し繝ｼ繝薙せ蟇ｾ蠢�</name>
+		<sentence>縺薙�ｮ繧ｽ繝輔ヨ縺ｯLIMITED迚医〒縺吶�ｮ縺ｧ縲¨intendoZone縺ｮ縺ｿ縺ｧ驟堺ｿ｡蜿ｯ閭ｽ縺ｧ縺吶�ゅ∩繧薙↑縺ｮ繝九Φ繝�繝ｳ繝峨�ｼ繝√Ε繝ｳ繝阪Ν繧ДS繝�繧ｦ繝ｳ繝ｭ繝ｼ繝峨�励Ξ繧､縺ｮ縺励￥縺ｿ繧剃ｽｿ逕ｨ縺励※驟堺ｿ｡縺吶ｋ縺薙→縺ｯ縺ｧ縺阪∪縺帙ｓ縲�</sentence>
+		<begin>12</begin><end>12</end><modify>False</modify><affect>True</affect>
+	</ZoneLimited>
+
+	<ZoneRomSize>
+		<name>繝�繧ｦ繝ｳ繝ｭ繝ｼ繝峨し繝ｼ繝薙せ蟇ｾ蠢�</name>
+		<sentence>繝�繧ｦ繝ｳ繝ｭ繝ｼ繝峨し繝ｼ繝薙せ逕ｨ縺ｮROM繧ｵ繧､繧ｺ縺ｯ2.5MByte莉･荳九〒縺ｪ縺代ｌ縺ｰ縺ｪ繧翫∪縺帙ｓ縲�</sentence>
+		<begin>0</begin><end>0</end><modify>False</modify><affect>True</affect>
+	</ZoneRomSize>
+
 <!-- 闍ｱ險ｳ萓晞�ｼ 縺薙％縺ｾ縺ｧ -->
 
 <!-- (ver.1.6 霑ｽ蜉�繝｡繝�繧ｻ繝ｼ繧ｸ 縺薙％縺九ｉ) -->
@@ -76,49 +139,6 @@
 		<sentence>荳ｭ蝗ｽ迚医�ｮ繝舌リ繝ｼ譁�蟄励→縺励※荳肴ｭ｣縺ｪ譁�蟄励そ繝�繝医′菴ｿ逕ｨ縺輔ｌ縺ｦ縺�縺ｾ縺吶��</sentence>
 		<begin>0</begin><end>0</end><modify>False</modify><affect>True</affect>
 	</ChinaBannerCharSet>
-	<ChinaAllRatingFree>
-		<name>繝ｬ繝ｼ繝�繧｣繝ｳ繧ｰ(荳ｭ蝗ｽ迚亥ｯｾ蠢�)</name>
-		<sentence>莉募髄蝨ｰ縺御ｸｭ蝗ｽ縺ｧ縺ゅｋ蝣ｴ蜷医�√☆縺ｹ縺ｦ縺ｮ蝗｣菴薙�ｮ繝ｬ繝ｼ繝�繧｣繝ｳ繧ｰ繧偵�悟�ｨ蟷ｴ鮨｢縲阪↓險ｭ螳壹☆繧句ｿ�隕√′縺ゅｊ縺ｾ縺吶��(繝槭せ繧ｿ繝ｼROM繧剃ｽ懈�舌☆繧矩圀縺ｫ縲√�槭せ繧ｿ繝ｼ繧ｨ繝�繧｣繧ｿ縺ｫ繧医▲縺ｦ閾ｪ蜍慕噪縺ｫ險ｭ螳壹＆繧後∪縺吶�ｮ縺ｧ縲ヽOM繧貞�阪ン繝ｫ繝峨☆繧句ｿ�隕√�ｯ縺ゅｊ縺ｾ縺帙ｓ縲�)</sentence>
-		<begin>2f0</begin><end>2ff</end><modify>True</modify><affect>True</affect>
-	</ChinaAllRatingFree>
-
-	<!-- For DS Station -->
-	<DSStationTmpJump>
-		<name>蠎鈴�ｭ隧ｦ驕顔沿蟇ｾ蠢�</name>
-		<sentence>蠎鈴�ｭ隧ｦ驕顔沿縺ｧ縺ｯtmp繧ｸ繝｣繝ｳ繝励�ｯ險ｱ蜿ｯ縺輔ｌ縺ｦ縺�縺ｾ縺帙ｓ縲�</sentence>
-		<begin>1d</begin><end>1d</end><modify>False</modify><affect>True</affect>
-	</DSStationTmpJump>
-
-	<DSStationRomSize>
-		<name>蠎鈴�ｭ隧ｦ驕顔沿蟇ｾ蠢�</name>
-		<sentence>蠎鈴�ｭ隧ｦ驕顔沿縺ｮROM繧ｵ繧､繧ｺ縺ｯ768Mbit莉･荳九〒縺ｪ縺代ｌ縺ｰ縺ｪ繧翫∪縺帙ｓ縲�</sentence>
-		<begin>0</begin><end>0</end><modify>False</modify><affect>True</affect>
-	</DSStationRomSize>
-
-	<DSStationLib>
-		<name>蠎鈴�ｭ隧ｦ驕顔沿蟇ｾ蠢�</name>
-		<sentence>蠎鈴�ｭ隧ｦ驕顔沿繝ｩ繧､繝悶Λ繝ｪ縺御ｽｿ逕ｨ縺輔ｌ縺ｦ縺�縺ｾ縺帙ｓ縲�</sentence>
-		<begin>0</begin><end>0</end><modify>False</modify><affect>True</affect>
-	</DSStationLib>
-
-	<!-- For Nintendo Zone -->
-	<ZoneTmpJump>
-		<name>繝�繧ｦ繝ｳ繝ｭ繝ｼ繝峨し繝ｼ繝薙せ蟇ｾ蠢�</name>
-		<sentence>繝�繧ｦ繝ｳ繝ｭ繝ｼ繝峨し繝ｼ繝薙せ逕ｨ縺ｮROM縺ｧ縺ｯ縲》mp繧ｸ繝｣繝ｳ繝励ｒ險ｱ蜿ｯ縺吶ｋ蠢�隕√′縺ゅｊ縺ｾ縺吶�３SF繝輔ぃ繧､繝ｫ縺ｮPermitLandingTmpJump繝励Ο繝代ユ繧｣繧定ｨｭ螳壹＠縺ｦ縺上□縺輔＞縲�</sentence>
-		<begin>1d</begin><end>1d</end><modify>False</modify><affect>True</affect>
-	</ZoneTmpJump>
-
-	<ZoneHybrid>
-		<name>繝�繧ｦ繝ｳ繝ｭ繝ｼ繝峨し繝ｼ繝薙せ蟇ｾ蠢�</name>
-		<sentence>繝�繧ｦ繝ｳ繝ｭ繝ｼ繝峨し繝ｼ繝薙せ逕ｨ繧｢繝励Μ繧辿YBRID迚医→縺励※菴懈�舌☆繧九％縺ｨ縺ｯ險ｱ蜿ｯ縺輔ｌ縺ｦ縺�縺ｾ縺帙ｓ縲�</sentence>
-		<begin>12</begin><end>12</end><modify>False</modify><affect>True</affect>
-	</ZoneHybrid>
-
-	<ZoneRomSize>
-		<name>繝�繧ｦ繝ｳ繝ｭ繝ｼ繝峨し繝ｼ繝薙せ蟇ｾ蠢�</name>
-		<sentence>繝�繧ｦ繝ｳ繝ｭ繝ｼ繝峨し繝ｼ繝薙せ逕ｨ縺ｮROM繧ｵ繧､繧ｺ縺ｯ2.5MByte莉･荳九〒縺ｪ縺代ｌ縺ｰ縺ｪ繧翫∪縺帙ｓ縲�</sentence>
-		<begin>0</begin><end>0</end><modify>False</modify><affect>True</affect>
-	</ZoneRomSize>
 
 	<!-- SDK Version -->
 	<SDKVersionExModuleTwlOld>