diff --git a/Makefile b/Makefile
index 2c740db..2582f48 100644
--- a/Makefile
+++ b/Makefile
@@ -19,8 +19,6 @@
 
 .DEFAULT_GOAL := all
 
-GITREV := $(shell git rev-parse --short HEAD)
-
 ##
 # Build configuration
 #
@@ -54,10 +52,7 @@ QEMU_FLAGS := -m 2G -smp 4 -rtc base=localtime -serial stdio
 QEMU_FLAGS += -usb -device usb-mouse
 
 # x86_64
-# TODO: Move this elsewhere
-ifeq ($(ARCH),x86_64)
 QEMU_FLAGS += -machine q35
-endif
 
 ##
 # General info
@@ -135,17 +130,15 @@ livesd: install
 	@mkdir -p $(RELEASE_DIR)
 	@utils/arch/$(ARCH)/generate-sd.sh $(LIVESD)
 
-# TODO: Maybe don't run with -hda but -drive?
 .PHONY: run
-run: livehdd
+run: livecd
 	@printf ">>> Running QEMU...\n"
-	@qemu-system-$(ARCH) $(QEMU_FLAGS) $(QEMU_MACHINE_FLAGS) -hda $(LIVEHDD)
+	@qemu-system-$(ARCH) $(QEMU_FLAGS) $(QEMU_MACHINE_FLAGS) -cdrom $(LIVECD)
 
-# TODO: Maybe don't run with -hda but -drive?
 .PHONY: run-uefi
-run-uefi: livehdd ovmf
+run-uefi: livecd ovmf
 	@printf ">>> Running QEMU (UEFI)...\n"
-	@qemu-system-$(ARCH) $(QEMU_FLAGS) $(QEMU_MACHINE_FLAGS) -bios ovmf/ovmf-$(ARCH).fd -hda $(LIVEHDD)
+	@qemu-system-$(ARCH) $(QEMU_FLAGS) $(QEMU_MACHINE_FLAGS) -bios ovmf/ovmf-$(ARCH).fd -cdrom $(LIVECD)
 
 .PHONY: clean
 clean:
diff --git a/boot/Makefile b/boot/Makefile
index 79e063c..e1fb122 100644
--- a/boot/Makefile
+++ b/boot/Makefile
@@ -28,11 +28,9 @@ export BUILD_DIR ?= build
 export SYSROOT_DIR ?= sysroot
 
 export ASFLAGS := $(foreach d, $(DEFINES), -D$d)
-export CFLAGS := $(foreach d, $(DEFINES), -D$d) -Wall -Wextra -Wno-unused-local-typedef -ffreestanding -fno-stack-protector -fno-stack-check -MMD -MP
+export CFLAGS := $(foreach d, $(DEFINES), -D$d) -Wall -Wextra -ffreestanding -fno-stack-protector -fno-stack-check -MMD -MP
 export LDFLAGS := -nostdlib
 
-include arch/$(ARCH)/config.mk
-
 export BOOT_ROOT := $(ROOT_DIR)/boot
 
 ifeq ($(BUILD_TYPE),debug)
diff --git a/boot/arch/aarch64/config.mk b/boot/arch/aarch64/config.mk
deleted file mode 100644
index e69de29..0000000
diff --git a/boot/arch/i686/config.mk b/boot/arch/i686/config.mk
deleted file mode 100644
index 65b82a4..0000000
--- a/boot/arch/i686/config.mk
+++ /dev/null
@@ -1 +0,0 @@
-CFLAGS += -DARCH_ACPI_AVAILABLE -DARCH_SMBIOS_AVAILABLE
\ No newline at end of file
diff --git a/boot/arch/x86_64/common/mm/paging.c b/boot/arch/x86_64/common/mm/paging.c
index 827201e..40826fd 100644
--- a/boot/arch/x86_64/common/mm/paging.c
+++ b/boot/arch/x86_64/common/mm/paging.c
@@ -58,6 +58,10 @@ static void _map(pagetable *pm, uintptr_t virt, uintptr_t phys, uint64_t flags)
     }
 
     pagetable *pml1_table = (pagetable *)(pml2_table->entries[pml2_idx] & 0x000FFFFFFFFFF000);
+    if ((pml1_table->entries[pml1_idx] & 1)) {
+        // debug("_map(): Remapping present page\n");
+    }
+
     pml1_table->entries[pml1_idx] = (phys & 0x000FFFFFFFFFF000) | flags;
 }
 
diff --git a/boot/arch/x86_64/common/proto/aurix/handoff.c b/boot/arch/x86_64/common/proto/aurix/handoff.c
deleted file mode 100644
index f23645e..0000000
--- a/boot/arch/x86_64/common/proto/aurix/handoff.c
+++ /dev/null
@@ -1,115 +0,0 @@
-/*********************************************************************************/
-/* Module Name:  handoff.c                                                       */
-/* Project:      AurixOS                                                         */
-/*                                                                               */
-/* Copyright (c) 2024-2025 Jozef Nagy                                            */
-/*                                                                               */
-/* This source is subject to the MIT License.                                    */
-/* See License.txt in the root of this repository.                               */
-/* All other rights reserved.                                                    */
-/*                                                                               */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR    */
-/* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,      */
-/* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE   */
-/* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER        */
-/* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, */
-/* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE */
-/* SOFTWARE.                                                                     */
-/*********************************************************************************/
-
-#include <arch/cpu/gdt.h>
-#include <arch/cpu/idt.h>
-#include <proto/aurix.h>
-#include <mm/vmm.h>
-#include <print.h>
-#include <stdint.h>
-
-struct gdt {
-	struct gdt_descriptor null;
-	struct gdt_descriptor kcode;
-	struct gdt_descriptor kdata;
-	struct gdt_descriptor ucode;
-	struct gdt_descriptor udata;
-	struct tss_descriptor tss;
-};
-
-void aurix_arch_handoff(void *kernel_entry, pagetable *pm, void *stack, uint32_t stack_size, struct aurix_parameters *parameters)
-{
-	struct tss tss = {
-		.iomap_base = sizeof(struct tss),
-	};
-
-	struct gdt gdt = {
-		.tss = {
-			.gdt = {
-				.base_low = ((uintptr_t)&tss) & 0xFFFF,
-				.base_mid = (((uintptr_t)&tss) >> 16) & 0xFF,
-				.base_high = (((uintptr_t)&tss) >> 24) & 0xFF,
-				.access = 0b10001001
-			},
-			.base_high = (((uintptr_t)&tss) >> 32) & 0xFFFF
-		},
-	};
-
-	struct gdtr gdtr = {
-		.base = (uint64_t)&gdt,
-		.limit = sizeof(gdt) - 1
-	};
-
-	gdt_set_entry(&gdt.null, 0, 0, 0, 0);
-	gdt_set_entry(&gdt.kcode, 0, 0, 0x9a, 0xaf);
-	gdt_set_entry(&gdt.kdata, 0, 0, 0x92, 0xcf);
-	gdt_set_entry(&gdt.ucode, 0, 0, 0xfa, 0xaf);
-	gdt_set_entry(&gdt.udata, 0, 0, 0xf2, 0xcf);
-
-	struct idtr idtr = {
-		.base = (uint64_t)0,
-		.limit = 0
-	};
-
-	__asm__ volatile(
-					"cli\n"
-					//"lgdt %[gdtr]\n"
-					//"ltr %[tss]\n"
-					//"pushq $0x08\n"
-					//"lea 1f(%%rip), %%rax\n"
-					//"pushq %%rax\n"
-					//"lretq\n"
-					//"1:\n"
-					//"movq $0x10, %%rax\n"
-					//"movq %%rax, %%ds\n"
-					//"movq %%rax, %%es\n"
-					//"movq %%rax, %%ss\n"
-					//"movq %%rax, %%fs\n"
-					//"movq %%rax, %%gs\n"
-
-					//"lidt %[idt]\n"
-
-					"movq %[pml4], %%cr3\n"
-					"movq %[stack], %%rsp\n"
-					"movq %[params], %%rdi\n"
-					"movq %[entry], %%rsi\n"
-
-					// rsi = kernel entry point addr
-					// rdi = kernel parameters
-					"xor %%rax, %%rax\n"
-					"xor %%rbx, %%rbx\n"
-					"xor %%rcx, %%rcx\n"
-					"xor %%rdx, %%rdx\n"
-					//"xor %%rdi, %%rdi\n"
-					//"xor %%rsi, %%rsi\n"
-					"xor %%r8, %%r8\n"
-					"xor %%r9, %%r9\n"
-					"xor %%r10, %%r10\n"
-					"xor %%r11, %%r11\n"
-					"xor %%r12, %%r12\n"
-					"xor %%r13, %%r13\n"
-					"xor %%r14, %%r14\n"
-					"xor %%r15, %%r15\n"
-
-					"callq *%%rsi\n"
-					:: [gdtr]"g"(gdtr), [tss]"r"((uint16_t)__builtin_offsetof(struct gdt, tss)),
-						[idt]"g"(idtr),
-						[pml4]"r"(pm), [stack]"r"(stack + stack_size),
-						[entry]"r"(kernel_entry), [params]"d"(parameters) : "rax", "memory");
-}
\ No newline at end of file
diff --git a/boot/arch/x86_64/common/proto/aurix_handoff.S b/boot/arch/x86_64/common/proto/aurix_handoff.S
new file mode 100644
index 0000000..7c8f896
--- /dev/null
+++ b/boot/arch/x86_64/common/proto/aurix_handoff.S
@@ -0,0 +1,24 @@
+.globl _aurix_handoff_start
+.globl _aurix_handoff_end
+.globl aurix_handoff
+
+_aurix_handoff_start:
+aurix_handoff:
+	cli
+	movq %rsi, %rsp
+.section _aurix_handoff
+	movq %rdi, %cr3
+	xor %rax, %rax
+	xor %rbx, %rbx
+	xor %rcx, %rcx
+	xor %rdi, %rdi
+	xor %r8, %r8
+	xor %r9, %r9
+	xor %r10, %r10
+	xor %r11, %r11
+	xor %r12, %r12
+	xor %r13, %r13
+	xor %r14, %r14
+	xor %r15, %r15
+	callq *%rdx
+_aurix_handoff_end:
\ No newline at end of file
diff --git a/boot/arch/x86_64/config.mk b/boot/arch/x86_64/config.mk
deleted file mode 100644
index 65b82a4..0000000
--- a/boot/arch/x86_64/config.mk
+++ /dev/null
@@ -1 +0,0 @@
-CFLAGS += -DARCH_ACPI_AVAILABLE -DARCH_SMBIOS_AVAILABLE
\ No newline at end of file
diff --git a/boot/common/config/config.c b/boot/common/config/config.c
index 57352e0..c0d5a21 100644
--- a/boot/common/config/config.c
+++ b/boot/common/config/config.c
@@ -18,10 +18,10 @@
 /*********************************************************************************/
 
 #include <config/config.h>
+#include <config/ini.h>
 #include <lib/string.h>
 #include <loader/loader.h>
 #include <mm/mman.h>
-#include <time/dt.h>
 #include <vfs/vfs.h>
 #include <print.h>
 #include <axboot.h>
@@ -47,9 +47,8 @@ struct axboot_cfg cfg = {
 	.timeout = DEFAULT_TIMEOUT,
 	.ui_mode = UI_TEXT,
 
-	//.entry_count = 0,
-	.entry_count = 2,
-	.bootlog_filename = NULL
+	//.entry_count = 0
+	.entry_count = 2
 };
 
 struct axboot_entry entries[2] = {
@@ -70,20 +69,6 @@ struct axboot_entry entries[2] = {
 
 void config_init(void)
 {
-	// create a filename for boot log
-	// format: \AXBOOT_LOG-YY-MM-DD_HHMMSS.txt
-	char bootlog_fn[33];
-	struct datetime dt;
-	get_datetime(&dt);
-
-	snprintf(bootlog_fn, 33, "\\AXBOOT_LOG-%u-%u-%u_%u%u%u.txt", dt.year, dt.month, dt.day, dt.h, dt.m, dt.s);
-	cfg.bootlog_filename = (char *)mem_alloc(ARRAY_LENGTH(bootlog_fn));
-	if (!cfg.bootlog_filename) {
-		debug("Error!\n");
-	} else {
-		strncpy(cfg.bootlog_filename, (char *)&bootlog_fn, 33);
-	}
-
 	char *config_buf = NULL;
 	uint8_t open = 0;
 	
@@ -96,7 +81,7 @@ void config_init(void)
 	}
 
 	if (open == 0) {
-		debug("config_init(): Couldn't open a configuration file! Entering console...\n");
+		debug("Couldn't open a configuration file! Entering console...\n");
 		//console();
 		while (1);
 	}
diff --git a/boot/common/fs/uefi_sfs.c b/boot/common/fs/uefi_sfs.c
index e1e5355..bd15e2e 100644
--- a/boot/common/fs/uefi_sfs.c
+++ b/boot/common/fs/uefi_sfs.c
@@ -80,7 +80,7 @@ struct vfs_drive *sfs_init(char *mountpoint)
 
 	fs->fsdata = fsdata;
 	fs->read = sfs_read;
-	fs->write = sfs_write;
+	fs->write = NULL; // sfs_write()
 
 	struct vfs_drive *drive = (struct vfs_drive *)mem_alloc(sizeof(struct vfs_drive));
 	if (drive == NULL) {
@@ -121,7 +121,7 @@ size_t sfs_read(char *filename, char **buffer, struct vfs_drive *dev, void *fsda
 	wfilename[n] = L'\0';
 
 	/* open the file */
-	status = volume->Open(volume, &file, wfilename, EFI_FILE_MODE_READ, 0);
+	status = volume->Open(volume, &file, wfilename, EFI_FILE_MODE_READ, EFI_FILE_READ_ONLY | EFI_FILE_HIDDEN | EFI_FILE_SYSTEM);
 	if (EFI_ERROR(status)) {
 		debug("sfs_read(): Failed to open file '%s': %s (%lx)\n", filename, efi_status_to_str(status), status);
 		mem_free(wfilename);
@@ -159,49 +159,4 @@ size_t sfs_read(char *filename, char **buffer, struct vfs_drive *dev, void *fsda
 	return len;
 }
 
-uint8_t sfs_write(char *filename, char *buffer, size_t size, struct vfs_drive *dev, void *fsdata)
-{
-	(void)dev;
-
-	struct sfs_fsdata *data = (struct sfs_fsdata *)fsdata;
-	EFI_FILE_PROTOCOL *volume = data->volume;
-	EFI_FILE_PROTOCOL *file;
-	CHAR16 *wfilename;
-	EFI_STATUS status = EFI_SUCCESS;
-	size_t len = 0;
-
-	wfilename = (CHAR16 *)mem_alloc(strlen(filename) * sizeof(CHAR16));
-	if (!wfilename) {
-		debug("sfs_write(): Failed to allocate memory for wide strings!\n");
-		return 0;
-	}
-
-	size_t n = mbstowcs(wfilename, (const char **)&filename, strlen(filename));
-	wfilename[n] = L'\0';
-
-	/* open the file */
-	status = volume->Open(volume, &file, wfilename, EFI_FILE_MODE_READ | EFI_FILE_MODE_WRITE | EFI_FILE_MODE_CREATE, EFI_FILE_SYSTEM);
-	if (EFI_ERROR(status)) {
-		debug("sfs_write(): Failed to open file '%s': %s (%lx)\n", filename, efi_status_to_str(status), status);
-		mem_free(wfilename);
-		return 0;
-	}
-
-	mem_free(wfilename);
-
-	// set position to the end of the file
-	file->SetPosition(file, 0xffffffffffffffff);
-
-	status = file->Write(file, &size, buffer);
-	if (EFI_ERROR(status)) {
-		debug("sfs_write(): Failed to read file '%s': %s (%lx)\n", filename, efi_status_to_str(status), status);
-		return 0;
-	}
-
-	/* close the file */
-	file->Close(file);
-
-	return len;
-}
-
 #endif
\ No newline at end of file
diff --git a/boot/common/init.c b/boot/common/init.c
index 4385ac5..00f337f 100644
--- a/boot/common/init.c
+++ b/boot/common/init.c
@@ -31,28 +31,18 @@ void axboot_init()
 	uart_init(115200);
 
 	if (!vfs_init("\\")) {
-		log("axboot_init(): Failed to mount boot drive! Halting...\n");
+		debug("axboot_init(): Failed to mount boot drive! Halting...\n");
 		// TODO: Halt
 		while (1);
 	}
 
-	config_init();
-
-#if defined(__aarch64__) && !defined(AXBOOT_UEFI)
-	struct axboot_entry rpi_kernel = {
-		.name = "AurixOS for Raspberry Pi",
-		.image_path = "\\System\\axkrnl",
-		.protocol = PROTO_AURIX
-	};
-	loader_load(&rpi_kernel);
-	UNREACHABLE();
-#endif
-
 #ifdef AXBOOT_UEFI
 #include <driver.h>
 	load_drivers();
 #endif
 
+	//config_init();
+
 	// boot straight away
 	if (config_get_timeout() < 1) {
 		struct axboot_entry *entries = config_get_entries();
@@ -61,6 +51,16 @@ void axboot_init()
 
 	ui_init();
 
-	log("axboot_init(): Returned from main menu, something went wrong. Halting!");
+	debug("axboot_init(): Returned from main menu, something went wrong. Halting!");
+	//UNREACHABLE();
+
+	// just boot aurixos for now
+	struct axboot_entry axos = {
+		.name = "AurixOS",
+		.description = "",
+		.image_path = "\\System\\axkrnl",
+		.protocol = PROTO_AURIX
+	};
+	loader_load(&axos);
 	UNREACHABLE();
 }
\ No newline at end of file
diff --git a/boot/common/loader/elf.c b/boot/common/loader/elf.c
index 9ae909b..ced1cd4 100644
--- a/boot/common/loader/elf.c
+++ b/boot/common/loader/elf.c
@@ -28,19 +28,19 @@
 /* https://github.com/KevinAlavik/nekonix/blob/main/kernel/src/proc/elf.c */
 /* Thanks, Kevin <3 */
 
-uintptr_t elf32_load(char *data, uintptr_t *addr, pagetable *pagemap)
+uintptr_t elf32_load(char *data, pagetable *pagemap)
 {
     (void)data;
-    (void)addr;
     (void)pagemap;
     return 0;
 }
 
-uintptr_t elf64_load(char *data, uintptr_t *addr, pagetable *pagemap)
+uintptr_t elf64_load(char *data, pagetable *pagemap)
 {
     struct elf_header *header = (struct elf_header *)data;
     struct elf_program_header *ph = (struct elf_program_header *)((uint8_t *)data + header->e_phoff);
 
+    uint64_t lowest = UINT64_MAX;
     uint64_t max_align = 0;
 
     for (uint16_t i = 0; i < header->e_phnum; i++) {
@@ -56,7 +56,9 @@ uintptr_t elf64_load(char *data, uintptr_t *addr, pagetable *pagemap)
         if (ph[i].p_type != PT_LOAD)
             continue;
         
-        uint64_t aligned_vaddr = ph[i].p_vaddr & ~(max_align - 1);
+        if ((ph[i].p_vaddr & (~(max_align - 1))) < lowest) {
+            lowest = ph[i].p_vaddr & ~(max_align - 1);
+        }
 
         uint64_t flags = VMM_PRESENT;
         if (ph[i].p_flags & PF_W)
@@ -64,48 +66,44 @@ uintptr_t elf64_load(char *data, uintptr_t *addr, pagetable *pagemap)
         if (!(ph[i].p_flags & PF_X))
             flags |= VMM_NX;
     
-        uint64_t phys = ((uint64_t)mem_alloc(ph[i].p_memsz + ph[i].p_vaddr - aligned_vaddr + 4096) + 4096) & ~0xFFF;
+        uint64_t phys = (uint64_t)mem_alloc(ph[i].p_memsz);
         if (!phys) {
-            log("elf64_load(): Out of memory\n");
+            debug("elf64_load(): Out of memory\n");
             return 0;
         }
-
-        if (addr != NULL && *addr == 0) {
-            *addr = phys;
-        }
         
         debug("elf64_load(): phys=0x%llx, virt=0x%llx, size=%lu\n", phys, ph[i].p_vaddr, ph[i].p_filesz);
 
-        map_page(pagemap, aligned_vaddr, phys, flags);
-        memcpy((void*)(phys + ph[i].p_vaddr - aligned_vaddr), data + ph[i].p_offset, ph[i].p_filesz);
+        map_page(pagemap, ph[i].p_vaddr, phys, flags);
+        memcpy((void*)ph[i].p_vaddr, data + ph[i].p_offset, ph[i].p_filesz);
     }
 
-    log("elf64_load(): ELF loaded successfully, entry: 0x%llx\n", header->e_entry);
-    return (uintptr_t)header->e_entry;
+    debug("elf64_load(): ELF loaded successfully, entry: 0x%llx\n", header->e_entry);
+    return (uintptr_t)((uint8_t *)data + header->e_entry);
 }
 
-uintptr_t elf_load(char *data, uintptr_t *addr, pagetable *pagemap)
+uintptr_t elf_load(char *data, pagetable *pagemap)
 {
     struct elf_header *header = (struct elf_header *)data;
 
     if (header->e_magic != ELF_MAGIC) {
-        log("elf_load(): Invalid ELF magic: 0x%x", header->e_magic);
+        debug("Invalid ELF magic: 0x%x", header->e_magic);
         return 0;
     }
 
     if (header->e_class != 2) {
-        log("elf_load(): Unsupported ELF class: %u", header->e_class);
+        debug("Unsupported ELF class: %u", header->e_class);
         return 0;
     }
 
     if (header->e_machine == 20 ||
         header->e_machine == 3 ||
         header->e_machine == 40) {
-        return elf32_load(data, addr, pagemap);
+        return elf32_load(data, pagemap);
     } else if (header->e_machine == 62) {
-        return elf64_load(data, addr, pagemap);
+        return elf64_load(data, pagemap);
     }
 
-    log("elf_load(): Unsupported ELF machine: %u", header->e_machine);
+    debug("Unsupported ELF machine: %u", header->e_machine);
     return 0;
 }
diff --git a/boot/common/loader/loader.c b/boot/common/loader/loader.c
index f91890d..4033534 100644
--- a/boot/common/loader/loader.c
+++ b/boot/common/loader/loader.c
@@ -41,7 +41,7 @@ int proto_str_to_int(char *proto)
 
 void loader_load(struct axboot_entry *entry)
 {
-	log("loader_load(): Booting \"%s\"...\n", entry->name);
+	debug("loader_load(): Booting \"%s\"...\n", entry->name);
 
 	switch (entry->protocol) {
 		case PROTO_AURIX: {
@@ -49,7 +49,7 @@ void loader_load(struct axboot_entry *entry)
 			break;
 		}
 		default: {
-			log("loader_load(): Entry doesn't have a supported protocol!\n");
+			debug("Entry doesn't have a supported protocol!\n");
 			break;
 		}
 	}
diff --git a/boot/common/mm/mman.c b/boot/common/mm/mman.c
index df4dd08..b76056b 100644
--- a/boot/common/mm/mman.c
+++ b/boot/common/mm/mman.c
@@ -42,7 +42,7 @@ int find_alloc(void *addr)
 int add_alloc(void *addr, size_t size)
 {
 	for (int i = 0; i < MAX_ALLOCATIONS; i++) {
-		if (allocation_list[i].addr == NULL) {
+		if (allocation_list[i].addr == 0) {
 			allocation_list[i].addr = addr;
 			allocation_list[i].size = size;
 			return 1;
@@ -112,6 +112,8 @@ void *mem_alloc(size_t n)
 	}
 
 	add_alloc(alloc, n);
+
+	debug("mem_alloc(): Allocated %u bytes\n", n);
 	return alloc;
 }
 
@@ -126,6 +128,7 @@ int mem_allocat(void *addr, size_t npages)
 	}
 
 	add_alloc(addr, npages * PAGE_SIZE);
+
 	return 1;
 }
 
@@ -149,6 +152,7 @@ void *mem_realloc(void *addr, size_t n)
 
 	memcpy(new, addr, old_size);
 	mem_free(addr);
+
 	return new;
 }
 
@@ -166,8 +170,9 @@ void mem_free(void *addr)
 		return;
 	}
 
-	remove_alloc(addr);
 	debug("mem_free(): Freed 0x%llx\n", addr);
+
+	remove_alloc(addr);
 }
 
 #endif
diff --git a/boot/common/print.c b/boot/common/print.c
index 241a43b..758706a 100644
--- a/boot/common/print.c
+++ b/boot/common/print.c
@@ -26,9 +26,7 @@
 #define NANOPRINTF_USE_WRITEBACK_FORMAT_SPECIFIERS 0
 #include <nanoprintf.h>
 
-#include <config/config.h>
 #include <uart/uart.h>
-#include <vfs/vfs.h>
 #include <print.h>
 
 #include <stddef.h>
@@ -36,62 +34,31 @@
 #include <stdarg.h>
 #include <stdbool.h>
 
-#include <efi.h>
-#include <efilib.h>
-#include <mm/mman.h>
-#include <lib/string.h>
-
 int32_t _fltused = 0;
 int32_t __eqdf2 = 0;
 int32_t __ltdf2 = 0;
 
-extern struct axboot_cfg cfg;
-
-CHAR16 wstr[1024];
-
 void log(const char *fmt, ...)
 {
 	va_list args;
-	char buf[1024];
-	size_t size = 0;
-
-	va_start(args, fmt);
-	size = npf_vsnprintf(buf, sizeof(buf), fmt, args);
-	va_end(args);
-
-	uart_sendstr(buf);
-
-	if (cfg.bootlog_filename != NULL) {
-		vfs_write(cfg.bootlog_filename, (char *)&buf, size);
-	}
-
-#ifdef AXBOOT_UEFI
-	char *bufp = &buf;
-	size_t n = mbstowcs((wchar_t *)&wstr, (const char **)&bufp, 1024);
-	wstr[n] = L'\r';
-	wstr[n+1] = L'\0';
-	gSystemTable->ConOut->OutputString(gSystemTable->ConOut, wstr);
-	gBootServices->Stall(100000);
-#endif
-}
-
-void debug(const char *fmt, ...)
-{
-	va_list args;
-	char buf[1024];
+	char buf[4096];
+
+	va_start(args, fmt);
+	npf_vsnprintf(buf, sizeof(buf), fmt, args);
+	va_end(args);
+
+	uart_sendstr(buf);
+}
+
+void debug(const char *fmt, ...)
+{
+	va_list args;
+	char buf[4096];
 
 	va_start(args, fmt);
 	npf_vsnprintf(buf, sizeof(buf), fmt, args);
 	va_end(args);
 
-#ifdef AXBOOT_UEFI
-	char *bufp = &buf;
-	size_t n = mbstowcs((wchar_t *)&wstr, (const char **)&bufp, 1024);
-	wstr[n] = L'\r';
-	wstr[n+1] = L'\0';
-	gSystemTable->ConOut->OutputString(gSystemTable->ConOut, wstr);
-	gBootServices->Stall(100000);
-#endif
 	uart_sendstr(buf);
 }
 
diff --git a/boot/common/proto/aurix.c b/boot/common/proto/aurix.c
index fdd18e3..c45d740 100644
--- a/boot/common/proto/aurix.c
+++ b/boot/common/proto/aurix.c
@@ -17,190 +17,67 @@
 /* SOFTWARE.                                                                     */
 /*********************************************************************************/
 
-#include <acpi/acpi.h>
 #include <proto/aurix.h>
 #include <loader/elf.h>
 #include <mm/mman.h>
 #include <mm/memmap.h>
 #include <mm/vmm.h>
-#include <lib/string.h>
-#include <ui/framebuffer.h>
 #include <vfs/vfs.h>
 #include <print.h>
 #include <axboot.h>
+#include <efi.h>
+#include <efilib.h>
 
-#include <stdint.h>
-#include <stdbool.h>
-
-#define AURIX_STACK_SIZE 16*1024
-
-bool aurix_get_memmap(struct aurix_parameters *params, axboot_memmap *mmap, uint32_t mmap_entries, pagetable *pm)
-{
-	if (params == NULL || mmap == NULL || pm == NULL ||  mmap_entries == 0) {
-		log("aurix_get_memmap(): Invalid parameter!\n");
-		return false;
-	}
-
-	// UEFI returns an unnecessarily large memory map with regions of the same type
-	// being split into multiple entries (probably due to memory attributes, which we do not care about).
-	for (uint32_t i = 0; i < mmap_entries; i++) {
-		if (i == mmap_entries - 1) {
-			break;
-		}
-		if (mmap[i].base + mmap[i].size >= mmap[i+1].base && mmap[i].type == mmap[i+1].type) {
-			mmap[i].size += mmap[i+1].size;
-			for (uint32_t j = i+1; j < mmap_entries; j++) {
-				mmap[j].base = mmap[j+1].base;
-				mmap[j].size = mmap[j+1].size;
-				mmap[j].type = mmap[j+1].type;
-			}
-			mmap_entries--;
-			i--;
-		}
-	}
-
-	// copy the memory map over to kernel parameters
-	params->mmap = (struct aurix_memmap *)mem_alloc(sizeof(struct aurix_memmap) * mmap_entries);
-	if (!(params->mmap)) {
-		log("aurix_get_memmap(): Failed to allocate memory for storing memory map!\n");
-		return false;
-	}
-	params->mmap_entries = mmap_entries;
-
-	for (uint32_t i = 0; i < mmap_entries; i++) {
-		params->mmap[i].base = mmap[i].base;
-		params->mmap[i].size = mmap[i].size;
-		switch (mmap[i].type) {
-			case MemMapReserved:
-			case MemMapFaulty:
-			case MemMapFirmware:
-				params->mmap[i].type = AURIX_MMAP_RESERVED;
-				break;
-			case MemMapACPIReclaimable:
-				params->mmap[i].type = AURIX_MMAP_ACPI_RECLAIMABLE;
-				break;
-			case MemMapACPIMappedIO:
-				params->mmap[i].type = AURIX_MMAP_ACPI_MAPPED_IO;
-				break;
-			case MemMapACPIMappedIOPortSpace:
-				params->mmap[i].type = AURIX_MMAP_ACPI_MAPPED_IO_PORTSPACE;
-				break;
-			case MemMapACPINVS:
-				params->mmap[i].type = AURIX_MMAP_ACPI_NVS;
-				break;
-			case MemMapFreeOnLoad:
-				params->mmap[i].type = AURIX_MMAP_BOOTLOADER_RECLAIMABLE;
-				break;
-			case MemMapUsable:
-				params->mmap[i].type = AURIX_MMAP_USABLE;
-				break;
-			default:
-				log("aurix_get_memmap(): Unknown memory type in entry %u (%u), setting as reserved.\n", i, mmap[i].type);
-				params->mmap[i].type = AURIX_MMAP_RESERVED;
-				break;
-		}
-	}
-
-	return true;
-}
-
-bool aurix_get_framebuffer(struct aurix_parameters *params)
-{
-	struct fb_mode *modes;
-	int current_mode;
-	uint32_t *fb_addr;
-
-	params->framebuffer = (struct aurix_framebuffer *)mem_alloc(sizeof(struct aurix_framebuffer));
-	if (!(params->framebuffer)) {
-		log("aurix_get_framebuffer(): Failed to allocate memory for framebuffer information!\n");
-		return false;
-	}
-
-	if (!get_framebuffer(&fb_addr, &modes, NULL, &current_mode)) {
-		log("aurix_get_framebuffer(): get_framebuffer() returned false, setting everything to 0.\n");
-		memset(params->framebuffer, 0, sizeof(struct aurix_framebuffer));
-		return false;
-	}
-
-	params->framebuffer->addr = (uintptr_t)fb_addr;
-	params->framebuffer->width = modes[current_mode].width;
-	params->framebuffer->height = modes[current_mode].height;
-	params->framebuffer->bpp = modes[current_mode].bpp;
-	params->framebuffer->pitch = modes[current_mode].pitch;
-	params->framebuffer->format = modes[current_mode].format;
-
-	return true;
-}
+extern __attribute__((noreturn)) void aurix_handoff(void *pagemap, void *stack, uint64_t entry, void *params);
+extern char _aurix_handoff_start[], _aurix_handoff_end[];
 
 void aurix_load(char *kernel_path)
 {
+	// read kernel -> test read
 	char *kbuf = NULL;
 	vfs_read(kernel_path, &kbuf);
 	
+	// TODO: Do something with the kernel :p
 	pagetable *pm = create_pagemap();
 	if (!pm) {
-		log("aurix_load(): Failed to create kernel pagemap! Halting...\n");
+		debug("aurix_load(): Failed to create kernel pagemap! Halting...\n");
 		// TODO: Halt
 		while (1);
 	}
-
-	axboot_memmap *mmap;
-	uint32_t mmap_entries = get_memmap(&mmap, pm);
+	
+	axboot_memmap *memmap = get_memmap(pm);
+	(void)memmap;
 
 	map_pages(pm, (uintptr_t)pm, (uintptr_t)pm, PAGE_SIZE, VMM_WRITABLE);
+	map_pages(pm, (uintptr_t)_aurix_handoff_start, (uintptr_t)_aurix_handoff_start, (uint64_t)_aurix_handoff_end - (uint64_t)_aurix_handoff_start, 0);
 
-	void *stack = mem_alloc(AURIX_STACK_SIZE); // 16 KiB stack should be well more than enough
+	void *stack = mem_alloc(16*1024); // 16 KiB stack should be well more than enough
 	if (!stack) {
-		log("aurix_load(): Failed to allocate stack! Halting...\n");
+		debug("aurix_load(): Failed to allocate stack! Halting...\n");
 		while (1);
 	}
-	memset(stack, 0, AURIX_STACK_SIZE);
 
-	map_pages(pm, (uintptr_t)stack, (uintptr_t)stack, AURIX_STACK_SIZE, VMM_WRITABLE | VMM_NX);
+	map_pages(pm, (uintptr_t)stack, (uintptr_t)stack, 16*1024, VMM_WRITABLE | VMM_NX);
 
-	uintptr_t kernel_addr = 0;
-	void *kernel_entry = (void *)elf_load(kbuf, &kernel_addr, pm);
+	void *kernel_entry = (void *)elf_load(kbuf, pm);
 	if (!kernel_entry) {
-		log("aurix_load(): Failed to load '%s'! Halting...\n", kernel_path);
+		debug("aurix_load(): Failed to load '%s'! Halting...\n", kernel_path);
 		while (1);
 	}
-	mem_free(kbuf);
+	// mem_free(kbuf);
 
-	struct aurix_parameters parameters = {0};
+	void *parameters = NULL;
+	(void)parameters;
 
-	// set current revision
-	parameters.revision = AURIX_PROTOCOL_REVISION;
+	debug("aurix_load(): Handoff state: pm=0x%llx, stack=0x%llx, kernel_entry=0x%llx\n", pm, stack, kernel_entry);
 
-	// translate memory map
-	if (!aurix_get_memmap(&parameters, mmap, mmap_entries, pm)) {
-		log("aurix_load(): Failed to aqcuire memory map!");
-		while (1);
-	}
+	// this triggers a #GP ????
+	// aurix_handoff(pm, stack, (uint64_t)kernel_entry, (void *)parameters);
+	// __builtin_unreachable();
 
-	parameters.kernel_addr = kernel_addr;
-
-	// get RSDP and SMBIOS
-#ifdef ARCH_ACPI_AVAILABLE
-	parameters.rsdp_addr = platform_get_rsdp();
-#endif
-
-#ifdef ARCH_SMBIOS_AVAILABLE
-	parameters.smbios_addr = platform_get_smbios();
-#endif
-
-	// get framebuffer information
-	if (!aurix_get_framebuffer(&parameters)) {
-		log("aurix_load(): Failed to aqcuire framebuffer information!\n");
-	}
-
-	// map framebuffer
-	map_pages(pm, parameters.framebuffer->addr, parameters.framebuffer->addr, parameters.framebuffer->height * parameters.framebuffer->pitch, VMM_WRITABLE);
-
-	log("aurix_load(): Handoff state: pm=0x%llx, stack=0x%llx, kernel_entry=0x%llx\n", pm, stack, kernel_entry);
-#ifdef AXBOOT_UEFI
-	uefi_exit_bs();
-#endif
-
-	aurix_arch_handoff(kernel_entry, pm, stack, AURIX_STACK_SIZE, &parameters);
+	__asm__ volatile("movq %[pml4], %%cr3\n"
+					"movq %[stack], %%rsp\n"
+					"callq *%[entry]\n"
+					:: [pml4]"r"(pm), [stack]"r"(stack + (16 * 1024)), [entry]"r"(kernel_entry) : "memory");
 	__builtin_unreachable();
 }
diff --git a/boot/common/vfs/vfs.c b/boot/common/vfs/vfs.c
index 63403a0..103928f 100644
--- a/boot/common/vfs/vfs.c
+++ b/boot/common/vfs/vfs.c
@@ -36,19 +36,19 @@ int vfs_init(char *root_mountpoint)
 {
 	boot_drive = mount_boot_volume(root_mountpoint);
 	if (boot_drive == NULL) {
-		log("vfs_init(): Failed to allocate memory for VFS!\n");
+		debug("vfs_init(): Failed to allocate memory for VFS!\n");
 		// fuck off and boot out early.
 		return 0;
 	}
 
-	log("vfs_init(): Mounted boot drive to \"\\\"\n");
+	debug("vfs_init(): Mounted boot drive to \"/\"\n");
 	return 1;
 }
 
 size_t vfs_read(char *filename, char **buf)
 {
 	if (boot_drive->fs->read == NULL) {
-		log("vfs_read(): Filesystem didn't set up a read function!\n");
+		debug("vfs_read(): Filesystem didn't set up a read function!");
 		return 0;
 	}
 
@@ -57,10 +57,9 @@ size_t vfs_read(char *filename, char **buf)
 
 int vfs_write(char *filename, char *buf, size_t len)
 {
-	if (boot_drive->fs->write == NULL) {
-		log("vfs_read(): Filesystem didn't setup a write function!\n");
-		return 0;
-	}
+	(void)filename;
+	(void)buf;
+	(void)len;
 
-	return boot_drive->fs->write(filename, buf, len, boot_drive, boot_drive->fs->fsdata);
+	return 0;
 }
\ No newline at end of file
diff --git a/boot/include/acpi/acpi.h b/boot/include/acpi/acpi.h
deleted file mode 100644
index 485d3f7..0000000
--- a/boot/include/acpi/acpi.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*********************************************************************************/
-/* Module Name:  acpi.h                                                          */
-/* Project:      AurixOS                                                         */
-/*                                                                               */
-/* Copyright (c) 2024-2025 Jozef Nagy                                            */
-/*                                                                               */
-/* This source is subject to the MIT License.                                    */
-/* See License.txt in the root of this repository.                               */
-/* All other rights reserved.                                                    */
-/*                                                                               */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR    */
-/* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,      */
-/* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE   */
-/* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER        */
-/* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, */
-/* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE */
-/* SOFTWARE.                                                                     */
-/*********************************************************************************/
-
-#ifndef _ACPI_ACPI_H
-#define _ACPI_ACPI_H
-
-#include <stdint.h>
-
-uintptr_t platform_get_rsdp(void);
-uintptr_t platform_get_smbios(void);
-
-#endif /* _ACPI_ACPI_H */
diff --git a/boot/include/axboot.h b/boot/include/axboot.h
index 4b52340..fca39c5 100644
--- a/boot/include/axboot.h
+++ b/boot/include/axboot.h
@@ -34,9 +34,4 @@
 
 void axboot_init(void);
 
-// I really had no idea where to put this
-#ifdef AXBOOT_UEFI
-void uefi_exit_bs(void);
-#endif
-
 #endif /* _AXBOOT_H */
\ No newline at end of file
diff --git a/boot/include/config/config.h b/boot/include/config/config.h
index b18227f..82be0ff 100644
--- a/boot/include/config/config.h
+++ b/boot/include/config/config.h
@@ -32,7 +32,6 @@ struct axboot_cfg {
 	int ui_mode;
 
 	int entry_count;
-	char *bootlog_filename;
 };
 
 struct axboot_entry {
diff --git a/boot/include/arch/x86_64/arch/cpu/idt.h b/boot/include/config/ini.h
similarity index 56%
rename from boot/include/arch/x86_64/arch/cpu/idt.h
rename to boot/include/config/ini.h
index 3ce588a..e6b52e0 100644
--- a/boot/include/arch/x86_64/arch/cpu/idt.h
+++ b/boot/include/config/ini.h
@@ -1,5 +1,5 @@
 /*********************************************************************************/
-/* Module Name:  idt.h                                                           */
+/* Module Name:  ini.h                                                           */
 /* Project:      AurixOS                                                         */
 /*                                                                               */
 /* Copyright (c) 2024-2025 Jozef Nagy                                            */
@@ -17,17 +17,70 @@
 /* SOFTWARE.                                                                     */
 /*********************************************************************************/
 
-#ifndef _ARCH_CPU_IDT_H
-#define _ARCH_CPU_IDT_H
+#ifndef _CONFIG_INI_H
+#define _CONFIG_INI_H
 
-#include <stdint.h>
+enum token_type {
+	SECTION,
+	KEY,
+	VALUE,
 
-struct idt_descriptor {
+	EOF,
+	ILLEGAL,
 };
 
-struct idtr {
-	uint16_t limit;
-	uint64_t base;
+struct string_view {
+	char *data;
+	unsigned int len;
 };
 
-#endif /* _ARCH_CPU_IDT_H */
+struct token {
+	enum token_type type;
+	struct string_view lit;
+};
+
+struct token_array {
+	struct token *items;
+	unsigned int count;
+	unsigned int capacity;
+};
+
+struct lexer {
+	char *input;
+	unsigned int pos;
+	unsigned int read_pos;
+	char ch;
+};
+
+struct parser {
+	struct token_array *tokens;
+	unsigned int pos;
+	unsigned int read_pos;
+	struct token *cur_token;
+};
+
+struct key_value {
+	struct string_view key;
+	struct string_view value;
+};
+
+struct section {
+	struct string_view name;
+	struct key_value *items;
+	unsigned int count;
+	unsigned int capacity;
+};
+
+struct ini_file {
+	struct section root;
+	struct section *items;
+	unsigned int count;
+	unsigned int capacity;
+};
+
+void parse_ini(struct ini_file *ini, char *buf);
+
+char *ini_get_value(struct ini_file *ini, char *section, char *key);
+int ini_get_value_int(struct ini_file *ini, char *section, char *key);
+
+#endif /* _CONFIG_INI_H */
diff --git a/boot/include/driver.h b/boot/include/driver.h
index 617bf2b..6c0a69a 100644
--- a/boot/include/driver.h
+++ b/boot/include/driver.h
@@ -32,8 +32,8 @@ struct driver {
 	EFI_MEMMAP_DEVICE_PATH devpath[2];
 };
 
-void load_drivers();
-
 #endif
 
+void load_drivers();
+
 #endif /* _DRIVER_H */
\ No newline at end of file
diff --git a/boot/include/fs/uefi_sfs.h b/boot/include/fs/uefi_sfs.h
index 6969f99..97d7ad4 100644
--- a/boot/include/fs/uefi_sfs.h
+++ b/boot/include/fs/uefi_sfs.h
@@ -26,6 +26,5 @@
 struct vfs_drive *sfs_init(char *mountpoint);
 
 size_t sfs_read(char *filename, char **buffer, struct vfs_drive *dev, void *fsdata);
-uint8_t sfs_write(char *filename, char *buffer, size_t size, struct vfs_drive *dev, void *fsdata);
 
 #endif /* _FS_UEFI_SFS_H */
diff --git a/boot/include/loader/elf.h b/boot/include/loader/elf.h
index 6252231..0613173 100644
--- a/boot/include/loader/elf.h
+++ b/boot/include/loader/elf.h
@@ -73,6 +73,6 @@ struct elf_program_header {
 #define PF_W 0x2
 #define PF_R 0x4
 
-uintptr_t elf_load(char *kernel, uintptr_t *addr, pagetable *pagemap);
+uintptr_t elf_load(char *kernel, pagetable *pagemap);
 
 #endif /* _LOADER_ELF_H */
diff --git a/boot/include/mm/memmap.h b/boot/include/mm/memmap.h
index 5679d01..51cd1cc 100644
--- a/boot/include/mm/memmap.h
+++ b/boot/include/mm/memmap.h
@@ -46,6 +46,6 @@ typedef struct _axboot_memmap {
 	int type;
 } axboot_memmap;
 
-uint32_t get_memmap(axboot_memmap **map, pagetable *pm);
+axboot_memmap *get_memmap(pagetable *pm);
 
 #endif /* _MEM_MEMMAP_H */
\ No newline at end of file
diff --git a/boot/include/proto/aurix.h b/boot/include/proto/aurix.h
index e3b26f2..8863e29 100644
--- a/boot/include/proto/aurix.h
+++ b/boot/include/proto/aurix.h
@@ -17,68 +17,9 @@
 /* SOFTWARE.                                                                     */
 /*********************************************************************************/
 
-#ifndef _AURIX_H
-#define _AURIX_H
+#ifndef _PROTO_AURIX_H
+#define _PROTO_AURIX_H
 
-#include <stdint.h>
-
-#define AURIX_PROTOCOL_REVISION 1
-
-enum aurix_memmap_entry {
-	AURIX_MMAP_RESERVED = 0,
-	
-	AURIX_MMAP_ACPI_RECLAIMABLE = 1,
-	AURIX_MMAP_ACPI_MAPPED_IO = 2,
-	AURIX_MMAP_ACPI_MAPPED_IO_PORTSPACE = 3,
-	AURIX_MMAP_ACPI_NVS = 4,
-
-	AURIX_MMAP_BOOTLOADER_RECLAIMABLE = 6,
-	AURIX_MMAP_USABLE = 7
-};
-
-enum aurix_framebuffer_format {
-	AURIX_FB_RGBA = 0,
-	AURIX_FB_BGRA = 1
-};
-
-struct aurix_memmap {
-	uintptr_t base;
-	uint32_t size;
-	uint8_t type;
-};
-
-struct aurix_framebuffer {
-	uintptr_t addr;
-	uint32_t width;
-	uint32_t height;
-	uint8_t bpp; // bits!
-	uint32_t pitch;
-	int format;
-};
-
-struct aurix_parameters {
-	// PROTOCOL INFO
-	uint8_t revision;
-
-	// MEMORY
-	struct aurix_memmap *mmap;
-	uint32_t mmap_entries;
-
-	uintptr_t kernel_addr; // physical address
-
-	// RSDP and SMBIOS
-	uintptr_t rsdp_addr;
-	uintptr_t smbios_addr;
-
-	// FRAMEBUFFER
-	struct aurix_framebuffer *framebuffer;
-};
-
-#ifdef _AXBOOT
-#include <mm/vmm.h>
 void aurix_load(char *kernel);
 
-void aurix_arch_handoff(void *kernel_entry, pagetable *pm, void *stack, uint32_t stack_size, struct aurix_parameters *parameters);
-#endif
-
 #endif /* _PROTO_AURIX_H */
diff --git a/boot/include/ui/framebuffer.h b/boot/include/ui/framebuffer.h
index eb9971b..41b9bff 100644
--- a/boot/include/ui/framebuffer.h
+++ b/boot/include/ui/framebuffer.h
@@ -24,8 +24,8 @@
 #include <stdbool.h>
 
 enum fb_format {
-	FB_RGBA = 0,
-	FB_BGRA = 1
+	FB_RGBA,
+	FB_BGRA
 };
 
 struct fb_mode {
diff --git a/boot/platform/uefi/acpi.c b/boot/platform/uefi/acpi.c
deleted file mode 100644
index 7a0cf1a..0000000
--- a/boot/platform/uefi/acpi.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/*********************************************************************************/
-/* Module Name:  acpi.c                                                          */
-/* Project:      AurixOS                                                         */
-/*                                                                               */
-/* Copyright (c) 2024-2025 Jozef Nagy                                            */
-/*                                                                               */
-/* This source is subject to the MIT License.                                    */
-/* See License.txt in the root of this repository.                               */
-/* All other rights reserved.                                                    */
-/*                                                                               */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR    */
-/* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,      */
-/* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE   */
-/* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER        */
-/* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, */
-/* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE */
-/* SOFTWARE.                                                                     */
-/*********************************************************************************/
-
-#include <lib/string.h>
-#include <print.h>
-#include <stdint.h>
-
-#include <efi.h>
-#include <efilib.h>
-
-uintptr_t platform_get_rsdp()
-{
-	EFI_GUID acpi10_guid = EFI_ACPI_10_TABLE_GUID;
-	EFI_GUID acpi20_guid = EFI_ACPI_20_TABLE_GUID;
-	uintptr_t rsdp_addr = 0;
-
-	for (EFI_UINTN i = 0; i < gSystemTable->NumberOfTableEntries; i++) {
-		if (memcmp(&(gSystemTable->ConfigurationTable[i].VendorGuid), &acpi10_guid, sizeof(EFI_GUID)) == 0) {
-			log("platform_get_rsdp(): Found RSDP (ACPI 1.0) at 0x%llx\n", gSystemTable->ConfigurationTable[i].VendorTable);
-			rsdp_addr = (uintptr_t)gSystemTable->ConfigurationTable[i].VendorTable;
-		}
-
-		// ACPI 2.0+ always takes higher priority over older version
-		if (memcmp(&(gSystemTable->ConfigurationTable[i].VendorGuid), &acpi20_guid, sizeof(EFI_GUID)) == 0) {
-			log("platform_get_rsdp(): Found RSDP (ACPI 2.0+) at 0x%llx\n", gSystemTable->ConfigurationTable[i].VendorTable);
-			return (uintptr_t)gSystemTable->ConfigurationTable[i].VendorTable;
-		}
-	}
-
-	if (rsdp_addr == 0) {
-		log("platform_get_rsdp(): RSDP not found!\n");
-	}
-
-	return rsdp_addr;
-}
-
-uintptr_t platform_get_smbios()
-{
-	EFI_GUID smbios_guid = SMBIOS_TABLE_GUID;
-	EFI_GUID smbios3_guid = SMBIOS3_TABLE_GUID;
-	uintptr_t smbios_addr = 0;
-
-	for (EFI_UINTN i = 0; i < gSystemTable->NumberOfTableEntries; i++) {
-		if (memcmp(&(gSystemTable->ConfigurationTable[i].VendorGuid), &smbios_guid, sizeof(EFI_GUID)) == 0) {
-			log("platform_get_rsmbios(): Found SMBIOS at 0x%llx\n", gSystemTable->ConfigurationTable[i].VendorTable);
-			smbios_addr = (uintptr_t)gSystemTable->ConfigurationTable[i].VendorTable;
-		}
-
-		// SMBIOS3 always takes higher priority over older version
-		if (memcmp(&(gSystemTable->ConfigurationTable[i].VendorGuid), &smbios3_guid, sizeof(EFI_GUID)) == 0) {
-			log("platform_get_smbios(): Found SMBIOS3 at 0x%llx\n", gSystemTable->ConfigurationTable[i].VendorTable);
-			return (uintptr_t)gSystemTable->ConfigurationTable[i].VendorTable;
-		}
-	}
-
-	if (smbios_addr == 0) {
-		log("platform_get_smbios(): SMBIOS not found!\n");
-	}
-
-	return smbios_addr;
-}
\ No newline at end of file
diff --git a/boot/platform/uefi/driver.c b/boot/platform/uefi/driver.c
index 6890350..25642ab 100644
--- a/boot/platform/uefi/driver.c
+++ b/boot/platform/uefi/driver.c
@@ -36,7 +36,7 @@ bool verify_secure_boot()
 	bool ret = 0;
 
 	if (!EFI_ERROR(gSystemTable->RuntimeServices->GetVariable(L"SecureBoot", &var_guid, NULL, &size, &val))) {
-		log("verify_secure_boot(): Secure Boot Status: %u\n", val);
+		debug("verify_secure_boot(): Secure Boot Status: %u\n", val);
 		ret = (bool)val;
 
 		if (!EFI_ERROR(gSystemTable->RuntimeServices->GetVariable(L"SetupMode", &var_guid, NULL, &size, &val)) && val != 0) {
@@ -49,16 +49,16 @@ bool verify_secure_boot()
 
 void load_drivers()
 {
-	// EFI_STATUS status;
+	EFI_STATUS status;
 	if (!verify_secure_boot()) {
-		log("load_drivers(): Secure boot is enabled! Won't load drivers...\n");
+		debug("load_drivers(): Secure boot is enabled! Won't load drivers...\n");
 		return;
 	}
 
 	// TODO: Create a vfs_list() function to get a list of files in a directory
 	// char *driver_path = "\\AxBoot\\drivers\\.efi";
 	// char *driver_binary;
-	// log("load_drivers(): Loading '%s'...\n", driver_name);
+	// debug("load_drivers(): Loading '%s'...\n", driver_name);
 	//
 	// size_t driver_size = vfs_read(driver_path, &driver_binary);
 	//
@@ -76,13 +76,13 @@ void load_drivers()
 	//
 	// status = gSystemTable->BootServices->LoadImage(EFI_FALSE, gImageHandle, (EFI_DEVICE_PATH_PROTOCOL *)driver_devpath, driver_binary, driver_size, &driver_handle);
 	// if (EFI_ERROR(status)) {
-		// log("load_drivers(): Failed to load driver '%s': %s (%llx)\n", driver_name, efi_status_to_str(status), status);
+		// debug("load_drivers(): Failed to load driver '%s': %s (%llx)\n", driver_name, efi_status_to_str(status), status);
 		// return;
 	// }
 	// 
 	// status = gSystemTable->BootServices->StartImage(driver_handle, NULL, NULL);
 	// if (EFI_ERROR(status)) {
-		// log("load_drivers(): Failed to start driver '%s': %s (%llx)\n", driver_name, efi_status_to_str(status), status);
+		// debug("load_drivers(): Failed to start driver '%s': %s (%llx)\n", driver_name, efi_status_to_str(status), status);
 		// return;
 	// }
 }
\ No newline at end of file
diff --git a/boot/platform/uefi/entry.c b/boot/platform/uefi/entry.c
index 6fe9c6a..eab0161 100644
--- a/boot/platform/uefi/entry.c
+++ b/boot/platform/uefi/entry.c
@@ -23,12 +23,15 @@
 #include <axboot.h>
 #include <mm/mman.h>
 #include <lib/string.h>
-#include <power.h>
 #include <print.h>
 
 #include <stdint.h>
 #include <stddef.h>
 
+#define INI_IMPLEMENTATION
+#include <config/ini.h>
+
+
 EFI_HANDLE gImageHandle;
 EFI_SYSTEM_TABLE *gSystemTable;
 EFI_BOOT_SERVICES *gBootServices;
@@ -93,50 +96,3 @@ EFI_STATUS uefi_entry(EFI_HANDLE ImageHandle,
 	axboot_init();
 	UNREACHABLE();
 }
-
-#define EXIT_BS_MAX_TRIES 10
-
-void uefi_exit_bs(void)
-{
-	EFI_UINTN map_key = 0;
-	EFI_UINTN map_size = 0;
-	EFI_MEMORY_DESCRIPTOR *map = NULL;
-	EFI_UINTN desc_size = 0;
-	EFI_UINT32 desc_ver = 0;
-	EFI_STATUS status;
-	
-	int tries = 0;
-
-	log("uefi_exit_bs(): Calling ExitBootServices(), this will be the last log you'll see before handoff!\n");
-
-	do {
-		map_key = 0;
-		map_size = 0;
-		desc_size = 0;
-		desc_ver = 0;
-		map = NULL;
-
-		tries++;
-		debug("uefi_exit_bs(): Trying to exit Boot Services, try %u/%u...\n", tries, EXIT_BS_MAX_TRIES);
-
-		status = gBootServices->GetMemoryMap(&map_size, map, &map_key, &desc_size, &desc_ver);
-		if (EFI_ERROR(status) && status != EFI_BUFFER_TOO_SMALL) {
-			log("uefi_exit_bs(): Failed to acquire memory map key: %s (%llx)\n", efi_status_to_str(status), status);
-			continue;
-		}
-
-		status = gBootServices->ExitBootServices(gImageHandle, map_key);
-		if (EFI_ERROR(status)) {
-			log("uefi_exit_bs(): Failed to exit boot services: %s (%llx)\n", efi_status_to_str(status), status);
-			continue;
-		}
-
-		break;
-	} while (tries <= EXIT_BS_MAX_TRIES);
-
-	if (EFI_ERROR(status)) {
-		log("uefi_exit_bs(): Failed to exit Boot Services, rebooting!");
-		platform_reboot();
-		UNREACHABLE();
-	}
-}
diff --git a/boot/platform/uefi/mm/memmap.c b/boot/platform/uefi/mm/memmap.c
index d411af2..6140c44 100644
--- a/boot/platform/uefi/mm/memmap.c
+++ b/boot/platform/uefi/mm/memmap.c
@@ -30,46 +30,42 @@
 static int efi_type_to_axboot(uint32_t efi_type)
 {
 	switch (efi_type) {
+		case EfiReservedMemoryType:
+			return MemMapReserved;
+		case EfiLoaderCode:
+			return MemMapFirmware;
 		case EfiLoaderData:
+			return MemMapFirmware;
 		case EfiBootServicesCode:
 		case EfiBootServicesData:
 			return MemMapFreeOnLoad;
-
 		case EfiRuntimeServicesCode:
 		case EfiRuntimeServicesData:
-		case EfiLoaderCode:
 			return MemMapFirmware;
-		
-		case EfiUnusableMemory:
-			return MemMapFaulty;
-
-		case EfiACPIReclaimMemory:
-			return MemMapACPIReclaimable;
-
-		case EfiACPIMemoryNVS:
-			return MemMapACPINVS;
-
-		case EfiMemoryMappedIO:
-			return MemMapACPIMappedIO;
-
-		case EfiMemoryMappedIOPortSpace:
-			return MemMapACPIMappedIOPortSpace;
-
-		case EfiPalCode:
-		case EfiPersistentMemory:
 		case EfiConventionalMemory:
 			return MemMapUsable;
+		case EfiUnusableMemory:
+			return MemMapFaulty;
+		case EfiACPIReclaimMemory:
+			return MemMapACPIReclaimable;
+		case EfiACPIMemoryNVS:
+			return MemMapACPINVS;
+		case EfiMemoryMappedIO:
+			return MemMapACPIMappedIO;
+		case EfiMemoryMappedIOPortSpace:
+			return MemMapACPIMappedIOPortSpace;
+		case EfiPalCode:
+			return MemMapUsable;
+		case EfiPersistentMemory:
 			return MemMapUsable;
-
 		case EfiUnacceptedMemoryType:
-		case EfiReservedMemoryType:
 			return MemMapReserved;
 		default:
 			return MemMapReserved;
 	}
 }
 
-uint32_t get_memmap(axboot_memmap **map, pagetable *pm)
+axboot_memmap *get_memmap(pagetable *pm)
 {
 	EFI_MEMORY_DESCRIPTOR *efi_map = NULL;
 	EFI_UINTN efi_map_key = 0;
@@ -80,8 +76,8 @@ uint32_t get_memmap(axboot_memmap **map, pagetable *pm)
 
 	status = gBootServices->GetMemoryMap(&size, efi_map, &efi_map_key, &desc_size, &desc_ver);
 	if (EFI_ERROR(status) && status != EFI_BUFFER_TOO_SMALL) {
-		log("get_memmap(): GetMemoryMap() returned an error: %s (0x%llx)\n", efi_status_to_str(status), status);
-		return 0;
+		debug("get_memmap(): GetMemoryMap() returned an error: %s (0x%llx)\n", efi_status_to_str(status), status);
+		return NULL;
 	}
 
 	efi_map = (EFI_MEMORY_DESCRIPTOR *)mem_alloc(size);
@@ -94,8 +90,8 @@ uint32_t get_memmap(axboot_memmap **map, pagetable *pm)
 			size += 2 * desc_size;
 			efi_map = (EFI_MEMORY_DESCRIPTOR *)mem_realloc(efi_map, size);
 		} else {
-			log("get_memmap(): GetMemoryMap() returned an error: %s (0x%llx)\n", efi_status_to_str(status), status);
-			return 0;
+			debug("get_memmap(): GetMemoryMap() returned an error: %s (0x%llx)\n", efi_status_to_str(status), status);
+			return NULL;
 		}
 	} while (status != EFI_SUCCESS);
 
@@ -137,19 +133,23 @@ uint32_t get_memmap(axboot_memmap **map, pagetable *pm)
 		cur_entry = (EFI_MEMORY_DESCRIPTOR *)((uint8_t *)cur_entry + desc_size);
 	}
 
-	*map = mem_alloc(sizeof(axboot_memmap) * entry_count);
-	memset(*map, 0, sizeof(axboot_memmap) * entry_count);
+	axboot_memmap *new_map = (axboot_memmap *)mem_alloc(sizeof(axboot_memmap) * entry_count);
+	memset(new_map, 0, sizeof(axboot_memmap) * entry_count);
+	
+	cur_entry = efi_map;
 	
 	// translate efi memmap to axboot memmap
 	for (uint32_t i = 0; i < entry_count; i++) {
-		(*map)[i].base = cur_entry->PhysicalStart;
-		(*map)[i].size = cur_entry->NumberOfPages * PAGE_SIZE;
-		(*map)[i].type = efi_type_to_axboot(efi_map[i].Type);
+		new_map[i].base = cur_entry->PhysicalStart;
+		new_map[i].size = cur_entry->NumberOfPages * PAGE_SIZE;
+		new_map[i].type = efi_type_to_axboot(efi_map[i].Type);
+
+		debug("get_memmap(): Entry %d: base=0x%llx, size=%u bytes, type=%x\n", i, new_map[i].base, new_map[i].size, new_map[i].type);
 
 		cur_entry = (EFI_MEMORY_DESCRIPTOR *)((uint8_t *)cur_entry + desc_size);
 	}
 
 	mem_free(efi_map);
 
-	return entry_count;
+	return new_map;
 }
diff --git a/boot/platform/uefi/power.c b/boot/platform/uefi/power.c
index d5afd3f..e4d7ccf 100644
--- a/boot/platform/uefi/power.c
+++ b/boot/platform/uefi/power.c
@@ -35,11 +35,11 @@ bool platform_is_reboot_to_fw_possible()
 	Status = gSystemTable->RuntimeServices->GetVariable(L"OsIndicationsSupported", &GlobalVarGuid, NULL, &OsIndicationsSize, &OsIndications);
 	if (!EFI_ERROR(Status)) {
 		if (OsIndications & EFI_OS_INDICATIONS_BOOT_TO_FW_UI) {
-			log("platform_is_reboot_to_fw_possible(): Boot to firmware UI is possible!\n");
+			debug("platform_is_reboot_to_fw_possible(): Boot to firmware UI is possible!\n");
 			return true;
 		}
 	} else {
-		log("platform_is_reboot_to_fw_possible(): Failed to get OsIndications variable: 0x%llx (%s) \n", Status, efi_status_to_str(Status));
+		debug("platform_is_reboot_to_fw_possible(): Failed to get OsIndications variable: 0x%llx (%s) \n", Status, efi_status_to_str(Status));
 	}
 
 	return false;
@@ -58,7 +58,7 @@ void platform_reboot_to_fw()
 
 	Status = gSystemTable->RuntimeServices->SetVariable(L"OsIndications", &GlobalVarGuid, EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS, OsIndicationsSize, &OsIndications);
 	if (EFI_ERROR(Status)) {
-		log("platform_reboot_to_fw(): Failed to set OsIndications variable: 0x%llx (%s) \n", Status, efi_status_to_str(Status));
+		debug("platform_reboot_to_fw(): Failed to set OsIndications variable: 0x%llx (%s) \n", Status, efi_status_to_str(Status));
 	}
 
 	gSystemTable->RuntimeServices->ResetSystem(EfiResetCold, EFI_SUCCESS, 0, NULL);
diff --git a/boot/platform/uefi/time/datetime.c b/boot/platform/uefi/time/datetime.c
index dcc2e9b..1a5d5c2 100644
--- a/boot/platform/uefi/time/datetime.c
+++ b/boot/platform/uefi/time/datetime.c
@@ -33,7 +33,7 @@ void get_datetime(struct datetime *dt)
 
 	status = gSystemTable->RuntimeServices->GetTime(&uefi_dt, NULL);
 	if (EFI_ERROR(status)) {
-		log("get_datetime(): Failed to acquire current time, setting to 1970/01/01 00:00:00!\n");
+		debug("get_datetime(): Failed to acquire current time, setting to 1970/01/01 00:00:00!\n");
 		return;
 	}
 
diff --git a/boot/platform/uefi/ui/framebuffer.c b/boot/platform/uefi/ui/framebuffer.c
index a800df7..4bb1184 100644
--- a/boot/platform/uefi/ui/framebuffer.c
+++ b/boot/platform/uefi/ui/framebuffer.c
@@ -40,7 +40,7 @@ bool get_framebuffer(uint32_t **fb_addr, struct fb_mode **available_modes, int *
 
 	Status = gBootServices->LocateProtocol(&gop_guid, NULL, (void**)&gop);
 	if (EFI_ERROR(Status)) {
-    	log("get_framebuffer(): Unable to locate GOP: %s (0x%llx)\n", efi_status_to_str(Status), Status);
+    	debug("get_framebuffer(): Unable to locate GOP: %s (0x%llx)\n", efi_status_to_str(Status), Status);
 	}
 
 	Status = gop->QueryMode(gop, gop->Mode == NULL ? 0 : gop->Mode->Mode, &SizeOfInfo, &mode_info);
@@ -48,16 +48,14 @@ bool get_framebuffer(uint32_t **fb_addr, struct fb_mode **available_modes, int *
 	if (Status == EFI_NOT_STARTED) {
 		Status = gop->SetMode(gop, 0);
 	} else if (EFI_ERROR(Status)) {
-		log("Unable to get native mode\n");
+		debug("Unable to get native mode\n");
 		return false;
 	} else {
 		nativeMode = gop->Mode->Mode;
 		numModes = gop->Mode->MaxMode;
 	}
 
-	if (total_modes != NULL) {
-		*total_modes = numModes;
-	}
+	*total_modes = numModes;
 	*available_modes = (struct fb_mode *)mem_alloc(sizeof(struct fb_mode) * numModes);
 
 	*fb_addr = (uint32_t *)gop->Mode->FrameBufferBase;
@@ -76,7 +74,7 @@ bool get_framebuffer(uint32_t **fb_addr, struct fb_mode **available_modes, int *
 		} else if (mode_info->PixelFormat == PixelBlueGreenRedReserved8BitPerColor) {
 			(*available_modes)[i].format = FB_BGRA;
 		} else {
-			log("get_framebuffer(): Unknown framebuffer format, assuming BGRA...\n");
+			debug("get_framebuffer(): Unknown framebuffer format, assuming BGRA...\n");
 			(*available_modes)[i].format = FB_BGRA;
 		}
 		
diff --git a/kernel/Makefile b/kernel/Makefile
index 4890579..a7027f1 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -47,12 +47,15 @@ KERNEL_CFLAGS := $(foreach d, $(INCLUDE_DIRS), -I$d) \
 				-fno-omit-frame-pointer \
 				-fno-stack-protector \
 				-fno-stack-check \
+				-fpic \
+				-fpie \
 				-MMD \
 				-MP
 
 KERNEL_LDFLAGS := -Tarch/$(ARCH)/linker.ld \
 				-nostdlib \
-				-static
+				-static \
+				-no-pie
 
 ifeq ($(BUILD_TYPE),debug)
 KERNEL_CFLAGS += -O0 -g3
diff --git a/kernel/arch/x86_64/config.mk b/kernel/arch/x86_64/config.mk
index 738c9ca..7be3279 100644
--- a/kernel/arch/x86_64/config.mk
+++ b/kernel/arch/x86_64/config.mk
@@ -20,7 +20,6 @@
 KERNEL_CFLAGS += -m64 \
 				-march=x86-64 \
 				-mabi=sysv \
-				-mcmodel=kernel \
 				-mno-red-zone \
 				-mno-80387 \
 				-mno-mmx \
diff --git a/kernel/arch/x86_64/linker.ld b/kernel/arch/x86_64/linker.ld
index 758e8b6..7314b13 100644
--- a/kernel/arch/x86_64/linker.ld
+++ b/kernel/arch/x86_64/linker.ld
@@ -31,7 +31,8 @@ PHDRS
 
 SECTIONS
 {
-	. = 0xffffffff80000000;
+	/* TODO: 0xffffffff80000000 */
+	. = 0x1000;
 
 	_linker_start_text = .;
 
diff --git a/kernel/include/boot/aurix.h b/kernel/include/boot/aurix.h
deleted file mode 100644
index e3b26f2..0000000
--- a/kernel/include/boot/aurix.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*********************************************************************************/
-/* Module Name:  aurix.h                                                         */
-/* Project:      AurixOS                                                         */
-/*                                                                               */
-/* Copyright (c) 2024-2025 Jozef Nagy                                            */
-/*                                                                               */
-/* This source is subject to the MIT License.                                    */
-/* See License.txt in the root of this repository.                               */
-/* All other rights reserved.                                                    */
-/*                                                                               */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR    */
-/* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,      */
-/* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE   */
-/* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER        */
-/* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, */
-/* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE */
-/* SOFTWARE.                                                                     */
-/*********************************************************************************/
-
-#ifndef _AURIX_H
-#define _AURIX_H
-
-#include <stdint.h>
-
-#define AURIX_PROTOCOL_REVISION 1
-
-enum aurix_memmap_entry {
-	AURIX_MMAP_RESERVED = 0,
-	
-	AURIX_MMAP_ACPI_RECLAIMABLE = 1,
-	AURIX_MMAP_ACPI_MAPPED_IO = 2,
-	AURIX_MMAP_ACPI_MAPPED_IO_PORTSPACE = 3,
-	AURIX_MMAP_ACPI_NVS = 4,
-
-	AURIX_MMAP_BOOTLOADER_RECLAIMABLE = 6,
-	AURIX_MMAP_USABLE = 7
-};
-
-enum aurix_framebuffer_format {
-	AURIX_FB_RGBA = 0,
-	AURIX_FB_BGRA = 1
-};
-
-struct aurix_memmap {
-	uintptr_t base;
-	uint32_t size;
-	uint8_t type;
-};
-
-struct aurix_framebuffer {
-	uintptr_t addr;
-	uint32_t width;
-	uint32_t height;
-	uint8_t bpp; // bits!
-	uint32_t pitch;
-	int format;
-};
-
-struct aurix_parameters {
-	// PROTOCOL INFO
-	uint8_t revision;
-
-	// MEMORY
-	struct aurix_memmap *mmap;
-	uint32_t mmap_entries;
-
-	uintptr_t kernel_addr; // physical address
-
-	// RSDP and SMBIOS
-	uintptr_t rsdp_addr;
-	uintptr_t smbios_addr;
-
-	// FRAMEBUFFER
-	struct aurix_framebuffer *framebuffer;
-};
-
-#ifdef _AXBOOT
-#include <mm/vmm.h>
-void aurix_load(char *kernel);
-
-void aurix_arch_handoff(void *kernel_entry, pagetable *pm, void *stack, uint32_t stack_size, struct aurix_parameters *parameters);
-#endif
-
-#endif /* _PROTO_AURIX_H */
diff --git a/kernel/kinit.c b/kernel/kinit.c
index 0d12edd..4b35ba3 100644
--- a/kernel/kinit.c
+++ b/kernel/kinit.c
@@ -17,22 +17,11 @@
 /* SOFTWARE.                                                                     */
 /*********************************************************************************/
 
-#include <boot/aurix.h>
 #include <debug/uart.h>
 
-void _start(struct aurix_parameters *params)
+void _start(void)
 {
 	serial_init();
-
-	if (params->revision != AURIX_PROTOCOL_REVISION) {
-		serial_sendstr("Aurix Protocol revision is not compatible!\n");
-	}
-
-	for (int i = 0; i < 100; i++) {
-        volatile uint32_t *fb_ptr = (uint32_t *)params->framebuffer->addr;
-        fb_ptr[i * (params->framebuffer->pitch / 4) + i] = 0xffffff;
-    }
-
 	serial_sendstr("Hello from AurixOS!\n");
 
 	for (;;) {
diff --git a/utils/arch/x86_64/generate-hdd.sh b/utils/arch/x86_64/generate-hdd.sh
index 67a6dec..39673ee 100755
--- a/utils/arch/x86_64/generate-hdd.sh
+++ b/utils/arch/x86_64/generate-hdd.sh
@@ -75,7 +75,6 @@ if [ "$unamestr" = 'Linux' ]; then
 	exit 200
 elif [ "$unamestr" = 'Darwin' ]; then
 	diskutil unmount "$tempmountdir" >/dev/null 2>&1
-	diskutil unmountDisk "$loopback" >/dev/null 2>&1
 	hdiutil detach "$loopback" >/dev/null 2>&1
 fi
 
@@ -85,6 +84,4 @@ rm -r "$tempmountdir"
 dd if="$BUILD_DIR/boot/pc-bios/stage1-hdd.bin" of="$disk_name" conv=notrunc bs=446 count=1 >/dev/null 2>&1
 dd if="$BUILD_DIR/boot/pc-bios/stage1-hdd.bin" of="$disk_name" conv=notrunc bs=1 count=2 skip=510 seek=510 >/dev/null 2>&1
 
-sync
-
 printf " done.\n"