diff --git a/dosbox-wii.pnproj b/dosbox-wii.pnproj
index 3a16c87..f95792f 100644
--- a/dosbox-wii.pnproj
+++ b/dosbox-wii.pnproj
@@ -1 +1 @@
-<Project name="dosbox-wii"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="src" path="src\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="cpu" path="cpu\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="core_dynrec" path="core_dynrec\"><File path="cache.h"></File><File path="decoder.h"></File><File path="decoder_basic.h"></File><File path="decoder_opcodes.h"></File><File path="dyn_fpu.h"></File><File path="Makefile.am"></File><File path="operators.h"></File><File path="risc_armv4le-common.h"></File><File path="risc_armv4le-o3.h"></File><File path="risc_armv4le-s3.h"></File><File path="risc_armv4le-thumb-iw.h"></File><File path="risc_armv4le-thumb-niw.h"></File><File path="risc_armv4le-thumb.h"></File><File path="risc_armv4le.h"></File><File path="risc_mipsel32.h"></File><File path="risc_x64.h"></File><File path="risc_x86.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="core_dyn_x86" path="core_dyn_x86\"><File path="cache.h"></File><File path="decoder.h"></File><File path="dyn_fpu.h"></File><File path="dyn_fpu_dh.h"></File><File path="helpers.h"></File><File path="Makefile.am"></File><File path="risc_x86.h"></File><File path="string.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="core_full" path="core_full\"><File path="ea_lookup.h"></File><File path="load.h"></File><File path="loadwrite.h"></File><File path="Makefile.am"></File><File path="op.h"></File><File path="optable.h"></File><File path="save.h"></File><File path="string.h"></File><File path="support.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="core_normal" path="core_normal\"><File path="helpers.h"></File><File path="Makefile.am"></File><File path="prefix_0f.h"></File><File path="prefix_66.h"></File><File path="prefix_66_0f.h"></File><File path="prefix_none.h"></File><File path="string.h"></File><File path="support.h"></File><File path="table_ea.h"></File></MagicFolder><File path="callback.cpp"></File><File path="core_dynrec.cpp"></File><File path="core_dyn_x86.cpp"></File><File path="core_full.cpp"></File><File path="core_normal.cpp"></File><File path="core_prefetch.cpp"></File><File path="core_simple.cpp"></File><File path="cpu.cpp"></File><File path="flags.cpp"></File><File path="instructions.h"></File><File path="lazyflags.h"></File><File path="Makefile.am"></File><File path="modrm.cpp"></File><File path="modrm.h"></File><File path="paging.cpp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="debug" path="debug\"><File path="debug.cpp"></File><File path="debug_disasm.cpp"></File><File path="debug_gui.cpp"></File><File path="debug_inc.h"></File><File path="debug_win32.cpp"></File><File path="disasm_tables.h"></File><File path="Makefile.am"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="dos" path="dos\"><File path="cdrom.cpp"></File><File path="cdrom.h"></File><File path="cdrom_aspi_win32.cpp"></File><File path="cdrom_image.cpp"></File><File path="cdrom_ioctl_linux.cpp"></File><File path="cdrom_ioctl_os2.cpp"></File><File path="cdrom_ioctl_win32.cpp"></File><File path="dev_con.h"></File><File path="dos.cpp"></File><File path="dos_classes.cpp"></File><File path="dos_codepages.h"></File><File path="dos_devices.cpp"></File><File path="dos_execute.cpp"></File><File path="dos_files.cpp"></File><File path="dos_ioctl.cpp"></File><File path="dos_keyboard_layout.cpp"></File><File path="dos_keyboard_layout_data.h"></File><File path="dos_memory.cpp"></File><File path="dos_misc.cpp"></File><File path="dos_mscdex.cpp"></File><File path="dos_programs.cpp"></File><File path="dos_tables.cpp"></File><File path="drives.cpp"></File><File path="drives.h"></File><File path="drive_cache.cpp"></File><File path="drive_fat.cpp"></File><File path="drive_iso.cpp"></File><File path="drive_local.cpp"></File><File path="drive_virtual.cpp"></File><File path="Makefile.am"></File><File path="scsidefs.h"></File><File path="wnaspi32.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="fpu" path="fpu\"><File path="fpu.cpp"></File><File path="fpu_instructions.h"></File><File path="fpu_instructions_x86.h"></File><File path="Makefile.am"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="gui" path="gui\"><File path="dosbox_logo.h"></File><File path="Makefile.am"></File><File path="midi.cpp"></File><File path="midi_alsa.h"></File><File path="midi_coreaudio.h"></File><File path="midi_coremidi.h"></File><File path="midi_oss.h"></File><File path="midi_win32.h"></File><File path="render.cpp"></File><File path="render_loops.h"></File><File path="render_scalers.cpp"></File><File path="render_scalers.h"></File><File path="render_simple.h"></File><File path="render_templates.h"></File><File path="render_templates_hq.h"></File><File path="render_templates_hq2x.h"></File><File path="render_templates_hq3x.h"></File><File path="render_templates_sai.h"></File><File path="sdlmain.cpp"></File><File path="sdl_gui.cpp"></File><File path="sdl_mapper.cpp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="hardware" path="hardware\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="serialport" path="serialport\"><File path="directserial_os2.cpp"></File><File path="directserial_os2.h"></File><File path="directserial_posix.cpp"></File><File path="directserial_posix.h"></File><File path="directserial_win32.cpp"></File><File path="directserial_win32.h"></File><File path="Makefile.am"></File><File path="misc_util.cpp"></File><File path="misc_util.h"></File><File path="nullmodem.cpp"></File><File path="nullmodem.h"></File><File path="serialdummy.cpp"></File><File path="serialdummy.h"></File><File path="serialport.cpp"></File><File path="softmodem.cpp"></File><File path="softmodem.h"></File></MagicFolder><File path="adlib.cpp"></File><File path="adlib.h"></File><File path="cmos.cpp"></File><File path="dbopl.cpp"></File><File path="dbopl.h"></File><File path="disney.cpp"></File><File path="dma.cpp"></File><File path="fmopl.c"></File><File path="fmopl.h"></File><File path="gameblaster.cpp"></File><File path="gus.cpp"></File><File path="hardware.cpp"></File><File path="iohandler.cpp"></File><File path="ipx.cpp"></File><File path="ipxserver.cpp"></File><File path="joystick.cpp"></File><File path="keyboard.cpp"></File><File path="Makefile.am"></File><File path="memory.cpp"></File><File path="mixer.cpp"></File><File path="mpu401.cpp"></File><File path="opl.cpp"></File><File path="opl.h"></File><File path="pcspeaker.cpp"></File><File path="pic.cpp"></File><File path="sblaster.cpp"></File><File path="tandy_sound.cpp"></File><File path="timer.cpp"></File><File path="vga.cpp"></File><File path="vga_attr.cpp"></File><File path="vga_crtc.cpp"></File><File path="vga_dac.cpp"></File><File path="vga_draw.cpp"></File><File path="vga_gfx.cpp"></File><File path="vga_memory.cpp"></File><File path="vga_misc.cpp"></File><File path="vga_other.cpp"></File><File path="vga_paradise.cpp"></File><File path="vga_s3.cpp"></File><File path="vga_seq.cpp"></File><File path="vga_tseng.cpp"></File><File path="vga_xga.cpp"></File><File path="ymf262.c"></File><File path="ymf262.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="ints" path="ints\"><File path="bios.cpp"></File><File path="bios_disk.cpp"></File><File path="bios_keyboard.cpp"></File><File path="ems.cpp"></File><File path="int10.cpp"></File><File path="int10.h"></File><File path="int10_char.cpp"></File><File path="int10_memory.cpp"></File><File path="int10_misc.cpp"></File><File path="int10_modes.cpp"></File><File path="int10_pal.cpp"></File><File path="int10_put_pixel.cpp"></File><File path="int10_vesa.cpp"></File><File path="int10_video_state.cpp"></File><File path="int10_vptable.cpp"></File><File path="Makefile.am"></File><File path="mouse.cpp"></File><File path="xms.cpp"></File><File path="xms.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="libs" path="libs\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="gui_tk" path="gui_tk\"><File path="Doxyfile"></File><File path="gui_tk.cpp"></File><File path="gui_tk.h"></File><File path="Makefile.am"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="zmbv" path="zmbv\"><File path="drvproc.cpp"></File><File path="Makefile.am"></File><File path="resource.h"></File><File path="zmbv.cpp"></File><File path="zmbv.def"></File><File path="zmbv.h"></File><File path="zmbv.inf"></File><File path="zmbv.sln"></File><File path="zmbv.vcproj"></File><File path="zmbv_vfw.cpp"></File><File path="zmbv_vfw.h"></File><File path="zmbv_vfw.rc"></File></MagicFolder><File path="Makefile.am"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="misc" path="misc\"><File path="cross.cpp"></File><File path="Makefile.am"></File><File path="messages.cpp"></File><File path="programs.cpp"></File><File path="setup.cpp"></File><File path="support.cpp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="platform" path="platform\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="visualc" path="visualc\"><File path="config.h"></File><File path="dirent.c"></File><File path="dirent.h"></File><File path="Makefile.am"></File><File path="ntddcdrm.h"></File><File path="ntddscsi.h"></File><File path="unistd.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="wii" path="wii\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="New Folder" path="New Folder\"></MagicFolder><File path="config.h"></File><File path="missingfunctions.cpp"></File><File path="wiihardware.cpp"></File><File path="wiihardware.h"></File></MagicFolder><File path="Makefile.am"></File><File path="sdl-win32.diff"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="shell" path="shell\"><File path="Makefile.am"></File><File path="shell.cpp"></File><File path="shell_batch.cpp"></File><File path="shell_cmds.cpp"></File><File path="shell_misc.cpp"></File></MagicFolder><File path="dosbox.cpp"></File><File path="Makefile.am"></File><File path="winres.rc"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="include" path="include\"><File path="bios.h"></File><File path="bios_disk.h"></File><File path="callback.h"></File><File path="control.h"></File><File path="cpu.h"></File><File path="cross.h"></File><File path="debug.h"></File><File path="dma.h"></File><File path="dosbox.h"></File><File path="dos_inc.h"></File><File path="dos_system.h"></File><File path="fpu.h"></File><File path="hardware.h"></File><File path="inout.h"></File><File path="ipx.h"></File><File path="ipxserver.h"></File><File path="joystick.h"></File><File path="keyboard.h"></File><File path="logging.h"></File><File path="Makefile.am"></File><File path="mapper.h"></File><File path="mem.h"></File><File path="mixer.h"></File><File path="modules.h"></File><File path="mouse.h"></File><File path="paging.h"></File><File path="pic.h"></File><File path="programs.h"></File><File path="regs.h"></File><File path="render.h"></File><File path="serialport.h"></File><File path="setup.h"></File><File path="shell.h"></File><File path="support.h"></File><File path="timer.h"></File><File path="vga.h"></File><File path="video.h"></File></MagicFolder><File path="README"></File><File path="VERSION"></File><File path="ChangeLog"></File><File path="NEWS"></File><File path="INSTALL"></File><File path="AUTHORS"></File><File path="THANKS"></File><File path="COPYING"></File><File path="Makefile.gc"></File><File path="Makefile.wii"></File><File path="Makefile"></File></Project>
\ No newline at end of file
+<Project name="dosbox-wii"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="src" path="src\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="cpu" path="cpu\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="core_dynrec" path="core_dynrec\"><File path="cache.h"></File><File path="decoder.h"></File><File path="decoder_basic.h"></File><File path="decoder_opcodes.h"></File><File path="dyn_fpu.h"></File><File path="Makefile.am"></File><File path="operators.h"></File><File path="risc_armv4le-common.h"></File><File path="risc_armv4le-o3.h"></File><File path="risc_armv4le-s3.h"></File><File path="risc_armv4le-thumb-iw.h"></File><File path="risc_armv4le-thumb-niw.h"></File><File path="risc_armv4le-thumb.h"></File><File path="risc_armv4le.h"></File><File path="risc_mipsel32.h"></File><File path="risc_x64.h"></File><File path="risc_x86.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="core_dyn_x86" path="core_dyn_x86\"><File path="cache.h"></File><File path="decoder.h"></File><File path="dyn_fpu.h"></File><File path="dyn_fpu_dh.h"></File><File path="helpers.h"></File><File path="Makefile.am"></File><File path="risc_x86.h"></File><File path="string.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="core_full" path="core_full\"><File path="ea_lookup.h"></File><File path="load.h"></File><File path="loadwrite.h"></File><File path="Makefile.am"></File><File path="op.h"></File><File path="optable.h"></File><File path="save.h"></File><File path="string.h"></File><File path="support.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="core_normal" path="core_normal\"><File path="helpers.h"></File><File path="Makefile.am"></File><File path="prefix_0f.h"></File><File path="prefix_66.h"></File><File path="prefix_66_0f.h"></File><File path="prefix_none.h"></File><File path="string.h"></File><File path="support.h"></File><File path="table_ea.h"></File></MagicFolder><File path="callback.cpp"></File><File path="core_dynrec.cpp"></File><File path="core_dyn_x86.cpp"></File><File path="core_full.cpp"></File><File path="core_normal.cpp"></File><File path="core_prefetch.cpp"></File><File path="core_simple.cpp"></File><File path="cpu.cpp"></File><File path="flags.cpp"></File><File path="instructions.h"></File><File path="lazyflags.h"></File><File path="Makefile.am"></File><File path="modrm.cpp"></File><File path="modrm.h"></File><File path="paging.cpp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="debug" path="debug\"><File path="debug.cpp"></File><File path="debug_disasm.cpp"></File><File path="debug_gui.cpp"></File><File path="debug_inc.h"></File><File path="debug_win32.cpp"></File><File path="disasm_tables.h"></File><File path="Makefile.am"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="dos" path="dos\"><File path="cdrom.cpp"></File><File path="cdrom.h"></File><File path="cdrom_aspi_win32.cpp"></File><File path="cdrom_image.cpp"></File><File path="cdrom_ioctl_linux.cpp"></File><File path="cdrom_ioctl_os2.cpp"></File><File path="cdrom_ioctl_win32.cpp"></File><File path="dev_con.h"></File><File path="dos.cpp"></File><File path="dos_classes.cpp"></File><File path="dos_codepages.h"></File><File path="dos_devices.cpp"></File><File path="dos_execute.cpp"></File><File path="dos_files.cpp"></File><File path="dos_ioctl.cpp"></File><File path="dos_keyboard_layout.cpp"></File><File path="dos_keyboard_layout_data.h"></File><File path="dos_memory.cpp"></File><File path="dos_misc.cpp"></File><File path="dos_mscdex.cpp"></File><File path="dos_programs.cpp"></File><File path="dos_tables.cpp"></File><File path="drives.cpp"></File><File path="drives.h"></File><File path="drive_cache.cpp"></File><File path="drive_fat.cpp"></File><File path="drive_iso.cpp"></File><File path="drive_local.cpp"></File><File path="drive_virtual.cpp"></File><File path="Makefile.am"></File><File path="scsidefs.h"></File><File path="wnaspi32.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="fpu" path="fpu\"><File path="fpu.cpp"></File><File path="fpu_instructions.h"></File><File path="fpu_instructions_x86.h"></File><File path="Makefile.am"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="gui" path="gui\"><File path="dosbox_logo.h"></File><File path="Makefile.am"></File><File path="midi.cpp"></File><File path="midi_alsa.h"></File><File path="midi_coreaudio.h"></File><File path="midi_coremidi.h"></File><File path="midi_oss.h"></File><File path="midi_win32.h"></File><File path="render.cpp"></File><File path="render_loops.h"></File><File path="render_scalers.cpp"></File><File path="render_scalers.h"></File><File path="render_simple.h"></File><File path="render_templates.h"></File><File path="render_templates_hq.h"></File><File path="render_templates_hq2x.h"></File><File path="render_templates_hq3x.h"></File><File path="render_templates_sai.h"></File><File path="sdlmain.cpp"></File><File path="sdl_gui.cpp"></File><File path="sdl_mapper.cpp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="hardware" path="hardware\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="serialport" path="serialport\"><File path="directserial_os2.cpp"></File><File path="directserial_os2.h"></File><File path="directserial_posix.cpp"></File><File path="directserial_posix.h"></File><File path="directserial_win32.cpp"></File><File path="directserial_win32.h"></File><File path="Makefile.am"></File><File path="misc_util.cpp"></File><File path="misc_util.h"></File><File path="nullmodem.cpp"></File><File path="nullmodem.h"></File><File path="serialdummy.cpp"></File><File path="serialdummy.h"></File><File path="serialport.cpp"></File><File path="softmodem.cpp"></File><File path="softmodem.h"></File></MagicFolder><File path="adlib.cpp"></File><File path="adlib.h"></File><File path="cmos.cpp"></File><File path="dbopl.cpp"></File><File path="dbopl.h"></File><File path="disney.cpp"></File><File path="dma.cpp"></File><File path="fmopl.c"></File><File path="fmopl.h"></File><File path="gameblaster.cpp"></File><File path="gus.cpp"></File><File path="hardware.cpp"></File><File path="iohandler.cpp"></File><File path="ipx.cpp"></File><File path="ipxserver.cpp"></File><File path="joystick.cpp"></File><File path="keyboard.cpp"></File><File path="Makefile.am"></File><File path="memory.cpp"></File><File path="mixer.cpp"></File><File path="mpu401.cpp"></File><File path="opl.cpp"></File><File path="opl.h"></File><File path="pcspeaker.cpp"></File><File path="pic.cpp"></File><File path="sblaster.cpp"></File><File path="tandy_sound.cpp"></File><File path="timer.cpp"></File><File path="vga.cpp"></File><File path="vga_attr.cpp"></File><File path="vga_crtc.cpp"></File><File path="vga_dac.cpp"></File><File path="vga_draw.cpp"></File><File path="vga_gfx.cpp"></File><File path="vga_memory.cpp"></File><File path="vga_misc.cpp"></File><File path="vga_other.cpp"></File><File path="vga_paradise.cpp"></File><File path="vga_s3.cpp"></File><File path="vga_seq.cpp"></File><File path="vga_tseng.cpp"></File><File path="vga_xga.cpp"></File><File path="ymf262.c"></File><File path="ymf262.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="ints" path="ints\"><File path="bios.cpp"></File><File path="bios_disk.cpp"></File><File path="bios_keyboard.cpp"></File><File path="ems.cpp"></File><File path="int10.cpp"></File><File path="int10.h"></File><File path="int10_char.cpp"></File><File path="int10_memory.cpp"></File><File path="int10_misc.cpp"></File><File path="int10_modes.cpp"></File><File path="int10_pal.cpp"></File><File path="int10_put_pixel.cpp"></File><File path="int10_vesa.cpp"></File><File path="int10_video_state.cpp"></File><File path="int10_vptable.cpp"></File><File path="Makefile.am"></File><File path="mouse.cpp"></File><File path="xms.cpp"></File><File path="xms.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="libs" path="libs\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="gui_tk" path="gui_tk\"><File path="Doxyfile"></File><File path="gui_tk.cpp"></File><File path="gui_tk.h"></File><File path="Makefile.am"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="zmbv" path="zmbv\"><File path="drvproc.cpp"></File><File path="Makefile.am"></File><File path="resource.h"></File><File path="zmbv.cpp"></File><File path="zmbv.def"></File><File path="zmbv.h"></File><File path="zmbv.inf"></File><File path="zmbv.sln"></File><File path="zmbv.vcproj"></File><File path="zmbv_vfw.cpp"></File><File path="zmbv_vfw.h"></File><File path="zmbv_vfw.rc"></File></MagicFolder><File path="Makefile.am"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="misc" path="misc\"><File path="cross.cpp"></File><File path="Makefile.am"></File><File path="messages.cpp"></File><File path="programs.cpp"></File><File path="setup.cpp"></File><File path="support.cpp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="platform" path="platform\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="visualc" path="visualc\"><File path="config.h"></File><File path="dirent.c"></File><File path="dirent.h"></File><File path="Makefile.am"></File><File path="ntddcdrm.h"></File><File path="ntddscsi.h"></File><File path="unistd.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="wii" path="wii\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="New Folder" path="New Folder\"></MagicFolder><File path="config.h"></File><File path="missingfunctions.cpp"></File><File path="wiihardware.cpp"></File><File path="wiihardware.h"></File></MagicFolder><File path="Makefile.am"></File><File path="sdl-win32.diff"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="shell" path="shell\"><File path="Makefile.am"></File><File path="shell.cpp"></File><File path="shell_batch.cpp"></File><File path="shell_cmds.cpp"></File><File path="shell_misc.cpp"></File></MagicFolder><File path="dosbox.cpp"></File><File path="dosbox.ico"></File><File path="Makefile.am"></File><File path="winres.rc"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="include" path="include\"><File path="bios.h"></File><File path="bios_disk.h"></File><File path="callback.h"></File><File path="control.h"></File><File path="cpu.h"></File><File path="cross.h"></File><File path="debug.h"></File><File path="dma.h"></File><File path="dosbox.h"></File><File path="dos_inc.h"></File><File path="dos_system.h"></File><File path="fpu.h"></File><File path="hardware.h"></File><File path="inout.h"></File><File path="ipx.h"></File><File path="ipxserver.h"></File><File path="joystick.h"></File><File path="keyboard.h"></File><File path="logging.h"></File><File path="Makefile.am"></File><File path="mapper.h"></File><File path="mem.h"></File><File path="mixer.h"></File><File path="modules.h"></File><File path="mouse.h"></File><File path="paging.h"></File><File path="pic.h"></File><File path="programs.h"></File><File path="regs.h"></File><File path="render.h"></File><File path="serialport.h"></File><File path="setup.h"></File><File path="shell.h"></File><File path="support.h"></File><File path="timer.h"></File><File path="vga.h"></File><File path="video.h"></File></MagicFolder><File path="README"></File><File path="VERSION"></File><File path="ChangeLog"></File><File path="NEWS"></File><File path="INSTALL"></File><File path="AUTHORS"></File><File path="THANKS"></File><File path="COPYING"></File><File path="Makefile.gc"></File><File path="Makefile.wii"></File><File path="Makefile"></File></Project>
\ No newline at end of file
diff --git a/include/dos_inc.h b/include/dos_inc.h
index fa128d9..ba9a9ee 100644
--- a/include/dos_inc.h
+++ b/include/dos_inc.h
@@ -286,19 +286,19 @@ public:
 
 	void	SaveVectors			(void);
 	void	RestoreVectors		(void);
-	void	SetSize				(Bit16u size)			{ sSave(sPSP,next_seg,size);		};
-	Bit16u	GetSize				(void)					{ return (Bit16u)sGet(sPSP,next_seg);		};
-	void	SetEnvironment		(Bit16u envseg)			{ sSave(sPSP,environment,envseg);	};
-	Bit16u	GetEnvironment		(void)					{ return (Bit16u)sGet(sPSP,environment);	};
+	void	SetSize				(Bit16u size)			{ SaveIt(2,0x02,size); /*sSave(sPSP,next_seg,size);*/		};
+	Bit16u	GetSize				(void)					{ return (Bit16u)GetIt(2,0x02); /*sGet(sPSP,next_seg);*/		};
+	void	SetEnvironment		(Bit16u envseg)			{ SaveIt(2,0x2c,envseg);/*sSave(sPSP,environment,envseg);*/	};
+	Bit16u	GetEnvironment		(void)					{ return (Bit16u)GetIt(2,0x2c);/*return (Bit16u)sGet(sPSP,environment);*/ };
 	Bit16u	GetSegment			(void)					{ return seg;						};
 	void	SetFileHandle		(Bit16u index, Bit8u handle);
 	Bit8u	GetFileHandle		(Bit16u index);
-	void	SetParent			(Bit16u parent)			{ sSave(sPSP,psp_parent,parent);	};
-	Bit16u	GetParent			(void)					{ return (Bit16u)sGet(sPSP,psp_parent);		};
-	void	SetStack			(RealPt stackpt)		{ sSave(sPSP,stack,stackpt);		};
-	RealPt	GetStack			(void)					{ return sGet(sPSP,stack);			};
-	void	SetInt22			(RealPt int22pt)		{ sSave(sPSP,int_22,int22pt);		};
-	RealPt	GetInt22			(void)					{ return sGet(sPSP,int_22);			};
+	void	SetParent			(Bit16u parent)			{ SaveIt(2,0x16,parent); /*sSave(sPSP,psp_parent,parent);*/	};
+	Bit16u	GetParent			(void)					{ return (Bit16u)GetIt(2,0x16);/*sGet(sPSP,psp_parent);*/		};
+	void	SetStack			(RealPt stackpt)		{ SaveIt(4,0x2e,stackpt); /*sSave(sPSP,stack,stackpt);*/		};
+	RealPt	GetStack			(void)					{ return GetIt(4,0x2e);/*sGet(sPSP,stack);*/			};
+	void	SetInt22			(RealPt int22pt)		{ SaveIt(4,0x0A,int22pt);/*sSave(sPSP,int_22,int22pt);*/		};
+	RealPt	GetInt22			(void)					{ return GetIt(4,0x0A); /*sGet(sPSP,int_22);*/			};
 	void	SetFCB1				(RealPt src);
 	void	SetFCB2				(RealPt src);
 	void	SetCommandTail		(RealPt src);	
diff --git a/src/dos/dos_classes.cpp b/src/dos/dos_classes.cpp
index 9d2fe6f..8f54ea4 100644
--- a/src/dos/dos_classes.cpp
+++ b/src/dos/dos_classes.cpp
@@ -25,7 +25,6 @@
 #include "dos_inc.h"
 #include "support.h"
 
-
 void DOS_ParamBlock::Clear(void) {
 	memset(&exec,0,sizeof(exec));
 	memset(&overlay,0,sizeof(overlay));
@@ -176,32 +175,45 @@ void DOS_PSP::MakeNew(Bit16u mem_size) {
 //	DOS_PSP prevpsp(dos.psp());
 	/* Clear it first */
 	Bitu i;
-	for (i=0;i<sizeof(sPSP);i++) mem_writeb(pt+i,0);
+	for (i=0;i<0x100;i++) mem_writeb(pt+i,0);
 	// Set size
-	sSave(sPSP,next_seg,seg+mem_size);
+	SaveIt(2,0x02,seg+mem_size);
+	//sSave(sPSP,next_seg,seg+mem_size);
 	/* far call opcode */
-	sSave(sPSP,far_call,0xea);
+	SaveIt(1,0x05,0xea);
+	//sSave(sPSP,far_call,0xea);
 	// far call to interrupt 0x21 - faked for bill & ted 
 	// lets hope nobody really uses this address
-	sSave(sPSP,cpm_entry,RealMake(0xDEAD,0xFFFF));
+	SaveIt(4,0x06,RealMake(0xDEAD,0xFFFF));
+	//sSave(sPSP,cpm_entry,RealMake(0xDEAD,0xFFFF));
 	/* Standard blocks,int 20  and int21 retf */
-	sSave(sPSP,exit[0],0xcd);
-	sSave(sPSP,exit[1],0x20);
-	sSave(sPSP,service[0],0xcd);
-	sSave(sPSP,service[1],0x21);
-	sSave(sPSP,service[2],0xcb);
+	SaveIt(1,0x00,0xcd); // INT...
+	//sSave(sPSP,exit[0],0xcd);
+	SaveIt(1,0x01,0x20); // ...20H
+	//sSave(sPSP,exit[1],0x20);
+	SaveIt(1,0x50,0xcd); // INT
+	SaveIt(1,0x51,0x21); // ...21H
+	SaveIt(1,0x52,0xcb); // RETF
+	//sSave(sPSP,service[0],0xcd);
+	//sSave(sPSP,service[1],0x21);
+	//sSave(sPSP,service[2],0xcb);
 	/* psp and psp-parent */
-	sSave(sPSP,psp_parent,dos.psp());
-	sSave(sPSP,prev_psp,0xffffffff);
-	sSave(sPSP,dos_version,0x0005);
+	SaveIt(2,0x16,dos.psp()); 
+	SaveIt(4,0x38,0xffffffff); 
+	SaveIt(2,0x40,0x0005); 
+	//sSave(sPSP,psp_parent,dos.psp());
+	//sSave(sPSP,prev_psp,0xffffffff);
+	//sSave(sPSP,dos_version,0x0005);
 	/* terminate 22,break 23,crititcal error 24 address stored */
 	SaveVectors();
 
 	/* FCBs are filled with 0 */
 	// ....
 	/* Init file pointer and max_files */
-	sSave(sPSP,file_table,RealMake(seg,offsetof(sPSP,files)));
-	sSave(sPSP,max_files,20);
+	SaveIt(4,0x34,RealMake(seg,offsetof(sPSP,files)));
+	//sSave(sPSP,file_table,RealMake(seg,offsetof(sPSP,files)));
+	SaveIt(2,0x32,20);
+	//sSave(sPSP,max_files,20);
 	for (i=0;i<20;i++) SetFileHandle(i,0xff);
 
 	/* User Stack pointer */
@@ -211,29 +223,35 @@ void DOS_PSP::MakeNew(Bit16u mem_size) {
 }
 
 Bit8u DOS_PSP::GetFileHandle(Bit16u index) {
-	if (index>=sGet(sPSP,max_files)) return 0xff;
-	PhysPt files=Real2Phys(sGet(sPSP,file_table));
+	if (index>=GetIt(2,0x32)) return 0xff;
+	PhysPt files=Real2Phys(GetIt(4,0x34));
+	/*if (index>=sGet(sPSP,max_files)) return 0xff;
+	PhysPt files=Real2Phys(sGet(sPSP,file_table));*/
 	return mem_readb(files+index);
 }
 
 void DOS_PSP::SetFileHandle(Bit16u index, Bit8u handle) {
-	if (index<sGet(sPSP,max_files)) {
-		PhysPt files=Real2Phys(sGet(sPSP,file_table));
+	if (index<GetIt(2,0x32)) {
+		PhysPt files=Real2Phys(GetIt(4,0x34));
 		mem_writeb(files+index,handle);
 	}
+	/*if (index<sGet(sPSP,max_files)) {
+		PhysPt files=Real2Phys(sGet(sPSP,file_table));
+		mem_writeb(files+index,handle);
+	}*/
 }
 
 Bit16u DOS_PSP::FindFreeFileEntry(void) {
-	PhysPt files=Real2Phys(sGet(sPSP,file_table));
-	for (Bit16u i=0;i<sGet(sPSP,max_files);i++) {
+	PhysPt files=Real2Phys(GetIt(4,0x34));
+	for (Bit16u i=0;i<GetIt(2,0x32);i++) {
 		if (mem_readb(files+i)==0xff) return i;
 	}	
 	return 0xff;
 }
 
 Bit16u DOS_PSP::FindEntryByHandle(Bit8u handle) {
-	PhysPt files=Real2Phys(sGet(sPSP,file_table));
-	for (Bit16u i=0;i<sGet(sPSP,max_files);i++) {
+	PhysPt files=Real2Phys(GetIt(4,0x34));
+	for (Bit16u i=0;i<GetIt(2,0x32);i++) {
 		if (mem_readb(files+i)==handle) return i;
 	}	
 	return 0xFF;
@@ -264,40 +282,47 @@ void DOS_PSP::CopyFileTable(DOS_PSP* srcpsp,bool createchildpsp) {
 }
 
 void DOS_PSP::CloseFiles(void) {
-	for (Bit16u i=0;i<sGet(sPSP,max_files);i++) {
+	for (Bit16u i=0;i<GetIt(2,0x32);i++) {
 		DOS_CloseFile(i);
 	}
 }
 
 void DOS_PSP::SaveVectors(void) {
 	/* Save interrupt 22,23,24 */
-	sSave(sPSP,int_22,RealGetVec(0x22));
-	sSave(sPSP,int_23,RealGetVec(0x23));
-	sSave(sPSP,int_24,RealGetVec(0x24));
+	SaveIt(4,0x0A,RealGetVec(0x22));
+	SaveIt(4,0x0E,RealGetVec(0x23));
+	SaveIt(4,0x12,RealGetVec(0x24));
+	//sSave(sPSP,int_22,RealGetVec(0x22));
+	//sSave(sPSP,int_23,RealGetVec(0x23));
+	//sSave(sPSP,int_24,RealGetVec(0x24));
 }
 
 void DOS_PSP::RestoreVectors(void) {
 	/* Restore interrupt 22,23,24 */
-	RealSetVec(0x22,sGet(sPSP,int_22));
-	RealSetVec(0x23,sGet(sPSP,int_23));
-	RealSetVec(0x24,sGet(sPSP,int_24));
+	RealSetVec(0x22,GetIt(4,0x0A));
+	RealSetVec(0x23,GetIt(4,0x0E));
+	RealSetVec(0x24,GetIt(4,0x12));
+
+	//RealSetVec(0x22,sGet(sPSP,int_22));
+	//RealSetVec(0x23,sGet(sPSP,int_23));
+	//RealSetVec(0x24,sGet(sPSP,int_24));
 }
 
 void DOS_PSP::SetCommandTail(RealPt src) {
 	if (src) {	// valid source
-		MEM_BlockCopy(pt+offsetof(sPSP,cmdtail),Real2Phys(src),128);
+		MEM_BlockCopy(pt+128,Real2Phys(src),128);
 	} else {	// empty
-		sSave(sPSP,cmdtail.count,0x00);
-		mem_writeb(pt+offsetof(sPSP,cmdtail.buffer),0x0d);
+		SaveIt(1,128,0);
+		mem_writeb(pt+129,0x0d);
 	};
 }
 
 void DOS_PSP::SetFCB1(RealPt src) {
-	if (src) MEM_BlockCopy(PhysMake(seg,offsetof(sPSP,fcb1)),Real2Phys(src),16);
+	if (src) MEM_BlockCopy(PhysMake(seg,0x5c),Real2Phys(src),16);
 }
 
 void DOS_PSP::SetFCB2(RealPt src) {
-	if (src) MEM_BlockCopy(PhysMake(seg,offsetof(sPSP,fcb2)),Real2Phys(src),16);
+	if (src) MEM_BlockCopy(PhysMake(seg,0x6c),Real2Phys(src),16);
 }
 
 bool DOS_PSP::SetNumFiles(Bit16u fileNum) {
@@ -306,13 +331,16 @@ bool DOS_PSP::SetNumFiles(Bit16u fileNum) {
 		fileNum+=2;	// Add a few more files for safety
 		Bit16u para = (fileNum/16)+((fileNum%16)>0);
 		RealPt data	= RealMake(DOS_GetMemory(para),0);
-		sSave(sPSP,file_table,data);
-		sSave(sPSP,max_files,fileNum);
+		SaveIt(4,0x34,data);
+		//sSave(sPSP,file_table,data);
+		SaveIt(2,0x32,fileNum);
+		//sSave(sPSP,max_files,fileNum);
 		Bit16u i;
-		for (i=0; i<20; i++)		SetFileHandle(i,sGet(sPSP,files[i]));
+		for (i=0; i<20; i++)		SetFileHandle(i,GetIt(1,0x18+i*1)/*sGet(sPSP,files[i])*/);
 		for (i=20; i<fileNum; i++)	SetFileHandle(i,0xFF);
 	} else {
-		sSave(sPSP,max_files,fileNum);
+		SaveIt(2,0x32,fileNum);
+		//sSave(sPSP,max_files,fileNum);
 	};
 	return true;
 }
diff --git a/src/misc/programs.cpp b/src/misc/programs.cpp
index b512879..f145d26 100644
--- a/src/misc/programs.cpp
+++ b/src/misc/programs.cpp
@@ -40,11 +40,7 @@ static Bit8u exe_block[]={
 	0xbc,0x00,0x04,					//MOV SP,0x400 decrease stack size
 	0xbb,0x40,0x00,					//MOV BX,0x040 for memory resize
 	0xb4,0x4a,						//MOV AH,0x4A	Resize memory block
-#ifdef HW_RVL
-	0x90,0x90,		// NOP, NOP... this prevents an invalid opcode crash in the core
-#else
 	0xcd,0x21,						//INT 0x21
-#endif
 //pos 12 is callback number
 	0xFE,0x38,0x00,0x00,			//CALLBack number
 	0xb8,0x00,0x4c,					//Mov ax,4c00