diff --git a/rowers/forms.py b/rowers/forms.py
index 8599496b..ffef4328 100644
--- a/rowers/forms.py
+++ b/rowers/forms.py
@@ -746,7 +746,8 @@ class PlanSelectForm(forms.Form):
         self.fields['plan'].empty_label = None
         if paymentprocessor:
             self.fields['plan'].queryset = PaidPlan.objects.filter(
-                paymentprocessor=paymentprocessor
+                paymentprocessor=paymentprocessor,
+                active=True
             ).exclude(
                 shortname="basic"
             ).order_by(
@@ -758,7 +759,8 @@ class PlanSelectForm(forms.Form):
             except AttributeError:
                 amount = 0
             self.fields['plan'].queryset = PaidPlan.objects.filter(
-                paymentprocessor=rower.paymentprocessor
+                paymentprocessor=rower.paymentprocessor,
+                active=True
                 ).exclude(
                     price__lte=amount
                 ).order_by(
diff --git a/rowers/models.py b/rowers/models.py
index ab8f822f..29322052 100644
--- a/rowers/models.py
+++ b/rowers/models.py
@@ -568,6 +568,8 @@ class PaidPlan(models.Model):
         choices=paymenttypes,
     )
 
+    active = models.BooleanField(default=True)
+
     clubsize = models.IntegerField(default=0)
 
     def __unicode__(self):
diff --git a/rowers/payments.py b/rowers/payments.py
index bbeb12f4..1e4304fa 100644
--- a/rowers/payments.py
+++ b/rowers/payments.py
@@ -10,30 +10,30 @@ def planstopaypal():
         plan.external_id = None
         plan.save()
 
-def initiaterowerplans():
-    rowers = Rower.objects.filter(paymenttype = 'recurring',paidplan = None)
-    for r in rowers:
-        r.paymentprocessor = 'paypal'
-        r.save()
+#def initiaterowerplans():
+#    rowers = Rower.objects.filter(paymenttype = 'recurring',paidplan = None)
+#    for r in rowers:
+#        r.paymentprocessor = 'paypal'
+#       r.save()
         
-def setrowerplans():
-    rowers = Rower.objects.all()
+#def setrowerplans():
+#    rowers = Rower.objects.all()
 
-    for r in rowers:
-        paidplans = PaidPlan.objects.filter(
-            shortname = r.rowerplan,
-            paymenttype = r.paymenttype,
-            clubsize = r.clubsize,
-            paymentprocessor=r.paymentprocessor)
+#    for r in rowers:
+#        paidplans = PaidPlan.objects.filter(
+#            shortname = r.rowerplan,
+#            paymenttype = r.paymenttype,
+#            clubsize = r.clubsize,
+#            paymentprocessor=r.paymentprocessor)
 
-        if paidplans:
-            r.paidplan = paidplans[0]
-            r.save()
-        else:
-            try:
-                print 'Could not set plan for ',r.user.username
-            except:
-                pass
+#        if paidplans:
+#            r.paidplan = paidplans[0]
+#            r.save()
+#        else:
+#            try:
+#                print 'Could not set plan for ',r.user.username
+#            except:
+#                pass
 
 def is_existing_customer(rower):
     if rower.country is not None and rower.customer_id is not None and rower.country != '':
diff --git a/rowers/templates/billing.html b/rowers/templates/billing.html
index 1d16238a..0aacc77e 100644
--- a/rowers/templates/billing.html
+++ b/rowers/templates/billing.html
@@ -19,7 +19,8 @@
 
       <p>Unless specified otherwise, the payments on the
         recurring payment plans are annual. The prices are specified
-        as a price per year.
+        as a price per year. You can downgrade or cancel your
+        plan at any time in your <a href="/rowers/me/edit/">settings</a>.
       </p>
       
       <table width="100%">
diff --git a/rowers/templates/downgrade.html b/rowers/templates/downgrade.html
index bf2e7bc7..7e5fe130 100644
--- a/rowers/templates/downgrade.html
+++ b/rowers/templates/downgrade.html
@@ -1,3 +1,4 @@
+
 {% extends "newbase.html" %}
 {% block title %}Rowsandall Paid Membership{% endblock title %}
 {% load rowerfilters %}
diff --git a/rowers/templates/downgradeconfirm.html b/rowers/templates/downgradeconfirm.html
index 9bb0aee0..1e027c34 100644
--- a/rowers/templates/downgradeconfirm.html
+++ b/rowers/templates/downgradeconfirm.html
@@ -56,7 +56,7 @@
       <a href="/rowers/downgrade">Change Downgrade</a>
   </li>
   <li class="grid_4">
-    <form id="payment-form" method="post" action="/rowers/downgradecheckouts"
+    <form id="payment-form" method="post" action="/rowers/downgradecheckouts/"
           autocomplete="off">
       <section>
         <label for="amount">
diff --git a/rowers/templates/fitnessmetric.html b/rowers/templates/fitnessmetric.html
index fd8d5d03..76110d0f 100644
--- a/rowers/templates/fitnessmetric.html
+++ b/rowers/templates/fitnessmetric.html
@@ -83,7 +83,7 @@
     {{ the_div|safe }}
   </li>
   <li class="grid_2">
-    <form enctype="multipart/form-data" action="/rowers/fitness-progress/user/{{ rower.user.id }}" method="post">
+    <form enctype="multipart/form-data" action="/rowers/fitness-progress/user/{{ rower.user.id }}/" method="post">
       <table>
         {{ form.as_table }}
       </table>
diff --git a/rowers/templates/gdpr_optin.html b/rowers/templates/gdpr_optin.html
index 311816ac..e9a37507 100644
--- a/rowers/templates/gdpr_optin.html
+++ b/rowers/templates/gdpr_optin.html
@@ -42,7 +42,7 @@
 </p>
 
 <p>
-  <form method="POST" action="/rowers/me/delete" class="padding">
+  <form method="POST" action="/rowers/me/delete/" class="padding">
     {% csrf_token %}
     <input id="id_delete_user" type="hidden" name="delete_user" value="True">
     <input class="button red small" type="submit" name="action" value="DELETE ACCOUNT">
diff --git a/rowers/templates/list_workouts.html b/rowers/templates/list_workouts.html
index 2ccb8c53..adf48b3b 100644
--- a/rowers/templates/list_workouts.html
+++ b/rowers/templates/list_workouts.html
@@ -80,10 +80,10 @@
     </p>
     {% if team %}
     <p>
-      <form id="searchform" action="/rowers/list-workouts/team/{{ team.id }}/{{ startdate|date:"Y-m-d" }}/{{ enddate|date:"Y-m-d" }}"
+      <form id="searchform" action="/rowers/list-workouts/team/{{ team.id }}/{{ startdate|date:"Y-m-d" }}/{{ enddate|date:"Y-m-d" }}/"
             method="get" accept-charset="utf-8">
         {% else %}
-        <form id="searchform" action="/rowers/list-workouts/{{ startdate|date:"Y-m-d" }}/{{ enddate|date:"Y-m-d" }}"
+        <form id="searchform" action="/rowers/list-workouts/{{ startdate|date:"Y-m-d" }}/{{ enddate|date:"Y-m-d" }}/"
               method="get" accept-charset="utf-8">
           {% endif %}
           {{ searchform }}
diff --git a/rowers/templates/multiflex.html b/rowers/templates/multiflex.html
index 92d4f140..4af8901d 100644
--- a/rowers/templates/multiflex.html
+++ b/rowers/templates/multiflex.html
@@ -27,7 +27,7 @@
     </div>
   </li>
   <li class="grid_2">
-    <form enctype="multipart/form-data" action="/rowers/user-multiflex/user/{{ userid }}" method="post">
+    <form enctype="multipart/form-data" action="/rowers/user-multiflex/user/{{ userid }}/" method="post">
       {% csrf_token %}
       <table>
         {{ chartform.as_table }}
diff --git a/rowers/templates/paidplans.html b/rowers/templates/paidplans.html
index 4550c0d7..331792e9 100644
--- a/rowers/templates/paidplans.html
+++ b/rowers/templates/paidplans.html
@@ -12,6 +12,11 @@
       hosting costs, we have created paid plans offering extended
       functionality.
     </p>
+    <p>
+      All plans are valid for a year. Recurring payment plans will automatically
+      bill you at the start of a new 12 month period. You can stop your plan
+      at any time in your <a href="/rowers/me/edit/">settings</a>.
+    </p>
 
     <p>
       <table class="plantable shortpadded" width="80%">
diff --git a/rowers/templates/paymentconfirm.html b/rowers/templates/paymentconfirm.html
index 10fba5ad..35b94715 100644
--- a/rowers/templates/paymentconfirm.html
+++ b/rowers/templates/paymentconfirm.html
@@ -65,7 +65,7 @@
       <a href="/rowers/billing">Change Order</a>
   </li>
   <li class="grid_4">
-    <form id="payment-form" method="post" action="/rowers/checkouts"
+    <form id="payment-form" method="post" action="/rowers/checkouts/"
           autocomplete="off">
       <section>
         <label for="amount">
diff --git a/rowers/templates/payments.html b/rowers/templates/payments.html
index 9c248bcb..dd32cfbf 100644
--- a/rowers/templates/payments.html
+++ b/rowers/templates/payments.html
@@ -235,7 +235,7 @@
 
     <h2>BrainTree Experimental Corner</h2>
 
-    <form id="payment-form" method="post" action="/rowers/checkouts"
+    <form id="payment-form" method="post" action="/rowers/checkouts/"
           autocomplete="off">
       <section>
         <label for="amount">
diff --git a/rowers/templates/plannedsessionedit.html b/rowers/templates/plannedsessionedit.html
index edb574c7..ce691ece 100644
--- a/rowers/templates/plannedsessionedit.html
+++ b/rowers/templates/plannedsessionedit.html
@@ -47,7 +47,7 @@
         <a href="/rowers/sessions/{{ thesession.id }}/clone/?when={{ timeperiod }}">Clone</a>
       </p>
       <input class="button green"
-             action="/rowers/sessions/{{ thesession.id }}/edit/user/{{ rower.user.id }}" type="submit" value="Save">
+             action="/rowers/sessions/{{ thesession.id }}/edit/user/{{ rower.user.id }}/" type="submit" value="Save">
     </form>
 
   </li>
diff --git a/rowers/templates/rankings.html b/rowers/templates/rankings.html
index 6291b8b5..ee1bc30b 100644
--- a/rowers/templates/rankings.html
+++ b/rowers/templates/rankings.html
@@ -114,7 +114,7 @@
     {% csrf_token %}
     
     <input name="piece" class="button green" 
-	   formaction="/rowers/ote-bests/user/{{ id }}/{{ startdate|date:"Y-m-d" }}/{{ enddate|date:"Y-m-d" }}"
+	   formaction="/rowers/ote-bests/user/{{ id }}/{{ startdate|date:"Y-m-d" }}/{{ enddate|date:"Y-m-d" }}/"
 	   type="submit" value="Add">
     </form>
   </li>/
diff --git a/rowers/templates/splitworkout.html b/rowers/templates/splitworkout.html
index 86756bc8..5ab8a668 100644
--- a/rowers/templates/splitworkout.html
+++ b/rowers/templates/splitworkout.html
@@ -12,7 +12,7 @@
   <ul class="main-content">
     <li class="grid_2">
       <p>
-        <form enctype="multipart/form-data" action="/rowers/workout/{{ workout.id }}/split" method="post">
+        <form enctype="multipart/form-data" action="/rowers/workout/{{ workout.id }}/split/" method="post">
           <table width=100%>
             {{ form.as_table }}
           </table>
diff --git a/rowers/templates/strokedata_form.html b/rowers/templates/strokedata_form.html
index 21e39da9..a34ee316 100644
--- a/rowers/templates/strokedata_form.html
+++ b/rowers/templates/strokedata_form.html
@@ -8,7 +8,7 @@
 {% endif %}
 <h1>Stroke Data for workout</h1>
 
-<form enctype="application/json" action="/rowers/api/workouts/{{ id }}/strokedata" method="post">
+<form enctype="application/json" action="/rowers/api/workouts/{{ id }}/strokedata/" method="post">
   <table>
     {{ form.as_table }}
   </table>
diff --git a/rowers/templates/summary_edit.html b/rowers/templates/summary_edit.html
index 5d61d6bf..32d7b067 100644
--- a/rowers/templates/summary_edit.html
+++ b/rowers/templates/summary_edit.html
@@ -38,7 +38,7 @@
     <p>
       See the how-to <a href="#howto">at the bottom of this page</a> for details on how to use this form.
     </p>
-    <form enctype="multipart/form-data" action="/rowers/workout/{{ workout.id }}/editintervals" method="post">
+    <form enctype="multipart/form-data" action="/rowers/workout/{{ workout.id }}/editintervals/" method="post">
       <table width=100%>
         {{ form.as_table }}
       </table>
@@ -73,7 +73,7 @@
   </li>
   <li class="grid_2">
     <h1>Updated Summary</h1>
-    <form enctype="multipart/form-data" action="/rowers/workout/{{ workout.id }}/editintervals" method="post">
+    <form enctype="multipart/form-data" action="/rowers/workout/{{ workout.id }}/editintervals/" method="post">
       {% csrf_token %}
       <input type="hidden" name="{{ savebutton }}" value="{{ intervalstring }}">
       <input type="hidden" name="nrintervals" value={{ nrintervals }}>
@@ -101,7 +101,7 @@
   <li class="grid_2">
     <h1>Detailed Summary Edit</h1>
     <p>This is still experimental and there are known bugs. Use at your own risk. Nothing is stored permanently until you hit Save in the Updated Summary section. You can use the restore original button to restore the original values.</p>
-    <form enctype="multipart/form-data" action="/rowers/workout/{{ workout.id }}/editintervals" method="post">
+    <form enctype="multipart/form-data" action="/rowers/workout/{{ workout.id }}/editintervals/" method="post">
       <table width=100%> 
         <thead>
           <tr>
diff --git a/rowers/templates/upgrade.html b/rowers/templates/upgrade.html
index 9f21c889..f224f7dd 100644
--- a/rowers/templates/upgrade.html
+++ b/rowers/templates/upgrade.html
@@ -20,7 +20,8 @@
 
       <p>Unless specified otherwise, the payments on the
         recurring payment plans are annual. The prices are specified
-        as a price per year.
+        as a price per year. You can downgrade or cancel your
+        plan at any time in your <a href="/rowers/me/edit/">settings</a>.
       </p>
       
         <table width="100%">
diff --git a/rowers/templates/upgradeconfirm.html b/rowers/templates/upgradeconfirm.html
index 92c28ccd..b42c4459 100644
--- a/rowers/templates/upgradeconfirm.html
+++ b/rowers/templates/upgradeconfirm.html
@@ -65,7 +65,7 @@
       <a href="/rowers/upgrade">Change Upgrade</a>
   </li>
   <li class="grid_4">
-    <form id="payment-form" method="post" action="/rowers/upgradecheckouts"
+    <form id="payment-form" method="post" action="/rowers/upgradecheckouts/"
           autocomplete="off">
       <section>
         <label for="amount">
diff --git a/rowers/templates/user_boxplot_select.html b/rowers/templates/user_boxplot_select.html
index ba2ff67b..f29d3fda 100644
--- a/rowers/templates/user_boxplot_select.html
+++ b/rowers/templates/user_boxplot_select.html
@@ -80,7 +80,7 @@
 </li>
 
   <li class="grid_2 maxheight">
-    <form enctype="multipart/form-data" action="/rowers/user-boxplot/user/{{ theuser.id }}" method="post">
+    <form enctype="multipart/form-data" action="/rowers/user-boxplot/user/{{ theuser.id }}/" method="post">
 
   {% if workouts %}
   
diff --git a/rowers/templates/user_multiflex_select.html b/rowers/templates/user_multiflex_select.html
index 0566ad12..9b4478fa 100644
--- a/rowers/templates/user_multiflex_select.html
+++ b/rowers/templates/user_multiflex_select.html
@@ -103,7 +103,7 @@
     </form>
   </li>
   <li class="grid_2 maxheight">
-    <form enctype="multipart/form-data" action="/rowers/user-multiflex/user/{{ theuser.id }}" method="post">
+    <form enctype="multipart/form-data" action="/rowers/user-multiflex/user/{{ theuser.id }}/" method="post">
   {% if workouts %}
   
   <input type="checkbox" onClick="toggle(this)" /> Toggle All<br/>
diff --git a/rowers/templates/workout_comments.html b/rowers/templates/workout_comments.html
index c858c8b7..4f593026 100644
--- a/rowers/templates/workout_comments.html
+++ b/rowers/templates/workout_comments.html
@@ -54,7 +54,7 @@
       </div>
     </div>
     {% endfor %}
-    <form enctype="multipart/form-data" action="/rowers/workout/{{ workout.id }}/comment" method="post">
+    <form enctype="multipart/form-data" action="/rowers/workout/{{ workout.id }}/comment/" method="post">
       <table width=100%>
         {{ form.as_table }}
       </table>
diff --git a/rowers/templates/workout_join_select.html b/rowers/templates/workout_join_select.html
index a6f2649e..7267ee91 100644
--- a/rowers/templates/workout_join_select.html
+++ b/rowers/templates/workout_join_select.html
@@ -70,7 +70,7 @@
 
 <ul class="main-content">
   <li class="grid_2 maxheight">
-    <form enctype="multipart/form-data" action="/rowers/workouts-join" method="post">
+    <form enctype="multipart/form-data" action="/rowers/workouts-join/" method="post">
       {% if workouts %}
   
       <input type="checkbox" onClick="toggle(this)" /> Toggle All<br/>
@@ -127,10 +127,10 @@
 </li>
 <li class="grid_2">
   {% if team %}
-  <form id="searchform" action="/rowers/workouts-join-select/team/{{ team.id }}/{{ startdate|date:"Y-m-d" }}/{{ enddate|date:"Y-m-d" }}"
+  <form id="searchform" action="/rowers/workouts-join-select/team/{{ team.id }}/{{ startdate|date:"Y-m-d" }}/{{ enddate|date:"Y-m-d" }}/"
         method="get" accept-charset="utf-8">
     {% else %}
-    <form id="searchform" action="/rowers/workouts-join-select/{{ startdate|date:"Y-m-d" }}/{{ enddate|date:"Y-m-d" }}"
+    <form id="searchform" action="/rowers/workouts-join-select/{{ startdate|date:"Y-m-d" }}/{{ enddate|date:"Y-m-d" }}/"
           method="get" accept-charset="utf-8">
       {% endif %}    
       {{ searchform }}
diff --git a/rowers/tests/testdata/testdata.csv.gz b/rowers/tests/testdata/testdata.csv.gz
index 7e09e811..a9a1d241 100644
Binary files a/rowers/tests/testdata/testdata.csv.gz and b/rowers/tests/testdata/testdata.csv.gz differ