diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..06f0bc3
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,146 @@
+### C ###
+# Prerequisites
+*.d
+
+# Object files
+*.o
+*.ko
+*.obj
+*.elf
+
+# Linker output
+*.ilk
+*.map
+*.exp
+
+# Precompiled Headers
+*.gch
+*.pch
+
+# Libraries
+*.lib
+*.a
+*.la
+*.lo
+
+# Shared objects (inc. Windows DLLs)
+*.dll
+*.so
+*.so.*
+*.dylib
+
+# Executables
+*.exe
+*.out
+*.app
+*.i*86
+*.x86_64
+*.hex
+
+# Debug files
+*.dSYM/
+*.su
+*.idb
+*.pdb
+
+# Kernel Module Compile Results
+*.mod*
+*.cmd
+.tmp_versions/
+modules.order
+Module.symvers
+Mkfile.old
+dkms.conf
+
+### C++ ###
+# Prerequisites
+
+# Compiled Object files
+*.slo
+
+# Precompiled Headers
+
+# Compiled Dynamic libraries
+
+# Fortran module files
+*.mod
+*.smod
+
+# Compiled Static libraries
+*.lai
+
+# Executables
+
+### Linux ###
+*~
+
+# temporary files which can be created if a process still has a handle open of a deleted file
+.fuse_hidden*
+
+# KDE directory preferences
+.directory
+
+# Linux trash folder which might appear on any partition or disk
+.Trash-*
+
+# .nfs files are created when an open file is removed but is still being accessed
+.nfs*
+
+### macOS ###
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+### macOS Patch ###
+# iCloud generated files
+*.icloud
+
+### Windows ###
+# Windows thumbnail cache files
+Thumbs.db
+Thumbs.db:encryptable
+ehthumbs.db
+ehthumbs_vista.db
+
+# Dump file
+*.stackdump
+
+# Folder config file
+[Dd]esktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msix
+*.msm
+*.msp
+
+# Windows shortcuts
+*.lnk
diff --git a/src/libkirk/aes.c b/src/libkirk/aes.c
index e1b50c6..bc69d17 100644
--- a/src/libkirk/aes.c
+++ b/src/libkirk/aes.c
@@ -872,8 +872,7 @@ int rijndaelKeySetupDec(u32 rk[/*4*(Nr + 1)*/], const u8 cipherKey[], int keyBit
 	return Nr;
 }
 
-void rijndaelEncrypt(const u32 rk[/*4*(Nr + 1)*/], int Nr, const u8 pt[16],
-    u8 ct[16])
+void rijndaelEncrypt(const unsigned int rk[], int Nr, const unsigned char pt[], unsigned char ct[])
 {
 	u32 s0, s1, s2, s3, t0, t1, t2, t3;
 #ifndef FULL_UNROLL
diff --git a/src/libkirk/amctrl.c b/src/libkirk/amctrl.c
index 59b08a0..d7614de 100644
--- a/src/libkirk/amctrl.c
+++ b/src/libkirk/amctrl.c
@@ -10,6 +10,7 @@
 #include "kirk_engine.h"
 #include "amctrl.h"
 #include "aes.h"
+#define STRBUF_SIZE 0x30
 
 // KIRK buffer.
 static u8 kirk_buf[0x0814];
@@ -680,146 +681,155 @@ int bbmac_forge(MAC_KEY *mkey, u8 *bbmac, u8 *vkey, u8 *buf)
 /*
 	sceNpDrm functions.
 */
+
 int sceNpDrmGetFixedKey(u8 *key, char *npstr, int type)
 {
-	AES_ctx akey;
-	MAC_KEY mkey;
-	char strbuf[0x30];
-	int retv;
-
-	if ((type & 0x01000000) == 0)
-		return 0x80550901;
-	
-	type &= 0x000000ff;
-
-	memset(strbuf, 0, 0x30);
-	strncpy(strbuf, npstr, 0x30);
-
-	retv = sceDrmBBMacInit(&mkey, 1);
-	
-	if (retv)
-		return retv;
-
-	retv = sceDrmBBMacUpdate(&mkey, (u8*)strbuf, 0x30);
-	
-	if (retv)
-		return retv;
-
-	retv = sceDrmBBMacFinal(&mkey, key, npdrm_fixed_key);
-	
-	if (retv)
-		return 0x80550902;
-
-	if (type == 0)
-		return 0;
-	if (type > 3)
-		return 0x80550901;
-	
-	type = (type - 1) * 16;
-
-	AES_set_key(&akey, &npdrm_enc_keys[type], 128);
-	AES_encrypt(&akey, key, key);
-
-	return 0;
+    AES_ctx akey;
+    MAC_KEY mkey;
+    char strbuf[STRBUF_SIZE];
+    int retv;
+
+    if ((type & 0x01000000) == 0)
+        return 0x80550901;
+    
+    type &= 0x000000ff;
+
+    memset(strbuf, 0, sizeof(strbuf)); // Clear the buffer
+    strncpy(strbuf, npstr, sizeof(strbuf) - 1); // Copy with space for null terminator
+    strbuf[sizeof(strbuf) - 1] = '\0'; // Ensure null termination
+
+    retv = sceDrmBBMacInit(&mkey, 1);
+    
+    if (retv)
+        return retv;
+
+    retv = sceDrmBBMacUpdate(&mkey, (u8*)strbuf, sizeof(strbuf)); // Use STRBUF_SIZE instead of magic number
+    
+    if (retv)
+        return retv;
+
+    retv = sceDrmBBMacFinal(&mkey, key, npdrm_fixed_key);
+    
+    if (retv)
+        return 0x80550902;
+
+    if (type == 0)
+        return 0;
+    if (type > 3)
+        return 0x80550901;
+    
+    type = (type - 1) * 16;
+
+    AES_set_key(&akey, &npdrm_enc_keys[type], 128);
+    AES_encrypt(&akey, key, key);
+
+    return 0;
 }
 
+#define DNAS_HASH_SIZE 0x80
+#define KEY_HASH_SIZE 0x70
+#define TABLE_HASH_SIZE 0x60
+#define PGD_HEADER_SIZE 0x30
+
 int decrypt_pgd(u8* pgd_data, int pgd_size, int flag, u8* key __attribute__((unused)))
 {
-	int result;
-	PGD_HEADER PGD[sizeof(PGD_HEADER)];
-	MAC_KEY mkey;
-	CIPHER_KEY ckey;
-	u8* fkey;
-
-	// Read in the PGD header parameters.
-	memset(PGD, 0, sizeof(PGD_HEADER));
-
-	PGD->buf = pgd_data;
-	PGD->key_index = *(u32*)(pgd_data + 4);
-	PGD->drm_type  = *(u32*)(pgd_data + 8);
-
-	// Set the hashing, crypto and open modes.
-	if (PGD->drm_type == 1) {
-		PGD->mac_type = 1;
-		flag |= 4;
-
-		if(PGD->key_index > 1) {
-			PGD->mac_type = 3;
-			flag |= 8;
-		}
-
-		PGD->cipher_type = 1;
-	} else {
-		PGD->mac_type = 2;
-		PGD->cipher_type = 2;
-	}
-
-	PGD->open_flag = flag;
-
-	// Get the fixed DNAS key.
-	fkey = NULL;
-	if ((flag & 0x2) == 0x2)
-		fkey = dnas_key1A90;
-	if ((flag & 0x1) == 0x1)
-		fkey = dnas_key1AA0;
-
-	if (fkey == NULL) {
-		printf("PGD: Invalid PGD DNAS flag! %08x\n", flag);
-		return -1;
-	}
-
-	// Test MAC hash at 0x80 (DNAS hash).
-	sceDrmBBMacInit(&mkey, PGD->mac_type);
-	sceDrmBBMacUpdate(&mkey, pgd_data, 0x80);
-	result = sceDrmBBMacFinal2(&mkey, pgd_data + 0x80, fkey);
-
-	if (result) {
-		printf("PGD: Invalid PGD 0x80 MAC hash!\n");
-		return -1;
-	}
-
-	// Test MAC hash at 0x70 (key hash).
-	sceDrmBBMacInit(&mkey, PGD->mac_type);
-	sceDrmBBMacUpdate(&mkey, pgd_data, 0x70);
-
-	// Generate the key from MAC 0x70.
-	bbmac_getkey(&mkey, pgd_data + 0x70, PGD->vkey);
-
-	// Decrypt the PGD header block (0x30 bytes).
-	sceDrmBBCipherInit(&ckey, PGD->cipher_type, 2, pgd_data + 0x10, PGD->vkey, 0);
-	sceDrmBBCipherUpdate(&ckey, pgd_data + 0x30, 0x30);
-	sceDrmBBCipherFinal(&ckey);
-
-	// Get the decryption parameters from the decrypted header.
-	PGD->data_size   = *(u32*)(pgd_data + 0x44);
-	PGD->block_size  = *(u32*)(pgd_data + 0x48);
-	PGD->data_offset = *(u32*)(pgd_data + 0x4c);
-
-	// Additional size variables.
-	PGD->align_size = (PGD->data_size + 15) &~ 15;
-	PGD->table_offset = PGD->data_offset + PGD->align_size;
-	PGD->block_nr = (PGD->align_size + PGD->block_size - 1) &~ (PGD->block_size - 1);
-	PGD->block_nr = PGD->block_nr / PGD->block_size;
-
-	if ((PGD->align_size + PGD->block_nr * 16) > pgd_size) {
-		printf("ERROR: Invalid PGD data size!\n");
-		return -1;
-	}
-
-	// Test MAC hash at 0x60 (table hash).
-	sceDrmBBMacInit(&mkey, PGD->mac_type);
-	sceDrmBBMacUpdate(&mkey, pgd_data + PGD->table_offset, PGD->block_nr * 16);
-	result = sceDrmBBMacFinal2(&mkey, pgd_data + 0x60, PGD->vkey);
-
-	if (result) {
-		printf("ERROR: Invalid PGD 0x60 MAC hash!\n");
-		return -1;
-	}
-
-	// Decrypt the data.
-	sceDrmBBCipherInit(&ckey, PGD->cipher_type, 2, pgd_data + 0x30, PGD->vkey, 0);
-	sceDrmBBCipherUpdate(&ckey, pgd_data + 0x90, PGD->align_size);
-	sceDrmBBCipherFinal(&ckey);
-
-	return PGD->data_size;
-}
+    int result;
+    PGD_HEADER PGD; // Declare a single instance of PGD_HEADER
+    MAC_KEY mkey;
+    CIPHER_KEY ckey;
+    u8* fkey;
+
+    // Read in the PGD header parameters.
+    memset(&PGD, 0, sizeof(PGD)); // Use &PGD to clear the structure
+
+    PGD.buf = pgd_data;
+    PGD.key_index = *(u32*)(pgd_data + 4);
+    PGD.drm_type  = *(u32*)(pgd_data + 8);
+
+    // Set the hashing, crypto and open modes.
+    if (PGD.drm_type == 1) {
+        PGD.mac_type = 1;
+        flag |= 4;
+
+        if (PGD.key_index > 1) {
+            PGD.mac_type = 3;
+            flag |= 8;
+        }
+
+        PGD.cipher_type = 1;
+    } else {
+        PGD.mac_type = 2;
+        PGD.cipher_type = 2;
+    }
+
+    PGD.open_flag = flag;
+
+    // Get the fixed DNAS key.
+    fkey = NULL;
+    if ((flag & 0x2) == 0x2)
+        fkey = dnas_key1A90; // Ensure dnas_key1A90 is defined elsewhere
+    if ((flag & 0x1) == 0x1)
+        fkey = dnas_key1AA0; // Ensure dnas_key1AA0 is defined elsewhere
+
+    if (fkey == NULL) {
+        printf("PGD: Invalid PGD DNAS flag! %08x\n", flag);
+        return -1;
+    }
+
+    // Test MAC hash at DNAS_HASH_SIZE (DNAS hash).
+    sceDrmBBMacInit(&mkey, PGD.mac_type);
+    sceDrmBBMacUpdate(&mkey, pgd_data, DNAS_HASH_SIZE);
+    result = sceDrmBBMacFinal2(&mkey, pgd_data + DNAS_HASH_SIZE, fkey);
+
+    if (result) {
+        printf("PGD: Invalid PGD %08x MAC hash!\n", DNAS_HASH_SIZE);
+        return -1;
+    }
+
+    // Test MAC hash at KEY_HASH_SIZE (key hash).
+    sceDrmBBMacInit(&mkey, PGD.mac_type);
+    sceDrmBBMacUpdate(&mkey, pgd_data, KEY_HASH_SIZE);
+
+    // Generate the key from MAC at KEY_HASH_SIZE.
+    bbmac_getkey(&mkey, pgd_data + KEY_HASH_SIZE, PGD.vkey);
+
+    // Decrypt the PGD header block (PGD_HEADER_SIZE bytes).
+    sceDrmBBCipherInit(&ckey, PGD.cipher_type, 2, pgd_data + 0x10, PGD.vkey, 0);
+    sceDrmBBCipherUpdate(&ckey, pgd_data + 0x30, PGD_HEADER_SIZE);
+    sceDrmBBCipherFinal(&ckey);
+
+    // Get the decryption parameters from the decrypted header.
+    PGD.data_size   = *(u32*)(pgd_data + 0x44);
+    PGD.block_size  = *(u32*)(pgd_data + 0x48);
+    PGD.data_offset = *(u32*)(pgd_data + 0x4c);
+
+    // Additional size variables.
+    PGD.align_size = (PGD.data_size + 15) & ~15; // Align to block size
+    PGD.table_offset = PGD.data_offset + PGD.align_size;
+    
+    // Calculate number of blocks.
+    PGD.block_nr = (PGD.align_size + PGD.block_size - 1) / PGD.block_size;
+
+    if ((PGD.align_size + (PGD.block_nr * 16)) > pgd_size) {
+        printf("ERROR: Invalid PGD data size!\n");
+        return -1;
+    }
+
+    // Test MAC hash at TABLE_HASH_SIZE (table hash).
+    sceDrmBBMacInit(&mkey, PGD.mac_type);
+    sceDrmBBMacUpdate(&mkey, pgd_data + PGD.table_offset, (PGD.block_nr * 16));
+    
+    result = sceDrmBBMacFinal2(&mkey, pgd_data + TABLE_HASH_SIZE, PGD.vkey);
+
+    if (result) {
+        printf("ERROR: Invalid PGD %08x MAC hash!\n", TABLE_HASH_SIZE);
+        return -1;
+    }
+
+     // Decrypt the data.
+     sceDrmBBCipherInit(&ckey, PGD.cipher_type, 2, pgd_data + 0x30, PGD.vkey, 0);
+     sceDrmBBCipherUpdate(&ckey, pgd_data + 0x90, PGD.align_size);
+     sceDrmBBCipherFinal(&ckey);
+
+     return PGD.data_size; 
+}
\ No newline at end of file
diff --git a/src/libkirk/ec.c b/src/libkirk/ec.c
index 0b28ff2..76fe7e0 100644
--- a/src/libkirk/ec.c
+++ b/src/libkirk/ec.c
@@ -6,10 +6,13 @@
 #include <stdio.h>
 
 #include "kirk_engine.h"
+#define POINT_COORD_SIZE 20
+#define ECDSA_BUFFER_SIZE 32 
+#define BN_BUFFER_SIZE 21    // Define a constant for BN buffer size
 
 struct point {
-  u8 x[20];
-  u8 y[20];
+    u8 x[POINT_COORD_SIZE];
+    u8 y[POINT_COORD_SIZE];
 };
 
 u8 ec_p[20];
@@ -20,20 +23,19 @@ struct point ec_G;  // mon
 struct point ec_Q;  // mon
 u8 ec_k[21];
 
-void hex_dump(char *str, u8 *buf, int size)
-{
-	int i;
+void hex_dump(char *str, u8 *buf, int size) {
+    int i;
 
-	if(str)
-	printf("%s:", str);
+    if (str)
+        printf("%s:", str);
 
-	for(i=0; i<size; i++){
-	if((i%32)==0){
-	  printf("\n%4X:", i);
-	}
-	printf(" %02X", buf[i]);
-	}
-	printf("\n\n");
+    for (i = 0; i < size; i++) {
+        if ((i % 32) == 0) {
+            printf("\n%4X:", i);
+        }
+        printf(" %02X", buf[i]);
+    }
+    printf("\n\n");
 }
 
 static void elt_copy(u8 *d, u8 *a)
@@ -236,42 +238,43 @@ static void point_mul(struct point *d, u8 *a, struct point *b)
 
 static void generate_ecdsa(u8 *outR, u8 *outS, u8 *k, u8 *hash)
 {
-	u8 e[21];
-	u8 kk[21];
-	u8 m[21];
-	u8 R[21];
-	u8 S[21];
-	u8 minv[21];
-	struct point mG;
-
-	e[0] = 0;R[0] = 0;S[0] = 0;
-	memcpy(e + 1, hash, 20);
-	bn_reduce(e, ec_N, 21);
-
-	kirk_CMD14(m+1, 20);
-	m[0] = 0;
-
-	point_mul(&mG, m, &ec_G);
-	point_from_mon(&mG);
-	R[0] = 0;
-	elt_copy(R+1, mG.x);
-
-	bn_copy(kk, k, 21);
-	bn_reduce(kk, ec_N, 21);
-	bn_to_mon(m, ec_N, 21);
-	bn_to_mon(e, ec_N, 21);
-	bn_to_mon(R, ec_N, 21);
-	bn_to_mon(kk, ec_N, 21);
-
-	bn_mon_mul(S, R, kk, ec_N, 21);
-	bn_add(kk, S, e, ec_N, 21);
-	bn_mon_inv(minv, m, ec_N, 21);
-	bn_mon_mul(S, minv, kk, ec_N, 21);
-
-	bn_from_mon(R, ec_N, 21);
-	bn_from_mon(S, ec_N, 21);
-	memcpy(outR,R+1,0x20);
-	memcpy(outS,S+1,0x20);
+    u8 e[BN_BUFFER_SIZE] = {0};
+    u8 kk[BN_BUFFER_SIZE] = {0};
+    u8 m[BN_BUFFER_SIZE] = {0};
+    u8 R[ECDSA_BUFFER_SIZE] = {0};
+    u8 S[ECDSA_BUFFER_SIZE] = {0};
+    u8 minv[BN_BUFFER_SIZE] = {0};
+    struct point mG;
+
+    memcpy(e + 1, hash, 20);
+    bn_reduce(e, ec_N, sizeof(e));
+
+    kirk_CMD14(m + 1, 20);
+    m[0] = 0;
+
+    point_mul(&mG, m, &ec_G);
+    point_from_mon(&mG);
+    
+    elt_copy(R + 1, mG.x);
+
+    bn_copy(kk, k, sizeof(kk));
+    bn_reduce(kk, ec_N, sizeof(kk));
+    
+    bn_to_mon(m, ec_N, sizeof(m));
+    bn_to_mon(e, ec_N, sizeof(e));
+    bn_to_mon(R, ec_N, sizeof(R));
+    bn_to_mon(kk, ec_N, sizeof(kk));
+
+    bn_mon_mul(S, R, kk, ec_N, sizeof(S));
+    bn_add(kk, S, e, ec_N, sizeof(kk));
+    bn_mon_inv(minv, m, ec_N, sizeof(minv));
+    bn_mon_mul(S, minv, kk, ec_N, sizeof(S));
+
+    bn_from_mon(R, ec_N, sizeof(R));
+    bn_from_mon(S, ec_N, sizeof(S));
+
+    memcpy(outR,R,ECDSA_BUFFER_SIZE); // Copy R value to outR (no offset)
+    memcpy(outS,S,ECDSA_BUFFER_SIZE); // Copy S value to outS (no offset)
 }
 
 static int check_ecdsa(struct point *Q, u8 *inR, u8 *inS, u8 *hash)
@@ -295,23 +298,16 @@ static int check_ecdsa(struct point *Q, u8 *inR, u8 *inS, u8 *hash)
 	bn_to_mon(R, ec_N, 21);
 	bn_to_mon(S, ec_N, 21);
 	bn_to_mon(e, ec_N, 21);
-	// make Sinv = 1/S
 	bn_mon_inv(Sinv, S, ec_N, 21);
-	// w1 = m * Sinv
 	bn_mon_mul(w1, e, Sinv, ec_N, 21);
-	// w2 = r * Sinv
 	bn_mon_mul(w2, R, Sinv, ec_N, 21);
 
-	// mod N both
 	bn_from_mon(w1, ec_N, 21);
 	bn_from_mon(w2, ec_N, 21);
 
-	// r1 = m/s * G
 	point_mul(&r1, w1, &ec_G);
-	// r2 = r/s * P
 	point_mul(&r2, w2, Q);
 
-	//r1 = r1 + r2
 	point_add(&r1, &r1, &r2);
 
 	point_from_mon(&r1);
@@ -379,14 +375,12 @@ void ecdsa_set_priv(u8 *ink)
 	memcpy(ec_k, k, sizeof ec_k);
 }
 
-int ecdsa_verify(u8 *hash, u8 *R, u8 *S)
-{
-	return check_ecdsa(&ec_Q, R, S, hash);
+int ecdsa_verify(u8 *hash, u8 *R, u8 *S) {
+    return check_ecdsa(&ec_Q, R, S, hash);
 }
 
-void ecdsa_sign(u8 *hash, u8 *R, u8 *S)
-{
-	generate_ecdsa(R, S, ec_k, hash);
+void ecdsa_sign(u8 *hash, u8 *R, u8 *S) {
+    generate_ecdsa(R, S, ec_k, hash);
 }
 
 int point_is_on_curve(u8 *p)