Sorted out some velocity problems