diff --git a/rowers/templates/videos.html b/rowers/templates/videos.html
index dd05a7fb..a5880e49 100644
--- a/rowers/templates/videos.html
+++ b/rowers/templates/videos.html
@@ -1,4 +1,5 @@
 
+
     {% extends "base.html" %}
     {% block title %}About us{% endblock title %}
     {% block content %}
@@ -14,7 +15,15 @@
 
 <h3>Integration with Strava, SportTracks or Concept2 logbook</h3>
 
-<p>Coming Soon</p>
+<p><iframe width="560" height="315" src="https://www.youtube.com/embed/wF_P6x0uSL4" frameborder="0" allowfullscreen></iframe></p>
+
+<p><iframe width="560" height="315" src="https://www.youtube.com/embed/rjNwXCh7jKg" frameborder="0" allowfullscreen></iframe></p>
+
+<p><iframe width="560" height="315" src="https://www.youtube.com/embed/WfccMz3SbAc" frameborder="0" allowfullscreen></iframe></p>
+
+<p><iframe width="560" height="315" src="https://www.youtube.com/embed/90AXO4dppT4" frameborder="0" allowfullscreen></iframe></p>
+
+
 
 <h3>Basic charts</h3>
 
@@ -38,4 +47,4 @@
 
 </div>
 
-    {% endblock content %}
\ No newline at end of file
+    {% endblock content %}
diff --git a/rowers/views.py b/rowers/views.py
index f850dc5e..53cde3e0 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -402,8 +402,12 @@ def add_workout_from_strokedata(user,importid,data,strokedata,source='c2'):
 	velo2 = savgol_filter(velo,windowsize,3)
     else:
 	velo2=velo
+
+    velo3 = pd.Series(velo2)
+    velo3 = velo3.replace([-np.inf,np.inf],np.nan)
+    velo3 = velo3.fillna(method='ffill')
     
-    pace2 = 500./abs(velo2)
+    pace2 = 500./abs(velo3)
     df[' Stroke500mPace (sec/500m)'] = pace2
 
     df = df.fillna(0)
@@ -630,8 +634,12 @@ def add_workout_from_stdata(user,importid,data):
 	velo2 = savgol_filter(velo,windowsize,3)
     else:
 	velo2 = velo
+
+    velo3 = pd.Series(velo2)
+    velo3 = velo3.replace([-np.inf,np.inf],np.nan)
+    velo3 = velo3.fillna(method='ffill')
     
-    pace2 = 500./abs(velo2)
+    pace2 = 500./abs(velo3)
     df[' Stroke500mPace (sec/500m)'] = pace2
 
     df = df.fillna(0)
@@ -3404,7 +3412,12 @@ def workout_upload_view(request,message=""):
 		else:
 		    velo2 = velo
 
-		pace2 = 500./abs(velo2)
+                velo3 = pd.Series(velo2)
+                velo3 = velo3.replace([-np.inf,np.inf],np.nan)
+                velo3 = velo3.fillna(method='ffill')
+            
+                pace2 = 500./abs(velo3)
+                
 		row.df[' Stroke500mPace (sec/500m)'] = pace2
 
 		row.df = row.df.fillna(0)
@@ -3613,8 +3626,6 @@ def workout_upload_view_debug(request,message=""):
 	    f2 = res[1] # file name incl media directory
 
 
-	    print fileformat
-
 	    # handle non-Painsled
 	    if (fileformat != 'csv'):
 		# handle RowPro: