VOID_HUD: Re-added primary because I'm a loser.
VOID_HUD: Re-added primary because I'm a loser.

--- a/IntCollection.cs
+++ b/IntCollection.cs
@@ -22,7 +22,7 @@
 
 namespace VOID
 {
-	public class IntCollection
+	public class IntCollection : IVOID_SaveValue
 	{
 		public static implicit operator long(IntCollection c)
 		{
@@ -34,6 +34,14 @@
 		public long collection { get; protected set; }
 		public ushort maxCount { get; protected set; }
 		public ushort wordLength { get; protected set; }
+
+		public Type type { get { return typeof(long); } }
+		public object AsType { get { return this.collection; } }
+
+		public void SetValue(object v)
+		{
+			this.collection = (long)v;
+		}
 
 		public IntCollection (ushort wordLength = 4, long initialCollection = 0)
 		{

--- a/VOID.csproj
+++ b/VOID.csproj
@@ -59,7 +59,6 @@
     <Compile Include="VOID_EditorCore.cs" />
     <Compile Include="VOID_EditorHUD.cs" />
     <Compile Include="IntCollection.cs" />
-    <Compile Include="VOID_DataValue.cs" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="Assembly-CSharp">

file:a/VOID_DataValue.cs (deleted)
--- a/VOID_DataValue.cs
+++ /dev/null
@@ -1,249 +1,1 @@
-//
-//  VOID_DataValue.cs
-//
-//  Author:
-//       toadicus <>
-//
-//  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/>.
-using System;
-using UnityEngine;
 
-namespace VOID
-{
-	public interface IVOID_DataValue
-	{
-		void Refresh();
-	}
-
-	public class VOID_DataValue<T> : IVOID_DataValue
-	{
-		/*
-		 * Static Members
-		 * */
-		public static implicit operator T(VOID_DataValue<T> v)
-		{
-			return (T)v.Value;
-		}
-
-		/*
-		 * Instance Members
-		 * */
-		/*
-		* Fields
-		 * */
-		protected T cache;
-		protected Func<T> ValueFunc;
-
-		/* 
-		 * Properties
-		 * */
-		public string Label { get; protected set; }
-		public string Units { get; protected set; }
-
-		public T Value {
-			get {
-				return (T)this.cache;
-			}
-		}
-
-		/*
-		 * Methods
-		 * */
-		public VOID_DataValue(string Label, Func<T> ValueFunc, string Units = "")
-		{
-			this.Label = Label;
-			this.Units = Units;
-			this.ValueFunc = ValueFunc;
-			this.cache = this.ValueFunc.Invoke ();
-		}
-
-		public void Refresh()
-		{
-			this.cache = this.ValueFunc.Invoke ();
-		}
-
-		public T GetFreshValue()
-		{
-			this.Refresh ();
-			return (T)this.cache;
-		}
-
-		public string ValueUnitString() {
-			return this.Value.ToString() + this.Units;
-		}
-
-		public virtual void DoGUIHorizontal()
-		{
-			GUILayout.BeginHorizontal (GUILayout.ExpandWidth (true));
-			GUILayout.Label (this.Label + ":");
-			GUILayout.FlexibleSpace ();
-			GUILayout.Label (this.ValueUnitString(), GUILayout.ExpandWidth (false));
-			GUILayout.EndHorizontal ();
-		}
-
-		public override string ToString()
-		{
-			return string.Format (
-				"{0}: {1}{2}",
-				this.Label,
-				this.Value.ToString (),
-				this.Units
-			);
-		}
-	}
-
-	internal interface IVOID_NumericValue
-	{
-		string ToString(string format);
-		string ToSIString(int digits, int MinMagnitude, int MaxMagnitude);
-	}
-
-	public abstract class VOID_NumValue<T> : VOID_DataValue<T>, IVOID_NumericValue
-	{
-		public VOID_NumValue(string Label, Func<T> ValueFunc, string Units = "") : base(Label, ValueFunc, Units) {}
-
-		public abstract string ToString(string Format);
-		public abstract string ToSIString(int digits = 3, int MinMagnitude = 0, int MaxMagnitude = int.MaxValue);
-
-		public abstract string ValueUnitString(string format);
-		public abstract string ValueUnitString(ushort digits);
-
-		public virtual void DoGUIHorizontal(string format)
-		{
-			GUILayout.BeginHorizontal (GUILayout.ExpandWidth (true));
-			GUILayout.Label (this.Label + ":");
-			GUILayout.FlexibleSpace ();
-			GUILayout.Label (this.ValueUnitString(format), GUILayout.ExpandWidth (false));
-			GUILayout.EndHorizontal ();
-		}
-
-		public virtual ushort DoGUIHorizontal(ushort digits)
-		{
-			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
-			GUILayout.Label(this.Label + ":", GUILayout.ExpandWidth(true));
-			GUILayout.FlexibleSpace();
-			GUILayout.Label(this.ValueUnitString(digits), GUILayout.ExpandWidth(false));
-			if (GUILayout.Button ("P")) {
-				digits = (ushort)((digits + 3) % 15);
-			}
-			GUILayout.EndHorizontal();
-
-			return digits;
-		}
-	}
-
-	public class VOID_DoubleValue : VOID_NumValue<double>, IVOID_NumericValue
-	{
-		public VOID_DoubleValue(string Label, Func<double> ValueFunc, string Units) : base(Label, ValueFunc, Units) {}
-
-		public override string ToString(string format)
-		{
-			return string.Format (
-				"{0}: {1}{2}",
-				this.Label,
-				this.Value.ToString (format),
-				this.Units
-			);
-		}
-
-		public override string ValueUnitString(string format) {
-			return this.Value.ToString(format) + this.Units;
-		}
-
-		public override string ValueUnitString(ushort digits) {
-			return Tools.MuMech_ToSI(this.Value, digits) + this.Units;
-		}
-
-		public override string ToSIString(int digits = 3, int MinMagnitude = 0, int MaxMagnitude = int.MaxValue)
-		{
-			return string.Format (
-				"{0}{1}",
-				Tools.MuMech_ToSI (this.Value, digits, MinMagnitude, MaxMagnitude),
-				this.Units
-			);
-		}
-	}
-	public class VOID_FloatValue : VOID_NumValue<float>, IVOID_NumericValue
-	{
-		public VOID_FloatValue(string Label, Func<float> ValueFunc, string Units) : base(Label, ValueFunc, Units) {}
-		
-		public override string ValueUnitString(string format) {
-			return this.Value.ToString(format) + this.Units;
-		}
-
-		public override string ValueUnitString(ushort digits) {
-			return Tools.MuMech_ToSI((double)this.Value, digits) + this.Units;
-		}
-
-		public override string ToString(string format)
-		{
-			return string.Format (
-				"{0}: {1}{2}",
-				this.Label,
-				this.Value.ToString (format),
-				this.Units
-			);
-		}
-
-		public override string ToSIString(int digits = 3, int MinMagnitude = 0, int MaxMagnitude = int.MaxValue)
-		{
-			return string.Format (
-				"{0}{1}",
-				Tools.MuMech_ToSI ((double)this.Value, digits, MinMagnitude, MaxMagnitude),
-				this.Units
-			);
-		}
-	}
-	public class VOID_IntValue : VOID_NumValue<int>, IVOID_NumericValue
-	{
-		public VOID_IntValue(string Label, Func<int> ValueFunc, string Units) : base(Label, ValueFunc, Units) {}
-		
-		public override string ValueUnitString(string format) {
-			return this.Value.ToString(format) + this.Units;
-		}
-
-		public override string ValueUnitString(ushort digits) {
-			return Tools.MuMech_ToSI((double)this.Value, digits) + this.Units;
-		}
-
-		public override string ToString(string format)
-		{
-			return string.Format (
-				"{0}: {1}{2}",
-				this.Label,
-				this.Value.ToString (format),
-				this.Units
-			);
-		}
-
-		public override string ToSIString(int digits = 3, int MinMagnitude = 0, int MaxMagnitude = int.MaxValue)
-		{
-			return string.Format (
-				"{0}{1}",
-				Tools.MuMech_ToSI ((double)this.Value, digits, MinMagnitude, MaxMagnitude),
-				this.Units
-			);
-		}
-	}
-
-
-	public class VOID_StrValue : VOID_DataValue<string>
-	{
-		public VOID_StrValue(string Label, Func<string> ValueFunc) : base(Label, ValueFunc, "") {}
-	}
-}
-
-

--- a/VOID_HUD.cs
+++ b/VOID_HUD.cs
@@ -101,7 +101,8 @@
 					" ETA " + Tools.ConvertInterval (vessel.orbit.timeToAp) +
 					"\nPe: " + Tools.MuMech_ToSI (vessel.orbit.PeA) + "m" +
 					" ETA " + Tools.ConvertInterval (vessel.orbit.timeToPe) +
-					"\nInc: " + vessel.orbit.inclination.ToString ("F3") + "°",
+					"\nInc: " + vessel.orbit.inclination.ToString ("F3") + "°" +
+					"\nPrimary: " + vessel.mainBody.bodyName,
 					labelStyle);
 				// Toadicus edit: Added "Biome: " line to surf/atmo HUD
 				GUI.Label (

--- a/VOID_Module.cs
+++ b/VOID_Module.cs
@@ -133,15 +133,22 @@
 				object fieldValue = field.GetValue(this);
 
 				bool convertBack = false;
+				bool isIntCollection = false;
 				if (fieldValue is IVOID_SaveValue)
 				{
+					if (fieldValue is IntCollection) {
+						isIntCollection = true;
+					}
 					fieldValue = (fieldValue as IVOID_SaveValue).AsType;
 					convertBack = true;
 				}
 
 				fieldValue = config.GetValue(fieldName, fieldValue);
 
-				if (convertBack)
+				if (isIntCollection) {
+					fieldValue = new IntCollection (4, (long)fieldValue);
+				}
+				else if (convertBack)
 				{
 					Type type = typeof(VOID_SaveValue<>).MakeGenericType (fieldValue.GetType ());
 					IVOID_SaveValue convertValue = Activator.CreateInstance (type) as IVOID_SaveValue;
@@ -195,64 +202,7 @@
 		protected float defWidth = 250f;
 		protected float defHeight = 50f;
 
-		public virtual void ModuleWindow(int _)
-		{
-			if (VOID_Core.Instance.updateTimer - this.lastUpdate > VOID_Core.Instance.updatePeriod) {
-				Tools.PostDebugMessage(string.Format(
-					"{0}: refreshing VOID_DataValues.",
-					this.GetType().Name
-				));
-
-				foreach (var fieldinfo in this.GetType().GetFields(
-					BindingFlags.Instance |
-					BindingFlags.NonPublic |
-					BindingFlags.Public |
-					BindingFlags.FlattenHierarchy
-				)) {
-					Tools.PostDebugMessage(string.Format(
-						"{0}: checking field {1}.",
-						this.GetType().Name,
-						fieldinfo.Name
-					));
-
-					object field = null;
-
-					try
-					{
-						field = fieldinfo.GetValue (this);
-					}
-					catch (NullReferenceException) {
-						Tools.PostDebugMessage(string.Format(
-							"{0}: caught NullReferenceException, could not get value for field {1}.",
-							this.GetType().Name,
-							fieldinfo.Name
-						));
-					}
-
-					if (field == null) {
-						continue;
-					}
-
-					if (typeof(IVOID_DataValue).IsAssignableFrom (field.GetType ())) {
-						Tools.PostDebugMessage(string.Format(
-							"{0}: found field {1}.",
-							this.GetType().Name,
-							fieldinfo.Name
-						));
-
-						(field as IVOID_DataValue).Refresh ();
-
-						Tools.PostDebugMessage(string.Format(
-							"{0}: refreshed field {1}.",
-							this.GetType().Name,
-							fieldinfo.Name
-						));
-					}
-				}
-
-				this.lastUpdate = VOID_Core.Instance.updateTimer;
-			}
-		}
+		public abstract void ModuleWindow(int _);
 
 		public override void DrawGUI()
 		{

--- a/VOID_Orbital.cs
+++ b/VOID_Orbital.cs
@@ -30,117 +30,25 @@
 		protected VOID_SaveValue<bool> toggleExtended = false;
 
 		[AVOID_SaveValue("precisionValues")]
-		protected long _precisionValues = 230584300921369395;
-		protected IntCollection precisionValues;
-
-		protected VOID_StrValue primaryName = new VOID_StrValue (
-			                                    VOIDLabels.void_primary,
-												new Func<string> (() => VOID_Core.Instance.vessel.mainBody.name)
-		                                    );
-		protected VOID_DoubleValue orbitAltitude = new VOID_DoubleValue (
-			                                         "Altitude (ASL)",
-			                                         new Func<double> (() => VOID_Core.Instance.vessel.orbit.altitude),
-			                                         "m"
-		                                         );
-		protected VOID_DoubleValue orbitVelocity = new VOID_DoubleValue (
-			                                         VOIDLabels.void_velocity,
-			                                         new Func<double> 
-														(() => VOID_Core.Instance.vessel.orbit.vel.magnitude),
-			                                         "m/s"
-		                                         );
-		protected VOID_DoubleValue orbitApoAlt = new VOID_DoubleValue(
-		                                        VOIDLabels.void_apoapsis,
-		                                        new Func<double>(() => VOID_Core.Instance.vessel.orbit.ApA),
-		                                        "m"
-	                                        );
-		protected VOID_DoubleValue oribtPeriAlt = new VOID_DoubleValue(
-		                                         VOIDLabels.void_periapsis,
-		                                         new Func<double>(() => VOID_Core.Instance.vessel.orbit.PeA),
-		                                         "m"
-	                                         );
-		protected VOID_StrValue timeToApo = new VOID_StrValue(
-		                                   "Time to Apoapsis",
-		                                   new Func<string>(
-												() => Tools.ConvertInterval(VOID_Core.Instance.vessel.orbit.timeToAp)
-										   )
-	                                   );
-
-		protected VOID_StrValue timeToPeri = new VOID_StrValue(
-			                                  "Time to Apoapsis",
-			                                  new Func<string>(
-				                                  () => Tools.ConvertInterval(VOID_Core.Instance.vessel.orbit.timeToPe)
-			                                  )
-		                                  );
-
-
-		protected VOID_DoubleValue orbitInclination = new VOID_DoubleValue(
-			                                        "Inclination",
-			                                        new Func<double>(() => VOID_Core.Instance.vessel.orbit.inclination),
-			                                        "°"
-		                                        );
-		protected VOID_DoubleValue gravityAccel = new VOID_DoubleValue(
-			                                        "Gravity",
-			                                        delegate()
-													{
-			double orbitRadius = VOID_Core.Instance.vessel.mainBody.Radius +
-				VOID_Core.Instance.vessel.mainBody.GetAltitude(VOID_Core.Instance.vessel.findWorldCenterOfMass());
-														return (VOID_Core.Constant_G * VOID_Core.Instance.vessel.mainBody.Mass) /
-														Math.Pow(orbitRadius, 2);
-													},
-			                                        "m/s²"
-		                                        );
-		protected VOID_StrValue orbitPeriod = new VOID_StrValue(
-		                                        "Period",
-												 new Func<string>(() => Tools.ConvertInterval(VOID_Core.Instance.vessel.orbit.period))
-	                                        );
-
-		protected VOID_DoubleValue semiMajorAxis = new VOID_DoubleValue(
-			                                         "Semi-Major Axis",
-			                                         new Func<double>(() => VOID_Core.Instance.vessel.orbit.semiMajorAxis),
-			                                         "m"
-		                                         );
-		protected VOID_DoubleValue eccentricity = new VOID_DoubleValue(
-			                                        "Eccentricity",
-			                                        new Func<double>(() => VOID_Core.Instance.vessel.orbit.eccentricity),
-			                                        ""
-		                                        );
-
-		protected VOID_DoubleValue meanAnomaly = new VOID_DoubleValue(
-												 "Mean Anomaly",
-												 new Func<double>(() => VOID_Core.Instance.vessel.orbit.meanAnomaly * 180d / Math.PI),
-												 "°"
-												);
-
-		protected VOID_DoubleValue trueAnomaly = new VOID_DoubleValue(
-		                                        "True Anomaly",
-		                                        new Func<double>(() => VOID_Core.Instance.vessel.orbit.trueAnomaly),
-		                                        "°"
-	                                        );
-
-		protected VOID_DoubleValue eccAnomaly = new VOID_DoubleValue(
-		                                       "Eccentric Anomaly",
-		                                       new Func<double>(() => VOID_Core.Instance.vessel.orbit.eccentricAnomaly * 180d / Math.PI),
-		                                       "°"
-	                                       );
-
-		protected VOID_DoubleValue longitudeAscNode = new VOID_DoubleValue(
-			"Long. Ascending Node",
-			new Func<double>(() => VOID_Core.Instance.vessel.orbit.LAN),
-			"°"
-			);
-
-		protected VOID_DoubleValue argumentPeriapsis = new VOID_DoubleValue(
-			"Argument of Periapsis",
-			new Func<double>(() => VOID_Core.Instance.vessel.orbit.argumentOfPeriapsis),
-			"°"
-			);
-
-		protected VOID_DoubleValue localSiderealLongitude = new VOID_DoubleValue(
-			  "Local Sidereal Longitude",
-			  new Func<double>(() => Tools.FixDegreeDomain(
-			      VOID_Core.Instance.vessel.longitude + VOID_Core.Instance.vessel.orbit.referenceBody.rotationAngle)),
-			  "°"
-			);
+		protected IntCollection precisionValues = new IntCollection(4, 230584300921369395);
+
+		protected double orbitAltitude;
+		protected double orbitVelocity;
+		protected double orbitApoAlt;
+		protected double oribtPeriAlt;
+		protected string timeToApo;
+		protected string timeToPeri;
+		protected double orbitInclination;
+		protected double gravityAccel;
+		protected string orbitPeriod;
+		protected double semiMajorAxis;
+		protected double eccentricity;
+		protected double meanAnomaly;
+		protected double trueAnomaly;
+		protected double eccAnomaly;
+		protected double longitudeAscNode;
+		protected double argumentPeriapsis;
+		protected double localSiderealLongitude;
 
 		public VOID_Orbital()
 		{
@@ -152,76 +60,197 @@
 
 		public override void ModuleWindow(int _)
 		{
-			base.ModuleWindow (_);
+			if (VOID_Core.Instance.updateTimer >= this.lastUpdate + VOID_Core.Instance.updatePeriod)
+			{
+				this.lastUpdate = VOID_Core.Instance.updateTimer;
+
+				this.orbitAltitude = vessel.orbit.altitude;
+				this.orbitVelocity = vessel.orbit.vel.magnitude;
+				this.orbitApoAlt = vessel.orbit.ApA;
+				this.oribtPeriAlt = vessel.orbit.PeA;
+				this.timeToApo = Tools.ConvertInterval(vessel.orbit.timeToAp);
+				this.timeToPeri = Tools.ConvertInterval(vessel.orbit.timeToPe);
+				this.orbitInclination = vessel.orbit.inclination;
+
+				double orbitRadius = vessel.mainBody.Radius + vessel.mainBody.GetAltitude(vessel.findWorldCenterOfMass());
+				this.gravityAccel = (VOID_Core.Constant_G * vessel.mainBody.Mass) / Math.Pow(orbitRadius, 2);
+
+				this.orbitPeriod = Tools.ConvertInterval(vessel.orbit.period);
+				this.semiMajorAxis = vessel.orbit.semiMajorAxis;
+				this.eccentricity = vessel.orbit.eccentricity;
+				this.meanAnomaly = vessel.orbit.meanAnomaly * 180d / Math.PI;
+				this.trueAnomaly = vessel.orbit.trueAnomaly;
+				this.eccAnomaly = vessel.orbit.eccentricAnomaly * 180d / Math.PI;
+				this.longitudeAscNode = vessel.orbit.LAN;
+				this.argumentPeriapsis = vessel.orbit.argumentOfPeriapsis;
+				this.localSiderealLongitude =
+					Tools.FixDegreeDomain(vessel.longitude + vessel.orbit.referenceBody.rotationAngle);
+			}
 
 			int idx = 0;
 
             GUILayout.BeginVertical();
 
-			this.primaryName.DoGUIHorizontal ();
-
-			this.precisionValues [idx] = this.orbitAltitude.DoGUIHorizontal (this.precisionValues [idx]);
-			idx++;
-
-			this.precisionValues [idx] = this.orbitVelocity.DoGUIHorizontal (this.precisionValues [idx]);
-			idx++;
-
-			this.precisionValues [idx] = this.orbitApoAlt.DoGUIHorizontal (this.precisionValues [idx]);
-			idx++;
-
-			this.timeToApo.DoGUIHorizontal();
-
-			this.precisionValues [idx] = this.oribtPeriAlt.DoGUIHorizontal (this.precisionValues [idx]);
-			idx++;
-
-			this.timeToPeri.DoGUIHorizontal();
-
-			this.orbitInclination.DoGUIHorizontal("F3");
-
-			this.precisionValues [idx] = this.gravityAccel.DoGUIHorizontal (this.precisionValues [idx]);
+            GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+            GUILayout.Label(VOIDLabels.void_primary + ":");
+			GUILayout.FlexibleSpace();
+            GUILayout.Label(vessel.mainBody.bodyName, GUILayout.ExpandWidth(false));
+            GUILayout.EndHorizontal();
+
+            GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+			GUILayout.Label(VOIDLabels.void_altitude_asl + ":", GUILayout.ExpandWidth(true));
+			GUILayout.FlexibleSpace();
+			GUILayout.Label(
+				Tools.MuMech_ToSI(this.orbitAltitude, this.precisionValues[idx]) + "m",
+				GUILayout.ExpandWidth(false)
+				);
+			if (GUILayout.Button ("P")) {
+				this.precisionValues [idx] = (ushort)((this.precisionValues[idx] + 3) % 15);
+			}
+            GUILayout.EndHorizontal();
+			idx++;
+
+            GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+			GUILayout.Label(VOIDLabels.void_velocity + ":");
+			GUILayout.FlexibleSpace();
+			GUILayout.Label(Tools.MuMech_ToSI(this.orbitVelocity, this.precisionValues [idx]) + "m/s", GUILayout.ExpandWidth(false));
+			
+			if (GUILayout.Button ("P")) {
+				this.precisionValues [idx] = (ushort)((this.precisionValues[idx] + 3) % 15);
+			}
+            GUILayout.EndHorizontal();
+			idx++;
+
+            GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+			GUILayout.Label(VOIDLabels.void_apoapsis + ":");
+			GUILayout.FlexibleSpace();
+			GUILayout.Label(Tools.MuMech_ToSI(this.orbitApoAlt, this.precisionValues [idx]) + "m", GUILayout.ExpandWidth(false));
+			
+			if (GUILayout.Button ("P")) {
+				this.precisionValues [idx] = (ushort)((this.precisionValues[idx] + 3) % 15);
+			}
+            GUILayout.EndHorizontal();
+			idx++;
+
+            GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+			GUILayout.Label("Time to Ap:");
+			GUILayout.FlexibleSpace();
+			GUILayout.Label(this.timeToApo, GUILayout.ExpandWidth(false));
+            GUILayout.EndHorizontal();
+
+            GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+			GUILayout.Label(VOIDLabels.void_periapsis + ":");
+			GUILayout.FlexibleSpace();
+			GUILayout.Label(
+				Tools.MuMech_ToSI(this.oribtPeriAlt, this.precisionValues [idx]) + "m",
+				GUILayout.ExpandWidth(false)
+				);
+			
+			if (GUILayout.Button ("P")) {
+				this.precisionValues [idx] = (ushort)((this.precisionValues[idx] + 3) % 15);
+			}
+            GUILayout.EndHorizontal();
+			idx++;
+
+            GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+			GUILayout.Label("Time to Pe:");
+			GUILayout.FlexibleSpace();
+            GUILayout.Label(this.timeToPeri, GUILayout.ExpandWidth(false));
+            GUILayout.EndHorizontal();
+
+            GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+			GUILayout.Label("Inclination:");
+			GUILayout.FlexibleSpace();
+            GUILayout.Label(this.orbitInclination.ToString("F3") + "°", GUILayout.ExpandWidth(false));
+            GUILayout.EndHorizontal();
+
+            GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+			GUILayout.Label("Gravity:");
+			GUILayout.FlexibleSpace();
+			GUILayout.Label(
+				Tools.MuMech_ToSI(gravityAccel, this.precisionValues[idx]) + "m/s²",
+				GUILayout.ExpandWidth(false)
+				);
+			
+			if (GUILayout.Button ("P")) {
+				this.precisionValues [idx] = (ushort)((this.precisionValues[idx] + 3) % 15);
+			}
+            GUILayout.EndHorizontal();
 			idx++;
 
 			this.toggleExtended = GUILayout.Toggle(this.toggleExtended, "Extended info");
 
 			if (this.toggleExtended)
             {
-				this.orbitPeriod.DoGUIHorizontal();
-
-				this.precisionValues [idx] = this.semiMajorAxis.DoGUIHorizontal (this.precisionValues [idx]);
+                GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+				GUILayout.Label("Period:");
+				GUILayout.FlexibleSpace();
+                GUILayout.Label(this.orbitPeriod, GUILayout.ExpandWidth(false));
+                GUILayout.EndHorizontal();
+
+                GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+				GUILayout.Label("Semi-major axis:");
+				GUILayout.FlexibleSpace();
+				GUILayout.Label(
+					Tools.MuMech_ToSI(this.semiMajorAxis, this.precisionValues [idx]) + "m",
+					GUILayout.ExpandWidth(false)
+					);
+				
+				if (GUILayout.Button ("P")) {
+					this.precisionValues [idx] = (ushort)((this.precisionValues[idx] + 3) % 15);
+				}
+                GUILayout.EndHorizontal();
 				idx++;
 
-				this.eccentricity.DoGUIHorizontal("F4");
-
-				this.meanAnomaly.DoGUIHorizontal("F3");
-
-				this.trueAnomaly.DoGUIHorizontal("F3");
-
-				this.eccAnomaly.DoGUIHorizontal("F3");
-
-				this.longitudeAscNode.DoGUIHorizontal("F3");
-
-				this.argumentPeriapsis.DoGUIHorizontal("F3");
-
-				this.localSiderealLongitude.DoGUIHorizontal("F3");
+                GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+				GUILayout.Label("Eccentricity:");
+				GUILayout.FlexibleSpace();
+				GUILayout.Label(this.eccentricity.ToString("F4"), GUILayout.ExpandWidth(false));
+                GUILayout.EndHorizontal();
+
+				// Toadicus edit: convert mean anomaly into degrees.
+                GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+				GUILayout.Label("Mean anomaly:");
+				GUILayout.FlexibleSpace();
+                GUILayout.Label(this.meanAnomaly.ToString("F3") + "°", GUILayout.ExpandWidth(false));
+                GUILayout.EndHorizontal();
+
+                GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+				GUILayout.Label("True anomaly:");
+				GUILayout.FlexibleSpace();
+				GUILayout.Label(this.trueAnomaly.ToString("F3") + "°", GUILayout.ExpandWidth(false));
+                GUILayout.EndHorizontal();
+
+				// Toadicus edit: convert eccentric anomaly into degrees.
+                GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+				GUILayout.Label("Eccentric anomaly:");
+				GUILayout.FlexibleSpace();
+                GUILayout.Label(this.eccAnomaly.ToString("F3") + "°", GUILayout.ExpandWidth(false));
+                GUILayout.EndHorizontal();
+
+                GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+				GUILayout.Label("Long. ascending node:");
+				GUILayout.FlexibleSpace();
+                GUILayout.Label(this.longitudeAscNode.ToString("F3") + "°", GUILayout.ExpandWidth(false));
+                GUILayout.EndHorizontal();
+
+                GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+				GUILayout.Label("Arg. of periapsis:");
+				GUILayout.FlexibleSpace();
+                GUILayout.Label(this.argumentPeriapsis.ToString("F3") + "°", GUILayout.ExpandWidth(false));
+                GUILayout.EndHorizontal();
+
+				// Toadicus edit: added local sidereal longitude.
+				GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+				GUILayout.Label("Local Sidereal Longitude:");
+				GUILayout.FlexibleSpace();
+				GUILayout.Label(this.localSiderealLongitude.ToString("F3") + "°", VOID_Core.Instance.LabelStyles["right"]);
+				GUILayout.EndHorizontal();
             }
 
             GUILayout.EndVertical();
             GUI.DragWindow();
 		}
-
-		public override void LoadConfig ()
-		{
-			base.LoadConfig ();
-
-			this.precisionValues = new IntCollection (4, this._precisionValues);
-		}
-
-		public override void _SaveToConfig (KSP.IO.PluginConfiguration config)
-		{
-			this._precisionValues = this.precisionValues.collection;
-
-			base._SaveToConfig (config);
-		}
 	}
 }
 

--- a/VOID_VesselInfo.cs
+++ b/VOID_VesselInfo.cs
@@ -48,10 +48,7 @@
 
 			GUILayout.BeginVertical();
 
-			GUILayout.Label(
-				vessel.vesselName,
-				VOID_Core.Instance.LabelStyles["center_bold"],
-				GUILayout.ExpandWidth(true));
+			GUILayout.Label(vessel.vesselName, VOID_Core.Instance.LabelStyles["center_bold"], GUILayout.ExpandWidth(true));
 
 			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
 			GUILayout.Label("G-force:");
@@ -71,10 +68,7 @@
 
 			    foreach (PartModule pm in p.Modules)
 			    {
-			        if ((pm.moduleName == "ModuleEngines") &&
-						((p.State == PartStates.ACTIVE) ||
-							((Staging.CurrentStage > Staging.lastStage) && (p.inverseStage == Staging.lastStage)))
-					)
+			        if ((pm.moduleName == "ModuleEngines") && ((p.State == PartStates.ACTIVE) || ((Staging.CurrentStage > Staging.lastStage) && (p.inverseStage == Staging.lastStage))))
 			        {
 			            max_thrust += ((ModuleEngines)pm).maxThrust;
 			            final_thrust += ((ModuleEngines)pm).finalThrust;
@@ -101,9 +95,7 @@
 			{
 				GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
 				GUILayout.Label("DeltaV (Current Stage):");
-				GUILayout.Label(
-					Tools.MuMech_ToSI(stages[Staging.lastStage].deltaV).ToString() + "m/s",
-					GUILayout.ExpandWidth(false));
+				GUILayout.Label(Tools.MuMech_ToSI(stages[Staging.lastStage].deltaV).ToString() + "m/s", GUILayout.ExpandWidth(false));
 				GUILayout.EndHorizontal();
 			}
 
@@ -129,19 +121,13 @@
 
 			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
 			GUILayout.Label("Thrust (curr/max):");
-			GUILayout.Label(
-				final_thrust.ToString("F1") +
-				" / " + max_thrust.ToString("F1") + " kN",
-				GUILayout.ExpandWidth(false));
+			GUILayout.Label(final_thrust.ToString("F1") + " / " + max_thrust.ToString("F1") + " kN", GUILayout.ExpandWidth(false));
 			GUILayout.EndHorizontal();
 
 			double gravity = vessel.mainBody.gravParameter / Math.Pow(vessel.mainBody.Radius + vessel.altitude, 2);
 			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
 			GUILayout.Label("T:W (curr/max):");
-			GUILayout.Label(
-				(final_thrust / (total_mass * gravity)).ToString("F2") +
-				" / " + (max_thrust / (total_mass * gravity)).ToString("F2"),
-				GUILayout.ExpandWidth(false));
+			GUILayout.Label((final_thrust / (total_mass * gravity)).ToString("F2") + " / " + (max_thrust / (total_mass * gravity)).ToString("F2"), GUILayout.ExpandWidth(false));
 			GUILayout.EndHorizontal();
 
 			double g_ASL = (VOID_Core.Constant_G * vessel.mainBody.Mass) / Math.Pow(vessel.mainBody.Radius, 2);