FInal changes to velocity

everything seems to be working now.