diff --git a/ChangeLog b/ChangeLog
index a0506cd..fc90fa7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,67 @@
+0.73
+  - Add two new opl2+opl3 emulators. (better speed, different implementation
+    approach)
+  - Improved DRO recording/better file structure.
+  - Add EGA emulation.
+  - Add special vga machine mode. Supports more of the exotic tricks like
+    changing the palette during screen updates, 9x16 fonts etc.
+  - Added special machine modes for the following svga cards:
+     - S3
+     - Paradise
+     - Tseng
+  - Fix problems with the vga split line feature.
+  - Improve vesa emulation.
+  - Add optional selection of old vesa mode for games that don't work
+    with certain vesa features.
+  - Improve video BIOS emulation to behave more like a real bios.
+  - Fixes for emulated 4bpp graphics modes.
+  - Fixes to paging system.
+  - Various fixes and improvements for the recompiling core.
+  - Add arm backend for the recompiling core.
+  - Add some mscdex quirks when dealing with files that are exactly 8.3 long.
+  - Small fixes to batch file handling.
+  - Small fixes to the XMS memory handling.
+  - Various fixes for aligned memory on hosts that want it.
+  - Various improvements to the mouse.
+  - Fixes and small speed ups to the debugger.
+  - Fix and improve lot's of compilation problems. (curses detection,
+    GCC 3.4 and GCC 4.X fixes)
+  - Added some basic auto keyboard layout handling. (windows only currently)
+  - Add basic support for evdev keyboard driver.
+  - Various fixes to the timer. (improve mode 2 timer changes,
+    implement mode 1, improve gate2 handling)
+  - Add audio extraction and mci audio support. Should enable CDROM audio
+    for Vista and adds volume control.
+  - Improve the directory cache speed a lot, especially with mounting slow
+    media like network paths.
+  - Various fixes to the create temporary file call.
+  - Don't keep batchfiles open during execution. Allows rewriting of the
+    active batchfile. (menu programs use this trick sometimes)
+  - Fix problems with filenames with 2 extensions.
+  - Add some more lowlevel dos tables.
+  - Fixes to hercules emulation.
+  - Fix flag handling for special case of ROR.
+  - Make the batchfile handling in regard to IF more flexible.
+  - Fixes to scrolling/panning feature.
+  - Add prefetch queue emulation.
+  - Make the emulated cpu type selectable. This is mainly the
+    identification commands and the way paging works.
+  - Some special EMS functionality added. (OS handles, zero-page handling)
+  - Improve support for EMS when booting a different OS.
+  - Improve cdrom speed detection by games.
+  - Improve stability of cycle guessing code, when there is background
+    activity.
+  - Fix various mscdex and cdrom detection schemes.
+  - Added Coremidi support on Mac OS X.
+  - Improve support for DOS devices when used to detect the existance
+    of directories in various ways.
+  - Add IRQ 2 emulation on VRET. (ega only)
+  - Added video parameter table and video state functionality.
+  - Increase default freespace to 250 MB.
+  - Some fixes to the fat filesystem handling for disk images.
+  - Some soundblaster fixes and command additions.
+  - Fix mixer 16bit direct transfers on bigendian hosts.
+  
 0.72
   - Fixed unitialized variable in joystick. (Fixes crashes on Vista and
     Mac OS X)
diff --git a/INSTALL b/INSTALL
index a555fa1..3a9548f 100644
--- a/INSTALL
+++ b/INSTALL
@@ -7,6 +7,8 @@ SDL
     (src/platform/sdl-win32.diff). If you want the patched sourcetree
     send us an email. (see README)
     Licensed under LGPL
+    Note that only version 1.2 and its subversions (1.2.8, 1.2.13 etc.)
+    are currently supported.
 
 Curses (optional)
     If you want to enable the debugger you need a curses library.
@@ -53,7 +55,7 @@ If you are building from the cvs run ./autogen.sh first before doing the followi
 In step 1 you could add the following switches:
 --enable-debug 
         enables the internal debugger. --enable-debug=heavy enables even more 
-        debug options. Dosbox should then be run from a xterm and when the sdl-
+        debug options. DOSBox should then be run from a xterm and when the sdl-
         window is active press alt-pause to enter the debugger.
 
 --enable-core-inline
@@ -66,7 +68,7 @@ In step 1 you could add the following switches:
 
 --disable-fpu-x86
         disables the assembly fpu core. Although relatively new the x86 fpu 
-	core has more accuracy then the regular fpu core. 
+        core has more accuracy then the regular fpu core. 
 
 --disable-dynamic-x86
         disables the dynamic x86 specific cpu core. Although it might be 
@@ -78,11 +80,15 @@ In step 1 you could add the following switches:
 
 --disable-dynrec
         disables the recompiling cpu core. Currently x86 and x86_64 only.
-	You can activate this core on x86 by disabling the dynamic-x86 core.
+        You can activate this core on x86 by disabling the dynamic-x86 core.
 
 --disable-dynamic-core
         disables all dynamic cores. (same effect as 
-	--disable-dynamic-x86 --disable-dynrec)
+        --disable-dynamic-x86 --disable-dynrec)
+
+--disable-opengl
+        disables OpenGL-support (output mode that can be selected in the
+        DOSBox configuration file).
 
 --disable-unaligned-memory
         disables unaligned memory access.
@@ -94,4 +100,5 @@ src/ints/bios_keyboard.cpp and go to line 30 and read there how to fix it.
 
 
 Build instructions for VC++6 
-Don't use VC++ 6:it creates faulty code in core_normal.cpp
+Don't use VC++ 6: it creates faulty code in core_normal.cpp
+Later Visual Studio versions work fine (vs2003/.net, vs2005, vs2008)
diff --git a/NEWS b/NEWS
index 41c520e..2b36f03 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,67 @@
+0.73
+  - Add two new opl2+opl3 emulators. (better speed, different implementation
+    approach)
+  - Improved DRO recording/better file structure.
+  - Add EGA emulation.
+  - Add special vga machine mode. Supports more of the exotic tricks like
+    changing the palette during screen updates, 9x16 fonts etc.
+  - Added special machine modes for the following svga cards:
+     - S3
+     - Paradise
+     - Tseng
+  - Fix problems with the vga split line feature.
+  - Improve vesa emulation.
+  - Add optional selection of old vesa mode for games that don't work
+    with certain vesa features.
+  - Improve video BIOS emulation to behave more like a real bios.
+  - Fixes for emulated 4bpp graphics modes.
+  - Fixes to paging system.
+  - Various fixes and improvements for the recompiling core.
+  - Add arm backend for the recompiling core.
+  - Add some mscdex quirks when dealing with files that are exactly 8.3 long.
+  - Small fixes to batch file handling.
+  - Small fixes to the XMS memory handling.
+  - Various fixes for aligned memory on hosts that want it.
+  - Various improvements to the mouse.
+  - Fixes and small speed ups to the debugger.
+  - Fix and improve lot's of compilation problems. (curses detection,
+    GCC 3.4 and GCC 4.X fixes)
+  - Added some basic auto keyboard layout handling. (windows only currently)
+  - Add basic support for evdev keyboard driver.
+  - Various fixes to the timer. (improve mode 2 timer changes,
+    implement mode 1, improve gate2 handling)
+  - Add audio extraction and mci audio support. Should enable CDROM audio
+    for Vista and adds volume control.
+  - Improve the directory cache speed a lot, especially with mounting slow
+    media like network paths.
+  - Various fixes to the create temporary file call.
+  - Don't keep batchfiles open during execution. Allows rewriting of the
+    active batchfile. (menu programs use this trick sometimes)
+  - Fix problems with filenames with 2 extensions.
+  - Add some more lowlevel dos tables.
+  - Fixes to hercules emulation.
+  - Fix flag handling for special case of ROR.
+  - Make the batchfile handling in regard to IF more flexible.
+  - Fixes to scrolling/panning feature.
+  - Add prefetch queue emulation.
+  - Make the emulated cpu type selectable. This is mainly the
+    identification commands and the way paging works.
+  - Some special EMS functionality added. (OS handles, zero-page handling)
+  - Improve support for EMS when booting a different OS.
+  - Improve cdrom speed detection by games.
+  - Improve stability of cycle guessing code, when there is background
+    activity.
+  - Fix various mscdex and cdrom detection schemes.
+  - Added Coremidi support on Mac OS X.
+  - Improve support for DOS devices when used to detect the existance
+    of directories in various ways.
+  - Add IRQ 2 emulation on VRET. (ega only)
+  - Added video parameter table and video state functionality.
+  - Increase default freespace to 250 MB.
+  - Some fixes to the fat filesystem handling for disk images.
+  - Some soundblaster fixes and command additions.
+  - Fix mixer 16bit direct transfers on bigendian hosts.
+  
 0.72
   - Fixed unitialized variable in joystick. (Fixes crashes on Vista and
     Mac OS X)
diff --git a/README b/README
index ac22b39..40f6557 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-DOSBox v0.72.01 (Wii port)
+DOSBox Wii (Port of DOSBox v0.73)
 http://code.google.com/p/dosbox-wii/
 
 ====
@@ -74,7 +74,7 @@ INDEX:
 
 Type INTRO in DOSBox for a quick tour.
 It is essential that you get familiar with the idea of mounting,
-DOSBox does not automatically make any drive (or parts of it)
+DOSBox does not automatically make any drive (or a part of it)
 accessible to the emulation.
 See the FAQ entry "I've got a Z instead of a C at the prompt" as
 well as the description of the MOUNT command (section 4).
@@ -91,18 +91,20 @@ Q: I've got a Z instead of a C at the prompt.
 Q: Do I always have to type these commands? Automation?
 Q: How do I change to fullscreen?
 Q: My CD-ROM doesn't work.
+Q: The game/application can't find its CD-ROM.
 Q: The mouse doesn't work.
 Q: There is no sound.
 Q: The sound stutters or sounds stretched/weird.
 Q: I can't type \ or : in DOSBox.
 Q: The keyboard lags.
 Q: The cursor always moves into one direction!
-Q: The game/application can't find its CD-ROM.
 Q: The game/application runs much too slow!
+Q: The game/application does not run at all/crashes!
 Q: Can DOSBox harm my computer?
 Q: I would like to change the memory size/cpu speed/ems/soundblaster IRQ.
 Q: What sound hardware does DOSBox presently emulate?
 Q: DOSBox crashes on startup and I'm running arts.
+Q: My Build game(Duke3D/Blood/Shadow Warrior) has problems.
 Q: Great README, but I still don't get it.
 
 
@@ -136,18 +138,43 @@ Q: My CD-ROM doesn't work.
 A: To mount your CD-ROM in DOSBox you have to specify some additional options 
    when mounting the CD-ROM. 
    To enable CD-ROM support (includes MSCDEX):
-     - mount d f:\ -t cdrom
-   To enable low-level CD-ROM-support (uses ioctl if possible):
-     - mount d f:\ -t cdrom -usecd 0
-   To enable low-level SDL-support:
-     - mount d f:\ -t cdrom -usecd 0 -noioctl
-   To enable low-level aspi-support (win98 with aspi-layer installed):
-     - mount d f:\ -t cdrom -usecd 0 -aspi
+     - mount d f:\ -t cdrom (windows)
+     - mount d /media/cdrom -t cdrom (linux)
+
+   In some cases you might want to use a different CD-ROM interface,
+   for example if CD audio does not work:
+     To enable SDL-support (does not include low-level CD access!):
+       - mount d f:\ -t cdrom -usecd 0 -noioctl
+     To enable ioctl access using digital audio extraction for CD audio
+     (windows-only, useful for Vista):
+       - mount d f:\ -t cdrom -ioctl_dx
+     To enable ioctl access using MCI for CD audio (windows-only):
+       - mount d f:\ -t cdrom -ioctl_mci
+     To force ioctl-only access (windows-only):
+       - mount d f:\ -t cdrom -ioctl_dio
+     To enable low-level aspi-support (win98 with aspi-layer installed):
+       - mount d f:\ -t cdrom -aspi
    
    In the commands: - d   driveletter you will get in DOSBox
                     - f:\ location of CD-ROM on your PC.
-                    - 0   The number of the CD-ROM drive, reported by mount -cd
-   See also the question: The game/application can't find its CD-ROM.
+                    - 0   The number of the CD-ROM drive, reported by "mount -cd"
+                          (note that this value is only needed when using SDL
+                           for CD audio, otherwise it is ignored)
+   See also the next question: The game/application can't find its CD-ROM.
+
+
+Q: The game/application can't find its CD-ROM.
+A: Be sure to mount the CD-ROM with -t cdrom switch, this will enable the
+   MSCDEX interface required by DOS games to interface with CD-ROMs.
+   Also try adding the correct label (-label LABEL) to the mount command,
+   where LABEL is the CD-label (volume ID) of the CD-ROM.
+   Under Windows you can specify -ioctl, -aspi or -noioctl. Look at the
+   description of the mount command in Section 4 for their meaning and the
+   additional audio-CD related options -ioctl_dx, ioctl_mci, ioctl_dio.
+   
+   Try creating a CD-ROM image (preferably CUE/BIN pair) and use the
+   DOSBox-internal IMGMOUNT tool to mount the image (the CUE sheet).
+   This enables very good low-level CD-ROM support on any operating system.
 
 
 Q: The mouse doesn't work.
@@ -169,6 +196,9 @@ A: Be sure that the sound is correctly configured in the game. This might be
    If you still don't get any sound set the core to normal and use some lower
    fixed cycles value (like cycles=2000). Also assure that your host operating
    sound does provide sound.
+   In certain cases it might be useful to use a different emulated sound device
+   like a soundblaster pro (sbtype=sbpro1 in the DOSBox configuration file) or
+   the gravis ultrasound (gus=true).
 
 
 Q: The sound stutters or sounds stretched/weird.
@@ -176,52 +206,41 @@ A: You're using too much CPU power to keep DOSBox running at the current speed.
    You can lower the cycles, skip frames, reduce the sampling rate of
    the respective sound device (see the DOSBox configuration file) or
    the mixer device. You can also increase the prebuffer in the configfile.
-   If you are using cycles=max or =auto, then make sure that there no
+   If you are using cycles=max or =auto, then make sure that there is no
    background processes interfering! (especially if they access the harddisk)
 
 
 Q: I can't type \ or : in DOSBox.
-A: This is a known problem. It only occurs if your keyboard layout isn't US.
+A: This can happen in various cases, like your host keyboard layout does not
+   have a matching DOS layout representation (or it was not correctly detected),
+   or the key mapping is wrong.
    Some possible fixes:
-     1. Switch the keyboard layout of your operating system.
-     2. Use / instead.
-     3. Open dosbox.conf and change usescancodes=false to usescancodes=true.
-     4. Add the commands you want to execute to the "configfile".
-     5. Change the DOS keyboard layout (see Section 7 Keyboard Layout).
-     6. Use ALT-58 for : and ALT-92 for \.
-     7. for \ try the keys around "enter". For ":" try shift and the keys 
-        between "enter" and "l" (US keyboard layout).
-     8. Try keyb.com from FreeDOS (http://projects.freedos.net/keyb/).
-        Look for keyb2.0 pre4 as older and newer versions are known to
-        have a bug in the loader routines.
+     1. Use / instead, or ALT-58 for : and ALT-92 for \.
+     2. Change the DOS keyboard layout (see Section 7: Keyboard Layout).
+     3. Add the commands you want to execute to the [autoexec]-section
+        of the DOSBox configuration file.
+     4. Open the DOSBox configuration file and change the usescancodes entry.
+     5. Switch the keyboard layout of your operating system.
+   
+   Note that if the host layout can not be identified, or keyboardlayout is set
+   to none in the DOSBox configuration file, the standard US layout is used.
+   In this configuration try the keys around "enter" for the key \ (backslash),
+   and for the key : (colon) use shift and the keys between "enter" and "l".
 
 
 Q: The keyboard lags.
-A: Lower the priority setting in the DOSBox configuration file
-   like set "priority=normal,normal". You might also want to
-   try lowering the cycles.
+A: Lower the priority setting in the DOSBox configuration file, for example
+   set "priority=normal,normal". You might also want to try lowering the cycles
+   (use a fixed cycle count to start with, like cycles=10000).
 
 
 Q: The cursor always moves into one direction!
 A: See if it still happens if you disable the joystick emulation,
    set joysticktype=none in the [joystick] section of your DOSBox
-   configuration file. Maybe also try unplugging any joystick.
+   configuration file. Maybe also try unplugging any joystick/gamepad.
    If you want to use the joystick in the game, try setting timed=false
    and be sure to calibrate the joystick (both in your OS as well as
-   in the game or the game's setup).
-   
-
-Q: The game/application can't find its CD-ROM.
-A: Be sure to mount the CD-ROM with -t cdrom switch, this will enable the
-   MSCDEX interface required by DOS games to interface with CD-ROMs.
-   Also try adding the correct label (-label LABEL). To enable lower-level
-   CD-ROM support, add the following switch to mount: -usecd #, where # is
-   the number of your CD-ROM drive reported by mount -cd. Under Windows you
-   can specify -ioctl, -aspi or -noioctl. Look at the description elsewhere
-   in this document for their meaning.
-   Try creating a CD-ROM image (preferably CUE/BIN pair) and use the
-   DOSBox-internal IMGMOUNT tool to mount the image. This enables very
-   good low-level CD-ROM support on any operating system.
+   in the game or the game's setup program).
 
 
 Q: The game/application runs much too slow!
@@ -229,6 +248,10 @@ A: Look at the section "How to run resource-demanding games" for more
    information.
 
 
+Q: The game/application does not run at all/crashes!
+A: Look at Section 10: Troubleshooting
+
+
 Q: Can DOSBox harm my computer?
 A: DOSBox can not harm your computer more than any other resource demanding
    program. Increasing the cycles does not overclock your real CPU.
@@ -240,6 +263,7 @@ Q: I would like to change the memory size/cpu speed/ems/soundblaster IRQ.
 A: This is possible! Just create a config file: config -writeconf configfile.
    Start your favourite editor and look through the settings. To start DOSBox
    with your new settings: dosbox -conf configfile
+   See the description of the config command in Section 4 for more details.
 
 
 Q: What sound hardware does DOSBox presently emulate?
@@ -260,9 +284,9 @@ A: DOSBox emulates several legacy sound devices:
      be sure the soundblaster is not disabled in the DOSBox configuration
      file. The Tandy DAC is only emulated at the BIOS level.
    - Adlib
-     Borrowed from MAME, this emulation is almost perfect and includes the 
-     Adlib's ability to almost play digitized sound.
-   - SoundBlaster 16/ SoundBlaster Pro I & II /SoundBlaster I & II
+     This emulation is almost perfect and includes the Adlib's ability to 
+     almost play digitized sound.
+   - SoundBlaster 16 / SoundBlaster Pro I & II / SoundBlaster I & II
      By default DOSBox provides Soundblaster 16 level 16-bit stereo sound. 
      You can select a different SoundBlaster version in the configfile of 
      DOSBox (See Internal Commands: CONFIG).
@@ -282,16 +306,23 @@ A: This isn't really a DOSBox problem, but the solution is to set the
    environment variable SDL_AUDIODRIVER to alsa or oss.
 
 
+Q: My Build game(Duke3D/Blood/Shadow Warrior) has problems.
+A: First of all, try to find a port of the game. Those will offer a 
+   better experience. To fix the graphics problem that occurs in 
+   DOSBox on higher resolutions. Open the configuration file of 
+   DOSBox and search for machine=svga_s3. Change svga_s3 to vesa_nolfb
+
+
 Q: Great README, but I still don't get it.
 A: A look at "The Newbie's pictorial guide to DOSBox" located at 
    http://vogons.zetafleet.com/viewforum.php?f=39 might help you.
    Also try the wiki of DOSBox:
-   http://dosbox.sourceforge.net/wiki/
+   http://www.dosbox.com/wiki/
 
 
 For more questions read the remainder of this README and/or check 
 the site/forum:
-http://dosbox.sourceforge.net
+http://www.dosbox.com
 
 
 
@@ -299,19 +330,23 @@ http://dosbox.sourceforge.net
 3. Usage:
 =========
 
-NOTE: Currently it is not possible to use command line options on the Wii.
-
 An overview of the command line options you can give to DOSBox.
 Windows Users must open cmd.exe or command.com or edit the shortcut to 
-DOSBox.exe for this.
+dosbox.exe for this.
 The options are valid for all operating systems unless noted in the option
 description:
 
 dosbox [name] [-exit] [-c command] [-fullscreen] [-conf congfigfile] 
        [-lang languagefile] [-machine machinetype] [-noconsole]
-       [-startmapper] [-noautoexec] [-scaler scaler | -forcescaler scaler]
+       [-startmapper] [-noautoexec] [-securemode] 
+       [-scaler scaler | -forcescaler scaler]
+       [-version]
        
 dosbox -version
+dosbox -editconf program
+dosbox -opencaptures program
+dosbox -printconf
+dosbox -eraseconf
 
   name   
         If "name" is a directory it will mount that as the C: drive.
@@ -323,7 +358,7 @@ dosbox -version
 
   -c command
         Runs the specified command before running "name". Multiple commands
-        can be specified. Each command should start with "-c", though.
+        can be specified. Each command should start with "-c" though.
         A command can be: an Internal Program, a DOS command or an executable 
         on a mounted drive.
 
@@ -333,15 +368,20 @@ dosbox -version
   -conf configfile
         Start DOSBox with the options specified in "configfile".
         Multiple -conf options may be present.
-        See Chapter 10 for more details.
+        See Section 11 for more details.
 
   -lang languagefile
         Start DOSBox using the language specified in "languagefile".
 
   -machine machinetype
         Setup DOSBox to emulate a specific type of machine. Valid choices are:
-        hercules, cga, pcjr, tandy, vga (default). The machinetype affects 
-        both the videocard and the available soundcards.
+        hercules, cga, pcjr, tandy, svga_s3 (default) as well as the additional
+        svga chipsets listed in the help of the DOSBox configuration file.
+        svga_s3 enables vesa emulation as well.
+        For some special vga effects the machinetype vgaonly can be used,
+        note that this disables svga capabilites and might be (considerably)
+        slower due to the much higher emulation precision.
+        The machinetype affects both the videocard and the available soundcards.
 
   -noconsole (Windows Only)
         Start DOSBox without showing the console window. Output will
@@ -354,6 +394,11 @@ dosbox -version
   -noautoexec
         Skips the [autoexec] section of the loaded configuration file.
 
+  -securemode
+        Same as -noautoexec, but adds config.com -securemode at the 
+        bottom of AUTOEXEC.BAT (which in turn disables any changes to how
+        the drives are mounted inside DOSBox).
+
   -scaler scaler
         Uses the scaler specified by "scaler". See the DOSBox configuration
         file for the available scalers.
@@ -365,17 +410,32 @@ dosbox -version
   -version
         output version information and exit. Useful for frontends.
 
+  -editconf program
+        calls program with as first parameter the configuration file.
+        You can specify this command more than once. In this case it will
+        move to second program if the first one fails to start.
+
+  -opencaptures program
+        calls program with as first paramater the location of the captures 
+        folder.
+  
+  -printconf
+        prints the location of the default configuration file.
+
+  -eraseconf
+        removes the default configuration file.
+
 Note: If a name/command/configfile/languagefile contains a space, put
       the whole name/command/configfile/languagefile between quotes
       ("command or file name"). If you need to use quotes within quotes
-      (most likely with -c and mount).
+      (most likely with -c and mount):
       Windows and OS/2 users can use single quotes inside the double quotes. 
       Other people should be able to use escaped double quotes inside the 
       double quotes.
-      win -c "mount c 'c:\program files\'" 
-      linux -c "mount c \"/tmp/name with space\""
+      Windows: -c "mount c 'c:\program files\'" 
+      Linux: -c "mount c \"/tmp/name with space\""
 
-For example:
+For example (Windows):
 
 dosbox c:\atlantis\atlantis.exe -c "MOUNT D C:\SAVES"
   This mounts c:\atlantis as c:\ and runs atlantis.exe.
@@ -429,11 +489,11 @@ MOUNT -u "Emulated Drive letter"
 
   -label drivelabel
         Sets the name of the drive to "drivelabel". Needed on some 
-        systems if the cd label isn't read correctly. Useful when a 
-        program can't find its CD-ROM. If you don't specify a label and no
+        systems if the CD-ROM label isn't read correctly (useful when a 
+        program can't find its CD-ROM). If you don't specify a label and no
         lowlevel support is selected (that is omitting the -usecd # and/or
-        -aspi parameters or specifying -noioctl): 
-          For win32: label is extracted from "Real Drive".
+        -aspi parameters, or specifying -noioctl): 
+          For Windows: label is extracted from "Real Drive".
           For Linux: label is set to NO_LABEL.
 
         If you do specify a label, this label will be kept as long as the drive
@@ -443,19 +503,29 @@ MOUNT -u "Emulated Drive letter"
         Forces use of the aspi layer. Only valid if mounting a CD-ROM under 
         Windows systems with an ASPI-Layer.
 
-  -ioctl   
+  -ioctl (automatic selection of the CD audio interface)
+  -ioctl_dx (digital audio extraction used for CD audio)
+  -ioctl_dio (ioctl calls used for CD audio)
+  -ioctl_mci (MCI used for CD audio)
         Forces use of ioctl commands. Only valid if mounting a CD-ROM under 
         a Windows OS which support them (Win2000/XP/NT).
+        The various choices only differ in the way CD audio is handled,
+        preferrably -ioctl_dio is used (lowest workload), but this might not
+        work on all systems so -ioctl_dx (or -ioctl_mci) can be used.
 
-  -noioctl   
+  -noioctl
         Forces use of the SDL CD-ROM layer. Valid on all systems.
 
   -usecd number
-        Forces use of SDL CD-ROM support for drive number.
-        Number can be found by -cd. Valid on all systems.
+        Valid on all systems, under windows the -noioctl switch has to be
+        present to make use of the -usecd switch.
+        Enables to select the drive that should be used by SDL. Use this if
+        the wrong or no CD-ROM drive is mounted while using the SDL CD-ROM
+        interface. "number" can be found by "MOUNT -cd".
 
   -cd
-        Displays all detected CD-ROM drives and their numbers. Use with -usecd.
+        Displays all CD-ROM drives detected by SDL, and their numbers.
+        See the information at the -usecd entry above.
 
   -u
         Removes the mount. Doesn't work for Z:\.
@@ -465,7 +535,7 @@ MOUNT -u "Emulated Drive letter"
 
   Basically MOUNT allows you to connect real hardware to DOSBox's emulated PC.
   So MOUNT C C:\GAMES tells DOSBox to use your C:\GAMES directory as drive C:
-  in DOSBox. It also allows you to change the drive's letter identification
+  in DOSBox. It also allows you to change the drive letter identification
   for programs that demand specific drive letters.
   
   For example: Touche: Adventures of The Fifth Musketeer must be run on your C:
@@ -477,41 +547,52 @@ MOUNT -u "Emulated Drive letter"
   Mounting your entire C drive with MOUNT C C:\ is NOT recommended! The same
   is true for mounting the root of any other drive, except for CD-ROMs (due to
   their read-only nature). Otherwise if you or DOSBox make a mistake you may
-  loose all your files.
+  lose all your files.
   It is recommended to put all your applications/games into a subdirectory
   and mount that.
 
   General MOUNT Examples:
-  1. To mount c:\DirX as a floppy : 
-       mount a c:\DirX -t floppy
-  2. To mount system CD-ROM drive E as CD-ROM drive D in DOSBox:
-       mount d e:\ -t cdrom
-  3. To mount system CD-ROM drive at mountpoint /media/cdrom as CD-ROM drive D 
-     in DOSBox:
-       mount d /media/cdrom -t cdrom -usecd 0
-  4. To mount a drive with ~870 mb free diskspace (simple version):
-       mount c d:\ -freesize 870
-  5. To mount a drive with ~870 mb free diskspace (experts only, full control):
-       mount c d:\ -size 512,127,16513,13500
-  6. To mount /home/user/dirY as drive C in DOSBox:
-       mount c /home/user/dirY
-  7. To mount the directory where DOSBox was started as D in DOSBox:
-       mount d .
+    1. To mount c:\DirX as a floppy : 
+         mount a c:\DirX -t floppy
+    2. To mount system CD-ROM drive E as CD-ROM drive D in DOSBox:
+         mount d e:\ -t cdrom
+    3. To mount system CD-ROM drive at mountpoint /media/cdrom as CD-ROM drive D 
+       in DOSBox:
+         mount d /media/cdrom -t cdrom -usecd 0
+    4. To mount a drive with ~870 mb free diskspace (simple version):
+         mount c d:\ -freesize 870
+    5. To mount a drive with ~870 mb free diskspace (experts only, full control):
+         mount c d:\ -size 512,127,16513,13500
+    6. To mount /home/user/dirY as drive C in DOSBox:
+         mount c /home/user/dirY
+    7. To mount the directory where DOSBox was started as D in DOSBox:
+         mount d .
+         (note the . which represents the directory where DOSBox was started)
 
 
 MEM
   Program to display the amount of free memory.
 
 
+VER
+VER set major_version [minor_version]
+  Display the current DOSBox version and reported DOS version
+  (parameterless usage).
+  Change the reported DOS version with the "set" parameter,
+  for example: "VER set 6 22" to have DOSBox report DOS 6.22
+  as version number.
+
+
 CONFIG -writeconf localfile
 CONFIG -writelang localfile
+CONFIG -securemode
 CONFIG -set "section property=value"
 CONFIG -get "section property"
 
   CONFIG can be used to change or query various settings of DOSBox 
   during runtime. It can save the current settings and language strings to
   disk. Information about all possible sections and properties can 
-  be found in section 11 (The Config File).
+  be found in Section 11 (The Config File).
 
   -writeconf localfile
        Write the current configuration settings to file. "localfile" is 
@@ -519,7 +600,7 @@ CONFIG -get "section property"
        The configuration file controls various settings of DOSBox: 
        the amount of emulated memory, the emulated soundcards and many more 
        things. It allows access to AUTOEXEC.BAT as well.
-       See section 11 (The Config File) for more information.
+       See Section 11 (The Config File) for more information.
 
   -writelang localfile
        Write the current language settings to file. "localfile" is 
@@ -527,8 +608,14 @@ CONFIG -get "section property"
        The language file controls all visible output of the internal commands
        and the internal DOS.
 
+  -securemode
+       Switches DOSBox to a more secure mode. In this mode the internal 
+       commands MOUNT, IMGMOUNT and BOOT won't work. It's not possible either
+       to create a new configfile or languagefile in this mode.
+       (Warning: you can only undo this mode by restarting DOSBox.)
+
   -set "section property=value"
-       CONFIG will attempt to set the property to new value. At this moment
+       CONFIG will attempt to set the property to new value. Currently
        CONFIG can not report whether the command succeeded or not.
 
   -get "section property"
@@ -540,20 +627,20 @@ CONFIG -get "section property"
   own preferences for each game.
   
   Examples:
-  1. To create a configfile in your current directory:
-      config -writeconf dosbox.conf
-  2. To set the cpu cycles to 10000:
-      config -set "cpu cycles=10000"
-  3. To turn ems memory emulation off:
-      config -set "dos ems=off"
-  4. To check which cpu core is being used.
-      config -get "cpu core"
+    1. To create a configfile in your current directory:
+        config -writeconf dosbox.conf
+    2. To set the cpu cycles to 10000:
+        config -set "cpu cycles=10000"
+    3. To turn ems memory emulation off:
+        config -set "dos ems=off"
+    4. To check which cpu core is being used.
+        config -get "cpu core"
 
 
 LOADFIX [-size] [program] [program-parameters]
 LOADFIX -f
-  Program to reduce the amount of memory available. Useful for old programs 
-  which don't expect much memory to be free. 
+  Program to reduce the amount of available conventional memory.
+  Useful for old programs which don't expect much memory to be free. 
 
   -size	        
         number of kilobytes to "eat up", default = 64kb
@@ -561,14 +648,14 @@ LOADFIX -f
   -f
         frees all previously allocated memory
   
-Examples:
-  1. To start mm2.exe and allocate 64kb memory 
-     (mm2 will have 64 kb less available) :
-     loadfix mm2
-  2. To start mm2.exe and allocate 32kb memory :
-     loadfix -32 mm2
-  3. To free previous allocated memory :
-     loadfix -f
+  Examples:
+    1. To start mm2.exe and allocate 64kb memory 
+       (mm2 will have 64 kb less available) :
+       loadfix mm2
+    2. To start mm2.exe and allocate 32kb memory :
+       loadfix -32 mm2
+    3. To free previous allocated memory :
+       loadfix -f
 
 
 RESCAN
@@ -583,11 +670,13 @@ MIXER
   mixer channel left:right [/NOSHOW] [/LISTMIDI]
   
   channel
-      Can be one of the following: MASTER, DISNEY, SPKR, GUS, SB, FM.
+      Can be one of the following: MASTER, DISNEY, SPKR, GUS, SB, FM [, CDAUDIO].
+      CDAUDIO is only available if a CD-ROM interface with volume control is
+      enabled (CD image, ioctl_dx).
   
   left:right
       The volume levels in percentages. If you put a D in front it will be
-      in decibel (example mixer gus d-10).
+      in decibel (Example: mixer gus d-10).
   
   /NOSHOW
       Prevents DOSBox from showing the result if you set one
@@ -596,8 +685,8 @@ MIXER
   /LISTMIDI
       Lists the available midi devices on your PC (Windows). To select a 
       device other than the Windows default midi-mapper, add a line 
-      'config=id' to the [midi] section in the configuration file, where
-      'id' is the number for the device as listed by LISTMIDI.
+      'midiconfig=id' to the [midi] section in the configuration file,
+      where 'id' is the number for the device as listed by LISTMIDI.
 
 
 IMGMOUNT
@@ -605,20 +694,31 @@ IMGMOUNT
   
   IMGMOUNT DRIVE [imagefile] -t [image_type] -fs [image_format] 
             -size [sectorsbytesize, sectorsperhead, heads, cylinders]
+  IMGMOUNT DRIVE [imagefile1, .. ,imagefileN] -t iso -fs iso 
 
   imagefile
-      Location of the image files to mount in DOSBox. The location can
+      Location of the image file to mount in DOSBox. The location can
       be on a mounted drive inside DOSBox, or on your real disk. It is
       possible to mount CD-ROM images (ISOs or CUE/BIN) as well, if you
-      need CD swapping capabilities specify all images in succession.
-      The CDs can be swapped with CTRL-F4 at any time.
+      need CD swapping capabilities specify all images in succession
+      (see the next entry).
+      CUE/BIN pairs are the preferred CD-ROM image type as they can
+      store audio tracks compared to ISOs (which are data-only). For
+      the CUE/BIN mounting always specify the CUE sheet.
+      
+  imagefile1, .. ,imagefileN
+      Location of the image files to mount in DOSBox. Specifying a number
+      of image files is only allowed for CD-ROM images. The CD's can be
+      swapped with CTRL-F4 at any time. This is required for games which
+      use multiple CD-ROMs and require the CD to be switched during the
+      gameplay at some point.
    
   -t 
       The following are valid image types:
-        floppy: Specifies a floppy image or images.  DOSBox will automatically 
-                identify the disk geometry ( 360K, 1.2MB, 720K, 1.44MB, etc).
-        iso:    Specifies a CD-ROM iso image.  The geometry is automatic and 
-                set for this size. This can be an iso or a cue/bin.
+        floppy: Specifies a floppy image. DOSBox will automatically identify
+                the disk geometry (360K, 1.2MB, 720K, 1.44MB, etc).
+        iso:    Specifies a CD-ROM iso image. The geometry is automatic and 
+                set for this size. This can be an iso or a cue/bin pair.
         hdd:    Specifies a harddrive image. The proper CHS geometry 
                 must be set for this to work.
 
@@ -630,18 +730,18 @@ IMGMOUNT
               available from inside DOSBox.
         none: DOSBox will make no attempt to read the file system on the disk.
               This is useful if you need to format it or if you want to boot 
-              the disk using the BOOT command.  When using the "none" 
+              the disk using the BOOT command. When using the "none" 
               filesystem, you must specify the drive number (2 or 3, 
               where 2 = master, 3 = slave) rather than a drive letter.  
               For example, to mount a 70MB image as the slave drive device, 
-              you would type:
+              you would type (without the quotes):
                 "imgmount 3 d:\test.img -size 512,63,16,142 -fs none" 
-                (without the quotes)  Compare this with a mount to read the 
-                drive in DOSBox, which would read as: 
+                Compare this with a mount to be able to access the drive
+                within DOSBox, which would read as: 
                 "imgmount e: d:\test.img -size 512,63,16,142"
 
   -size 
-     The Cylinders, Heads and Sectors specification of the drive.
+     The Cylinders, Heads and Sectors of the drive.
      Required to mount hard drive images.
      
   An example how to mount CD-ROM images:
@@ -670,7 +770,7 @@ BOOT
 
   [-l driveletter]
      This parameter allows you to specify the drive to boot from.  
-     The default is the A drive, the floppy drive.  You can also boot  
+     The default is the A drive, the floppy drive. You can also boot  
      a hard drive image mounted as master by specifying "-l C" 
      without the quotes, or the drive as slave by specifying "-l D"
      
@@ -690,12 +790,12 @@ IPX
 
   With regard to actually setting up a network, one system needs to be 
   the server. To set this up, type "IPXNET STARTSERVER" (without the quotes)
-  in a DOSBox session. The server DOSBox session will 
-  automatically add itself to the virtual IPX network. For every 
-  additional computer that should be part of the virtual IPX network, 
-  you'll need to type "IPXNET CONNECT <computer host name or IP>". 
-  For example, if your server is at bob.dosbox.com, 
-  you would type "IPXNET CONNECT bob.dosbox.com" on every non-server system. 
+  in a DOSBox session. The server DOSBox session will automatically add
+  itself to the virtual IPX network. For every additional computer that
+  should be part of the virtual IPX network, you'll need to type
+  "IPXNET CONNECT <computer host name or IP>". 
+  For example, if your server is at bob.dosbox.com, you would type
+  "IPXNET CONNECT bob.dosbox.com" on every non-server system. 
   
   To play games that need Netbios a file named NETBIOS.EXE from Novell is 
   needed. Establish the IPX connection as explained above, then run 
@@ -785,17 +885,19 @@ KEYB [languagecode [codepage [codepagefile]]]
 
 
   Examples:
-  1) To load the german keyboard layout (automatically uses codepage 858):
-       keyb gr
-  2) To load the russian keyboard layout with codepage 866:
-       keyb ru 866
-     In order to type russian characters press ALT+RIGHT-SHIFT.
-  3) To load the french keyboard layout with codepage 850 (where the
-     codepage is defined in EGACPI.DAT):
-       keyb fr 850 EGACPI.DAT
-  4) To load codepage 858 (without a keyboard layout):
-       keyb none 858
-     This can be used to change the codepage for the freedos keyb2 utility.
+    1. To load the german keyboard layout (automatically uses codepage 858):
+         keyb gr
+    2. To load the russian keyboard layout with codepage 866:
+         keyb ru 866
+       In order to type russian characters press ALT+RIGHT-SHIFT.
+    3. To load the french keyboard layout with codepage 850 (where the
+       codepage is defined in EGACPI.DAT):
+         keyb fr 850 EGACPI.DAT
+    4. To load codepage 858 (without a keyboard layout):
+         keyb none 858
+       This can be used to change the codepage for the FreeDOS keyb2 utility.
+    5. To display the current codepage and, if loaded, the keyboard layout:
+         keyb
 
 
 
@@ -808,13 +910,13 @@ For more information use the /? command line switch with the programs.
 ================
 
 ALT-ENTER     Switch to full screen and back.
-ALT-PAUSE     Pause emulation.
+ALT-PAUSE     Pause emulation (hit ALT-PAUSE again to continue).
 CTRL-F1       Start the keymapper.
 CTRL-F4       Change between mounted disk-images. Update directory cache for all drives!
 CTRL-ALT-F5   Start/Stop creating a movie of the screen. (avi video capturing)
-CTRL-F5       Save a screenshot. (png)
+CTRL-F5       Save a screenshot. (PNG format)
 CTRL-F6       Start/Stop recording sound output to a wave file.
-CTRL-ALT-F7   Start/Stop recording of OPL commands.
+CTRL-ALT-F7   Start/Stop recording of OPL commands. (DRO format)
 CTRL-ALT-F8   Start/Stop the recording of raw MIDI commands.
 CTRL-F7       Decrease frameskip.
 CTRL-F8       Increase frameskip.
@@ -824,19 +926,20 @@ CTRL-F11      Slow down emulation (Decrease DOSBox Cycles).
 CTRL-F12      Speed up emulation (Increase DOSBox Cycles).
 ALT-F12       Unlock speed (turbo button).
 
-These are the default keybindings. They can be changed in the keymapper.
+(NOTE: Once you increase your DOSBox cycles beyond your computer's maximum
+capacity, it will produce the same effect as slowing down the emulation.
+This maximum will vary from computer to computer.)
+
+
+These are the default keybindings. They can be changed in the keymapper
+(see Section 6: Mapper).
 
 Saved/recorded files can be found in current_directory/capture 
-(can be changed in the configfile). 
+(this can be changed in the DOSBox configuration file). 
 The directory has to exist prior to starting DOSBox, otherwise nothing 
 gets saved/recorded !
 
 
-NOTE: Once you increase your DOSBox cycles beyond your computer's maximum
-capacity, it will produce the same effect as slowing down the emulation.
-This maximum will vary from computer to computer.
-
-
 
 ==========
 6. Mapper:
@@ -846,10 +949,10 @@ When you start the DOSBox mapper (either with CTRL-F1 or -startmapper as
 a command line argument to the DOSBox executable) you are presented with 
 a virtual keyboard and a virtual joystick.
 
-These virtual devices correspond to the keys DOSBox will report to the
-DOS applications. If you click on a key with your mouse, you can see in
-the lower left corner with which event it is associated (EVENT) and to
-what events it is currently bound.
+These virtual devices correspond to the keys and events DOSBox will
+report to the DOS applications. If you click on a button with your mouse,
+you can see in the lower left corner with which event it is associated
+(EVENT) and to what events it is currently bound.
 
 Event: EVENT
 BIND: BIND
@@ -901,32 +1004,32 @@ Examples about remapping the joystick:
   You have a joystick attached, it is working fine under DOSBox and you
   want to play some keyboard-only game with the joystick (it is assumed
   that the game is controlled by the arrows on the keyboard):
-    1) Start the mapper, then click on one of the arrows in the middle
+    1. Start the mapper, then click on one of the arrows in the middle
        of the left part of the screen (right above the Mod1/Mod2 buttons).
        EVENT should be key_left. Now click on Add and move your joystick
        in the respective direction, this should add an event to the BIND.
-    2) Repeat the above for the missing three directions, additionally
+    2. Repeat the above for the missing three directions, additionally
        the buttons of the joystick can be remapped as well (fire/jump).
-    3) Click on Save, then on Exit and test it with some game.
+    3. Click on Save, then on Exit and test it with some game.
 
   You want to swap the y-axis of the joystick because some flightsim uses
   the up/down joystick movement in a way you don't like, and it is not
   configurable in the game itself:
-    1) Start the mapper and click on Y- in the upper joystick field (this
+    1. Start the mapper and click on Y- in the upper joystick field (this
        is for the first joystick if you have two joysticks attached) or the
        lower joystick field (second joystick or, if you have only one
        joystick attached, the second axes cross).
        EVENT should be jaxis_0_1- (or jaxis_1_1-).
-    2) Click on Del to remove the current binding, then click Add and move
+    2. Click on Del to remove the current binding, then click Add and move
        your joystick downwards. A new bind should be created.
-    3) Repeat this for Y+, save the layout and finally test it with some game.
+    3. Repeat this for Y+, save the layout and finally test it with some game.
 
 
 
 If you change the default mapping, you can save your changes by clicking on
-"Save". DOSBox will save the mapping to a location specified in the configfile
-(mapperfile=mapper.txt). At startup, DOSBox will load your mapperfile, if it
-is present in the configfile.
+"Save". DOSBox will save the mapping to a location specified in the configuration
+file (the mapperfile= entry). At startup, DOSBox will load your mapperfile,
+if it is present in the DOSBox configuration file.
 
 
 
@@ -935,39 +1038,43 @@ is present in the configfile.
 ===================
 
 To switch to a different keyboard layout, either the entry "keyboardlayout"
-in the [dos] section in dosbox.conf can be used, or the internal DOSBox
-program keyb.com. Both accept DOS conforming language codes (see below), but
-only by using keyb.com a custom codepage can be specified.
+in the [dos] section of the DOSBox configuration file can be used, or the
+internal DOSBox program keyb.com. Both accept DOS conforming language codes
+(see below), but only by using keyb.com a custom codepage can be specified.
+
+The default keyboardlayout=auto currently works under windows only, the
+layout is chosen according to the OS layout.
 
 Layout switching
   DOSBox supports a number of keyboard layouts and codepages by default,
   in this case just the layout identifier needs to be specified (like
-  keyboardlayout=sv in the DOSBox config file, or using "keyb sv" at
-  the DOSBox command prompt).
+  keyboardlayout=sv in the DOSBox configuration file, or using "keyb sv"
+  at the DOSBox command prompt).
   
   Some keyboard layouts (for example layout GK codepage 869 and layout RU
   codepage 808) have support for dual layouts that can be activated by
   pressing LEFT-ALT+RIGHT-SHIFT and deactivated by LEFT-ALT+LEFT-SHIFT.
 
 Supported external files
-  The freedos .kl files are supported (freedos keyb2 keyboard layoutfiles) as
-  well as the freedos keyboard.sys/keybrd2.sys/keybrd3.sys libraries which
+  The FreeDOS .kl files are supported (FreeDOS keyb2 keyboard layoutfiles) as
+  well as the FreeDOS keyboard.sys/keybrd2.sys/keybrd3.sys libraries which
   consist of all available .kl files.
   See http://projects.freedos.net/keyb/ for precompiled keyboard layouts if
-  the DOSBox-integrated layouts don't work for some reason, or updated or
+  the DOSBox-integrated layouts don't work for some reason, or if updated or
   new layouts become available.
 
-  Both .CPI (MSDOS/compatible codepage files) and .CPX (freedos UPX-compressed
-  codepage files) can be used. Some codepages are compiled into DOSBox, so it
-  is mostly not needed to care about external codepage files. If you need
-  a different (or custom) codepage file, copy it into the directory of the
-  DOSBox configuration file so it is accessible for DOSBox.
+  Both .CPI (MS-DOS and compatible codepage files) and .CPX (FreeDOS
+  UPX-compressed codepage files) can be used. Some codepages are compiled
+  into DOSBox, so it is mostly not needed to care about external codepage
+  files. If you need a different (or custom) codepage file, copy it into
+  the directory of the DOSBox configuration file so it is accessible for
+  DOSBox.
 
   Additional layouts can be added by copying the corresponding .kl file into
-  the directory of dosbox.conf and using the first part of the filename as
-  language code.
+  the directory of the DOSBox configuration file and using the first part of
+  the filename as language code.
   Example: For the file UZ.KL (keyboard layout for Uzbekistan) specify
-           "keyboardlayout=uz" in dosbox.conf.
+           "keyboardlayout=uz" in the DOSBox configuration file.
   The integration of keyboard layout packages (like keybrd2.sys) works similar.
 
 
@@ -1046,7 +1153,7 @@ CPU Cycles
   in the DOSBox configuration file specify for example cycles=30000. When
   running some DOS application you can raise the cycles with CTRL-F12 even
   more, but you will be limited by the power of your actual CPU. You can see
-  how much free time your true CPU has by looking at the Task Manager in
+  how much free time your real CPU has by looking at the Task Manager in
   Windows 2000/XP and the System Monitor in Windows 95/98/ME. Once 100% of
   your real CPU time is used there is no further way to speed up DOSBox
   unless you reduce the load generated by the non-CPU parts of DOSBox. 
@@ -1070,7 +1177,7 @@ Graphics emulation
 Sound emulation
   You can also try to disable the sound through the setup utility of the game
   to reduce load on your CPU further. Setting nosound=true does NOT disable
-  the emulation of sound devices, just the sound output will be disabled.
+  the emulation of sound devices, just the output of sound will be disabled.
 
 Also try to close every program but DOSBox to reserve as much resources
 as possible for DOSBox.
@@ -1109,7 +1216,12 @@ Running a certain game closes DOSBox, crashes with some message or hangs:
       fixed cycles (for example cycles=10000)
       ems=false
       xms=false
-    or combinations of the above settings
+    or combinations of the above settings,
+    similar the machine settings that control the emulated chipset and
+    functionality:
+      machine=vesa_nolfb
+    or
+      machine=vgaonly
   - use loadfix before starting the game
 
 The game exits to the DOSBox prompt with some error message:
@@ -1139,14 +1251,17 @@ You can edit the generated configfile to customize DOSBox.
 The file is divided into several sections (the names have [] around it). 
 Some sections have options you can set.
 # and % indicate comment-lines. 
-The generated configfile contains the current settings. You can alter them and
-start DOSBox with the -conf switch to load the file and use these settings.
+The DOSBox configuration file contains the current settings. You can
+alter them and start DOSBox with the -conf switch to load the file and
+use these settings.
+
+DOSBox will parse configuration files that are specified with -conf. If 
+none were specified it will try to load "dosbox.conf" from the local
+directory. If there is none, DOSBox will load the user configuration
+file. This file will be created if it doesn't exist. The file can be
+found in ~/.dosbox (Linux) or  "~/Library/Preferences" (MAC OS X).
+Windows users should use the shortcuts in the startmenu to find it.
 
-DOSBox will first parse the settings in ~/.dosboxrc (Linux),
-~\dosbox.conf (Win32) or "~/Library/Preferences/DOSBox Preferences"
-(MACOSX). Afterwards DOSBox will parse all configfiles specified with the 
--conf switch. If no configfile is specified with the -conf switch, DOSBox will 
-look in the current directory for dosbox.conf.
 
 
 
@@ -1183,5 +1298,5 @@ See the THANKS file.
 ============
 
 See the site: 
-http://dosbox.sourceforge.net
+http://www.dosbox.com
 for an email address (The Crew-page).
diff --git a/THANKS b/THANKS
index 82284d4..1e6f809 100644
--- a/THANKS
+++ b/THANKS
@@ -3,7 +3,8 @@ We would like to thank:
 
 Vlad R. of the vdmsound project for excellent sound blaster info.
 Tatsuyuki Satoh of the Mame Team for making an excellent FM emulator.
-Jarek Burczynski for the new OPL emulator.
+Jarek Burczynski for the new OPL3 emulator.
+Ken Silverman for his work on an OPL2 emulator.
 
 The Bochs and DOSemu projects which I used for information.
 Freedos for ideas in making my shell.
@@ -15,12 +16,13 @@ Sourceforge for hosting our homepage and other development tools.
 Mirek Luza, for his moderation of the forums.
 eL_Pusher, DosFreak and MiniMax for their moderation of VOGONS forum.
 
-crazyc and gulikoza for their work on the dynrec core.
+crazyc, gulikoza, M-HT for their work on the dynrec core.
 
 Jantien for the version management.
 Shawn, Johannes and Marcus for creating the MAC OS X version.
 Jochen for creating the OS/2 version.
 Ido Beeri for the icon.
+GOG Team for the splash screen.
 All the people who submitted a bug.
 The Beta Testers.
 
diff --git a/VERSION b/VERSION
index f49e2c7..db9d1f2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.72
+0.73
diff --git a/acinclude.m4 b/acinclude.m4
index 5ad91a1..a505a71 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -305,7 +305,7 @@ AC_SUBST(ALSA_LIBS)
 
 AH_TOP([
 /*
- *  Copyright (C) 2002-2007  The DOSBox Team
+ *  Copyright (C) 2002-2009  The DOSBox Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/configure.in b/configure.in
index 0bdf342..72c62c0 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl Init.
-AC_INIT(dosbox,0.72)
+AC_INIT(dosbox,0.73)
 AC_PREREQ(2.50)
 AC_CONFIG_SRCDIR(README)
 
@@ -121,17 +121,14 @@ d_test.d_type = 0;
 
 
 dnl Check for powf
-if test x$target = xi386-pc-os2-emx ; then
-  AC_MSG_CHECKING(for powf in libm);
-  LIBS_BACKUP=$LIBS;
-  LIBS="$LIBS -lm";
-  AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <math.h>]],[[
+AC_MSG_CHECKING(for powf in libm);
+LIBS_BACKUP=$LIBS;
+LIBS="$LIBS -lm";
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <math.h>]],[[
         powf(1.0f, 1.0f);
-  ]])], [AC_MSG_RESULT(yes)], [AC_DEFINE([DB_HAVE_NO_POWF],[1],[libm doesn't include powf])])
-  LIBS=$LIBS_BACKUP
-else
-AC_CHECK_LIB([m],[powf],,[AC_DEFINE([DB_HAVE_NO_POWF],[1],[libm doesn't include powf])])
-fi
+]])], [AC_MSG_RESULT(yes)], [AC_DEFINE([DB_HAVE_NO_POWF],[1],[libm doesn't include powf])])
+LIBS=$LIBS_BACKUP
+
 
 dnl Checks for libraries.
 
@@ -377,6 +374,18 @@ else
    AC_MSG_WARN([Can't find SDL_net, internal modem and ipx disabled])
 fi
 
+AH_TEMPLATE(C_X11_XKB,[define to 1 if you have XKBlib.h and X11 lib])
+AC_CHECK_LIB(X11, main, have_x11_lib=yes, have_x11_lib=no, )
+AC_CHECK_HEADER(X11/XKBlib.h, have_x11_h=yes, have_x11_h=no, )
+AC_MSG_CHECKING(for XKBlib support)
+if test x$have_x11_lib = xyes -a x$have_x11_h = xyes ; then
+   LIBS="$LIBS -lX11"
+   AC_DEFINE(C_X11_XKB,1)
+   AC_MSG_RESULT(yes)
+else
+   AC_MSG_RESULT(no)
+fi
+
 AH_TEMPLATE(C_OPENGL,[Define to 1 to use opengl display output support])
 AC_CHECK_LIB(GL, main, have_gl_lib=yes, have_gl_lib=no , )
 AC_CHECK_LIB(opengl32, main, have_opengl32_lib=yes,have_opengl32_lib=no , )
@@ -454,7 +463,7 @@ case "$target" in
        dnl to do more to distinguish them.
        dnl For now I am lazy and do not add proper detection code.
        AC_DEFINE(MACOSX, 1, [Compiling on Mac OS X])
-       LIBS="$LIBS -framework CoreMidi -framework AudioUnit -framework AudioToolbox"
+       LIBS="$LIBS -framework CoreMIDI -framework AudioUnit -framework AudioToolbox"
        AC_DEFINE(C_DIRECTSERIAL, 1, [ Define to 1 if you want serial passthrough support (Win32, Posix and OS/2).])
        ;;
     *-*-linux*)
diff --git a/include/bios.h b/include/bios.h
index 34c4798..a31e13c 100644
--- a/include/bios.h
+++ b/include/bios.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2002-2007  The DOSBox Team
+ *  Copyright (C) 2002-2009  The DOSBox Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/include/bios_disk.h b/include/bios_disk.h
index 9a14366..c2b6444 100644
--- a/include/bios_disk.h
+++ b/include/bios_disk.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2002-2008  The DOSBox Team
+ *  Copyright (C) 2002-2009  The DOSBox Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/include/callback.h b/include/callback.h
index 9d83a35..47e5c41 100644
--- a/include/callback.h
+++ b/include/callback.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2002-2007  The DOSBox Team
+ *  Copyright (C) 2002-2009  The DOSBox Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/* $Id: callback.h,v 1.23 2009/04/25 16:25:03 harekiet Exp $ */
+/* $Id: callback.h,v 1.24 2009/05/27 09:15:40 qbix79 Exp $ */
 
 #ifndef DOSBOX_CALLBACK_H
 #define DOSBOX_CALLBACK_H
diff --git a/include/control.h b/include/control.h
index 827e0d1..de9955d 100644
--- a/include/control.h
+++ b/include/control.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2002-2008  The DOSBox Team
+ *  Copyright (C) 2002-2009  The DOSBox Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/* $Id: control.h,v 1.1 2009/02/01 14:11:45 qbix79 Exp $ */
+/* $Id: control.h,v 1.2 2009/05/27 09:15:40 qbix79 Exp $ */
 
 #ifndef DOSBOX_CONTROL_H
 #define DOSBOX_CONTROL_H
diff --git a/include/cpu.h b/include/cpu.h
index 8a32032..5b830d0 100644
--- a/include/cpu.h
+++ b/include/cpu.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2002-2008  The DOSBox Team
+ *  Copyright (C) 2002-2009  The DOSBox Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/* $Id: cpu.h,v 1.56 2009/04/25 16:25:03 harekiet Exp $ */
+/* $Id: cpu.h,v 1.57 2009/05/27 09:15:40 qbix79 Exp $ */
 
 #ifndef DOSBOX_CPU_H
 #define DOSBOX_CPU_H
diff --git a/include/debug.h b/include/debug.h
index a563f8b..e018070 100644
--- a/include/debug.h
+++ b/include/debug.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2002-2007  The DOSBox Team
+ *  Copyright (C) 2002-2009  The DOSBox Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/include/dma.h b/include/dma.h
index 4e1c737..95beb06 100644
--- a/include/dma.h
+++ b/include/dma.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2002-2008  The DOSBox Team
+ *  Copyright (C) 2002-2009  The DOSBox Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/* $Id: dma.h,v 1.18 2008/09/13 20:04:28 c2woody Exp $ */
+/* $Id: dma.h,v 1.19 2009/05/27 09:15:41 qbix79 Exp $ */
 
 #ifndef DOSBOX_DMA_H
 #define DOSBOX_DMA_H
diff --git a/include/dos_inc.h b/include/dos_inc.h
index fa128d9..e1a5b2f 100644
--- a/include/dos_inc.h
+++ b/include/dos_inc.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2002-2008  The DOSBox Team
+ *  Copyright (C) 2002-2009  The DOSBox Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/* $Id: dos_inc.h,v 1.77 2009/04/25 16:25:03 harekiet Exp $ */
+/* $Id: dos_inc.h,v 1.78 2009/05/27 09:15:41 qbix79 Exp $ */
 
 #ifndef DOSBOX_DOS_INC_H
 #define DOSBOX_DOS_INC_H
diff --git a/include/dosbox.h b/include/dosbox.h
index d4c6079..0c00d95 100644
--- a/include/dosbox.h
+++ b/include/dosbox.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2002-2008  The DOSBox Team
+ *  Copyright (C) 2002-2009  The DOSBox Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/* $Id: dosbox.h,v 1.31 2008/01/09 20:34:21 c2woody Exp $ */
+/* $Id: dosbox.h,v 1.32 2009/05/27 09:15:41 qbix79 Exp $ */
 
 #ifndef DOSBOX_DOSBOX_H
 #define DOSBOX_DOSBOX_H
diff --git a/include/fpu.h b/include/fpu.h
index e906440..01f6331 100644
--- a/include/fpu.h
+++ b/include/fpu.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2002-2007  The DOSBox Team
+ *  Copyright (C) 2002-2009  The DOSBox Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/include/hardware.h b/include/hardware.h
index 073cabe..cc4a370 100644
--- a/include/hardware.h
+++ b/include/hardware.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2002-2007  The DOSBox Team
+ *  Copyright (C) 2002-2009  The DOSBox Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/include/inout.h b/include/inout.h
index 4bd858d..3f0fed4 100644
--- a/include/inout.h
+++ b/include/inout.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2002-2007  The DOSBox Team
+ *  Copyright (C) 2002-2009  The DOSBox Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/* $Id: inout.h,v 1.12 2009/04/25 16:25:03 harekiet Exp $ */
+/* $Id: inout.h,v 1.13 2009/05/27 09:15:41 qbix79 Exp $ */
 
 #ifndef DOSBOX_INOUT_H
 #define DOSBOX_INOUT_H
diff --git a/include/ipx.h b/include/ipx.h
index ca56be4..1fd3a85 100644
--- a/include/ipx.h
+++ b/include/ipx.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2002-2007  The DOSBox Team
+ *  Copyright (C) 2002-2009  The DOSBox Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/* $Id: ipx.h,v 1.12 2007/01/13 08:35:49 qbix79 Exp $ */
+/* $Id: ipx.h,v 1.13 2009/05/27 09:15:41 qbix79 Exp $ */
 
 #ifndef DOSBOX_IPX_H
 #define DOSBOX_IPX_H
diff --git a/include/ipxserver.h b/include/ipxserver.h
index db0850e..fb1a4e8 100644
--- a/include/ipxserver.h
+++ b/include/ipxserver.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2002-2007  The DOSBox Team
+ *  Copyright (C) 2002-2009  The DOSBox Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/include/joystick.h b/include/joystick.h
index 6e5b6c6..fd859b3 100644
--- a/include/joystick.h
+++ b/include/joystick.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2002-2007  The DOSBox Team
+ *  Copyright (C) 2002-2009  The DOSBox Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/* $Id: joystick.h,v 1.12 2007/08/12 10:23:35 c2woody Exp $ */
+/* $Id: joystick.h,v 1.13 2009/05/27 09:15:41 qbix79 Exp $ */
 #ifndef DOSBOX_JOYSTICK_H
 #define DOSBOX_JOYSTICK_H
 void JOYSTICK_Enable(Bitu which,bool enabled);
diff --git a/include/keyboard.h b/include/keyboard.h
index 1c0de21..9c3a3eb 100644
--- a/include/keyboard.h
+++ b/include/keyboard.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2002-2007  The DOSBox Team
+ *  Copyright (C) 2002-2009  The DOSBox Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/include/mapper.h b/include/mapper.h
index 9f606b7..9532e62 100644
--- a/include/mapper.h
+++ b/include/mapper.h
@@ -1,5 +1,5 @@
  /*
- *  Copyright (C) 2002-2007  The DOSBox Team
+ *  Copyright (C) 2002-2009  The DOSBox Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -30,6 +30,7 @@ void MAPPER_AddHandler(MAPPER_Handler * handler,MapKeys key,Bitu mods,char const
 void MAPPER_Init(void);
 void MAPPER_StartUp(Section * sec);
 void MAPPER_Run(bool pressed);
+void MAPPER_RunInternal();
 void MAPPER_LosingFocus(void);
 
 
diff --git a/include/mem.h b/include/mem.h
index 5bbb636..9a445be 100644
--- a/include/mem.h
+++ b/include/mem.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2002-2007  The DOSBox Team
+ *  Copyright (C) 2002-2009  The DOSBox Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/include/mouse.h b/include/mouse.h
index 06a46ad..d70b52a 100644
--- a/include/mouse.h
+++ b/include/mouse.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2002-2007  The DOSBox Team
+ *  Copyright (C) 2002-2009  The DOSBox Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/* $Id: mouse.h,v 1.14 2008/03/08 22:04:44 c2woody Exp $ */
+/* $Id: mouse.h,v 1.15 2009/05/27 09:15:41 qbix79 Exp $ */
 
 
 #ifndef DOSBOX_MOUSE_H
diff --git a/include/paging.h b/include/paging.h
index 8a4346d..09b19c3 100644
--- a/include/paging.h
+++ b/include/paging.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2002-2008  The DOSBox Team
+ *  Copyright (C) 2002-2009  The DOSBox Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/* $Id: paging.h,v 1.32 2009/04/25 16:25:03 harekiet Exp $ */
+/* $Id: paging.h,v 1.33 2009/05/27 09:15:41 qbix79 Exp $ */
 
 #ifndef DOSBOX_PAGING_H
 #define DOSBOX_PAGING_H
diff --git a/include/pic.h b/include/pic.h
index 5021aa6..ffb103c 100644
--- a/include/pic.h
+++ b/include/pic.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2002-2007  The DOSBox Team
+ *  Copyright (C) 2002-2009  The DOSBox Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/include/programs.h b/include/programs.h
index 3be183f..103f7f7 100644
--- a/include/programs.h
+++ b/include/programs.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2002-2007  The DOSBox Team
+ *  Copyright (C) 2002-2009  The DOSBox Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/* $Id: programs.h,v 1.18 2009/03/11 20:18:37 qbix79 Exp $ */
+/* $Id: programs.h,v 1.19 2009/05/27 09:15:41 qbix79 Exp $ */
 
 #ifndef DOSBOX_PROGRAMS_H
 #define DOSBOX_PROGRAMS_H
diff --git a/include/regs.h b/include/regs.h
index a6a2ea2..958cfb8 100644
--- a/include/regs.h
+++ b/include/regs.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2002-2007  The DOSBox Team
+ *  Copyright (C) 2002-2009  The DOSBox Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/include/render.h b/include/render.h
index 94af7bb..094dbdc 100644
--- a/include/render.h
+++ b/include/render.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2002-2007  The DOSBox Team
+ *  Copyright (C) 2002-2009  The DOSBox Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/include/serialport.h b/include/serialport.h
index 0b2ef48..75e75fe 100644
--- a/include/serialport.h
+++ b/include/serialport.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2002-2007  The DOSBox Team
+ *  Copyright (C) 2002-2009  The DOSBox Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/* $Id: serialport.h,v 1.16 2009/02/01 14:11:45 qbix79 Exp $ */
+/* $Id: serialport.h,v 1.17 2009/05/27 09:15:41 qbix79 Exp $ */
 
 #ifndef DOSBOX_SERIALPORT_H
 #define DOSBOX_SERIALPORT_H
diff --git a/include/setup.h b/include/setup.h
index 75c1fbf..be71941 100644
--- a/include/setup.h
+++ b/include/setup.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2002-2008  The DOSBox Team
+ *  Copyright (C) 2002-2009  The DOSBox Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/* $Id: setup.h,v 1.40 2009/02/15 20:01:08 qbix79 Exp $ */
+/* $Id: setup.h,v 1.41 2009/05/27 09:15:41 qbix79 Exp $ */
 
 #ifndef DOSBOX_SETUP_H
 #define DOSBOX_SETUP_H
@@ -26,7 +26,6 @@
 #pragma warning ( disable : 4290 )
 #endif
 
-#include <stdio.h>
 
 #ifndef CH_LIST
 #define CH_LIST
@@ -52,11 +51,11 @@ public:
 	Hex():_hex(0) { };
 	bool operator==(Hex const& other) {return _hex == other._hex;}
 	operator int () const { return _hex; }
-
+   
 };
 
 class Value {
-/*
+/* 
  * Multitype storage container that is aware of the currently stored type in it.
  * Value st = "hello";
  * Value in = 1;
@@ -72,7 +71,7 @@ private:
 public:
 	class WrongType { }; // Conversion error class
 	enum Etype { V_NONE, V_HEX, V_BOOL, V_INT, V_STRING, V_DOUBLE,V_CURRENT} type;
-
+	
 	/* Constructors */
 	Value()                      :_string(0),   type(V_NONE)                  { };
 	Value(Hex in)                :_hex(in),     type(V_HEX)                   { };
@@ -84,7 +83,7 @@ public:
 	Value(Value const& in):_string(0) {plaincopy(in);}
 	~Value() { destroy();};
 	Value(std::string const& in,Etype _t) :_string(0),type(V_NONE) {SetValue(in,_t);}
-
+	
 	/* Assigment operators */
 	Value& operator= (Hex in) throw(WrongType)                { return copy(Value(in));}
 	Value& operator= (int in) throw(WrongType)                { return copy(Value(in));}
@@ -132,7 +131,7 @@ public:
 	virtual bool CheckValue(Value const& in, bool warn);
 	//Set interval value to in or default if in is invalid. force always sets the value.
 	void SetVal(Value const& in, bool forced,bool warn=true) {if(forced || CheckValue(in,warn)) value = in; else value = default_value;}
-	virtual ~Property(){ }
+	virtual ~Property(){ } 
 	virtual const std::vector<Value>& GetValues() const;
 	Value::Etype Get_type(){return default_value.type;}
 
@@ -147,12 +146,12 @@ protected:
 class Prop_int:public Property {
 public:
 	Prop_int(std::string const& _propname,Changeable::Value when, int _value)
-		:Property(_propname,when) {
+		:Property(_propname,when) { 
 		default_value = value = _value;
 		min = max = -1;
 	}
 	Prop_int(std::string const&  _propname,Changeable::Value when, int _min,int _max,int _value)
-		:Property(_propname,when) {
+		:Property(_propname,when) { 
 		default_value = value = _value;
 		min = _min;
 		max = _max;
@@ -178,7 +177,7 @@ public:
 class Prop_bool:public Property {
 public:
 	Prop_bool(std::string const& _propname, Changeable::Value when, bool _value)
-		:Property(_propname,when) {
+		:Property(_propname,when) { 
 		default_value = value = _value;
 	}
 	void SetValue(std::string const& in);
@@ -188,7 +187,7 @@ public:
 class Prop_string:public Property{
 public:
 	Prop_string(std::string const& _propname, Changeable::Value when, char const * const _value)
-		:Property(_propname,when) {
+		:Property(_propname,when) { 
 		default_value = value = _value;
 	}
 	void SetValue(std::string const& in);
@@ -199,7 +198,7 @@ class Prop_path:public Prop_string{
 public:
 	std::string realpath;
 	Prop_path(std::string const& _propname, Changeable::Value when, char const * const _value)
-		:Prop_string(_propname,when,_value) {
+		:Prop_string(_propname,when,_value) { 
 		default_value = value = _value;
 		realpath = _value;
 	}
@@ -210,7 +209,7 @@ public:
 class Prop_hex:public Property {
 public:
 	Prop_hex(std::string const& _propname, Changeable::Value when, Hex _value)
-		:Property(_propname,when) {
+		:Property(_propname,when) { 
 		default_value = value = _value;
 	}
 	void SetValue(std::string const& in);
@@ -264,7 +263,7 @@ public:
 	Prop_path* Add_path(std::string const& _propname, Property::Changeable::Value when, char const * const _value=NULL);
 	Prop_bool*  Add_bool(std::string const& _propname, Property::Changeable::Value when, bool _value=false);
 	Prop_hex* Add_hex(std::string const& _propname, Property::Changeable::Value when, Hex _value=0);
-//	void Add_double(char const * const _propname, double _value=0.0);
+//	void Add_double(char const * const _propname, double _value=0.0);   
 	Prop_multival *Add_multi(std::string const& _propname, Property::Changeable::Value when,std::string const& sep);
 	Prop_multival_remain *Add_multiremain(std::string const& _propname, Property::Changeable::Value when,std::string const& sep);
 
@@ -307,7 +306,7 @@ public:
 	virtual void SetValue(std::string const& input);
 };
 
-
+   
 class Section_line: public Section{
 public:
 	Section_line(std::string const& _sectionname):Section(_sectionname){}
diff --git a/include/shell.h b/include/shell.h
index 7edc944..310ca4b 100644
--- a/include/shell.h
+++ b/include/shell.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2002-2007  The DOSBox Team
+ *  Copyright (C) 2002-2009  The DOSBox Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/* $Id: shell.h,v 1.26 2009/03/23 10:55:35 qbix79 Exp $ */
+/* $Id: shell.h,v 1.27 2009/05/27 09:15:41 qbix79 Exp $ */
 
 #ifndef DOSBOX_SHELL_H
 #define DOSBOX_SHELL_H
diff --git a/include/support.h b/include/support.h
index e0b913f..b51ab89 100644
--- a/include/support.h
+++ b/include/support.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2002-2007  The DOSBox Team
+ *  Copyright (C) 2002-2009  The DOSBox Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/* $Id: support.h,v 1.17 2009/04/25 16:25:03 harekiet Exp $ */
+/* $Id: support.h,v 1.18 2009/05/27 09:15:41 qbix79 Exp $ */
 
 #ifndef DOSBOX_SUPPORT_H
 #define DOSBOX_SUPPORT_H
diff --git a/include/timer.h b/include/timer.h
index 556778a..1ae025c 100644
--- a/include/timer.h
+++ b/include/timer.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2002-2007  The DOSBox Team
+ *  Copyright (C) 2002-2009  The DOSBox Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/include/video.h b/include/video.h
index c690ffe..10d28df 100644
--- a/include/video.h
+++ b/include/video.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2002-2008  The DOSBox Team
+ *  Copyright (C) 2002-2009  The DOSBox Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/* $Id: video.h,v 1.25 2008/08/24 16:43:06 qbix79 Exp $ */
+/* $Id: video.h,v 1.26 2009/05/27 09:15:41 qbix79 Exp $ */
 
 #ifndef DOSBOX_VIDEO_H
 #define DOSBOX_VIDEO_H
diff --git a/src/cpu/core_dyn_x86/dyn_fpu.h b/src/cpu/core_dyn_x86/dyn_fpu.h
index b2db1e8..2d57370 100644
--- a/src/cpu/core_dyn_x86/dyn_fpu.h
+++ b/src/cpu/core_dyn_x86/dyn_fpu.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2002-2007  The DOSBox Team
+ *  Copyright (C) 2002-2009  The DOSBox Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/* $Id: dyn_fpu.h,v 1.3 2007/06/14 17:47:24 c2woody Exp $ */
+/* $Id: dyn_fpu.h,v 1.4 2009/05/27 09:15:41 qbix79 Exp $ */
 
 #include "dosbox.h"
 #if C_FPU
diff --git a/src/cpu/core_dyn_x86/dyn_fpu_dh.h b/src/cpu/core_dyn_x86/dyn_fpu_dh.h
index 193f664..a5298e2 100644
--- a/src/cpu/core_dyn_x86/dyn_fpu_dh.h
+++ b/src/cpu/core_dyn_x86/dyn_fpu_dh.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2002-2007  The DOSBox Team
+ *  Copyright (C) 2002-2009  The DOSBox Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/* $Id: dyn_fpu_dh.h,v 1.5 2007/09/29 13:23:59 c2woody Exp $ */
+/* $Id: dyn_fpu_dh.h,v 1.6 2009/05/27 09:15:41 qbix79 Exp $ */
 
 #include "dosbox.h"
 #if C_FPU
diff --git a/src/cpu/core_dyn_x86/risc_x86.h b/src/cpu/core_dyn_x86/risc_x86.h
index 1e96e5c..323955e 100644
--- a/src/cpu/core_dyn_x86/risc_x86.h
+++ b/src/cpu/core_dyn_x86/risc_x86.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2002-2008  The DOSBox Team
+ *  Copyright (C) 2002-2009  The DOSBox Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/* $Id: risc_x86.h,v 1.31 2008/08/06 18:31:26 c2woody Exp $ */
+/* $Id: risc_x86.h,v 1.32 2009/05/27 09:15:41 qbix79 Exp $ */
 
 static void gen_init(void);
 
diff --git a/src/cpu/core_dyn_x86/string.h b/src/cpu/core_dyn_x86/string.h
index 7bb7ebb..62f44ac 100644
--- a/src/cpu/core_dyn_x86/string.h
+++ b/src/cpu/core_dyn_x86/string.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2002-2007  The DOSBox Team
+ *  Copyright (C) 2002-2009  The DOSBox Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/cpu/core_dynrec/cache.h b/src/cpu/core_dynrec/cache.h
index 6bae16c..da78ac2 100644
--- a/src/cpu/core_dynrec/cache.h
+++ b/src/cpu/core_dynrec/cache.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2002-2007  The DOSBox Team
+ *  Copyright (C) 2002-2009  The DOSBox Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/cpu/core_dynrec/decoder.h b/src/cpu/core_dynrec/decoder.h
index 6c0a6bd..0996756 100644
--- a/src/cpu/core_dynrec/decoder.h
+++ b/src/cpu/core_dynrec/decoder.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2002-2008  The DOSBox Team
+ *  Copyright (C) 2002-2009  The DOSBox Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/* $Id: decoder.h,v 1.5 2008/09/19 16:48:02 c2woody Exp $ */
+/* $Id: decoder.h,v 1.6 2009/05/27 09:15:41 qbix79 Exp $ */
 
 
 #include "decoder_basic.h"
diff --git a/src/cpu/core_dynrec/decoder_basic.h b/src/cpu/core_dynrec/decoder_basic.h
index 65d442d..fce63f8 100644
--- a/src/cpu/core_dynrec/decoder_basic.h
+++ b/src/cpu/core_dynrec/decoder_basic.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2002-2008  The DOSBox Team
+ *  Copyright (C) 2002-2009  The DOSBox Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/* $Id: decoder_basic.h,v 1.14 2009/03/29 17:32:20 qbix79 Exp $ */
+/* $Id: decoder_basic.h,v 1.15 2009/05/27 09:15:41 qbix79 Exp $ */
 
 
 /*
diff --git a/src/cpu/core_dynrec/decoder_opcodes.h b/src/cpu/core_dynrec/decoder_opcodes.h
index 807f281..716fd83 100644
--- a/src/cpu/core_dynrec/decoder_opcodes.h
+++ b/src/cpu/core_dynrec/decoder_opcodes.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2002-2008  The DOSBox Team
+ *  Copyright (C) 2002-2009  The DOSBox Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/cpu/core_dynrec/dyn_fpu.h b/src/cpu/core_dynrec/dyn_fpu.h
index 09ef38d..ded9b5b 100644
--- a/src/cpu/core_dynrec/dyn_fpu.h
+++ b/src/cpu/core_dynrec/dyn_fpu.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2002-2008  The DOSBox Team
+ *  Copyright (C) 2002-2009  The DOSBox Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/cpu/core_dynrec/operators.h b/src/cpu/core_dynrec/operators.h
index 45289a6..fd03c46 100644
--- a/src/cpu/core_dynrec/operators.h
+++ b/src/cpu/core_dynrec/operators.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2002-2007  The DOSBox Team
+ *  Copyright (C) 2002-2009  The DOSBox Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/cpu/core_dynrec/risc_armv4le.h b/src/cpu/core_dynrec/risc_armv4le.h
index 4427fc1..77496d3 100644
--- a/src/cpu/core_dynrec/risc_armv4le.h
+++ b/src/cpu/core_dynrec/risc_armv4le.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2002-2008  The DOSBox Team
+ *  Copyright (C) 2002-2009  The DOSBox Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/* $Id: risc_armv4le.h,v 1.2 2008/09/02 20:44:41 c2woody Exp $ */
+/* $Id: risc_armv4le.h,v 1.3 2009/05/27 09:15:41 qbix79 Exp $ */
 
 
 /* ARMv4 (little endian) backend (switcher) by M-HT */
diff --git a/src/cpu/core_dynrec/risc_mipsel32.h b/src/cpu/core_dynrec/risc_mipsel32.h
index 1ddbf0c..dba666b 100644
--- a/src/cpu/core_dynrec/risc_mipsel32.h
+++ b/src/cpu/core_dynrec/risc_mipsel32.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2002-2008  The DOSBox Team
+ *  Copyright (C) 2002-2009  The DOSBox Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/* $Id: risc_mipsel32.h,v 1.4 2008/09/19 16:48:03 c2woody Exp $ */
+/* $Id: risc_mipsel32.h,v 1.5 2009/05/27 09:15:41 qbix79 Exp $ */
 
 
 /* MIPS32 (little endian) backend by crazyc */
diff --git a/src/cpu/core_dynrec/risc_x64.h b/src/cpu/core_dynrec/risc_x64.h
index 74de7f4..cf78853 100644
--- a/src/cpu/core_dynrec/risc_x64.h
+++ b/src/cpu/core_dynrec/risc_x64.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2002-2008  The DOSBox Team
+ *  Copyright (C) 2002-2009  The DOSBox Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/* $Id: risc_x64.h,v 1.11 2008/09/02 20:44:41 c2woody Exp $ */
+/* $Id: risc_x64.h,v 1.12 2009/05/27 09:15:41 qbix79 Exp $ */
 
 
 // some configuring defines that specify the capabilities of this architecture
diff --git a/src/cpu/core_dynrec/risc_x86.h b/src/cpu/core_dynrec/risc_x86.h
index 3a8d598..bb4df79 100644
--- a/src/cpu/core_dynrec/risc_x86.h
+++ b/src/cpu/core_dynrec/risc_x86.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2002-2008  The DOSBox Team
+ *  Copyright (C) 2002-2009  The DOSBox Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/* $Id: risc_x86.h,v 1.8 2008/09/02 20:44:41 c2woody Exp $ */
+/* $Id: risc_x86.h,v 1.9 2009/05/27 09:15:41 qbix79 Exp $ */
 
 
 // some configuring defines that specify the capabilities of this architecture