diff --git a/lib/libnx/include/nx/hierarchicalsha256.h b/lib/libnx/include/nx/hierarchicalsha256.h
new file mode 100644
index 0000000..7039dcc
--- /dev/null
+++ b/lib/libnx/include/nx/hierarchicalsha256.h
@@ -0,0 +1,27 @@
+#pragma once
+#include <string>
+#include <fnd/types.h>
+#include <crypto/sha.h>
+#include <fnd/ISerialiseableBinary.h>
+
+namespace nx
+{
+	namespace hierarchicalsha256
+	{
+		static const size_t kDefaultLevelNum = 2;
+	}
+	
+#pragma pack(push,1)
+	struct sHierarchicalSha256Header
+	{
+		crypto::sha::sSha256Hash master_hash;
+		le_uint32_t hash_block_size;
+		le_uint32_t hash_level_num;
+		struct sLayout
+		{
+			le_uint64_t offset;
+			le_uint64_t size;
+		} hash_data, hash_target;
+	};
+#pragma pack(pop)
+}
diff --git a/lib/libnx/include/nx/ivfc.h b/lib/libnx/include/nx/ivfc.h
index 475f833..0d74426 100644
--- a/lib/libnx/include/nx/ivfc.h
+++ b/lib/libnx/include/nx/ivfc.h
@@ -11,7 +11,7 @@ namespace nx
 	namespace ivfc
 	{
 		const std::string kIvfcSig = "IVFC";
-		static const size_t kMaxIvfcLevel = 4;
+		static const size_t kMaxIvfcLevel = 7;
 		static const uint32_t kIvfcId = 0x20000;
 	}
 	
@@ -24,13 +24,13 @@ namespace nx
 		le_uint32_t level_num;
 		struct sIvfcLevelHeader
 		{
-			uint64_t logical_offset;
-			uint64_t hash_data_size;
-			uint32_t block_size;
+			le_uint64_t logical_offset;
+			le_uint64_t hash_data_size;
+			le_uint32_t block_size;
 			byte_t reserved[4];
 		} level_header[ivfc::kMaxIvfcLevel];
-		byte_t unk_0xA0[0x20];
-		byte_t master_hash[0x20];
+		byte_t reserved_00[0x8];
+		crypto::sha::sSha256Hash master_hash;
 	};
 #pragma pack(pop)
 }
diff --git a/lib/libnx/include/nx/nca.h b/lib/libnx/include/nx/nca.h
index 9f11a69..e301ae7 100644
--- a/lib/libnx/include/nx/nca.h
+++ b/lib/libnx/include/nx/nca.h
@@ -6,6 +6,7 @@
 #include <crypto/rsa.h>
 #include <fnd/ISerialiseableBinary.h>
 #include <nx/ivfc.h>
+#include <nx/hierarchicalsha256.h>
 
 namespace nx
 {
@@ -20,6 +21,8 @@ namespace nx
 		static const size_t kAesKeyNum = 16;
 		static const size_t kRightsIdLen = 0x10;
 		static const size_t kKeyAreaEncryptionKeyNum = 3;
+		static const size_t kFsHeaderHashSuperblockLen = 0x130;
+		static const uint16_t kDefaultFsHeaderVersion = 2;
 
 		enum ProgramPartitionId
 		{
@@ -41,6 +44,7 @@ namespace nx
 			TYPE_CONTROL,
 			TYPE_MANUAL,
 			TYPE_DATA,
+			TYPE_PUBLIC_DATA
 		};
 
 		enum KeyBankIndex
@@ -68,7 +72,7 @@ namespace nx
 		enum HashType
 		{
 			HASH_AUTO,
-			HASH_UNK1,
+			HASH_NONE,
 			HASH_HIERARCHICAL_SHA256,
 			HASH_HIERARCHICAL_INTERGRITY // IVFC
 		};
@@ -79,7 +83,7 @@ namespace nx
 			CRYPT_NONE,
 			CRYPT_AESXTS,
 			CRYPT_AESCTR,
-			CRYPT_BKTR
+			CRYPT_AESCTREX
 		};	
 	}
 	
@@ -109,33 +113,28 @@ namespace nx
 		crypto::aes::sAes128Key enc_aes_key[nca::kAesKeyNum];
 	};
 
+	struct sNcaFsHeader
+	{
+		le_uint16_t version;
+		byte_t format_type;
+		byte_t hash_type;
+		byte_t encryption_type;
+		byte_t reserved_0[3];
+		union {
+			byte_t hash_superblock[nca::kFsHeaderHashSuperblockLen];
+			nx::sHierarchicalSha256Header hierarchicalsha256_header;
+			nx::sIvfcHeader ivfc_header;
+		};
+		crypto::aes::sAesIvCtr base_ctr;
+		byte_t reserved_1[0xB8];
+	};
+
 	struct sNcaHeaderBlock
 	{
 		byte_t signature_main[crypto::rsa::kRsa2048Size];
 		byte_t signature_acid[crypto::rsa::kRsa2048Size];
 		sNcaHeader header;
-		byte_t fs_header[nx::nca::kPartitionNum][nx::nca::kSectorSize];
-	};
-
-	struct sNcaFsHeader
-	{
-		le_uint16_t version; // usually 0x0002
-		byte_t format_type; // RomFs(0x00), PartitionFs(0x01)
-		byte_t hash_type; // HashTypeAuto(0x00), HashTypeHierarchicalSha256(0x02), HashTypeHierarchicalIntegrity(0x03).RomFs uses (0x03) this is forced, PartitionFs uses (0x02).
-		byte_t encryption_type; // EncryptionTypeAuto(0x00), EncryptionTypeNone(0x01), EncryptionTypeAesCtr(0x03)
-		byte_t reserved[3];
-	};
-
-	struct sHierarchicalSha256Header
-	{
-		byte_t master_hash[0x20];
-		le_uint32_t hash_block_size;
-		le_uint32_t unk_0x02;
-		struct sLayout
-		{
-			le_uint64_t offset;
-			le_uint64_t size;
-		} hash_data, hash_target;
+		sNcaFsHeader fs_header[nx::nca::kPartitionNum];
 	};
 
 #pragma pack(pop)