Average speed and acceleration + other small changes