diff --git a/sys/vmm/getfreevirtualpage.c b/sys/vmm/getfreevirtualpage.c
index 97cf201..7738e86 100644
--- a/sys/vmm/getfreevirtualpage.c
+++ b/sys/vmm/getfreevirtualpage.c
@@ -86,13 +86,10 @@
 
     if ((pageDirectory[pdI] & PAGE_PRESENT) != PAGE_PRESENT) { /* If Page Directory Is Not Yet Allocated Allocate It */
 
-<<<<<<< HEAD
      if (pdI == 0x21)
        kprintf("GOT YOU: %i", _current->id);
 
-=======
       pageDirectory[pdI] = (uint32_t) vmm_findFreePage(_current->id) | PAGE_DEFAULT;
->>>>>>> 178e47e730a76fc6339a993efae2ed0480e6f652
 
       /* Also Add It To Virtual Space So We Can Make Changes Later */
       pageTable = (uint32_t *) (PT_BASE_ADDR + (PD_INDEX( PT_BASE_ADDR ) * 0x1000)); /* Table that maps that 4MB */
@@ -109,7 +106,7 @@
       bzero(pageTable, PAGE_SIZE);
     }
     else {
-      pageTable = (uint32_y *) (PT_BASE_ADDR + (0x1000 * pdI));
+      pageTable = (uint32_t *) (PT_BASE_ADDR + (0x1000 * pdI));
     }
 
     ptI = ((start_page - (pdI * 0x400000)) / 0x1000);
@@ -127,7 +124,7 @@
         vmm_clearVirtualPage((uInt32) ((pdI * (1024 * 4096)) + (y * 4096)));
       }
       else {
-        kprintf("-> y: %i, ptI: 0x%X, pdI: 0x%X pTS: 0x%X ??\n", y, ptI, pdI, pageTableSrc[y]);
+        kprintf("-> y: %i, ptI: 0x%X, pdI: 0x%X pTS: 0x%X ??\n", y, ptI, pdI, pageTable[y]);
         K_PANIC("UHM HOW DO WE HAVE AN ALLOCATED PAGE HERE!!\n");
       }
 
diff --git a/sys/vmm/paging.c b/sys/vmm/paging.c
index 0cf2bb8..e61d2f3 100644
--- a/sys/vmm/paging.c
+++ b/sys/vmm/paging.c
@@ -406,7 +406,7 @@
       K_PANIC("Returned NULL");
   }
   for (x = (_current->oInfo.vmStart / (1024 * 4096)); x < 1024; x++) {
-kapnic("v_mFT");
+    kpanic("v_mFT");
     pageTableSrc = (uint32_t *) (PT_BASE_ADDR + (4096 * x));
 
     for (y = 0; y < 1024; y++) {
@@ -502,10 +502,10 @@
       pageDirectory[x] = (uint32_t) vmm_findFreePage(_current->id) | PAGE_DEFAULT;
 
       /* Also Add It To Virtual Space So We Can Make Changes Later */
-      pageTable = (uint32_t *) (PT_BASE_ADDR + (PD_INDEX( PT_BASE_ADDR ) * 0x1000)); /* Table that maps that 4MB */
+      pageTableSrc = (uint32_t *) (PT_BASE_ADDR + (PD_INDEX( PT_BASE_ADDR ) * 0x1000)); /* Table that maps that 4MB */
 
       pageTableSrc[x] = (pageDirectory[x] & 0xFFFFF000) | PAGE_DEFAULT;
-      pageTableSrc = (uint32_t *) (PT_BASE_ADDR + (pdI * 0x1000));
+      pageTableSrc = (uint32_t *) (PT_BASE_ADDR + (x * 0x1000));
 
       /* Reload Page Directory */
       asm(