Fix direction correlation; add velocity-velocity correlation.