diff --git a/config/packages/climate.yaml b/config/packages/climate.yaml
index c0113f07..45752a46 100644
--- a/config/packages/climate.yaml
+++ b/config/packages/climate.yaml
@@ -153,7 +153,7 @@ automation:
     trigger:
       - platform: numeric_state
         entity_id: climate.downstairs
-        attribute: temperature
+        attribute: target_temp_high
         above: 76
       - platform: state
         entity_id: group.bed
@@ -169,11 +169,14 @@ automation:
             state: 'on'
       - condition: numeric_state
         entity_id: climate.downstairs
-        attribute: temperature
+        attribute: target_temp_high
         above: 76
+      - condition: state
+        entity_id: sun.sun
+        state: 'below_horizon'
     action:
       - service: climate.set_temperature
         data:
           entity_id: climate.downstairs
-          temperature: 76
+          target_temp_high: 76
 
diff --git a/config/packages/garadget.yaml b/config/packages/garadget.yaml
index 1164fc05..5f5c93fa 100755
--- a/config/packages/garadget.yaml
+++ b/config/packages/garadget.yaml
@@ -93,7 +93,7 @@ automation:
           - person.carlo
           - person.stacey
           - person.justin
-        from: 'not_home'
+        from: 'driving'
         to: 'home'
     condition:
       - condition: state
@@ -102,6 +102,9 @@ automation:
       - condition: state
         entity_id: group.bed
         state: 'off'
+      - condition: state
+        entity_id: group.family
+        state: 'home'
     action:
       - service: cover.open_cover
         target:
@@ -131,7 +134,7 @@ automation:
         entity_id:
           - person.carlo
           - person.stacey
-        from: 'not_home'
+#       from: 'driving'
         to: 'home'
     condition:
         - condition: state
diff --git a/config/recorder.yaml b/config/recorder.yaml
index 60b40ddd..3c08173a 100755
--- a/config/recorder.yaml
+++ b/config/recorder.yaml
@@ -45,6 +45,7 @@ exclude:
     - sensor.*_last_boot
     - sensor.*_since
     - sensor.*uptime*
+    - sensor.sun_next_*
     - sensor.vpn_client_*
     - switch.*_do_not_disturb_*
     - switch.*_repeat_switch
@@ -84,8 +85,6 @@ exclude:
     - sensor.rachio_watering_time
     - sensor.stacey_iphone11_activity
     - sensor.stacey_iphone11_audio_output
-    - sensor.sun_next_dawn
-    - sensor.sun_next_noon
     - sensor.time
     - switch.bear_stone
     - switch.alarm_panel_1_screensaver