diff --git a/ctrtool/ctrtool.sln b/ctrtool/ctrtool.sln
new file mode 100644
index 0000000..ab9464c
--- /dev/null
+++ b/ctrtool/ctrtool.sln
@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ctrtool", "ctrtool.vcxproj", "{96F5CA15-30DA-4DF5-9DFF-523D58D38001}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{96F5CA15-30DA-4DF5-9DFF-523D58D38001}.Debug|Win32.ActiveCfg = Debug|Win32
+		{96F5CA15-30DA-4DF5-9DFF-523D58D38001}.Debug|Win32.Build.0 = Debug|Win32
+		{96F5CA15-30DA-4DF5-9DFF-523D58D38001}.Release|Win32.ActiveCfg = Release|Win32
+		{96F5CA15-30DA-4DF5-9DFF-523D58D38001}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/ctrtool/exheader.c b/ctrtool/exheader.c
index f9207e2..65e488a 100644
--- a/ctrtool/exheader.c
+++ b/ctrtool/exheader.c
@@ -470,15 +470,11 @@ void exheader_verify(exheader_context* ctx)
 
 
 	// Storage Info Verify
-	for(i=0; i<8; i++)
-	{
-		if(0 == (ctx->header.arm11systemlocalcaps.storageinfo.systemsavedataid[i] & ~ctx->header.accessdesc.arm11systemlocalcaps.storageinfo.systemsavedataid[i]))
-			continue;
-		if(i < 4)
-			ctx->validsystemsaveID[0] = Fail;
-		else
-			ctx->validsystemsaveID[1] = Fail;
-	}
+	if(0 != (getle32(ctx->header.arm11systemlocalcaps.storageinfo.systemsavedataid) & ~getle32(ctx->header.arm11systemlocalcaps.storageinfo.systemsavedataid)))
+		ctx->validsystemsaveID[0] = Fail;
+	if(0 != (getle32(ctx->header.arm11systemlocalcaps.storageinfo.systemsavedataid+4) & ~getle32(ctx->header.accessdesc.arm11systemlocalcaps.storageinfo.systemsavedataid+4)))
+		ctx->validsystemsaveID[1] = Fail;
+
 	for(i=0; i<7; i++)
 	{
 		if(0 == (ctx->header.arm11systemlocalcaps.storageinfo.accessinfo[i] & ~ctx->header.accessdesc.arm11systemlocalcaps.storageinfo.accessinfo[i]))