diff --git a/src/clj/auto_ap/ssr/components/inputs.clj b/src/clj/auto_ap/ssr/components/inputs.clj
index a7a6559b..53469306 100644
--- a/src/clj/auto_ap/ssr/components/inputs.clj
+++ b/src/clj/auto_ap/ssr/components/inputs.clj
@@ -374,7 +374,7 @@
            (assoc "@htmx:before-history-save" "destroyDatepicker(dp)" )
            (assoc "@htmx:before-cleanup-element" "destroyDatepicker(dp)" )
            (assoc "x-destroy" "destroyDatepicker(dp)")
-           (assoc "@change-date.camel" "console.log('date changing'); value = dp.getDate(\"mm/dd/yyyy\");")
+           (assoc "@change-date.camel" "value = dp.getDate(\"mm/dd/yyyy\");")
 
            (update :class #(str % (use-size size) " w-full"))
            (dissoc :size :name :x-model :x-modelable))]]))
diff --git a/src/clj/auto_ap/ssr/components/periods.clj b/src/clj/auto_ap/ssr/components/periods.clj
index ec8b2978..1a321028 100644
--- a/src/clj/auto_ap/ssr/components/periods.clj
+++ b/src/clj/auto_ap/ssr/components/periods.clj
@@ -18,7 +18,7 @@
                                             :end
                                             (atime/unparse-local atime/normal-date))})
 
-         :x-init "$watch('periods', ds => source_date= ds.length > 0 ? ds[0].end : null)"}
+         :x-init "$watch('periods', ds => source_date= ds.length > 0 ? ds[0].end : null)" }
    [:template {:x-for "(v,n) in periods"}
     [:div
      [:input {:type "hidden"
@@ -59,14 +59,15 @@
                 {:name "Advanced"
                  :content [:div.flex.gap-4 {:class "overflow-hidden max-h-[300px]"
                                             :x-data (hx/json {:calendarTarget "0"
-                                                              :calendarWhich "start"}) }
+                                                              :calendarWhich "start"}) 
+                                            "@change-date.camel" "$el.querySelectorAll('.text-inputs.' + calendarWhich)[calendarTarget].focus()"}
                            (inputs/calendar-input- {:x-model "periods[calendarTarget][calendarWhich]"})
                            [:div.flex.flex-col.gap-4.p-2
                             [:div.overflow-y-scroll.flex.flex-col.gap-4
                              [:template {:x-for "(p, i) in periods" ":key" "i"}
                               [:div.flex.gap-4.
-                               (inputs/text-input- { :x-model "p.start" "@focus" "calendarTarget =i; calendarWhich='start'" })
-                               (inputs/text-input- { :x-model "p.end" "@focus" "calendarTarget =i; calendarWhich='end'"})
+                               (inputs/text-input- { :class "text-inputs start" :x-model "periods[i].start" "@focus" "calendarTarget =i; calendarWhich='start'" })
+                               (inputs/text-input- { :class "text-inputs end" :x-model "periods[i].end" "@focus" "calendarTarget =i; calendarWhich='end'"})
                                (buttons/a-icon-button- {"@click.prevent.stop" "periods=periods.filter((_, i2) => i !== i2); calendarTarget=0"} svg/x)]
                               #_(com/pill {:color :secondary}
                                           [:span {:x-text "p.start"}]
@@ -110,19 +111,18 @@
                            (buttons/a-button- {"@click" "dates=getFourWeekPeriods(dates[dates.length -1])"} "13 periods")
                            (buttons/a-button- {"@click" "dates=withLastYear(dates[dates.length -1])"} "Add prior year")
                            (buttons/a-button- {"@click" "dates=[]"} "Clear")]]}
-               {:name "Advanced"
+               {:name "Advanced oooo"
                 :content [:div.flex.gap-4 {:class "overflow-hidden max-h-[300px]"
-                                           :x-data (hx/json {:calendarTarget "0" })}
-                          (inputs/calendar-input- {:x-model "dates[calendarTarget]"})
+                                           :x-data (hx/json {:calendarTarget "0" })
+                                           "@change-date.camel" "$el.querySelectorAll('.text-inputs')[calendarTarget].focus();"}
+                          (inputs/calendar-input- {:x-model "dates[calendarTarget]" })
                           [:div.flex.flex-col.gap-4.p-2
                            [:div.overflow-y-scroll.flex.flex-col.gap-4
                             [:template {:x-for "(p, i) in dates" ":key" "i"}
                              [:div.flex.gap-4.
-                              (inputs/text-input- {:x-model "p" "@focus" "calendarTarget =i; 'start'"})
-                              (buttons/a-icon-button- {"@click.prevent.stop" "dates=dates.filter((_, i2) => i !== i2); calendarTarget=0"} svg/x)]
-                             #_(com/pill {:color :secondary}
-                                         [:span {:x-text "p.start"}]
-                                         " - "
-                                         [:span {:x-text "p.end"}])]]
+                              (inputs/text-input- {:x-model "dates[i]" 
+                                                   "@focus" "calendarTarget =i;  "
+                                                   :class "text-inputs"})
+                              (buttons/a-icon-button- {"@click.prevent.stop" "dates=dates.filter((_, i2) => i !== i2); calendarTarget=0"} svg/x)] ]]
                            (buttons/button- {"@click.prevent.stop" "dates.push(null); calendarTarget=0" :class "w-32"} "Add new period")]]}]
         :active "Quick"})]]]])
\ No newline at end of file
diff --git a/src/clj/auto_ap/ssr/ui.clj b/src/clj/auto_ap/ssr/ui.clj
index 94c7c436..ab07c4ce 100644
--- a/src/clj/auto_ap/ssr/ui.clj
+++ b/src/clj/auto_ap/ssr/ui.clj
@@ -46,8 +46,8 @@
      [:script {:src "https://unpkg.com/htmx.org/dist/ext/debug.js"}]
      [:script {:src "/js/htmx-disable.js"}]
      [:script {:type "text/javascript", :src "https://cdn.yodlee.com/fastlink/v4/initialize.js", :async "async"}]]
-    [:link {:rel "stylesheet" :href "https://cdn.jsdelivr.net/npm/vanillajs-datepicker@1.1.4/dist/css/datepicker.min.css"}]
-    [:script {:type "text/javascript" :src "https://cdn.jsdelivr.net/npm/vanillajs-datepicker@1.1.4/dist/js/datepicker-full.min.js"}]
+    [:link {:rel "stylesheet" :href "https://cdn.jsdelivr.net/npm/vanillajs-datepicker@1.3.4/dist/css/datepicker.min.css"}]
+    [:script {:type "text/javascript" :src "https://cdn.jsdelivr.net/npm/vanillajs-datepicker@1.3.4/dist/js/datepicker-full.min.js"}]
     [:script {:src "https://unpkg.com/htmx.org/dist/ext/response-targets.js"}]
     [:script {:src "https://cdn.jsdelivr.net/npm/date-fns@3.6.0/cdn.min.js" :defer true}]
     [:script {:src "https://cdnjs.cloudflare.com/ajax/libs/Chart.js/4.4.1/chart.umd.min.js" :integrity "sha512-CQBWl4fJHWbryGE+Pc7UAxWMUMNMWzWxF4SQo9CgkJIN1kx6djDQZjh3Y8SZ1d+6I+1zze6Z7kHXO7q3UyZAWw==" :crossorigin "anonymous" :referrerpolicy "no-referrer"}]