diff --git a/healthgraph/parser.py b/healthgraph/parser.py
index 18e7892..540823a 100644
--- a/healthgraph/parser.py
+++ b/healthgraph/parser.py
@@ -64,7 +64,7 @@ def parse_distance(val):
     if val is None:
         return None
     try:
-        return float(val) / 1000
+        return float(val)
     except:
         raise exceptions.ParseValueError("Error parsing distance value.")
     
@@ -72,7 +72,7 @@ def parse_distance_km(val):
     if val is None:
         return None
     try:
-        return float(val)
+        return float(val) * 1000
     except:
         raise exceptions.ParseValueError("Error parsing distance value.")
     
diff --git a/samples/bottle/views/welcome.html b/samples/bottle/views/welcome.html
index 80167fd..943928a 100644
--- a/samples/bottle/views/welcome.html
+++ b/samples/bottle/views/welcome.html
@@ -37,7 +37,7 @@ <h2>Recent Activities</h2>
 						<tr>
 							<td>{{ stats.get('start_time') }}</td>
 							<td>{{ stats.get('type') }}</td>
-							<td align="right">{{ '%.1f' % stats.get('total_distance', 0) }}</td>
+							<td align="right">{{ '%.1f' % (stats.get('total_distance', 0.0) / 1000) }}</td>
 						</tr>
 						%end		
 					</tbody>
@@ -58,11 +58,11 @@ <h2>Total Distance</h2>
 						%for sport, stats in records.items():
 						<tr>
 							<td>{{ sport }}</td>
-							<td align="right">{{ '%.1f' % stats.get('THIS_WEEK', 0) }}</td>
-							<td align="right">{{ '%.1f' % stats.get('LAST_WEEK', 0) }}</td>
-							<td align="right">{{ '%.1f' % stats.get('THIS_MONTH', 0) }}</td>
-							<td align="right">{{ '%.1f' % stats.get('LAST_MONTH', 0) }}</td>
-							<td align="right">{{ '%.1f' % stats.get('OVERALL', 0) }}</td>
+							<td align="right">{{ '%.1f' % (stats.get('THIS_WEEK', 0.0) / 1000) }}</td>
+							<td align="right">{{ '%.1f' % (stats.get('LAST_WEEK', 0.0) / 1000) }}</td>
+							<td align="right">{{ '%.1f' % (stats.get('THIS_MONTH', 0.0) / 1000) }}</td>
+							<td align="right">{{ '%.1f' % (stats.get('LAST_MONTH', 0.0) / 1000) }}</td>
+							<td align="right">{{ '%.1f' % (stats.get('OVERALL', 0.0) / 1000) }}</td>
 						</tr>
 						%end		
 					</tbody>