diff --git a/boatmovers/forms.py b/boatmovers/forms.py
index fb5fe184..b629878b 100644
--- a/boatmovers/forms.py
+++ b/boatmovers/forms.py
@@ -18,12 +18,13 @@ choices = [
     ('ScoreIncrease','Score Increase')
 ]
 
-filenameslist = glob.glob('media/boatmovers_*.csv')
-datechoices = [
-    (a[17:-4],a[17:-4]) for a in filenameslist
-]
 
 class DatesForm(forms.Form):
+    filenameslist = glob.glob('media/boatmovers_*.csv')
+    filenameslist.sort()
+    datechoices = [
+        (a[17:-4],a[17:-4]) for a in filenameslist
+    ]
     date1 = forms.ChoiceField(choices=datechoices)
     date2 = forms.ChoiceField(choices=datechoices)
     sort_by = forms.ChoiceField(choices=choices)
diff --git a/boatmovers/views.py b/boatmovers/views.py
index 76352b31..5513da66 100644
--- a/boatmovers/views.py
+++ b/boatmovers/views.py
@@ -17,6 +17,8 @@ from boatmovers.scrapers import *
 import django_rq
 queue = django_rq.get_queue('high')
 
+import glob
+
 class AthleteCreateView(CreateView):
     model = Athlete
     fields = [
@@ -100,11 +102,22 @@ def boatmovers_view(request):
                   )
 
 def boatmovers_compareview(request):
+    filenameslist = glob.glob('media/boatmovers_*.csv')
+    filenameslist.sort()
+    datechoices = [
+        (a[17:-4],a[17:-4]) for a in filenameslist
+    ]
+
     form = DatesForm()
+    form.fields['date1'].choices = datechoices
+    form.fields['date2'].choices = datechoices
+    
     df = pd.DataFrame()
 
     if request.method == 'POST':
         form = DatesForm(request.POST)
+        form.fields['date1'].choices = datechoices
+        form.fields['date2'].choices = datechoices
         if form.is_valid():
             date1 = form.cleaned_data['date1']
             date2 = form.cleaned_data['date2']
diff --git a/rowers/tasks.py b/rowers/tasks.py
index f4d58eb4..d18a38fc 100644
--- a/rowers/tasks.py
+++ b/rowers/tasks.py
@@ -1496,13 +1496,14 @@ def handle_calctrimp(id,
         normv = response.normv
         normw = response.normw
         hrtss = response.hrtss
-        dologging('metrics.log','Got tss {tss}, normp {normp} trimp {trimp} normv {normv} normw {normw} hrtss {hrtss}'.format(
+        dologging('metrics.log','File {csvfile}. Got tss {tss}, normp {normp} trimp {trimp} normv {normv} normw {normw} hrtss {hrtss}'.format(
             tss = tss,
             normp = normp,
             trimp = trimp,
             normv = normv,
             normw = normw,
-            hrtss = hrtss
+            hrtss = hrtss,
+            csvfile=csvfile,
         ))
         
 
@@ -1555,6 +1556,10 @@ def handle_calctrimp(id,
     workout.normv = normv
     workout.normw = normw
     workout.save()
+    dologging('metrics.log','Saving to workout {id} {obscure}'.format(
+        id = id,
+        obscure = encoder.encode_hex(id)
+    ))
 
     return 1
 
diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz
index 71e1bc0f..92adbacc 100644
Binary files a/rowers/tests/testdata/testdata.tcx.gz and b/rowers/tests/testdata/testdata.tcx.gz differ
diff --git a/rowers/uploads.py b/rowers/uploads.py
index 9f17145f..0e93bf8c 100644
--- a/rowers/uploads.py
+++ b/rowers/uploads.py
@@ -149,6 +149,10 @@ def do_sync(w, options, quick=False):
     try:
         if options['nkid'] != 0 and options['nkid'] != '':  # pragma: no cover
             w.uploadedtonk = options['nkid']
+            dologging('metrics.log','NK ID {nkid} file {csvfilename}'.format(
+                nkid=nkid,
+                csvfilename=w.csvfilename,
+            ))
             w.save()
             record = create_or_update_syncrecord(w.user, w, nkid=options['nkid'])
     except KeyError: