Some minor adjustments in hitting a wall.
Merge Andrews collision changes.