diff --git a/zsnes/src/cfgparse.psr b/zsnes/src/cfgparse.psr
index dda5cf75..710c3417 100644
--- a/zsnes/src/cfgparse.psr
+++ b/zsnes/src/cfgparse.psr
@@ -345,4 +345,4 @@ NEWSYM SDRatio, db 0          ; 0 = /2, 28 = /30
 NEWSYM KeyEmuSpeedUp, dd 0
 NEWSYM KeyEmuSpeedDown, dd 0
 NEWSYM AllowUDLR, db 0
-NEWSYM KeyDisplayBatt, dd 0
\ No newline at end of file
+NEWSYM KeyDisplayBatt, dd 0
diff --git a/zsnes/src/cpu/dspproc.asm b/zsnes/src/cpu/dspproc.asm
index 4190e9c6..0c0a23f1 100644
--- a/zsnes/src/cpu/dspproc.asm
+++ b/zsnes/src/cpu/dspproc.asm
@@ -1571,9 +1571,9 @@ section .text
     shl eax,cl
     sar eax,1
     jmp %%got_delta
-    %%invalid_range
+%%invalid_range
     and eax,~0x7FF
-    %%got_delta
+%%got_delta
     mov edx,eax
 
     cmp dword[filter0],240
diff --git a/zsnes/src/cpu/execute.asm b/zsnes/src/cpu/execute.asm
index 6da92ace..a3fb9d32 100644
--- a/zsnes/src/cpu/execute.asm
+++ b/zsnes/src/cpu/execute.asm
@@ -32,7 +32,7 @@ EXTSYM InitPreGame,Curtableaddr,curcyc,debugdisble,dmadata,guioff,memtabler8
 EXTSYM SetupPreGame,memtablew8,regaccessbankr8,showmenu,snesmap2,snesmmap
 EXTSYM DeInitPostGame,spcPCRam,startdebugger,xp,xpb,xpc,tablead,tableadb
 EXTSYM tableadc,SA1UpdateDPage,Makemode7Table,nextmenupopup,MovieProcessing
-EXTSYM OSExit,DosExit,InitDir,InitDrive,createnewcfg,sfxramdata,deinitvideo
+EXTSYM DosExit,InitDir,InitDrive,createnewcfg,sfxramdata,deinitvideo
 EXTSYM SFXEnable,wramdata,cycpbl,cycpblt,irqon,spcon
 EXTSYM multchange,romispal,scrndis,sprlefttot,sprleftpr,processsprites
 EXTSYM cachesprites,NextLineStart,FlipWait,LastLineStart,opcjmptab,CheatOn
@@ -515,7 +515,7 @@ NEWSYM endprog
     mov ebx,InitDir
     call Change_Dir
 
-    jmp OSExit
+    jmp DosExit
 
 NEWSYM interror
     stim
@@ -1375,7 +1375,7 @@ NEWSYM cpuover
     jne .noprocmovie
     cmp byte[ZMVZClose],1
     jne .noprocmovie
-    jmp OSExit
+    jmp DosExit
 .noprocmovie
 
     cmp byte[snesmouse],4
diff --git a/zsnes/src/cpu/saddress.inc b/zsnes/src/cpu/saddress.inc
index 68b0dafd..4f1a74ea 100644
--- a/zsnes/src/cpu/saddress.inc
+++ b/zsnes/src/cpu/saddress.inc
@@ -22,10 +22,6 @@
 EXTSYM SA1DPageR8,SA1DPageR16,SA1DPageW8,SA1DPageW16
 
 
-
-
-
-
 ;*******************************************************
 ; Address Modes
 ;*******************************************************
diff --git a/zsnes/src/dos/dosintrf.asm b/zsnes/src/dos/dosintrf.asm
index 1f92f8ea..83cb95ce 100644
--- a/zsnes/src/dos/dosintrf.asm
+++ b/zsnes/src/dos/dosintrf.asm
@@ -179,9 +179,6 @@ NEWSYM WaitForKey       ; Wait for a key to be pressed
     ; return key in al
     ret
 
-NEWSYM OSExit
-    jmp DosExit
-
 NEWSYM Open_File
     pushad
     mov dword[ZOpenMode],0
@@ -963,10 +960,10 @@ NEWSYM GUIWFVID,  db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0     ; If Windows Fu
 NEWSYM GUII2VID,  db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0     ; Super 2xSAI Engine
 NEWSYM GUIM7VID,  db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0     ; Hi-Resolution Mode 7
 NEWSYM GUIBIFIL,  db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0     ; Bilinear Filtering
-NEWSYM GUITBWVID, db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0    ; Triple Buffering (Win)
-NEWSYM GUIHQ2X,   db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0      ; HQ2X Filter
-NEWSYM GUIHQ3X,   db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0      ; HQ3X Filter
-NEWSYM GUIHQ4X,   db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0      ; HQ4X Filter
+NEWSYM GUITBWVID, db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0     ; Triple Buffering (Win)
+NEWSYM GUIHQ2X,   db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0     ; HQ2X Filter
+NEWSYM GUIHQ3X,   db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0     ; HQ3X Filter
+NEWSYM GUIHQ4X,   db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0     ; HQ4X Filter
 SECTION .text
 
 ; ****************************
diff --git a/zsnes/src/dos/sw.asm b/zsnes/src/dos/sw.asm
index bfd35808..76f8a2a6 100644
--- a/zsnes/src/dos/sw.asm
+++ b/zsnes/src/dos/sw.asm
@@ -27,7 +27,7 @@ EXTSYM SidewinderFix
    xor cl,ch
    jpe %%ParChkSW
    mov [%1],ebx
-   %%ParChkSW:
+%%ParChkSW:
 %endmacro
 
 section .data
diff --git a/zsnes/src/gui/gui.asm b/zsnes/src/gui/gui.asm
index 5778870b..9319399c 100644
--- a/zsnes/src/gui/gui.asm
+++ b/zsnes/src/gui/gui.asm
@@ -146,11 +146,9 @@ EXTSYM KeyDisplayBatt
 
 %ifdef __UNIXSDL__
 EXTSYM numlockptr
-%endif
-%ifdef __WIN32__
+%elifdef __WIN32__
 EXTSYM initDirectDraw,reInitSound
-%endif
-%ifdef __MSDOS__
+%elifdef __MSDOS__
 EXTSYM dssel
 %endif
 
diff --git a/zsnes/src/linux/sdlintrf.asm b/zsnes/src/linux/sdlintrf.asm
index 08c6c8e5..e86c4f62 100644
--- a/zsnes/src/linux/sdlintrf.asm
+++ b/zsnes/src/linux/sdlintrf.asm
@@ -22,7 +22,7 @@
 
 %include "macros.mac"
 
-EXTSYM DosExit,ZFileSystemInit,getcmdline,GUIRestoreVars,getcfg,obtaindir
+EXTSYM ZFileSystemInit,getcmdline,GUIRestoreVars,getcfg,obtaindir
 EXTSYM ConvertJoyMap,tparms,SBHDMA,spcon,cfgsoundon,cfgcvidmode,InitDir
 EXTSYM InitDrive,SRAMChdir,DOScreatenewcfg,ExecGUISaveVars,allocptr,putchar
 EXTSYM getchar,ZOpenFile,ZOpenMode,ZFileSeek,ZOpenFileName,ZFileSeekMode
@@ -169,10 +169,6 @@ NEWSYM WaitForKey       ; Wait for a key to be pressed
     ; return key in al
     ret
 
-NEWSYM OsExit
-NEWSYM OSExit
-    jmp DosExit
-
 SECTION .data
 NEWSYM TempHandle, dd 0
 
diff --git a/zsnes/src/ui.asm b/zsnes/src/ui.asm
index 1a2dba31..a55c8779 100644
--- a/zsnes/src/ui.asm
+++ b/zsnes/src/ui.asm
@@ -25,7 +25,7 @@
 EXTSYM PrintStr,WaitForKey,PrintChar,ram7fa,wramdataa,malloc,MMXSupport
 EXTSYM MMXextSupport,statefileloc,LatestSave,firstsaveinc,Open_File
 EXTSYM Get_File_Date,Close_File,Change_Dir,Get_Dir,romloadskip,cfgloadgdir
-EXTSYM cfgloadsdir,init18_2hz,OSExit,SRAMDirCurDir,SRAMChdir,SRAMChdirFail
+EXTSYM cfgloadsdir,init18_2hz,SRAMDirCurDir,SRAMChdir,SRAMChdirFail
 EXTSYM BitConv32Ptr,spcBuffera,spritetablea,vcache2bs,vcache4bs,vcache8bs
 EXTSYM RGBtoYUVPtr,newgfx16b,vidbuffer,vidbufferofsa,vidbufferofsmos,ngwinptr
 EXTSYM vidbufferofsb,headdata,romdata,sfxramdata,setaramdata,wramdata,ram7f,vram
@@ -34,6 +34,10 @@ EXTSYM fnamest,filefound,vidbufferofsc,Sup48mbit,Sup16mbit,guioff
 
 %ifdef __UNIXSDL__
 EXTSYM LinuxExit,GetFilename
+%elifdef __WIN32__
+EXTSYM _imp__GetModuleFileNameA@12,memcpy,exit
+%elifdef __MSDOS__
+EXTSYM argv
 %endif
 
 ; Function 0501h
@@ -123,13 +127,6 @@ NEWSYM AllocMem
 ; Get Command Line       Locates SET CMDLINE environment
 ;*******************************************************
 
-%ifdef __WIN32__
-EXTSYM _imp__GetModuleFileNameA@12
-EXTSYM memcpy
-%elifdef __MSDOS__
-EXTSYM argv
-%endif
-
 NEWSYM getcmdline
 %ifdef __MSDOS__
 %if 0
@@ -881,7 +878,7 @@ SECTION .text
 
 NEWSYM DosExit ; Terminate Program
 %ifdef __WIN32__
-	call OSExit
+	call exit
 %elifdef __UNIXSDL__
 	call LinuxExit
 %elifdef __MSDOS__
diff --git a/zsnes/src/version.c b/zsnes/src/version.c
index cd95540b..80923721 100644
--- a/zsnes/src/version.c
+++ b/zsnes/src/version.c
@@ -39,5 +39,3 @@ void placetime()
          strlen(VERSION_STR) -
          strlen(__TIME__), __TIME__);
 }
-
-
diff --git a/zsnes/src/win/winintrf.asm b/zsnes/src/win/winintrf.asm
index 2d3738cd..cd38edb6 100644
--- a/zsnes/src/win/winintrf.asm
+++ b/zsnes/src/win/winintrf.asm
@@ -22,10 +22,10 @@
 
 %include "macros.mac"
 
-EXTSYM DosExit,ZFileSystemInit,getcmdline,GUIRestoreVars,getcfg,obtaindir
+EXTSYM ZFileSystemInit,getcmdline,GUIRestoreVars,getcfg,obtaindir
 EXTSYM ConvertJoyMap,tparms,preparedir,SBHDMA,ccmdline,spcon,cfgsoundon
 EXTSYM cfgcvidmode,InitDir,InitDrive,DOScreatenewcfg,ExecGUISaveVars,allocptr
-EXTSYM putchar,getch,exit,ZOpenFile,ZOpenMode,ZFileSeek,ZOpenFileName
+EXTSYM putchar,getch,ZOpenFile,ZOpenMode,ZFileSeek,ZOpenFileName
 EXTSYM ZFileSeekMode,ZFileSeekPos,ZFileSeekHandle,ZFileWriteHandle
 EXTSYM ZFileWriteSize,ZFileWriteBlock,ZFileWrite,ZFileReadHandle,ZFileReadSize
 EXTSYM ZFileReadBlock,ZFileRead,ZFileDelFName,ZFileDelete,ZCloseFileHandle
@@ -177,11 +177,6 @@ NEWSYM WaitForKey       ; Wait for a key to be pressed
     ; return key in al
     ret
 
-NEWSYM OsExit
-NEWSYM OSExit
-    call exit
-    jmp DosExit
-
 SECTION .data
 NEWSYM TempHandle, dd 0
 
@@ -1002,7 +997,7 @@ NEWSYM GUIIEVID,  db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 NEWSYM GUIFSVID,  db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0       ; Full Screen
 NEWSYM GUIWSVID,  db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0       ; (Full Scr. | Wide Scr.)
 NEWSYM GUISSVID,  db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0       ; Small Screen
-NEWSYM GUITBVID,  db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0      ; Triple Buffering
+NEWSYM GUITBVID,  db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0       ; Triple Buffering
 NEWSYM GUIHSVID,  db 0,0,0,1,0,1,1,1,0,0,1,0,1,0,1,1,0,1,0,1,1,0,1,0,1,0,1,1,0,1,0,1,1,0,1,1,1       ; Half/Quarter Scanlines
 NEWSYM GUI2xVID,  db 0,0,0,1,0,1,1,1,0,0,1,0,1,0,1,1,0,1,0,1,1,0,1,0,1,0,1,1,0,1,0,1,1,0,1,1,1       ; 2xSaI/Super Eagle Engines
 NEWSYM GUIM7VID,  db 0,0,0,1,0,1,1,1,0,0,1,0,1,0,1,1,0,1,0,1,1,0,1,0,1,0,1,1,0,1,0,1,1,0,1,1,1       ; ?Mode 7 video thing?
@@ -1010,7 +1005,7 @@ NEWSYM GUIWFVID,  db 0,1,0,0,0,0,1,1,1,0,0,0,0,1,1,1,0,0,1,1,1,0,0,0,0,1,1,1,0,0
 NEWSYM GUIDSIZE,  db 0,0,0,1,0,1,1,1,0,0,1,0,1,0,1,1,0,1,0,1,1,0,1,0,1,0,1,1,0,1,0,1,1,0,1,1,1
 NEWSYM GUIRATIO,  db 0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 NEWSYM GUIBIFIL,  db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-NEWSYM GUITBWVID, db 0,1,0,0,0,0,1,1,1,0,0,0,0,1,1,1,0,0,1,1,1,0,0,0,0,1,1,1,0,0,1,1,1,0,0,1,1      ; Triple Buffering (Win)
+NEWSYM GUITBWVID, db 0,1,0,0,0,0,1,1,1,0,0,0,0,1,1,1,0,0,1,1,1,0,0,0,0,1,1,1,0,0,1,1,1,0,0,1,1       ; Triple Buffering (Win)
 NEWSYM GUISMODE,  db 0,0,0,0,1,0,0,0,1,0,0,1,0,1,0,0,1,0,1,0,0,0,0,1,0,1,0,0,1,0,1,0,0,0,0,0,0
 NEWSYM GUIDSMODE, db 0,0,0,0,0,1,0,1,0,0,0,0,1,0,0,1,0,1,0,0,1,0,0,0,1,0,0,1,0,1,0,0,1,0,1,0,1
 NEWSYM GUIHQ2X,   db 0,0,0,1,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0       ; hq2x filter