Separate VOIDFlightMaster and VOIDEditorMaster.
Separate VOIDFlightMaster and VOIDEditorMaster.

--- /dev/null
+++ b/VOIDEditorMaster.cs
@@ -1,1 +1,100 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//    VOID - Vessel Orbital Information Display for Kerbal Space Program
+//    Copyright (C) 2012 Iannic-ann-od
+//    Copyright (C) 2013 Toadicus
+//
+//    This program is free software: you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation, either version 3 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Much, much credit to Younata, Adammada, Nivvydaskrl and to all the authors
+//  behind MechJeb, RemoteTech Relay Network, ISA MapSat, and Protractor for some
+//  invaluable functions and making your nicely written code available to learn from.
+//
+///////////////////////////////////////////////////////////////////////////////
+//
+//  This software uses VesselSimulator and Engineer.Extensions from Engineer Redux.
+//  Engineer Redux (c) 2013 cybutek
+//  Used by permission.
+//
+///////////////////////////////////////////////////////////////////////////////
 
+using System;
+using UnityEngine;
+using Engineer.VesselSimulator;
+
+namespace VOID
+{
+	[KSPAddon(KSPAddon.Startup.EditorAny, false)]
+	public class VOIDEditorMaster : MonoBehaviour
+	{
+		protected VOID_EditorCore Core;
+
+		public void Awake()
+		{
+			Tools.PostDebugMessage ("VOIDEditorMaster: Waking up.");
+			this.Core = VOID_EditorCore.Instance;
+			this.Core.ResetGUI ();
+			SimManager.HardReset();
+			Tools.PostDebugMessage ("VOIDEditorMaster: Awake.");
+		}
+
+		public void Update()
+		{
+			if (!HighLogic.LoadedSceneIsEditor && this.Core != null)
+			{
+				this.Core.SaveConfig ();
+				this.Core = null;
+				VOID_EditorCore.Reset();
+				return;
+			}
+
+			if (this.Core == null)
+			{
+				this.Awake();
+			}
+
+			this.Core.Update ();
+
+			if (this.Core.factoryReset)
+			{
+				KSP.IO.File.Delete<VOID_EditorCore>("config.xml");
+				this.Core = null;
+				VOID_EditorCore.Reset();
+			}
+		}
+
+		public void FixedUpdate()
+		{
+			if (this.Core == null || !HighLogic.LoadedSceneIsEditor)
+			{
+				return;
+			}
+
+			this.Core.FixedUpdate ();
+		}
+
+		public void OnGUI()
+		{
+			if (this.Core == null)
+			{
+				return;
+			}
+
+			this.Core.OnGUI();
+		}
+	}
+}
+

--- a/VOIDFlightMaster.cs
+++ b/VOIDFlightMaster.cs
@@ -96,65 +96,5 @@
 			this.Core.OnGUI();
 		}
     }
-
-	[KSPAddon(KSPAddon.Startup.EditorAny, false)]
-	public class VOIDEditorMaster : MonoBehaviour
-	{
-		protected VOID_EditorCore Core;
-
-		public void Awake()
-		{
-			Tools.PostDebugMessage ("VOIDEditorMaster: Waking up.");
-			this.Core = VOID_EditorCore.Instance;
-			this.Core.ResetGUI ();
-			SimManager.HardReset();
-			Tools.PostDebugMessage ("VOIDEditorMaster: Awake.");
-		}
-
-		public void Update()
-		{
-			if (!HighLogic.LoadedSceneIsEditor && this.Core != null)
-			{
-				this.Core.SaveConfig ();
-				this.Core = null;
-				VOID_EditorCore.Reset();
-				return;
-			}
-
-			if (this.Core == null)
-			{
-				this.Awake();
-			}
-
-			this.Core.Update ();
-
-			if (this.Core.factoryReset)
-			{
-				KSP.IO.File.Delete<VOID_EditorCore>("config.xml");
-				this.Core = null;
-				VOID_EditorCore.Reset();
-			}
-		}
-
-		public void FixedUpdate()
-		{
-			if (this.Core == null || !HighLogic.LoadedSceneIsEditor)
-			{
-				return;
-			}
-
-			this.Core.FixedUpdate ();
-		}
-
-		public void OnGUI()
-		{
-			if (this.Core == null)
-			{
-				return;
-			}
-
-			this.Core.OnGUI();
-		}
-	}
 }
 

--- a/VOID_Core.cs
+++ b/VOID_Core.cs
@@ -108,6 +108,8 @@
 		protected bool GUIStylesLoaded = false;
 		protected Dictionary<string, GUIStyle> _LabelStyles = new Dictionary<string, GUIStyle>();
 
+		protected CelestialBody _Kerbin;
+
 		[AVOID_SaveValue("togglePower")]
 		public VOID_SaveValue<bool> togglePower = true;
 		public bool powerAvailable = true;
@@ -211,6 +213,22 @@
 			get
 			{
 				return FlightGlobals.Bodies;
+			}
+		}
+
+		public CelestialBody Kerbin
+		{
+			get
+			{
+				if (this._Kerbin == null)
+				{
+					if (FlightGlobals.Bodies != null)
+					{
+						this._Kerbin = FlightGlobals.Bodies.First(b => b.name == "Kerbin");
+					}
+				}
+
+				return this._Kerbin;
 			}
 		}
 
@@ -440,7 +458,7 @@
 			if (this.vessel != null)
 			{
 				SimManager.Instance.Gravity = VOID_Core.Instance.vessel.mainBody.gravParameter /
-				Math.Pow(VOID_Core.Instance.vessel.mainBody.Radius, 2);
+					Math.Pow(VOID_Core.Instance.vessel.Radius(), 2);
 				SimManager.Instance.TryStartSimulation();
 			}
 

--- a/VOID_EditorCore.cs
+++ b/VOID_EditorCore.cs
@@ -122,7 +122,8 @@
 
 			if (EditorLogic.SortedShipList.Count > 0)
 			{
-				SimManager.Instance.Gravity = 9.08665;
+				SimManager.Instance.Gravity = this.Kerbin.gravParameter /
+					Math.Pow(this.Kerbin.Radius, 2);
 				SimManager.Instance.TryStartSimulation();
 			}
 

--- a/VOID_VesselInfo.cs
+++ b/VOID_VesselInfo.cs
@@ -43,7 +43,7 @@
 
 		protected VOID_DoubleValue totalMass = new VOID_DoubleValue(
 			"Total Mass",
-			new Func<double>(() => VOID_Core.Instance.vessel.GetTotalMass()),
+			new Func<double> (() => SimManager.Instance.TryGetLastMass()),
 			"tons"
 		);
 
@@ -118,7 +118,7 @@
 
 				double currThrust = SimManager.Instance.LastStage.actualThrust;
 				double maxThrust = SimManager.Instance.LastStage.thrust;
-				double mass = VOID_Core.Instance.vessel.GetTotalMass();
+				double mass = SimManager.Instance.TryGetLastMass();
 				double gravity = VOID_Core.Instance.vessel.mainBody.gravParameter /
 				                 Math.Pow(
 					                 VOID_Core.Instance.vessel.mainBody.Radius + VOID_Core.Instance.vessel.altitude,
@@ -142,7 +142,7 @@
 					return double.NaN;
 
 				double maxThrust = SimManager.Instance.LastStage.thrust;
-				double mass = VOID_Core.Instance.vessel.GetTotalMass();
+				double mass = SimManager.Instance.TryGetLastMass();
 				double gravity = (VOID_Core.Constant_G * VOID_Core.Instance.vessel.mainBody.Mass) /
 				                 Math.Pow(VOID_Core.Instance.vessel.mainBody.Radius, 2);
 				double weight = mass * gravity;
@@ -214,8 +214,6 @@
 				SimManager.Instance.RequestSimulation();
 			}
 
-			Stage[] stages = SimManager.Instance.Stages;
-
 			GUILayout.BeginVertical();
 
 			GUILayout.Label(