diff --git a/rowers/dataprep.py b/rowers/dataprep.py
index da4a7f7b..4faf1137 100644
--- a/rowers/dataprep.py
+++ b/rowers/dataprep.py
@@ -363,8 +363,6 @@ def dataprep(rowdatadf,id=0,bands=True,barchart=True,otwpower=True,
             data['peakforceangle'] = peakforceangle
             data['driveenergy'] = driveenergy
             data['drivelength'] = drivelength
-            data['peakforce'] = peakforce
-            data['averageforce'] = averageforce
         except KeyError:
             pass
         
@@ -378,18 +376,18 @@ def dataprep(rowdatadf,id=0,bands=True,barchart=True,otwpower=True,
 	except KeyError:
 	    equivergpower = 0*p+50.
 	
-	#nowindpace = nowindpace.apply(lambda x: timedeltaconv(x))
+	nowindpace2 = nowindpace.apply(lambda x: timedeltaconv(x))
 	ergvelo = (equivergpower/2.8)**(1./3.)
 
 	ergpace = 500./ergvelo
 	ergpace[ergpace == np.inf] = 240.
-	#ergpace = ergpace.apply(lambda x: timedeltaconv(x))
+	ergpace2 = ergpace.apply(lambda x: timedeltaconv(x))
 
-	data['ergpace'] = ergpace
-	data['nowindpace'] = nowindpace
+	data['ergpace'] = ergpace*1e3
+	data['nowindpace'] = nowindpace*1e3
 	data['equivergpower'] = equivergpower
-	data['fergpace'] = nicepaceformat(ergpace)
-	data['fnowindpace'] = nicepaceformat(nowindpace)
+	data['fergpace'] = nicepaceformat(ergpace2)
+	data['fnowindpace'] = nicepaceformat(nowindpace2)
 
     data = data.replace([-np.inf,np.inf],np.nan)
     data = data.fillna(method='ffill')
diff --git a/rowers/views.py b/rowers/views.py
index 0b1f0ff4..bd567aff 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -3705,7 +3705,7 @@ def workout_upload_view(request,message=""):
 
 		w.save()
                 # put stroke data in database
-                res = dataprep.dataprep(row.df,id=w.id,bands=True,barchart=True,otwpower=True)
+                res = dataprep.dataprep(row.df,id=w.id,bands=True,barchart=True,otwpower=True,empower=True)
 
 		# Make Plot
 		if (make_plot):
@@ -4643,7 +4643,7 @@ def strokedatajson(request,id):
 		    hrtr=r.tr,hran=r.an,ftp=r.ftp)
         rowdata = rdata(row.csvfilename,rower=rr).df
         
-        datadf = dataprep.dataprep(rowdata,id=row.id,bands=True,barchart=True,otwpower=True)    
+        datadf = dataprep.dataprep(rowdata,id=row.id,bands=True,barchart=True,otwpower=True,empower=True)    
         # mangling
 
         #