Touchups

Combined some collision check preparing things, nothing big really.
Check for closest collision now takes into account the amount of the
step the object has already done.