Adding Distance to Lap (correctly calculated) and adding more stuff