diff --git a/YJMPD-UWP/Model/GameHandler.cs b/YJMPD-UWP/Model/GameHandler.cs
index e72e0f5..68e1b61 100644
--- a/YJMPD-UWP/Model/GameHandler.cs
+++ b/YJMPD-UWP/Model/GameHandler.cs
@@ -218,6 +218,8 @@ namespace YJMPD_UWP.Model
 
             GeofenceMonitor.Current.Geofences.Clear();
             Selected = false;
+            App.Photo.Reset();
+            Destination = new BasicGeoposition() { Altitude = -1 };
 
             App.Navigate(typeof(ScoreView));
             UpdateGameStatus(GameStatus.ENDED);
diff --git a/YJMPD-UWP/ViewModels/MatchVM.cs b/YJMPD-UWP/ViewModels/MatchVM.cs
index 50627a5..3891989 100644
--- a/YJMPD-UWP/ViewModels/MatchVM.cs
+++ b/YJMPD-UWP/ViewModels/MatchVM.cs
@@ -29,7 +29,7 @@ namespace YJMPD_UWP.ViewModels
                 if (App.Game.Status != Model.GameHandler.GameStatus.STARTED)
                     return;
 
-                Degrees = (int)(angle + -e.Heading.HeadingMagneticNorth);
+                Degrees = (int)(angle + -e.Heading.HeadingTrueNorth);
                 NotifyPropertyChanged(nameof(Degrees));
             });
         }
diff --git a/YJMPD-UWP/ViewModels/PhotoVM.cs b/YJMPD-UWP/ViewModels/PhotoVM.cs
index 2d122b3..39f5aca 100644
--- a/YJMPD-UWP/ViewModels/PhotoVM.cs
+++ b/YJMPD-UWP/ViewModels/PhotoVM.cs
@@ -31,7 +31,6 @@ namespace YJMPD_UWP.ViewModels
                     timer.Start();
                 else
                 {
-                    secondsleft = 60;
                     timer.Stop();
                 }
             });
@@ -41,6 +40,8 @@ namespace YJMPD_UWP.ViewModels
         {
             NotifyPropertyChanged(nameof(TimeOut));
 
+            Debug.WriteLine("Testing");
+
             secondsleft--;
             if(secondsleft <= 0)
             {
diff --git a/YJMPD-UWP/Views/ScoreView.xaml.cs b/YJMPD-UWP/Views/ScoreView.xaml.cs
index 03da032..f652a2f 100644
--- a/YJMPD-UWP/Views/ScoreView.xaml.cs
+++ b/YJMPD-UWP/Views/ScoreView.xaml.cs
@@ -28,11 +28,6 @@ namespace YJMPD_UWP.Views
             ReadyButton.IsEnabled = false;
 
             App.Api.Ready();
-
-            await Task.Delay(TimeSpan.FromMilliseconds(500));
-
-            App.Game.MoveToWaiting();
-            App.Navigate(typeof(WaitingView), "Waiting on other players...");
         }
     }
 }