:: commit f0988eb96755bec437c5783c10c0e9fd7322625c

diff --git a/stage23/lib/elf.c b/stage23/lib/elf.c
index e398cb8c..67d721e9 100644
--- a/stage23/lib/elf.c
+++ b/stage23/lib/elf.c
@@ -26,22 +26,6 @@
 #define EI_VERSION  6
 #define EI_OSABI    7
 
-struct elf64_hdr {
-    uint8_t  ident[16];
-    uint16_t type;
-    uint16_t machine;
-    uint32_t version;
-    uint64_t entry;
-    uint64_t phoff;
-    uint64_t shoff;
-    uint32_t flags;
-    uint16_t hdr_size;
-    uint16_t phdr_size;
-    uint16_t ph_num;
-    uint16_t shdr_size;
-    uint16_t sh_num;
-    uint16_t shstrndx;
-};
 
 struct elf32_hdr {
     uint8_t  ident[16];
@@ -82,19 +66,6 @@ struct elf32_phdr {
     uint32_t p_align;
 };
 
-struct elf64_shdr {
-    uint32_t sh_name;
-    uint32_t sh_type;
-    uint64_t sh_flags;
-    uint64_t sh_addr;
-    uint64_t sh_offset;
-    uint64_t sh_size;
-    uint32_t sh_link;
-    uint32_t sh_info;
-    uint64_t sh_addralign;
-    uint64_t sh_entsize;
-};
-
 struct elf32_shdr {
     uint32_t sh_name;
     uint32_t sh_type;
diff --git a/stage23/lib/elf.h b/stage23/lib/elf.h
index 8db57f91..98af704c 100644
--- a/stage23/lib/elf.h
+++ b/stage23/lib/elf.h
@@ -35,4 +35,41 @@ int elf32_load(uint8_t *elf, uint32_t *entry_point, uint32_t *top, uint32_t allo
 int elf32_load_section(uint8_t *elf, void *buffer, const char *name, size_t limit);
 struct elf_section_hdr_info* elf32_section_hdr_info(uint8_t *elf);
 
+struct elf64_hdr {
+    uint8_t  ident[16];
+    uint16_t type;
+    uint16_t machine;
+    uint32_t version;
+    uint64_t entry;
+    uint64_t phoff;
+    uint64_t shoff;
+    uint32_t flags;
+    uint16_t hdr_size;
+    uint16_t phdr_size;
+    uint16_t ph_num;
+    uint16_t shdr_size;
+    uint16_t sh_num;
+    uint16_t shstrndx;
+};
+struct elf64_shdr {
+    uint32_t sh_name;
+    uint32_t sh_type;
+    uint64_t sh_flags;
+    uint64_t sh_addr;
+    uint64_t sh_offset;
+    uint64_t sh_size;
+    uint32_t sh_link;
+    uint32_t sh_info;
+    uint64_t sh_addralign;
+    uint64_t sh_entsize;
+};
+struct elf64_sym {
+    uint32_t st_name;
+    uint8_t  st_info;
+    uint8_t  st_other;
+    uint16_t st_shndx;
+    uint64_t st_value;
+    uint64_t st_size;
+};
+
 #endif
diff --git a/stage23/protos/bootboot.c b/stage23/protos/bootboot.c
index 234a6000..0cf9bd62 100644
--- a/stage23/protos/bootboot.c
+++ b/stage23/protos/bootboot.c
@@ -29,42 +29,7 @@ __attribute__((noreturn)) void bootboot_spinup(
                  pagemap_t *pagemap,
                  uint64_t entry_point, uint64_t stack,
                  size_t numcores, struct smp_information* cores);
-struct elf64_hdr {
-    uint8_t  ident[16];
-    uint16_t type;
-    uint16_t machine;
-    uint32_t version;
-    uint64_t entry;
-    uint64_t phoff;
-    uint64_t shoff;
-    uint32_t flags;
-    uint16_t hdr_size;
-    uint16_t phdr_size;
-    uint16_t ph_num;
-    uint16_t shdr_size;
-    uint16_t sh_num;
-    uint16_t shstrndx;
-};
-struct elf64_shdr {
-    uint32_t sh_name;
-    uint32_t sh_type;
-    uint64_t sh_flags;
-    uint64_t sh_addr;
-    uint64_t sh_offset;
-    uint64_t sh_size;
-    uint32_t sh_link;
-    uint32_t sh_info;
-    uint64_t sh_addralign;
-    uint64_t sh_entsize;
-};
-struct elf64_sym {
-    uint32_t st_name;
-    uint8_t  st_info;
-    uint8_t  st_other;
-    uint16_t st_shndx;
-    uint64_t st_value;
-    uint64_t st_size;
-};
+
 #define BOOTBOOT_FB     0xfffffffffc000000
 #define BOOTBOOT_INFO   0xffffffffffe00000
 #define BOOTBOOT_ENV    0xffffffffffe01000
@@ -199,6 +164,7 @@ void bootboot_load(char *config, void *efi_system_table) {
         uint8_t* ramdisk_data = freadall(ramdisk_file, MEMMAP_KERNEL_AND_MODULES);
         ramdisk_size = ramdisk_file->size;
         ramdisk_start = (uint64_t)(size_t)ramdisk_data;
+        fclose(ramdisk_file);
     }
 
     /// Header info ///
@@ -263,7 +229,6 @@ void bootboot_load(char *config, void *efi_system_table) {
         size_t mmapent;
         struct e820_entry_t* e820e = get_memmap(&mmapent);
         if (mmapent > 248) {
-            term_reinit();
             panic("Too much memory entries! our god bzt decided that %d entries is too much, max is 248", mmapent);
         }
         for (uint32_t i = 0;i < mmapent;i++) {