changed update velocities
fixed tracking problem
fixed updating the grid