diff --git a/rowers/datautils.py b/rowers/datautils.py
index b19a7597..4048fd24 100644
--- a/rowers/datautils.py
+++ b/rowers/datautils.py
@@ -304,15 +304,16 @@ def getmaxwattinterval(tt,ww,i):
     if len(w_roll):
         # now goes with # data points - should be fixed seconds
         indexmax = w_roll.idxmax(axis=1)
-        indexmaxpos = indexmax.get_loc(indexmax)
+        #        indexmaxpos = indexmax.get_loc(indexmax)
+        indexmaxpos = indexmax
         try:
-            t_0 = tt.iloc[indexmaxpos]
-            t_1 = tt.iloc[indexmaxpos-i]
-            deltas = tt.iloc[indexmaxpos-i:indexmaxpos].diff().dropna()
+            t_0 = tt.ix[indexmaxpos]
+            t_1 = tt.ix[indexmaxpos-i]
+            deltas = tt.ix[indexmaxpos-i:indexmaxpos].diff().dropna()
             testres = 1.0e-3*deltas.max() < 30.
             if testres:
                 deltat = 1.0e-3*(t_0-t_1)
-                wmax = w_roll.iloc[indexmaxpos]
+                wmax = w_roll.ix[indexmaxpos]
                 #if wmax > 800 or wmax*5.0e-4*deltat > 800.0:
                 #    wmax = 0
             else:
diff --git a/rowers/templates/payment_completed.html b/rowers/templates/payment_completed.html
index dbfc9c9a..653907dc 100644
--- a/rowers/templates/payment_completed.html
+++ b/rowers/templates/payment_completed.html
@@ -24,7 +24,8 @@
   as a price per year. You can downgrade or cancel your
   plan at any time, through the <a href="/rowers/me/edit/">settings page</a>.
   Please refer to our <a href="/rowers/legal/">terms and conditions</a> for our
-  payments and refunds policy. Accepted payment methods are the payment methods offered
+  <a href="/rowers/legel/#refunds">payments and refunds policy</a>.
+  Accepted payment methods are the payment methods offered
   by
   <a href="https://www.braintreegateway.com/merchants/jytq7yxsm66qqdzb/verified">Braintree</a>
   through us. If you have any questions about our payments and refunds policy, please contact
diff --git a/rowers/templates/paymentconfirm.html b/rowers/templates/paymentconfirm.html
index d757f65a..1f616834 100644
--- a/rowers/templates/paymentconfirm.html
+++ b/rowers/templates/paymentconfirm.html
@@ -20,7 +20,7 @@
 </p>
 
 <p>
-  Payments will be procesed by Braintree (A PayPal service):
+  Payments will be processed by Braintree (A PayPal service):
 </p>
 <p>
   <a href="https://www.braintreegateway.com/merchants/{{ BRAINTREE_MERCHANT_ID }}/verified" target="_blank">
diff --git a/rowers/templates/upgradeconfirm.html b/rowers/templates/upgradeconfirm.html
index e3b0aa98..ec4221c3 100644
--- a/rowers/templates/upgradeconfirm.html
+++ b/rowers/templates/upgradeconfirm.html
@@ -20,7 +20,7 @@
 </p>
 
 <p>
-  Payments will be procesed by Braintree (A PayPal service):
+  Payments will be processed by Braintree (A PayPal service):
 </p>
 <p>
   <a href="https://www.braintreegateway.com/merchants/{{ BRAINTREE_MERCHANT_ID }}/verified" target="_blank">
diff --git a/rowers/tests/test_payments.py b/rowers/tests/test_payments.py
index 794416d5..ab67cfb7 100644
--- a/rowers/tests/test_payments.py
+++ b/rowers/tests/test_payments.py
@@ -501,6 +501,8 @@ class PaymentTest(TestCase):
             'payment_method_nonce': 'aap',
             }
 
+        form = BillingForm(form_data)
+        self.assertTrue(not form.is_valid())
 
         login = self.c.login(username=u.username, password=self.password)
         self.assertTrue(login)
@@ -511,7 +513,7 @@ class PaymentTest(TestCase):
         self.assertEqual(response.status_code,200)
 
         self.assertRedirects(response,
-                             expected_url = '/rowers/checkout/{planid}'.format(
+                             expected_url = '/rowers/checkout/{planid}/'.format(
                                  planid=plans[1].id),
                              status_code=302,target_status_code=200)
 
@@ -546,7 +548,7 @@ class PaymentTest(TestCase):
             }
 
         form = BillingForm(form_data)
-        self.assertTrue(form.is_valid())
+        self.assertTrue(not form.is_valid())
 
         login = self.c.login(username=u.username, password=self.password)
         self.assertTrue(login)
@@ -557,7 +559,7 @@ class PaymentTest(TestCase):
         self.assertEqual(response.status_code,200)
 
         self.assertRedirects(response,
-                             expected_url = '/rowers/upgradecheckout/{planid}'.format(
+                             expected_url = '/rowers/upgradecheckout/{planid}/'.format(
                                  planid=plans[1].id),
                              status_code=302,target_status_code=200)
         
@@ -591,7 +593,7 @@ class PaymentTest(TestCase):
             }
 
         form = BillingForm(form_data)
-        self.assertTrue(form.is_valid())
+        self.assertTrue(not form.is_valid())
 
         login = self.c.login(username=u.username, password=self.password)
         self.assertTrue(login)
@@ -602,7 +604,7 @@ class PaymentTest(TestCase):
         self.assertEqual(response.status_code,200)
 
         self.assertRedirects(response,
-                            expected_url = '/rowers/downgradecheckout/{planid}'.format(
+                            expected_url = '/rowers/downgradecheckout/{planid}/'.format(
                                 planid=plans[1].id),
                              status_code=302,target_status_code=200)
         
diff --git a/rowers/tests/testdata/testdata.csv.gz b/rowers/tests/testdata/testdata.csv.gz
index 7dc55d87..58b6f988 100644
Binary files a/rowers/tests/testdata/testdata.csv.gz and b/rowers/tests/testdata/testdata.csv.gz differ
diff --git a/rowers/views/paymentviews.py b/rowers/views/paymentviews.py
index 2f680fe6..f72c16ca 100644
--- a/rowers/views/paymentviews.py
+++ b/rowers/views/paymentviews.py
@@ -332,7 +332,7 @@ def checkouts_view(request):
     elif 'tac' not in request.POST:
         try:
             planid = int(request.POST['plan'])
-            url = reverse('downgrade_confirm_view',kwargs={'planid':planid})
+            url = reverse('payment_confirm_view',kwargs={'planid':planid})
             messages.error(request,"You must review and acknowledge the terms and conditions")
             return HttpResponseRedirect(url)
         except IndexError:
@@ -421,7 +421,7 @@ def downgrade_checkouts_view(request):
     elif 'tac' not in request.POST:
         try:
             planid = int(request.POST['plan'])
-            url = reverse('payment_confirm_view',kwargs={'planid':planid})
+            url = reverse('downgrade_confirm_view',kwargs={'planid':planid})
             messages.error(request,"You must review and acknowledge the terms and conditions")
             return HttpResponseRedirect(url)
         except IndexError: