diff --git a/README.md b/README.md
index 178840ee..77fef340 100644
--- a/README.md
+++ b/README.md
@@ -10,29 +10,29 @@ Many new features and options are made available through the menu system; I stro
 
 
 ## Documentation Index 
-   __1.__ [Usage and compatibility](https://github.com/Dil3mm4/sur_myevic/blob/master/git_doc_en/usageandcompatibility_en.md)
+   __1.__ [Usage and compatibility](git_doc_en/usageandcompatibility_en.md)
    
-   __2.__ [Behvaiour Changes](https://github.com/Dil3mm4/sur_myevic/blob/master/git_doc_en/behaviourchanges_en.md)
+   __2.__ [Behaviour Changes](git_doc_en/behaviourchanges_en.md)
    
-   __3.__ [How to build](https://github.com/Dil3mm4/sur_myevic/blob/master/git_doc_en/howtobuild_en.md)
+   __3.__ [How to build](git_doc_en/howtobuild_en.md)
 
-   __4.__ [Profiles](https://github.com/Dil3mm4/sur_myevic/blob/master/git_doc_en/profiles_en.md)
+   __4.__ [Profiles](git_doc_en/profiles_en.md)
 
-   __5.__ [Menus](https://github.com/Dil3mm4/sur_myevic/blob/master/git_doc_en/menus_en.md)
+   __5.__ [Menus](git_doc_en/menus_en.md)
 
- 5a. [Main Screen](https://github.com/Dil3mm4/sur_myevic/blob/master/git_doc_en/mainscr_en.md)
+   5a. [Main Screen](git_doc_en/mainscr_en.md)
      
-   5b. [Screen Menu](https://github.com/Dil3mm4/sur_myevic/blob/master/git_doc_en/screen_en.md)
+   5b. [Screen Menu](git_doc_en/screen_en.md)
 
-   5c. [Coil Menu](https://github.com/Dil3mm4/sur_myevic/blob/master/git_doc_en/coils_en.md)
+   5c. [Coil Menu](git_doc_en/coils_en.md)
 
-   5d. [Vaping Menu](https://github.com/Dil3mm4/sur_myevic/blob/master/git_doc_en/vaping_en.md)
+   5d. [Vaping Menu](git_doc_en/vaping_en.md)
 
-   5e. [Clock Menu](https://github.com/Dil3mm4/sur_myevic/blob/master/git_doc_en/clock_en.md)
+   5e. [Clock Menu](git_doc_en/clock_en.md)
 
-   5f. [Interface Menu](https://github.com/Dil3mm4/sur_myevic/blob/master/git_doc_en/interface_en.md)
+   5f. [Interface Menu](git_doc_en/interface_en.md)
   
-   5d. [Expert Menu](https://github.com/Dil3mm4/sur_myevic/blob/master/git_doc_en/expert_en.md)
+   5d. [Expert Menu](git_doc_en/expert_en.md)
 
 -----
 ### Thanks to:
diff --git a/bin/myevic.bin b/bin/myevic.bin
index 3113437d..2f23a446 100755
Binary files a/bin/myevic.bin and b/bin/myevic.bin differ
diff --git a/git_doc_en/usageandcompatibility_en.md b/git_doc_en/usageandcompatibility_en.md
index 6d8fbdcb..908f6692 100644
--- a/git_doc_en/usageandcompatibility_en.md
+++ b/git_doc_en/usageandcompatibility_en.md
@@ -57,4 +57,4 @@ So as long as you have no warning (a blinking "balance" on the battery icon or a
 
 -----
 
-Next Page: [Profiles](behaviourchanges_en.md)→
+Next Page: [Behaviour Changes](behaviourchanges_en.md)→
diff --git a/src/atomizer.c b/src/atomizer.c
index 84326621..0c55d36c 100644
--- a/src/atomizer.c
+++ b/src/atomizer.c
@@ -348,8 +348,8 @@ __myevic__ void StopFire()
 
 		RTCWriteRegister( RTCSPARE_VV_MJOULES, MilliJoules );
 
-		if (( FireDuration * 10 >= dfPreheatTime )
-		||  ( dfStatus.pcurve && FireDuration > 10 ))
+		if (( dfPreheatTime && ( FireDuration * 10 >= dfPreheatTime ))
+		||  ( dfStatus.pcurve && ( FireDuration > 10 )))
 		{
 			PreheatDelay = dfPHDelay * 100;
 		}
diff --git a/src/menus.c b/src/menus.c
index fdb8527c..e3eac027 100644
--- a/src/menus.c
+++ b/src/menus.c
@@ -1979,13 +1979,13 @@ const menu_t ScreenSaveMenu =
 	0,
 	7,
 	{
-		{ String_None, 0, EVENT_EXIT_MENUS, 0 },
-		{ String_Clock, 0, EVENT_EXIT_MENUS, 0 },
-		{ String_3D, 0, EVENT_EXIT_MENUS, 0 },
-		{ String_Logo, 0, EVENT_EXIT_MENUS, 0 },
-		{ String_Qix, 0, EVENT_EXIT_MENUS, 0 },
-		{ String_Snow, 0, EVENT_EXIT_MENUS, 0 },
-		{ String_Splash, 0, EVENT_EXIT_MENUS, 0 }
+		{ String_None, 0, EVENT_PARENT_MENU, 0 },
+		{ String_Clock, 0, EVENT_PARENT_MENU, 0 },
+		{ String_3D, 0, EVENT_PARENT_MENU, 0 },
+		{ String_Logo, 0, EVENT_PARENT_MENU, 0 },
+		{ String_Qix, 0, EVENT_PARENT_MENU, 0 },
+		{ String_Snow, 0, EVENT_PARENT_MENU, 0 },
+		{ String_Splash, 0, EVENT_PARENT_MENU, 0 }
 	}
 };