Collision fix?

I'm not 100% sure if this is bug free, and I also don't like how it
becomes a little less smooth around corners, but it's not that big of a
deal I would say.