Fix velocity issues.

Hold this, It's getting there but it's not done.

It's one hell of an improvement though.