Some collision improvements, no longer uses velocity.