Distance Improvements

Improved distance calculation (actually calculates in terms of km now)