Updated the Velocity mode

Fixed a heap of stuff to make it more accurate and capture more situations in v3