diff --git a/NewHorizons/Builder/Atmosphere/AtmosphereBuilder.cs b/NewHorizons/Builder/Atmosphere/AtmosphereBuilder.cs
index 2bf896ac..04baaeca 100644
--- a/NewHorizons/Builder/Atmosphere/AtmosphereBuilder.cs
+++ b/NewHorizons/Builder/Atmosphere/AtmosphereBuilder.cs
@@ -12,7 +12,7 @@ namespace NewHorizons.Atmosphere
             atmoGO.SetActive(false);
             atmoGO.transform.parent = body.transform;
 
-            if (atmosphereModule.hasAtmosphere)
+            if (atmosphereModule.HasAtmosphere)
             {
                 var mat = GameObject.Find("TimberHearth_Body/Atmosphere_TH/AtmoSphere/Atmosphere_LOD0").GetComponent<MeshRenderer>().material;
 
diff --git a/NewHorizons/Builder/Body/CometTailBuilder.cs b/NewHorizons/Builder/Body/CometTailBuilder.cs
index fd349451..85ab4eb1 100644
--- a/NewHorizons/Builder/Body/CometTailBuilder.cs
+++ b/NewHorizons/Builder/Body/CometTailBuilder.cs
@@ -16,7 +16,7 @@ namespace NewHorizons.Builder.Body
             var cometTail = GameObject.Instantiate(GameObject.Find("Comet_Body/Sector_CO/Effects_CO/Effects_CO_TailMeshes"), go.transform);
             cometTail.transform.localPosition = Vector3.zero;
             cometTail.name = "CometTail";
-            cometTail.transform.localScale = Vector3.one * 110 / module.SurfaceSize;
+            cometTail.transform.localScale = Vector3.one * module.SurfaceSize / 110;
             cometTail.transform.localRotation = Quaternion.Euler(0, 180, 90);
             /*
             var alignment = cometTail.AddComponent<AlignWithTargetBody>();
diff --git a/NewHorizons/Builder/General/MarkerBuilder.cs b/NewHorizons/Builder/General/MarkerBuilder.cs
index 2ef4af4d..cb51de61 100644
--- a/NewHorizons/Builder/General/MarkerBuilder.cs
+++ b/NewHorizons/Builder/General/MarkerBuilder.cs
@@ -8,22 +8,27 @@ namespace NewHorizons.Builder.General
 {
     static class MarkerBuilder
     {
-        public static void Make(GameObject body, string name, bool isMoon, bool isStar)
+        public static void Make(GameObject body, string name, IPlanetConfig config)
         {
-            MapMarker MM = body.AddComponent<MapMarker>();
-            MM.SetValue("_labelID", (UITextType)Utility.AddToUITable.Add(name.ToUpper()));
+            MapMarker mapMarker = body.AddComponent<MapMarker>();
+            mapMarker.SetValue("_labelID", (UITextType)Utility.AddToUITable.Add(name.ToUpper()));
 
-            if (isMoon)
+            var markerType = "Planet";
+
+            if (config.Orbit.IsMoon)
             {
-                MM.SetValue("_markerType", MM.GetType().GetNestedType("MarkerType", BindingFlags.NonPublic).GetField("Moon").GetValue(MM));
+                markerType = "Moon";
             }
-            else if(isStar)
+            else if (config.Star != null)
             {
-                MM.SetValue("_markerType", MM.GetType().GetNestedType("MarkerType", BindingFlags.NonPublic).GetField("Sun").GetValue(MM));
+                markerType = "Sun";
             }
+            else if (config.FocalPoint != null)
             {
-                MM.SetValue("_markerType", MM.GetType().GetNestedType("MarkerType", BindingFlags.NonPublic).GetField("Planet").GetValue(MM));
+                markerType = "HourglassTwins";
             }
+
+            mapMarker.SetValue("_markerType", mapMarker.GetType().GetNestedType("MarkerType", BindingFlags.NonPublic).GetField(markerType).GetValue(mapMarker));
         }
     }
 }
diff --git a/NewHorizons/External/AtmosphereModule.cs b/NewHorizons/External/AtmosphereModule.cs
index b2fecfcf..5265248d 100644
--- a/NewHorizons/External/AtmosphereModule.cs
+++ b/NewHorizons/External/AtmosphereModule.cs
@@ -20,6 +20,6 @@ namespace NewHorizons.External
         public bool HasRain { get; set; }
         public bool HasSnow { get; set; }
         public bool HasOxygen { get; set; }
-        public bool hasAtmosphere { get; set; }
+        public bool HasAtmosphere { get; set; }
     }
 }
diff --git a/NewHorizons/Main.cs b/NewHorizons/Main.cs
index f94d49b8..7ea6ee75 100644
--- a/NewHorizons/Main.cs
+++ b/NewHorizons/Main.cs
@@ -240,7 +240,7 @@ namespace NewHorizons
                 RFVolumeBuilder.Make(go, owRigidBody, sphereOfInfluence);
 
             if (body.Config.Base.HasMapMarker)
-                MarkerBuilder.Make(go, body.Config.Name, body.Config.Orbit.IsMoon, body.Config.Star != null);
+                MarkerBuilder.Make(go, body.Config.Name, body.Config);
 
             if (body.Config.Base.HasAmbientLight)
                 AmbientLightBuilder.Make(go, sphereOfInfluence);