diff --git a/Engines/FlatRedBallXNA/FlatRedBall/Audio/SoundEffectPlayInfo.cs b/Engines/FlatRedBallXNA/FlatRedBall/Audio/SoundEffectPlayInfo.cs
index 43aadab65..898d93d20 100644
--- a/Engines/FlatRedBallXNA/FlatRedBall/Audio/SoundEffectPlayInfo.cs
+++ b/Engines/FlatRedBallXNA/FlatRedBall/Audio/SoundEffectPlayInfo.cs
@@ -15,6 +15,13 @@ public struct SoundEffectPlayInfo
         public SoundEffect SoundEffect;
         public double LastPlayTime;
 
-
     }
+
+    //public struct SoundEffectInstancePlayInfo
+    //{
+    //    public SoundEffectInstance SoundEffect;
+    //    public double LastPlayTime;
+
+    //}
+
 }
diff --git a/Engines/FlatRedBallXNA/FlatRedBall/Input/Keyboard.cs b/Engines/FlatRedBallXNA/FlatRedBall/Input/Keyboard.cs
index 8de4fd778..2babcd388 100644
--- a/Engines/FlatRedBallXNA/FlatRedBall/Input/Keyboard.cs
+++ b/Engines/FlatRedBallXNA/FlatRedBall/Input/Keyboard.cs
@@ -74,6 +74,10 @@ public IReadOnlyCollection<Microsoft.Xna.Framework.Input.Keys> KeysTyped
             }
         }
 
+        /// <summary>
+        /// The main keyboard for the game.
+        /// </summary>
+        public static Keyboard Main => InputManager.Keyboard;
 
         #endregion
 
diff --git a/Engines/FlatRedBallXNA/FlatRedBall/Input/Mouse.cs b/Engines/FlatRedBallXNA/FlatRedBall/Input/Mouse.cs
index 582d32aeb..0c91a0e75 100644
--- a/Engines/FlatRedBallXNA/FlatRedBall/Input/Mouse.cs
+++ b/Engines/FlatRedBallXNA/FlatRedBall/Input/Mouse.cs
@@ -139,6 +139,9 @@ public PositionedObject GrabbedPositionedObject
 
         DelegateBased1DInput scrollWheel;
 
+        /// <summary>
+        /// A 1D Input for the scroll wheel, where scroll wheel values will be normalized to be between -1 and 1 per wheel "tick".
+        /// </summary>
         public I1DInput ScrollWheel
         {
             get
@@ -168,6 +171,10 @@ public float ScrollWheelChange
             }
         }
 
+        /// <summary>
+        /// The main mouse for the game.
+        /// </summary>
+        public static Mouse Main => InputManager.Mouse;
 
 #if !MONOGAME && !FNA
         public bool IsOwnerFocused
diff --git a/Engines/FlatRedBallXNA/FlatRedBall/TimeManager.cs b/Engines/FlatRedBallXNA/FlatRedBall/TimeManager.cs
index ae284779a..b9c8be684 100644
--- a/Engines/FlatRedBallXNA/FlatRedBall/TimeManager.cs
+++ b/Engines/FlatRedBallXNA/FlatRedBall/TimeManager.cs
@@ -80,7 +80,8 @@ struct VoidTaskResult { }
         /// The amount of time in seconds since the game started running. 
         /// This value is updated once-per-frame so it will 
         /// always be the same value until the next frame is called.
-        /// This value does not consider pausing. To consider pausing, see CurrentScreenTime.
+        /// This value does not consider pausing, and it does not reset when
+        /// a new screen starts. To consider pausing, see CurrentScreenTime.
         /// </summary>
         /// <remarks>
         /// This value can be used to uniquely identify a frame.
diff --git a/FRBDK/Glue/Glue/Content/ContentTypes.csv b/FRBDK/Glue/Glue/Content/ContentTypes.csv
index 0fb9aae8a..339badcb3 100644
--- a/FRBDK/Glue/Glue/Content/ContentTypes.csv
+++ b/FRBDK/Glue/Glue/Content/ContentTypes.csv
@@ -221,4 +221,4 @@ Camera,TRUE,QualifiedType = FlatRedBall.Camera,,,,,,,,,,,,,,FALSE,,,"Name=X, Typ
 Effect (.fx),,QualifiedType = Microsoft.Xna.Framework.Graphics.Effect,,fx,,,,,,,,,,,,FALSE,,,,FALSE,,,,,TRUE,FALSE,,FALSE,FALSE,,EffectImporter,EffectProcessor,FALSE,,
 Video (.wmv),,QualifiedType = Microsoft.Xna.Framework.Media.Video,,wmv,,,,,,,,,,,,FALSE,,,,FALSE,,,,,FALSE,FALSE,,FALSE,FALSE,,WmvImporter,VideoProcessor,FALSE,,
 XactProject (.xap),,,,xap,,,,,,,,,,,,FALSE,,,,FALSE,,,,,FALSE,FALSE,,FALSE,FALSE,,XactImporter,XactProcessor,FALSE,,
-SoundEffectInstance (.wav),TRUE,QualifiedType = Microsoft.Xna.Framework.Audio.SoundEffectInstance,,wav,,,,,,,"{THIS} = FlatRedBall.FlatRedBallServices.Load<Microsoft.Xna.Framework.Audio.SoundEffect>(@""{FILE_NAME}"", {CONTENT_MANAGER_NAME}).CreateInstance();",,,if(this.IsDisposed == false) { this.Stop();  this.Dispose(); },,FALSE,,,,,,,,,TRUE,FALSE,,FALSE,FALSE,,,,FALSE,,
+SoundEffectInstance (.wav),TRUE,QualifiedType = Microsoft.Xna.Framework.Audio.SoundEffectInstance,,wav,,,,,,,"{THIS} = FlatRedBall.FlatRedBallServices.Load<Microsoft.Xna.Framework.Audio.SoundEffect>(@""{FILE_NAME}"", {CONTENT_MANAGER_NAME}).CreateInstance();",,,if(this.IsDisposed == false) { this.Stop();  this.Dispose(); },,FALSE,,,,,,,,,FALSE,FALSE,,FALSE,FALSE,,,,FALSE,,