Simon's commenting and fixed average speed

Yep