Start neatening speed display

Doing too much work on draw - we can do metrics ahead of time and just
keep them.