diff --git a/ShiftOS.Server/Program.cs b/ShiftOS.Server/Program.cs
index fa9ebee..5170ccd 100644
--- a/ShiftOS.Server/Program.cs
+++ b/ShiftOS.Server/Program.cs
@@ -155,13 +155,7 @@ namespace ShiftOS.Server
                 Console.WriteLine("FUCK. Something HORRIBLE JUST HAPPENED.");
             };
 
-            AppDomain.CurrentDomain.UnhandledException += (o, a) =>
-            {
-                if(server.IsOnline == true)
-                    server.Stop();
-                System.Diagnostics.Process.Start("ShiftOS.Server.exe");
-            };
-				
+            	
 			server.OnReceived += (o, a) =>
 			{
 				var obj = a.Data.Object;
@@ -208,7 +202,6 @@ namespace ShiftOS.Server
             task.Wait();
             */
 
-            RandomUserGenerator.StartThread();
 
             while (server.IsOnline)
             {
diff --git a/ShiftOS.WinForms/Stories/LegionStory.cs b/ShiftOS.WinForms/Stories/LegionStory.cs
index 8c79f0e..056fe85 100644
--- a/ShiftOS.WinForms/Stories/LegionStory.cs
+++ b/ShiftOS.WinForms/Stories/LegionStory.cs
@@ -368,7 +368,7 @@ namespace ShiftOS.WinForms.Stories
                     SetProgress(i);
                     Thread.Sleep(100);
                 }
-                Story.Start("downloader");
+                SaveSystem.CurrentSave.StoriesExperienced.Add("downloader");
                 SetProgress(0);
                 SetStatus("Dependencies installed.");
                 Thread.Sleep(2000);
diff --git a/ShiftOS_TheReturn/Story.cs b/ShiftOS_TheReturn/Story.cs
index 4d1d5cc..f473f89 100644
--- a/ShiftOS_TheReturn/Story.cs
+++ b/ShiftOS_TheReturn/Story.cs
@@ -154,7 +154,7 @@ namespace ShiftOS.Engine
                                                     Method = mth,
                                                     AutoComplete = true,
                                                 };
-                                                SaveSystem.CurrentSave.Password = Context.Id;
+                                                SaveSystem.CurrentSave.PickupPoint = Context.Id;
                                                 Context.OnComplete += () =>
                                                 {
                                                     StoryComplete?.Invoke(stid);