VOID_Core, VOID_EditorCore: Added new toggle to disable engineering calcs.
VOID_Core, VOID_EditorCore: Added new toggle to disable engineering calcs.

--- a/VOID_CBInfoBrowser.cs
+++ b/VOID_CBInfoBrowser.cs
@@ -217,13 +217,13 @@
 		    else GUILayout.Label((body.orbit.ApA / 1000).ToString("##,#") + "km", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
 
 		    if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-		    else GUILayout.Label(Tools.ConvertInterval(body.orbit.timeToAp), VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
+		    else GUILayout.Label(VOID_Tools.ConvertInterval(body.orbit.timeToAp), VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
 
 		    if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
 		    else GUILayout.Label((body.orbit.PeA / 1000).ToString("##,#") + "km", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
 
 		    if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-		    else GUILayout.Label(Tools.ConvertInterval(body.orbit.timeToPe), VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
+		    else GUILayout.Label(VOID_Tools.ConvertInterval(body.orbit.timeToPe), VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
 
 		    if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
 		    else GUILayout.Label((body.orbit.semiMajorAxis / 1000).ToString("##,#") + "km", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
@@ -232,10 +232,10 @@
 		    else GUILayout.Label(body.orbit.eccentricity.ToString("F4") + "", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
 
 		    if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-		    else GUILayout.Label(Tools.ConvertInterval(body.orbit.period), VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-
-		    if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-		    else GUILayout.Label(Tools.ConvertInterval(body.rotationPeriod), VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
+		    else GUILayout.Label(VOID_Tools.ConvertInterval(body.orbit.period), VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
+
+		    if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
+		    else GUILayout.Label(VOID_Tools.ConvertInterval(body.rotationPeriod), VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
 
 		    if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
 		    else GUILayout.Label((body.orbit.orbitalSpeed / 1000).ToString("F2") + "km/s", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));

--- a/VOID_Core.cs
+++ b/VOID_Core.cs
@@ -38,6 +38,7 @@
 {
 	public class VOID_Core : VOID_Module, IVOID_Module
 	{
+		#region Singleton Members
 		/*
 		 * Static Members
 		 * */
@@ -72,8 +73,10 @@
 			_instance = null;
 			_initialized = false;
 		}
+		#endregion
 
 		public static double Constant_G = 6.674e-11;
+
 		/*
 		 * Fields
 		 * */
@@ -136,6 +139,9 @@
 		protected VOID_SaveValue<double> _updatePeriod = 1001f / 15000f;
 		protected float _updateTimer = 0f;
 		protected string stringFrequency;
+
+		[AVOID_SaveValue("vesselSimActive")]
+		protected VOID_SaveValue<bool> vesselSimActive;
 
 		// Vessel Type Housekeeping
 		protected List<VesselType> _allVesselTypes = new List<VesselType>();
@@ -472,7 +478,7 @@
 		{
 			this.LoadBeforeUpdate();
 
-			if (this.vessel != null)
+			if (this.vessel != null && this.vesselSimActive)
 			{
 				SimManager.Gravity = VOID_Core.Instance.vessel.mainBody.gravParameter /
 					Math.Pow(VOID_Core.Instance.vessel.Radius(), 2);
@@ -621,6 +627,9 @@
 			}
 
 			this.UseToolbarManager = GUILayout.Toggle(this.UseToolbarManager, "Use Blizzy's Toolbar If Available");
+
+			this.vesselSimActive.value = GUILayout.Toggle(this.vesselSimActive.value,
+				"Enable Engineering Calculations");
 
 			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
 
@@ -988,6 +997,8 @@
 			this.VOIDIconOffInactivePath = "VOID/Textures/void_icon_light";
 			this.VOIDIconOffActivePath = "VOID/Textures/void_icon_dark";
 
+			this.vesselSimActive = true;
+
 			this.UseToolbarManager = false;
 
 			this.LoadConfig();

--- a/VOID_DataLogger.cs
+++ b/VOID_DataLogger.cs
@@ -97,7 +97,7 @@
 			GUILayout.BeginVertical();
 
 			GUILayout.Label("System time: " + DateTime.Now.ToString("HH:mm:ss"));
-			GUILayout.Label(Tools.ConvertInterval(stopwatch1));
+			GUILayout.Label(VOID_Tools.ConvertInterval(stopwatch1));
 
 			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
 			if (GUILayout.Button("Start"))

--- a/VOID_EditorCore.cs
+++ b/VOID_EditorCore.cs
@@ -129,7 +129,7 @@
 				this.StartGUI();
 			}
 
-			if (EditorLogic.SortedShipList.Count > 0)
+			if (EditorLogic.SortedShipList.Count > 0 && this.vesselSimActive)
 			{
 				SimManager.Gravity = VOID_Data.KerbinGee;
 				SimManager.TryStartSimulation();

--- a/VOID_Orbital.cs
+++ b/VOID_Orbital.cs
@@ -158,12 +158,12 @@
 
 		public static readonly VOID_StrValue timeToApo = new VOID_StrValue(
 			"Time to Apoapsis",
-			new Func<string>(() => Tools.ConvertInterval(VOID_Core.Instance.vessel.orbit.timeToAp))
+			new Func<string>(() => VOID_Tools.ConvertInterval(VOID_Core.Instance.vessel.orbit.timeToAp))
 		);
 
 		public static readonly VOID_StrValue timeToPeri = new VOID_StrValue(
 			"Time to Periapsis",
-			new Func<string>(() => Tools.ConvertInterval(VOID_Core.Instance.vessel.orbit.timeToPe))
+			new Func<string>(() => VOID_Tools.ConvertInterval(VOID_Core.Instance.vessel.orbit.timeToPe))
 		);
 
 		public static readonly VOID_DoubleValue orbitInclination = new VOID_DoubleValue(
@@ -186,7 +186,7 @@
 
 		public static readonly VOID_StrValue orbitPeriod = new VOID_StrValue(
 			"Period",
-			new Func<string>(() => Tools.ConvertInterval(VOID_Core.Instance.vessel.orbit.period))
+			new Func<string>(() => VOID_Tools.ConvertInterval(VOID_Core.Instance.vessel.orbit.period))
 		);
 
 		public static readonly VOID_DoubleValue semiMajorAxis = new VOID_DoubleValue(
@@ -233,7 +233,7 @@
 
 		public static readonly VOID_DoubleValue localSiderealLongitude = new VOID_DoubleValue(
 			"Local Sidereal Longitude",
-			new Func<double>(() => Tools.FixDegreeDomain(
+			new Func<double>(() => VOID_Tools.FixDegreeDomain(
 				VOID_Core.Instance.vessel.longitude + VOID_Core.Instance.vessel.orbit.referenceBody.rotationAngle)),
 			"°"
 		);

--- a/VOID_Rendezvous.cs
+++ b/VOID_Rendezvous.cs
@@ -58,7 +58,10 @@
 			Vessel rendezvessel = new Vessel();
 			CelestialBody rendezbody = new CelestialBody();
 
-			this.RegisterModule = VOID_Core.Instance.Modules.Where(m => typeof(VOID_VesselRegister).IsAssignableFrom(m.GetType())).FirstOrDefault() as VOID_VesselRegister;
+			if (this.RegisterModule == null)
+			{
+				this.RegisterModule = VOID_Core.Instance.Modules.Where(m => typeof(VOID_VesselRegister).IsAssignableFrom(m.GetType())).FirstOrDefault() as VOID_VesselRegister;
+			}
 
 			GUILayout.BeginVertical();
 
@@ -148,7 +151,7 @@
 					// Toadicus edit: added local sidereal longitude.
 					// Toadicus edit: added local sidereal longitude.
 					double LSL = v.longitude + v.orbit.referenceBody.rotationAngle;
-					LSL = Tools.FixDegreeDomain (LSL);
+					LSL = VOID_Tools.FixDegreeDomain (LSL);
 
 					//display orbital info for orbiting/flying/suborbital/escaping vessels only
 					GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
@@ -196,7 +199,7 @@
 					{
 						GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
 						GUILayout.Label("Period:");
-						GUILayout.Label(Tools.ConvertInterval(v.orbit.period), GUILayout.ExpandWidth(false));
+						GUILayout.Label(VOID_Tools.ConvertInterval(v.orbit.period), GUILayout.ExpandWidth(false));
 						GUILayout.EndHorizontal();
 
 						GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
@@ -247,12 +250,12 @@
 				{
 					GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
 					GUILayout.Label("Latitude:");
-					GUILayout.Label(Tools.GetLatitudeString(vessel), GUILayout.ExpandWidth(false));
+					GUILayout.Label(VOID_Tools.GetLatitudeString(vessel), GUILayout.ExpandWidth(false));
 					GUILayout.EndHorizontal();
 
 					GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
 					GUILayout.Label("Longitude:");
-					GUILayout.Label(Tools.GetLongitudeString(vessel), GUILayout.ExpandWidth(false));
+					GUILayout.Label(VOID_Tools.GetLongitudeString(vessel), GUILayout.ExpandWidth(false));
 					GUILayout.EndHorizontal();
 
 					GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
@@ -297,28 +300,28 @@
 				//SUN2PLANET:
 				if (vessel.mainBody.bodyName == "Sun" && cb.referenceBody == vessel.mainBody)
 				{
-					Tools.display_transfer_angles_SUN2PLANET(cb, vessel);
+					VOID_Tools.display_transfer_angles_SUN2PLANET(cb, vessel);
 					//if (debugging) Debug.Log("[VOID] SUN2PLANET OK");
 				}
 
 				//PLANET2PLANET
 				else if (vessel.mainBody.referenceBody.bodyName == "Sun" && cb.referenceBody == vessel.mainBody.referenceBody)
 				{
-					Tools.display_transfer_angles_PLANET2PLANET(cb, vessel);
+					VOID_Tools.display_transfer_angles_PLANET2PLANET(cb, vessel);
 					//if (debugging) Debug.Log("[VOID] PLANET2PLANET OK");
 				}
 
 				//PLANET2MOON
 				else if (vessel.mainBody.referenceBody.bodyName == "Sun" && cb.referenceBody == vessel.mainBody)
 				{
-					Tools.display_transfer_angles_PLANET2MOON(cb, vessel);
+					VOID_Tools.display_transfer_angles_PLANET2MOON(cb, vessel);
 					//if (debugging) Debug.Log("[VOID] PLANET2MOON OK");
 				}
 
 				//MOON2MOON
 				else if (vessel.mainBody.referenceBody.referenceBody.bodyName == "Sun" && cb.referenceBody == vessel.mainBody.referenceBody)
 				{
-					Tools.display_transfer_angles_MOON2MOON(cb, vessel);
+					VOID_Tools.display_transfer_angles_MOON2MOON(cb, vessel);
 					//if (debugging) Debug.Log("[VOID] MOON2MOON OK");
 				}
 

--- a/VOID_SurfAtmo.cs
+++ b/VOID_SurfAtmo.cs
@@ -125,12 +125,12 @@
 
 		public static readonly VOID_StrValue surfLatitude = new VOID_StrValue(
 			"Latitude",
-			new Func<string> (() => Tools.GetLatitudeString(VOID_Core.Instance.vessel))
+			new Func<string> (() => VOID_Tools.GetLatitudeString(VOID_Core.Instance.vessel))
 		);
 
 		public static readonly VOID_StrValue surfLongitude = new VOID_StrValue(
 			"Longitude",
-			new Func<string> (() => Tools.GetLongitudeString(VOID_Core.Instance.vessel))
+			new Func<string> (() => VOID_Tools.GetLongitudeString(VOID_Core.Instance.vessel))
 		);
 
 		public static readonly VOID_StrValue vesselHeading = new VOID_StrValue(
@@ -138,7 +138,7 @@
 			delegate()
 		{
 			double heading = core.vessel.getSurfaceHeading();
-			string cardinal = Tools.get_heading_text(heading);
+			string cardinal = VOID_Tools.get_heading_text(heading);
 
 			return string.Format(
 				"{0}° {1}",
@@ -198,7 +198,7 @@
 
 		public static readonly VOID_StrValue currBiome = new VOID_StrValue(
 			"Biome",
-			new Func<string> (() => Tools.GetBiome(VOID_Core.Instance.vessel).name)
+			new Func<string> (() => VOID_Tools.GetBiome(VOID_Core.Instance.vessel).name)
 		);
 
 	}

--- a/VOID_Tools.cs
+++ b/VOID_Tools.cs
@@ -30,9 +30,9 @@
 using System;
 using UnityEngine;
 
-namespace ToadicusTools
+namespace VOID
 {
-	public static partial class Tools
+	public static partial class VOID_Tools
 	{
 		#region VESSEL_EXTENSIONS_SCIENCE
 		public static CBAttributeMap.MapAttribute GetBiome(this Vessel vessel)
@@ -511,7 +511,7 @@
 			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
 			GUILayout.Label("Phase angle (curr/trans):");
 			GUILayout.Label(
-				Tools.mrenigma03_calcphase(vessel, body).ToString("F3") + "° / " + Tools.Nivvy_CalcTransferPhaseAngle(
+				VOID_Tools.mrenigma03_calcphase(vessel, body).ToString("F3") + "° / " + VOID_Tools.Nivvy_CalcTransferPhaseAngle(
 					vessel.orbit.semiMajorAxis,
 					body.orbit.semiMajorAxis,
 					vessel.mainBody.gravParameter
@@ -523,7 +523,7 @@
 			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
 			GUILayout.Label("Transfer velocity:");
 			GUILayout.Label(
-				(Tools.Younata_DeltaVToGetToOtherBody(
+				(VOID_Tools.Younata_DeltaVToGetToOtherBody(
 					(vessel.mainBody.gravParameter / 1000000000),
 					(vessel.orbit.semiMajorAxis / 1000),
 					(body.orbit.semiMajorAxis / 1000)
@@ -535,46 +535,46 @@
 
 		public static void display_transfer_angles_PLANET2PLANET(CelestialBody body, Vessel vessel)
 		{
-			double dv1 = Tools.Younata_DeltaVToGetToOtherBody(
+			double dv1 = VOID_Tools.Younata_DeltaVToGetToOtherBody(
 				(vessel.mainBody.referenceBody.gravParameter / 1000000000),
 				(vessel.mainBody.orbit.semiMajorAxis / 1000),
 				(body.orbit.semiMajorAxis / 1000)
 			);
-			double dv2 = Tools.Younata_DeltaVToExitSOI(
+			double dv2 = VOID_Tools.Younata_DeltaVToExitSOI(
 				(vessel.mainBody.gravParameter / 1000000000),
 				(vessel.orbit.semiMajorAxis / 1000),
 				(vessel.mainBody.sphereOfInfluence / 1000),
 				Math.Abs(dv1)
 			);
 
-			double trans_ejection_angle = Tools.Younata_TransferBurnPoint(
+			double trans_ejection_angle = VOID_Tools.Younata_TransferBurnPoint(
 				(vessel.orbit.semiMajorAxis / 1000),
 				dv2,
 				(Math.PI / 2.0),
 				(vessel.mainBody.gravParameter / 1000000000)
 			);
-			double curr_ejection_angle = Tools.Adammada_CurrentEjectionAngle(
+			double curr_ejection_angle = VOID_Tools.Adammada_CurrentEjectionAngle(
 				FlightGlobals.ActiveVessel.longitude,
 				FlightGlobals.ActiveVessel.orbit.referenceBody.rotationAngle,
 				FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.LAN,
 				FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.orbitPercent
 			);
 
-			double trans_phase_angle = Tools.Nivvy_CalcTransferPhaseAngle(
+			double trans_phase_angle = VOID_Tools.Nivvy_CalcTransferPhaseAngle(
 				vessel.mainBody.orbit.semiMajorAxis,
 				body.orbit.semiMajorAxis,
 				vessel.mainBody.referenceBody.gravParameter
 			) % 360;
-			double curr_phase_angle = Tools.Adammada_CurrrentPhaseAngle(
+			double curr_phase_angle = VOID_Tools.Adammada_CurrrentPhaseAngle(
 				body.orbit.LAN,
 				body.orbit.orbitPercent,
 				FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.LAN,
 				FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.orbitPercent
 			);
 
-			double adj_phase_angle = Tools.adjustCurrPhaseAngle(trans_phase_angle, curr_phase_angle);
-			double adj_trans_ejection_angle = Tools.adjust_transfer_ejection_angle(trans_ejection_angle, trans_phase_angle);
-			double adj_curr_ejection_angle = Tools.adjust_current_ejection_angle(curr_ejection_angle);
+			double adj_phase_angle = VOID_Tools.adjustCurrPhaseAngle(trans_phase_angle, curr_phase_angle);
+			double adj_trans_ejection_angle = VOID_Tools.adjust_transfer_ejection_angle(trans_ejection_angle, trans_phase_angle);
+			double adj_curr_ejection_angle = VOID_Tools.adjust_current_ejection_angle(curr_ejection_angle);
 
 			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
 			GUILayout.Label("Phase angle (curr/trans):");
@@ -600,13 +600,13 @@
 
 		public static void display_transfer_angles_PLANET2MOON(CelestialBody body, Vessel vessel)
 		{
-			double dv1 = Tools.Younata_DeltaVToGetToOtherBody(
+			double dv1 = VOID_Tools.Younata_DeltaVToGetToOtherBody(
 				(vessel.mainBody.gravParameter / 1000000000),
 				(vessel.orbit.semiMajorAxis / 1000),
 				(body.orbit.semiMajorAxis / 1000)
 			);
 
-			double trans_phase_angle = Tools.Nivvy_CalcTransferPhaseAngle(
+			double trans_phase_angle = VOID_Tools.Nivvy_CalcTransferPhaseAngle(
 				vessel.orbit.semiMajorAxis,
 				body.orbit.semiMajorAxis,
 				vessel.mainBody.gravParameter
@@ -615,7 +615,7 @@
 			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
 			GUILayout.Label("Phase angle (curr/trans):");
 			GUILayout.Label(
-				Tools.mrenigma03_calcphase(vessel, body).ToString("F3") + "° / " + trans_phase_angle.ToString("F3") + "°",
+				VOID_Tools.mrenigma03_calcphase(vessel, body).ToString("F3") + "° / " + trans_phase_angle.ToString("F3") + "°",
 				GUILayout.ExpandWidth(false)
 			);
 			GUILayout.EndHorizontal();
@@ -628,50 +628,50 @@
 
 		public static void display_transfer_angles_MOON2MOON(CelestialBody body, Vessel vessel)
 		{
-			double dv1 = Tools.Younata_DeltaVToGetToOtherBody(
+			double dv1 = VOID_Tools.Younata_DeltaVToGetToOtherBody(
 				(vessel.mainBody.referenceBody.gravParameter / 1000000000),
 				(vessel.mainBody.orbit.semiMajorAxis / 1000),
 				(body.orbit.semiMajorAxis / 1000)
 			);
-			double dv2 = Tools.Younata_DeltaVToExitSOI(
+			double dv2 = VOID_Tools.Younata_DeltaVToExitSOI(
 				(vessel.mainBody.gravParameter / 1000000000),
 				(vessel.orbit.semiMajorAxis / 1000),
 				(vessel.mainBody.sphereOfInfluence / 1000),
 				Math.Abs(dv1)
 			);
-			double trans_ejection_angle = Tools.Younata_TransferBurnPoint(
+			double trans_ejection_angle = VOID_Tools.Younata_TransferBurnPoint(
 				(vessel.orbit.semiMajorAxis / 1000),
 				dv2,
 				(Math.PI / 2.0),
 				(vessel.mainBody.gravParameter / 1000000000)
 			);
 
-			double curr_phase_angle = Tools.Adammada_CurrrentPhaseAngle(
+			double curr_phase_angle = VOID_Tools.Adammada_CurrrentPhaseAngle(
 				body.orbit.LAN,
 				body.orbit.orbitPercent,
 				FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.LAN,
 				FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.orbitPercent
 			);
-			double curr_ejection_angle = Tools.Adammada_CurrentEjectionAngle(
+			double curr_ejection_angle = VOID_Tools.Adammada_CurrentEjectionAngle(
 				FlightGlobals.ActiveVessel.longitude,
 				FlightGlobals.ActiveVessel.orbit.referenceBody.rotationAngle,
 				FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.LAN,
 				FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.orbitPercent
 			);
 
-			double trans_phase_angle = Tools.Nivvy_CalcTransferPhaseAngle(
+			double trans_phase_angle = VOID_Tools.Nivvy_CalcTransferPhaseAngle(
 				vessel.mainBody.orbit.semiMajorAxis,
 				body.orbit.semiMajorAxis,
 				vessel.mainBody.referenceBody.gravParameter
 			) % 360;
 
-			double adj_phase_angle = Tools.adjustCurrPhaseAngle(trans_phase_angle, curr_phase_angle);
+			double adj_phase_angle = VOID_Tools.adjustCurrPhaseAngle(trans_phase_angle, curr_phase_angle);
 			//double adj_ejection_angle = adjustCurrEjectionAngle(trans_phase_angle, curr_ejection_angle);
 
 			//new stuff
 			//
-			double adj_trans_ejection_angle = Tools.adjust_transfer_ejection_angle(trans_ejection_angle, trans_phase_angle);
-			double adj_curr_ejection_angle = Tools.adjust_current_ejection_angle(curr_ejection_angle);
+			double adj_trans_ejection_angle = VOID_Tools.adjust_transfer_ejection_angle(trans_ejection_angle, trans_phase_angle);
+			double adj_curr_ejection_angle = VOID_Tools.adjust_current_ejection_angle(curr_ejection_angle);
 			//
 			//
 

--- a/VOID_Transfer.cs
+++ b/VOID_Transfer.cs
@@ -68,7 +68,7 @@
 
 					if (selectedBodies.Contains(body))
 					{
-						Tools.display_transfer_angles_SUN2PLANET(body, vessel);  //show phase angles for each selected body
+						VOID_Tools.display_transfer_angles_SUN2PLANET(body, vessel);  //show phase angles for each selected body
 						tad_targeting(body);    //display Set/Unset Target button for each selected body
 					}
 			    }
@@ -91,7 +91,7 @@
 
 			            if (selectedBodies.Contains(body))
 			            {
-			                Tools.display_transfer_angles_PLANET2PLANET(body, vessel);
+			                VOID_Tools.display_transfer_angles_PLANET2PLANET(body, vessel);
 			                tad_targeting(body);    //display Set/Unset Target button
 			            }
 			        }
@@ -110,7 +110,7 @@
 
 			        if (selectedBodies.Contains(body))
 			        {
-			            Tools.display_transfer_angles_PLANET2MOON(body, vessel);
+			            VOID_Tools.display_transfer_angles_PLANET2MOON(body, vessel);
 			            tad_targeting(body);    //display Set/Unset Target button
 			        }
 			    }
@@ -133,7 +133,7 @@
 
 						if (selectedBodies.Contains(body))
 						{
-							Tools.display_transfer_angles_MOON2MOON(body, vessel);
+							VOID_Tools.display_transfer_angles_MOON2MOON(body, vessel);
 							tad_targeting(body);    //display Set/Unset Target button
 						}
 					}

--- a/VOID_VesselInfo.cs
+++ b/VOID_VesselInfo.cs
@@ -26,12 +26,13 @@
 // WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+using Engineer.VesselSimulator;
+using Engineer.Extensions;
 using KSP;
 using System;
 using System.Collections.Generic;
+using ToadicusTools;
 using UnityEngine;
-using Engineer.VesselSimulator;
-using Engineer.Extensions;
 
 namespace VOID
 {
@@ -107,7 +108,7 @@
 			"Total Mass",
 			delegate()
 		{
-			if (SimManager.LastStage == null)
+			if (SimManager.Stages == null || SimManager.LastStage == null)
 			{
 				return double.NaN;
 			}
@@ -121,12 +122,12 @@
 			"Resource Mass",
 			delegate()
 			{
-				double rscMass = 0;
-				foreach (Part part in VOID_Core.Instance.vessel.Parts)
+				if (SimManager.Stages == null || SimManager.LastStage == null)
 				{
-					rscMass += part.GetResourceMass();
+					return double.NaN;
 				}
-				return rscMass;
+
+				return SimManager.LastStage.totalBaseMass;
 			},
 			"tons"
 		);
@@ -135,11 +136,9 @@
 			"DeltaV (Current Stage)",
 			delegate()
 			{
-				if (SimManager.Stages == null ||
-					SimManager.Stages.Length <= Staging.lastStage
-				)
-					return double.NaN;
-				return SimManager.Stages[Staging.lastStage].deltaV;
+				if (SimManager.Stages == null || SimManager.LastStage == null)
+					return double.NaN;
+				return SimManager.LastStage.deltaV;
 			},
 			"m/s"
 		);
@@ -148,7 +147,7 @@
 			"DeltaV (Total)",
 			delegate()
 			{
-				if (SimManager.Stages == null)
+				if (SimManager.Stages == null || SimManager.LastStage == null)
 					return double.NaN;
 				return SimManager.LastStage.totalDeltaV;
 			},
@@ -165,7 +164,7 @@
 			"Thrust (curr/max)",
 			delegate()
 			{
-				if (SimManager.Stages == null)
+				if (SimManager.Stages == null || SimManager.LastStage == null)
 					return "N/A";
 
 				double currThrust = SimManager.LastStage.actualThrust;
@@ -236,15 +235,17 @@
 				{
 					if (part.enabled)
 					{
+						ModuleEngines engineModule;
+						ModuleEnginesFX enginesFXModule;
 						List<Propellant> propellantList = null;
 
-						if (part.HasModule<ModuleEngines>())
-						{
-							propellantList = part.GetModule<ModuleEngines>().propellants;
-						}
-						else if (part.HasModule<ModuleEnginesFX>())
-						{
-							propellantList = part.GetModule<ModuleEnginesFX>().propellants;
+						if (part.tryGetFirstModuleOfType<ModuleEngines>(out engineModule))
+						{
+							propellantList = engineModule.propellants;
+						}
+						else if (part.tryGetFirstModuleOfType<ModuleEnginesFX>(out enginesFXModule))
+						{
+							propellantList = enginesFXModule.propellants;
 						}
 							
 						if (propellantList != null)
@@ -260,10 +261,10 @@
 						}
 					}
 
-					if (part.HasModule<ModuleResourceIntake>() && part.enabled)
+					ModuleResourceIntake intakeModule;
+
+					if (part.enabled && part.tryGetFirstModuleOfType<ModuleResourceIntake>(out intakeModule))
 					{
-						ModuleResourceIntake intakeModule = part.GetModule<ModuleResourceIntake>();
-
 						if (intakeModule.resourceName == "IntakeAir")
 						{
 							currentAmount += intakeModule.airFlow;

--- a/VOID_VesselRegister.cs
+++ b/VOID_VesselRegister.cs
@@ -115,7 +115,7 @@
 
 			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
 			GUILayout.Label(
-				Tools.UppercaseFirst(vesselSituation) + " " + selectedVesselType.ToString() + "s  @ " + seletedBody.bodyName,
+				VOID_Tools.UppercaseFirst(vesselSituation) + " " + selectedVesselType.ToString() + "s  @ " + seletedBody.bodyName,
 				VOID_Core.Instance.LabelStyles["center"],
 				GUILayout.ExpandWidth(true));
 			GUILayout.EndHorizontal();