diff --git a/Assets/GameOverScreen.cs b/Assets/GameOverScreen.cs
index 7a9c10de4f14a5ec873aafa1124ce1e677cd7a13..717dcd6702080abd9f5e72b630299361ae47089d 100644
--- a/Assets/GameOverScreen.cs
+++ b/Assets/GameOverScreen.cs
@@ -36,7 +36,7 @@ public class GameOverScreen : MonoBehaviour
 
         if(activeScene.name == "WaveComplete")
         {
-            resultText.text = "POINTS: " + ScoreManager.score.ToString() + "; WAVE: " + waveManager.waveNumber.ToString();
+            resultText.text = "POINTS: " + ScoreManager.score.ToString() + " \nWAVE: " + waveManager.waveNumber.ToString();
             ScoreboardEntry entry = new ScoreboardEntry(MainMenu.playerName, waveManager.waveNumber, ScoreManager.score ); //Score is still semi-hardcoded
 
             //LoadFile
diff --git a/Assets/Scripts/Managers/WaveManager.cs b/Assets/Scripts/Managers/WaveManager.cs
index 4844ec2224c57dbcb94bc8b9d63539d8f8f6fe25..fa33f4ae5b13d2d8c2647839d3ff6a4b18df080a 100644
--- a/Assets/Scripts/Managers/WaveManager.cs
+++ b/Assets/Scripts/Managers/WaveManager.cs
@@ -21,6 +21,7 @@ public class WaveManager : MonoBehaviour
     //public int enemyWaveAmount = 0;
     public int weight = 5;
     public int increment = 2;
+    public int maxWaveNumber = 10;
 
     void Start ()
     {
@@ -96,6 +97,10 @@ public class WaveManager : MonoBehaviour
 
     void NextWave()
     {
+        if (waveNumber >= maxWaveNumber)
+        {
+            return;
+        }
         waveNumber++;
         enemiesKilled = 0;
 
diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset
index 46f3414b90bad0e9ad13d9abf3d3845e592dd78f..bf6a792f88d22bf30b4d6156356184fbbd06bbfd 100644
--- a/UserSettings/EditorUserSettings.asset
+++ b/UserSettings/EditorUserSettings.asset
@@ -30,10 +30,10 @@ EditorUserSettings:
       value: 22424703114646680e0b0227036c72111f19352f223d68252320092a
       flags: 0
     RecentlyUsedScenePath-8:
-      value: 22424703114646680e0b0227036c681100123b2521382a35392c5326ece92021
+      value: 22424703114646680e0b0227036c6515183417273c2423242867083debf42d
       flags: 0
     RecentlyUsedScenePath-9:
-      value: 22424703114646680e0b0227036c6515183417273c2423242867083debf42d
+      value: 22424703114646680e0b0227036c681100123b2521382a35392c5326ece92021
       flags: 0
     vcSharedLogLevel:
       value: 0d5e400f0650