diff --git a/Documentation/About.md b/Documentation/About.md
index 9e35d08d..3a2d65db 100644
--- a/Documentation/About.md
+++ b/Documentation/About.md
@@ -32,7 +32,7 @@ tmplinshi for the [CreateFormData function](https://www.autohotkey.com/boards/vi
 iseahound (Edison Hua) for the [Vis2 function](https://www.autohotkey.com/boards/viewtopic.php?f=6&t=36047) used for OCR.  
 Coco for [JSON class](https://www.autohotkey.com/boards/viewtopic.php?f=6&t=627).  
 Thiago Talma for some improvements to the code, debugging and many suggestions.  
-chosen1ft for fixing the mixing rows bug when saving a project.  
+chosen1ft for suggestions and testing.  
 [Translation revisions](https://www.macrocreator.com/project/).  
 
 
@@ -40,7 +40,9 @@ chosen1ft for fixing the mixing rows bug when saving a project.
 
 ## Version 5.3.6
 * Fixed bug with multiple compare operators.
+* Fixed issue with variables and strings in expressions.
 * Fixed other groups expanding when inserting new group.
+* Small bug fixes.
 
 ## Version 5.3.5
 * Updated max value for *Pause (Sleep)* command.
diff --git a/LIB/Eval.ahk b/LIB/Eval.ahk
index 4b277f75..fcec17a1 100644
--- a/LIB/Eval.ahk
+++ b/LIB/Eval.ahk
@@ -312,7 +312,7 @@ Eval($x, _CustomVars := "", _Init := true)
 			Else If (!RegExMatch(_String1, "^<~#.*#~>$"))
 				__Elements["&_String" A_Index "_&"] := _String1
 			,	$z[$i] := RegExReplace($z[$i], "sU)"".*""", "&_String" A_Index "_&",, 1)
-			_Pos += StrLen(_String1)
+			_Pos++
 		}
 		$z[$i] := RegExReplace($z[$i], "&_String\d+_&", """$0""")
 		
diff --git a/LIB/Internal.ahk b/LIB/Internal.ahk
index bbf1c40e..14529327 100644
--- a/LIB/Internal.ahk
+++ b/LIB/Internal.ahk
@@ -1465,6 +1465,7 @@ SaveProject(FileName)
 	local All_Data
 
 	All_Data := "[PMC Globals]|" IfDirectContext "|" IfDirectWindow "|" ExpIcon "`n"
+	Sleep, 100
 	Loop, %TabCount%
 	{
 		PMCSet := "[PMC Code v" CurrentVersion "]|" o_AutoKey[A_Index]
diff --git a/MacroCreator.ahk b/MacroCreator.ahk
index 0edbd552..23ff46a4 100644
--- a/MacroCreator.ahk
+++ b/MacroCreator.ahk
@@ -68,7 +68,7 @@ https://www.autohotkey.com/boards/viewtopic.php?f=6&t=627
 
 Thiago Talma for some improvements to the code, debugging and many suggestions.
 
-chosen1ft for fixing the mixing rows bug when saving a project.
+chosen1ft for suggestions and testing.
 
 Translation revisions:
 https://www.macrocreator.com/project/
@@ -4268,7 +4268,7 @@ tmplinshi for the CreateFormData function.
 iseahound (Edison Hua) for the Vis2 function used for OCR.
 Coco for JSON class.
 Thiago Talma for some improvements to the code, debugging and many suggestions.
-chosen1ft for fixing the mixing rows bug when saving a project.
+chosen1ft for suggestions and testing.
 )
 Gui, 34:Add, Link, y+10 W340 r1, <a href="https://www.macrocreator.com/project/">Translation revisions.</a>
 Gui, 34:Add, Groupbox, Section xm+58 W360 H130 Center, GNU General Public License
@@ -12258,11 +12258,11 @@ Try Menu, CopyTo, Uncheck, % CopyMenuLabels[A_List]
 Gui, chMacro:Default
 Gui, chMacro:Submit, NoHide
 Gui, chMacro:ListView, InputList%A_List%
+GoSub, PrevRefresh
 GoSub, chMacroGuiSize
 GoSub, LoadData
 GoSub, RowCheck
 GuiControl, 28:, OSHK, %A_List%
-GoSub, PrevRefresh
 Try Menu, CopyTo, Check, % CopyMenuLabels[A_List]
 GuiControl, chMacro:Focus, InputList%A_List%
 If (InStr(CopyMenuLabels[A_List], "()"))
@@ -12946,7 +12946,7 @@ LV_ModifyCol(3, 100)	; Manual
 LV_ModifyCol(4, 60)		; Loop
 LV_ModifyCol(5, 200)	; Context
 LV_ModifyCol(6, 45)		; Index
-Gui, 32:Show,, %t_Lang145%
+Gui, 32:Show, W690 H500, %t_Lang145%
 
 If (A_ThisLabel = "EditSelectedMacro")
 	Goto, MacroListEdit
@@ -12968,7 +12968,7 @@ GuiControl, 32:Disable, EditMacrosCancel
 Critical
 Gui, 32:Submit, NoHide
 Project := [], Labels := "", ActiveList := A_List
-Sleep, 100
+Sleep, 10
 Gui, 32:Default
 Loop, %TabCount%
 {
@@ -12990,7 +12990,7 @@ Loop, %TabCount%
 	Project.Push(LVData := LVManager[IndexN].GetData())
 	If (IndexN = ActiveList)
 		NewActive := A_Index
-	Sleep, 100
+	Sleep, 10
 }
 ActiveList := NewActive
 Gui, chMacro:Default