diff --git a/README.md b/README.md
index 5847a17..2610159 100644
--- a/README.md
+++ b/README.md
@@ -81,24 +81,24 @@ When you want to see whats happening do a debug run;
 
 Current set is WIP.
 
-* mb_autoexec_append_cmd
-* mb_autoexec_append_echo
-* mb_autoexec_append_rem
-* mb_autoexec_append_show_gui
-* mb_autoexec_append_stop_fail
-* mb_autoexec_append_exit
-* mb_autoexec_append_joyporta_mouse
-* mb_autoexec_append_save_screenshot
-* mb_autoexec_append_save_video
-* mb_autoexec_append_safe_test
-* mb_autoexec_append_safe_cmd
-* mb_autoexec_write_default
-* mb_autoexec_show_gui40
-* mb_autoexec_show_gui40_mouse
-* mb_autoexec_show_gui80
-* mb_autoexec_show_gui80_mouse
-* mb_autoexec_safe_cmd
-* mb_autoexec_safe_test
+* mb_autoexec_append_cmd `<dir>`
+* mb_autoexec_append_echo `<dir> <message>`
+* mb_autoexec_append_rem `<dir> <remark>`
+* mb_autoexec_append_show_gui `<dir>`
+* mb_autoexec_append_stop_fail `<dir>`
+* mb_autoexec_append_exit `<dir>`
+* mb_autoexec_append_joyporta_mouse `<dir>`
+* mb_autoexec_append_save_screenshot `<dir> [prefix]`
+* mb_autoexec_append_save_video `<dir> [prefix]`
+* mb_autoexec_append_safe_test `<dir> <cmd> [timeout] [exit-code]`
+* mb_autoexec_append_safe_cmd `<dir> <cmd> [timeout] [exit-code]`
+* mb_autoexec_write_default `<dir> [text-mode]`
+* mb_autoexec_show_gui40 `<dir> [cmd]`
+* mb_autoexec_show_gui40_mouse `<dir> [cmd]`
+* mb_autoexec_show_gui80 `<dir> [cmd]`
+* mb_autoexec_show_gui80_mouse `<dir> [cmd]`
+* mb_autoexec_safe_cmd `<dir> <cmd> [text-mode]`
+* mb_autoexec_safe_test `<dir> <cmd> [text-mode]`
 * mb_msxhub_file
 * mb_msxhub_get_dos1_boot
 * mb_msxhub_get_dos2_boot
@@ -148,8 +148,8 @@ Current set is WIP.
 * mb_msxrom_machine_Panasonic_FS-A1WSX
 * mb_msxrom_machine_Boosted_MSX2_EN
 * mb_msxrom_machine_Boosted_MSX2+_JP
-* mb_openmsx_setup
-* mb_openmsx_dosctl
+* mb_openmsx_setup `<dir> <machine>`
+* mb_openmsx_dosctl `<dir> [machine] [mem-argu]`
 * mb_sdcc_compile_asm
 * mb_sdcc_link_asm_lib
 * mb_sdcc_link_asm
@@ -160,9 +160,9 @@ Current set is WIP.
 * mb_sdcc_link_asm_8000
 * mb_sdcc_link_asm_C000
 * mb_sdcc_link_asm_dos = calls mb_sdcc_link_asm_0100
-* mb_sdcc_hex2bin
-* mb_clean
-* mb_mkdir
+* mb_sdcc_hex2bin `<in> <out>`
+* mb_clean `<dir>`
+* mb_mkdir `<dir>`
 * mb_delete
 * mb_copy
 * mb_unix2dos
diff --git a/lib/make/mb_openmsx.mk b/lib/make/mb_openmsx.mk
index b69d699..0e9d532 100644
--- a/lib/make/mb_openmsx.mk
+++ b/lib/make/mb_openmsx.mk
@@ -3,10 +3,7 @@ MB_OPENMSX_BOOT_TIMEOUT  ?= 25
 MB_OPENMSX_BOOT_OS       ?= nextor
 MB_OPENMSX_MACHINE       ?= Philips_NMS_8250
 MB_OPENMSX_SPEED         ?= $(if $(findstring turboR,$(MB_OPENMSX_MACHINE)),100,333)
-MB_OPENMSX_EXTS          ?=
-MB_OPENMSX_EXTRA_SLOT    ?= -ext slotexpander
-MB_OPENMSX_EXTRA_MEM     ?= -ext ram4mb
-MB_OPENMSX_EXTRA_HDD     ?= -ext ide-nextor
+MB_OPENMSX_EXTS          ?= 
 MB_OPENMSX_HDD_SIZE      ?= 4m
 MB_OPENMSX_SCALE_FACTOR  ?= 3
 MB_OPENMSX_THROTTLE      ?= off
@@ -26,7 +23,7 @@ define mb_openmsx_setup
 	$(if $(wildcard $(1)-omsx/share/scripts/night_flight.tcl),,$(call mb_copy,$(PATH_MSXBUILD_REAL)/lib/openmsx/share/scripts/night_flight.tcl,$(1)-omsx/share/scripts))
 	$(if $(wildcard $(1)-omsx/share/scripts/omsxctl.tcl),,$(call mb_msxhub_file,$(1)-omsx/share/scripts,OMSXCTL/1.0-1/get/OMSXCTL/omsxctl.tcl))
 	$(if $(wildcard $(1)-omsx/share/extensions),,$(call mb_mkdir,$(1)-omsx/share/extensions))
-	$(if $(wildcard $(1)-omsx/share/extensions/ide-nextor.xml),,$(call mb_copy,$(PATH_MSXBUILD_REAL)/lib/openmsx/share/extensions/ide-nextor.xml,$(1)-omsx/share/extensions))
+	$(if $(wildcard $(1)-omsx/share/extensions/fire-hdd.xml),,$(call mb_copy,$(PATH_MSXBUILD_REAL)/lib/openmsx/share/extensions/fire-hdd.xml,$(1)-omsx/share/extensions))
 	$(call mb_msxrom_setup,$(1))
 	$(call mb_msxrom_extension_ide_nextor,$(1))
 	$(call mb_msxrom_machine_$(2),$(1))
@@ -37,7 +34,7 @@ define _mb_openmsx_run
 	BOOT_WATCHDOG=$(MB_OPENMSX_BOOT_TIMEOUT) \
 	FIRE_HDD_PATH="$(1)" \
 	FIRE_HDD_SIZE=$(MB_OPENMSX_HDD_SIZE) \
-	FIRE_HDD_IMAGE="$(1)-omsx/persistent/ide-nextor/untitled1/hd.dsk" \
+	FIRE_HDD_IMAGE="$(1)-omsx/persistent/fire-hdd/untitled1/image-hda.dsk" \
 	SCALE_FACTOR=$(MB_OPENMSX_SCALE_FACTOR) \
 	SPEED=$(MB_OPENMSX_SPEED) \
 	HEADLESS=$(MB_OPENMSX_HEADLESS) \
@@ -49,9 +46,9 @@ define _mb_openmsx_run
 	OPENMSX_HOME="$(1)-omsx" \
 	$(PATH_OPENMSX)/openmsx \
 		-machine $(2) \
-		$(MB_OPENMSX_EXTRA_SLOT) \
-		$(MB_OPENMSX_EXTRA_HDD) \
-		$(MB_OPENMSX_EXTRA_MEM) \
+		-ext slotexpander \
+		-ext fire-hdd \
+		$(if $(3),$(3),-ext ram4mb) \
 		$(MB_OPENMSX_EXTS) \
 		-control stdio < $(1)-omsx/stdio.xml
 	@echo === openMSX Done for $@
@@ -68,5 +65,5 @@ define mb_openmsx_dosctl
 	$(if $(wildcard $(1)/utils),$(call _mb_openmsx_dosctl_bat,$(1)/utils),$(call _mb_openmsx_dosctl_bat,$(1)))
 	$(if $(wildcard $(1)/omsxctl.com),,$(call mb_msxhub_file,$(1),OMSXCTL/1.0-1/get/OMSXCTL/omsxctl.com))
 	$(if $(wildcard $(1)/command.com),,$(if $(wildcard $(1)/command2.com),,$(call mb_msxhub_get_$(MB_OPENMSX_BOOT_OS)_boot,$(1))))
-	$(call _mb_openmsx_run,$(1),$(if $(2),$(2),$(MB_OPENMSX_MACHINE)))
+	$(call _mb_openmsx_run,$(1),$(if $(2),$(2),$(MB_OPENMSX_MACHINE)),$(3))
 endef
diff --git a/lib/openmsx/share/extensions/ide-nextor.xml b/lib/openmsx/share/extensions/fire-hdd.xml
similarity index 73%
rename from lib/openmsx/share/extensions/ide-nextor.xml
rename to lib/openmsx/share/extensions/fire-hdd.xml
index f181b7b..944782e 100644
--- a/lib/openmsx/share/extensions/ide-nextor.xml
+++ b/lib/openmsx/share/extensions/fire-hdd.xml
@@ -2,11 +2,11 @@
 <!DOCTYPE msxconfig SYSTEM 'msxconfig2.dtd'>
 <msxconfig>
 	<info>
-		<name>Sunrise ATA-IDE Nextor</name>
-		<manufacturer>Sunrise</manufacturer>
+		<name>MSXBUILD Fire HDD</name>
+		<manufacturer>distributedrebirth.love</manufacturer>
 		<code />
 		<release_year>2024</release_year>
-		<description>ATA-IDE interface with hard disk.</description>
+		<description>Sunrise IDE with lastest nextor.</description>
 		<type>external hard disk</type>
 	</info>
 	<devices>
@@ -19,7 +19,7 @@
 					</rom>
 					<master>
 						<type>IDEHD</type>
-						<filename>hd.dsk</filename>
+						<filename>image-hda.dsk</filename>
 					</master>
 				</SunriseIDE>
 			</secondary>