Some changes
Distance and time are now calculated correctly