diff --git a/CHANGES.md b/CHANGES.md
index 0670785d..95bd3c4c 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -193,4 +193,4 @@
 ### Fixes
 - Fixed some issues with point lights.
 - Fixed issues with shadows.
-- Fixed an issue with the default movement.
\ No newline at end of file
+- Fixed an issue with the default movement.
diff --git a/EditorContent/Materials/Arrows_Blue.jsmat b/EditorContent/Materials/Arrows_Blue.jsmat
index 1c227395..ed46cf04 100644
--- a/EditorContent/Materials/Arrows_Blue.jsmat
+++ b/EditorContent/Materials/Arrows_Blue.jsmat
@@ -2,12 +2,12 @@
 
 string VertexShader = basic.vert
 string FragmentShader = basic.frag
-int UseShadowCutout = 0
-int IsTranslucent = 0
+bool UseShadowCutout = 0
+bool IsTranslucent = 0
 
 // Material specific parameters:
 vector3 u_diffuse = <0 0 0>
 float u_specularSize = 0
 float u_specularStrength = 0
 vector3 u_emissive = <0 0 1>
-int u_useTexture = 0
\ No newline at end of file
+bool u_useTexture = 0
\ No newline at end of file
diff --git a/EditorContent/Materials/Arrows_Green.jsmat b/EditorContent/Materials/Arrows_Green.jsmat
index 8dc71a11..a97128a8 100644
--- a/EditorContent/Materials/Arrows_Green.jsmat
+++ b/EditorContent/Materials/Arrows_Green.jsmat
@@ -2,12 +2,12 @@
 
 string VertexShader = basic.vert
 string FragmentShader = basic.frag
-int UseShadowCutout = 0
-int IsTranslucent = 0
+bool UseShadowCutout = 0
+bool IsTranslucent = 0
 
 // Material specific parameters:
 vector3 u_diffuse = <0 0 0>
 float u_specularSize = 0
 float u_specularStrength = 0
 vector3 u_emissive = <0 1 0>
-int u_useTexture = 0
\ No newline at end of file
+bool u_useTexture = 0
\ No newline at end of file
diff --git a/EditorContent/Materials/Arrows_Red.jsmat b/EditorContent/Materials/Arrows_Red.jsmat
index bdaf0cab..087af53e 100644
--- a/EditorContent/Materials/Arrows_Red.jsmat
+++ b/EditorContent/Materials/Arrows_Red.jsmat
@@ -2,12 +2,12 @@
 
 string VertexShader = basic.vert
 string FragmentShader = basic.frag
-int UseShadowCutout = 0
-int IsTranslucent = 0
+bool UseShadowCutout = 0
+bool IsTranslucent = 0
 
 // Material specific parameters:
 vector3 u_diffuse = <0 0 0>
 float u_specularSize = 0
 float u_specularStrength = 0
 vector3 u_emissive = <1 0 0>
-int u_useTexture = 0
\ No newline at end of file
+bool u_useTexture = 0
\ No newline at end of file
diff --git a/EditorContent/Materials/CollisionVisualize/Collider.jsmat b/EditorContent/Materials/CollisionVisualize/Collider.jsmat
index 55ac95e8..0dbab8cb 100644
--- a/EditorContent/Materials/CollisionVisualize/Collider.jsmat
+++ b/EditorContent/Materials/CollisionVisualize/Collider.jsmat
@@ -1,12 +1,12 @@
 // Default material parameters:
 string VertexShader = basic.vert
 string FragmentShader = basic.frag
-int UseShadowCutout = 0
-int IsTranslucent = 0
+bool UseShadowCutout = 0
+bool IsTranslucent = 0
 
 // Material specific parameters:
 vector3 u_diffuse = <1 0.5 0>
 float u_specularSize = 0
 float u_specularStrength = 0
 vector3 u_emissive = <0 0 0>
-int u_useTexture = 0
\ No newline at end of file
+bool u_useTexture = 0
\ No newline at end of file
diff --git a/EditorContent/Materials/CollisionVisualize/DynamicPhysicsBody.jsmat b/EditorContent/Materials/CollisionVisualize/DynamicPhysicsBody.jsmat
index 7f60e293..eea3f258 100644
--- a/EditorContent/Materials/CollisionVisualize/DynamicPhysicsBody.jsmat
+++ b/EditorContent/Materials/CollisionVisualize/DynamicPhysicsBody.jsmat
@@ -1,12 +1,12 @@
 // Default material parameters:
 string VertexShader = basic.vert
 string FragmentShader = basic.frag
-int UseShadowCutout = 0
-int IsTranslucent = 0
+bool UseShadowCutout = 0
+bool IsTranslucent = 0
 
 // Material specific parameters:
 vector3 u_diffuse = <0 1 0.5>
 float u_specularSize = 0
 float u_specularStrength = 0
 vector3 u_emissive = <0 0 0>
-int u_useTexture = 0
\ No newline at end of file
+bool u_useTexture = 0
\ No newline at end of file
diff --git a/EditorContent/Materials/CollisionVisualize/KinematicPhyiscsBody.jsmat b/EditorContent/Materials/CollisionVisualize/KinematicPhyiscsBody.jsmat
index 314adee0..07877b75 100644
--- a/EditorContent/Materials/CollisionVisualize/KinematicPhyiscsBody.jsmat
+++ b/EditorContent/Materials/CollisionVisualize/KinematicPhyiscsBody.jsmat
@@ -1,12 +1,12 @@
 // Default material parameters:
 string VertexShader = basic.vert
 string FragmentShader = basic.frag
-int UseShadowCutout = 0
-int IsTranslucent = 0
+bool UseShadowCutout = 0
+bool IsTranslucent = 0
 
 // Material specific parameters:
 vector3 u_diffuse = <0 0.5 1>
 float u_specularSize = 0
 float u_specularStrength = 0
 vector3 u_emissive = <0 0 0>
-int u_useTexture = 0
\ No newline at end of file
+bool u_useTexture = 0
\ No newline at end of file
diff --git a/EditorContent/Materials/CollisionVisualize/StaticPhysicsBody.jsmat b/EditorContent/Materials/CollisionVisualize/StaticPhysicsBody.jsmat
index 0db394a6..8e6ea672 100644
--- a/EditorContent/Materials/CollisionVisualize/StaticPhysicsBody.jsmat
+++ b/EditorContent/Materials/CollisionVisualize/StaticPhysicsBody.jsmat
@@ -1,12 +1,12 @@
 // Default material parameters:
 string VertexShader = basic.vert
 string FragmentShader = basic.frag
-int UseShadowCutout = 0
-int IsTranslucent = 0
+bool UseShadowCutout = 0
+bool IsTranslucent = 0
 
 // Material specific parameters:
 vector3 u_diffuse = <1 0.2 0>
 float u_specularSize = 0
 float u_specularStrength = 0
 vector3 u_emissive = <0 0 0>
-int u_useTexture = 0
\ No newline at end of file
+bool u_useTexture = 0
\ No newline at end of file
diff --git a/EditorContent/Materials/EngineDefaultPhong.jsmat b/EditorContent/Materials/EngineDefaultPhong.jsmat
index 8ba9fc36..61c6b191 100644
--- a/EditorContent/Materials/EngineDefaultPhong.jsmat
+++ b/EditorContent/Materials/EngineDefaultPhong.jsmat
@@ -2,13 +2,13 @@
 
 string VertexShader = basic.vert
 string FragmentShader = basic.frag
-int UseShadowCutout = 0
-int IsTranslucent = 0
+bool UseShadowCutout = 0
+bool IsTranslucent = 0
 
 // Material specific parameters:
 vector3 u_diffuse = <1 1 1>
 float u_specularSize = 0
 float u_specularStrength = 0
-int u_reverseNormal = 1
+bool u_reverseNormal = 1
 vector3 u_emissive = <0 0 0>
-int u_useTexture = 0
\ No newline at end of file
+bool u_useTexture = 0
\ No newline at end of file
diff --git a/EditorContent/Materials/Reflective.jsmat b/EditorContent/Materials/Reflective.jsmat
index 9039ed9c..99917abc 100644
--- a/EditorContent/Materials/Reflective.jsmat
+++ b/EditorContent/Materials/Reflective.jsmat
@@ -2,8 +2,8 @@
 
 string VertexShader = basic.vert
 string FragmentShader = basic.frag
-int UseShadowCutout = 0
-int IsTranslucent = 0
+bool UseShadowCutout = 0
+bool IsTranslucent = 0
 
 // Material specific parameters:
 vector3 u_diffuse = <0.5 0.5 0.5>
diff --git a/EngineSource/Engine/File/SaveData.cpp b/EngineSource/Engine/File/SaveData.cpp
index 3a928067..c93f56b7 100644
--- a/EngineSource/Engine/File/SaveData.cpp
+++ b/EngineSource/Engine/File/SaveData.cpp
@@ -47,7 +47,7 @@ SaveData::SaveData(std::string SaveName, std::string Extension, bool InSaveFolde
 	IsNew = FileIsNew;
 }
 
-SaveData SaveData::ParseString(const std::string& Str)
+SaveData SaveData::ParseString(std::string Str)
 {
 	SaveData OutData;
 	std::string CurrentString;
@@ -61,6 +61,7 @@ SaveData SaveData::ParseString(const std::string& Str)
 
 	char Last = 0;
 	bool InComment = false;
+	Str.append(" ");
 
 	for (char c : Str)
 	{
diff --git a/EngineSource/Engine/File/SaveData.h b/EngineSource/Engine/File/SaveData.h
index 68163123..5b6a0477 100644
--- a/EngineSource/Engine/File/SaveData.h
+++ b/EngineSource/Engine/File/SaveData.h
@@ -32,7 +32,7 @@ struct SaveData
 
 	SaveData();
 	SaveData(std::string SaveName, std::string Extension = "kesv", bool InSaveFolder = true, bool ShouldSaveOnClose = true);
-	static SaveData ParseString(const std::string& Str);
+	static SaveData ParseString(std::string Str);
 
 	std::string SerializeString() const;