cleanup of output
new speed calculations