Added velocity changes, and collision checks