diff --git a/data/scene/default.scene b/data/scene/default.scene
index 1f1176a27b..f083723be7 100644
--- a/data/scene/default.scene
+++ b/data/scene/default.scene
@@ -6,8 +6,7 @@ function preInitialization()
     critical objects.
     ]]--
 
-    --openspace.time.setTime(openspace.time.currentWallTime())
-    openspace.time.setTime('2015-03-15T11:00:00.00')
+    openspace.time.setTime(openspace.time.currentWallTime())
     dofile(openspace.absPath('${SCRIPTS}/bind_keys.lua'))
 end
 
@@ -63,7 +62,7 @@ return {
         "uranus",
         "neptune",
         "stars",
-        --"stars-denver",
+        -- "stars-denver",
         "milkyway",
         --"milkyway-eso",
         "constellationbounds",
diff --git a/data/scene/juno.scene b/data/scene/juno.scene
index 54e58865da..172d0caeca 100755
--- a/data/scene/juno.scene
+++ b/data/scene/juno.scene
@@ -5,16 +5,7 @@ function preInitialization()
     which the scene should start and other settings that might determine initialization
     critical objects.
     ]]--
-
-    -- openspace.time.setTime("2007-02-28T11:40:00.000")
-
-    -- openspace.time.setTime("2015-07-08T15:57:45.00")
-    -- openspace.time.setTime("2015-07-12T07:41:00.00")
-    -- openspace.time.setTime("2015-07-12T15:43:00.00")
-    -- openspace.time.setTime("2015-07-12T22:19:20.00")
-    -- openspace.time.setTime("2015-07-13T20:59:00.00")
-    -- openspace.time.setTime("2015-07-14T02:41:55.00")
-    openspace.time.setTime("2016-07-12T10:05:00.00")
+    openspace.time.setTime("2016-07-05T10:05:00.00")
     openspace.time.setDeltaTime(0)
 
     dofile(openspace.absPath('${SCRIPTS}/common.lua'))
@@ -24,6 +15,8 @@ function preInitialization()
       1, 5, 10, 20, 40, 90, 360, 720, 2880, 14400,
         28800, 57600, 115200, 230400, 460800, 921600, 1843200, 3686400, 7372800, 14745600
     })
+
+    openspace.bindKey("F6", "openspace.setPropertyValue('Interaction.coordinateSystem', 'Jupiter');");
 end
 
 function postInitialization()
diff --git a/data/scene/juno/juno/juno.mod b/data/scene/juno/juno/juno.mod
index 50f5475b16..01006cfa80 100644
--- a/data/scene/juno/juno/juno.mod
+++ b/data/scene/juno/juno/juno.mod
@@ -26,12 +26,8 @@ return {
                     0.0, -1.0, 0.0
                 }
             },
-            Shading = {
-                PerformShading = true,
-                Fadeable = false,
-                Ghosting = false,
-            },
         },
+
         Ephemeris = {
             Type = "Spice",
             Body = "JUNO",
@@ -136,8 +132,7 @@ return {
             Body = "JUNO",
             Frame = "GALACTIC",
             Observer = "JUPITER BARYCENTER",
-            -- Observer = "PLUTO BARYCENTER",
-            RGB = {0.70,0.50,0.20},
+            RGB = { 0.70,0.50,0.20 },
             TropicalOrbitPeriod = 394250.0,
             EarthOrbitRatio = 4.5,
             DayLength = 9.9259,
@@ -145,9 +140,7 @@ return {
             Textures = {
                 Type = "simple",
                 Color = "textures/glare_blue.png",
-                -- need to add different texture
             },  
         },
-        GuiName = "/Solar/JunoTrail"
     },
     }