Collision is better

It's not buggy, and yes, the displaced camera issue is still there, but
it is better, so let's just call collision good before I throw my
computer out a window.