Fixed collider overlap issues, collisions look much better.

Resultant velocity seems to be iffy by instinct, need to check