Index: trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/AutoConfigure.asm
===================================================================
--- trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/AutoConfigure.asm	(revision 523)
+++ trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/AutoConfigure.asm	(revision 525)
@@ -174,6 +174,9 @@
 ALIGN JUMP_ALIGN
 StoreAndDisplayNumberOfControllers:
-	mov		ax, 1
-	MAX_U	al, cl						; Cannot store zero
+	xor		ax, ax
+	or		al, cl
+	jnz		SHORT .AtLeastOneController
+	inc		ax							; Cannot store zero
+.AtLeastOneController:
 	test	BYTE [di+ROMVARS.wFlags], FLG_ROMVARS_FULLMODE
 	jnz		SHORT .FullModeSoNoNeedToLimit
Index: trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Dialogs.asm
===================================================================
--- trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Dialogs.asm	(revision 523)
+++ trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Dialogs.asm	(revision 525)
@@ -3,5 +3,5 @@
 
 ;
-; XTIDE Universal BIOS and Associated Tools 
+; XTIDE Universal BIOS and Associated Tools
 ; Copyright (C) 2009-2010 by Tomi Tilli, 2011-2012 by XTIDE Universal BIOS Team.
 ;
@@ -10,11 +10,11 @@
 ; the Free Software Foundation; either version 2 of the License, or
 ; (at your option) any later version.
-; 
+;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-; GNU General Public License for more details.		
+; GNU General Public License for more details.
 ; Visit http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
-;		
+;
 
 ; Section containing code
@@ -190,6 +190,5 @@
 	mov		dx, ds
 	mov		ax, bx
-	CALL_MENU_LIBRARY StartProgressTaskWithIoInDSSIandParamInDXAX
-	ret
+	JMP_MENU_LIBRARY StartProgressTaskWithIoInDSSIandParamInDXAX
 
 
Index: trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Main.asm
===================================================================
--- trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Main.asm	(revision 523)
+++ trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Main.asm	(revision 525)
@@ -1,3 +1,3 @@
-; Project name	:	XTIDE Univeral BIOS Configurator v2
+; Project name	:	XTIDE Universal BIOS Configurator v2
 ; Description	:	Program start and exit.
 
Index: trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/MenuEvents.asm
===================================================================
--- trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/MenuEvents.asm	(revision 523)
+++ trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/MenuEvents.asm	(revision 525)
@@ -33,6 +33,5 @@
 MenuEvents_DisplayMenu:
 	mov		bx, MenuEventHandler
-	CALL_MENU_LIBRARY DisplayWithHandlerInBXandUserDataInDXAX
-	ret
+	JMP_MENU_LIBRARY DisplayWithHandlerInBXandUserDataInDXAX
 
 
@@ -218,5 +217,6 @@
 	jnz		SHORT .PrintNameOfLoadedFile
 	test	ax, FLG_CFGVARS_ROMLOADED
-	jnz		SHORT .PrintLoadedEeprom
+	mov		si, g_szEEPROM
+	jnz		SHORT .PrintNameOfLoadedFileOrEeprom
 	; Fall to .PrintNothingLoaded
 
@@ -228,14 +228,11 @@
 .PrintNameOfLoadedFile:
 	mov		si, g_cfgVars+CFGVARS.szOpenedFile
-	CALL_DISPLAY_LIBRARY PrintNullTerminatedStringFromCSSI
-	jmp		SHORT .PrintTypeOfLoadedBios
-
-ALIGN JUMP_ALIGN
-.PrintLoadedEeprom:
-	mov		si, g_szEEPROM
+	; Fall to .PrintNameOfLoadedFileOrEeprom
+
+ALIGN JUMP_ALIGN
+.PrintNameOfLoadedFileOrEeprom:
 	CALL_DISPLAY_LIBRARY PrintNullTerminatedStringFromCSSI
 	; Fall to .PrintTypeOfLoadedBios
 
-ALIGN JUMP_ALIGN
 .PrintTypeOfLoadedBios:
 	mov		si, g_szSourceAndTypeSeparator
Index: trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Menuitem.asm
===================================================================
--- trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Menuitem.asm	(revision 523)
+++ trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Menuitem.asm	(revision 525)
@@ -3,5 +3,5 @@
 
 ;
-; XTIDE Universal BIOS and Associated Tools 
+; XTIDE Universal BIOS and Associated Tools
 ; Copyright (C) 2009-2010 by Tomi Tilli, 2011-2012 by XTIDE Universal BIOS Team.
 ;
@@ -10,11 +10,11 @@
 ; the Free Software Foundation; either version 2 of the License, or
 ; (at your option) any later version.
-; 
+;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-; GNU General Public License for more details.		
+; GNU General Public License for more details.
 ; Visit http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
-;		
+;
 
 ; Section containing code
@@ -168,5 +168,5 @@
 	call	GetConfigurationBufferToESDIforMenuitemInDSSI
 	add		di, [si+MENUITEM.itemValue+ITEM_VALUE.wRomvarsValueOffset]
-		
+
 	push	bx
 	mov		bx,[si+MENUITEM.itemValue+ITEM_VALUE.fnValueWriter]
@@ -176,5 +176,5 @@
 .NoWriter:
 	pop		bx
-		
+
 	jmp		[cs:bx+.rgfnJumpToStoreValueBasedOnItemType]
 .InvalidItemType:
@@ -295,6 +295,5 @@
 	CALL_MENU_LIBRARY RefreshTitle
 	CALL_MENU_LIBRARY GetHighlightedItemToAX
-	CALL_MENU_LIBRARY RefreshItemFromAX
-	ret
+	JMP_MENU_LIBRARY RefreshItemFromAX
 
 ALIGN JUMP_ALIGN
Index: trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Menupage.asm
===================================================================
--- trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Menupage.asm	(revision 523)
+++ trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Menupage.asm	(revision 525)
@@ -3,5 +3,5 @@
 
 ;
-; XTIDE Universal BIOS and Associated Tools 
+; XTIDE Universal BIOS and Associated Tools
 ; Copyright (C) 2009-2010 by Tomi Tilli, 2011-2012 by XTIDE Universal BIOS Team.
 ;
@@ -10,11 +10,11 @@
 ; the Free Software Foundation; either version 2 of the License, or
 ; (at your option) any later version.
-; 
+;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-; GNU General Public License for more details.		
+; GNU General Public License for more details.
 ; Visit http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
-;		
+;
 
 ; Section containing code
@@ -39,6 +39,5 @@
 	xor		ax, ax
 	CALL_MENU_LIBRARY HighlightItemFromAX
-	CALL_MENU_LIBRARY RefreshWindow
-	ret
+	JMP_MENU_LIBRARY RefreshWindow
 
 
Index: trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Menupages/MainMenu.asm
===================================================================
--- trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Menupages/MainMenu.asm	(revision 523)
+++ trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Menupages/MainMenu.asm	(revision 525)
@@ -3,5 +3,5 @@
 
 ;
-; XTIDE Universal BIOS and Associated Tools 
+; XTIDE Universal BIOS and Associated Tools
 ; Copyright (C) 2009-2010 by Tomi Tilli, 2011-2012 by XTIDE Universal BIOS Team.
 ;
@@ -10,11 +10,11 @@
 ; the Free Software Foundation; either version 2 of the License, or
 ; (at your option) any later version.
-; 
+;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-; GNU General Public License for more details.		
+; GNU General Public License for more details.
 ; Visit http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
-;		
+;
 
 ; Section containing initialized data
@@ -29,5 +29,5 @@
 iend
 
-g_MenuitemMainMenuLicense:		
+g_MenuitemMainMenuLicense:
 istruc MENUITEM
 	at	MENUITEM.fnActivate,		dw	Menuitem_DisplayHelpMessageFromDSSI
@@ -35,8 +35,8 @@
 	at	MENUITEM.szQuickInfo,		dw	g_szNfoMainLicense
 	at	MENUITEM.szHelp,			dw	g_szHelpMainLicense
-	at	MENUITEM.bFlags,			db	FLG_MENUITEM_VISIBLE		
-	at	MENUITEM.bType,				db	TYPE_MENUITEM_ACTION
-iend
-		
+	at	MENUITEM.bFlags,			db	FLG_MENUITEM_VISIBLE
+	at	MENUITEM.bType,				db	TYPE_MENUITEM_ACTION
+iend
+
 g_MenuitemMainMenuLoadBiosFromFile:
 istruc MENUITEM
@@ -89,5 +89,5 @@
 iend
 
-g_MenuitemMainMenuSaveFile:		
+g_MenuitemMainMenuSaveFile:
 istruc MENUITEM
 	at	MENUITEM.fnActivate,		dw	BiosFile_SaveUnsavedChanges
@@ -97,5 +97,5 @@
 	at	MENUITEM.bFlags,			db	NULL
 	at	MENUITEM.bType,				db	TYPE_MENUITEM_ACTION
-iend		
+iend
 
 g_MenuitemMainMenuExitToDos:
@@ -109,5 +109,5 @@
 iend
 
-g_MenuitemMainMenuHomePage:		
+g_MenuitemMainMenuHomePage:
 istruc MENUITEM
 	at	MENUITEM.fnActivate,		dw	Menuitem_DisplayHelpMessageFromDSSI
@@ -115,7 +115,7 @@
 	at	MENUITEM.szQuickInfo,		dw	g_szNfoMainHomePage
 	at	MENUITEM.szHelp,			dw	g_szNfoMainHomePage
-	at	MENUITEM.bFlags,			db	FLG_MENUITEM_VISIBLE		
-	at	MENUITEM.bType,				db	TYPE_MENUITEM_ACTION
-iend						
+	at	MENUITEM.bFlags,			db	FLG_MENUITEM_VISIBLE
+	at	MENUITEM.bType,				db	TYPE_MENUITEM_ACTION
+iend
 
 
@@ -139,5 +139,5 @@
 	call	.EnableOrDisableConfigureXtideUniversalBios
 	call	.EnableOrDisableFlashEeprom
-	call	.EnableOrDisableSave			
+	call	.EnableOrDisableSave
 	mov		si, g_MenupageForMainMenu
 	jmp		Menupage_ChangeToNewMenupageInDSSI
@@ -220,6 +220,6 @@
 ;		Nothing
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN		
-.EnableOrDisableSave:	
+ALIGN JUMP_ALIGN
+.EnableOrDisableSave:
 	test	WORD [g_cfgVars+CFGVARS.wFlags], FLG_CFGVARS_FILELOADED
 	jz		SHORT .DisableSave
@@ -227,9 +227,9 @@
 	ret
 
-ALIGN JUMP_ALIGN				
+ALIGN JUMP_ALIGN
 .DisableSave:
 	and		BYTE [g_MenuitemMainMenuSaveFile+MENUITEM.bFlags], ~FLG_MENUITEM_VISIBLE
 	ret
-				
+
 ;--------------------------------------------------------------------
 ; MENUITEM activation functions (.fnActivate)
@@ -243,7 +243,5 @@
 ALIGN JUMP_ALIGN
 ExitToDosSelectedFromMenu:
-	CALL_MENU_LIBRARY CloseMenuIfExitEventAllows
-ExitToDosFromBackButton:
-	ret
+	JMP_MENU_LIBRARY CloseMenuIfExitEventAllows
 
 
@@ -262,4 +260,5 @@
 .CancelFileLoading:
 	add		sp, BYTE FILE_DIALOG_IO_size
+ExitToDosFromBackButton:
 	ret
 
@@ -284,4 +283,2 @@
 	jmp		Dialogs_DisplayNotificationFromCSDX
 
-
-	
