Fine tuned collision...god I hate collisions sometimes.
I hope this fixes the conflict...
Fine tuned collisions, HOPEFULLY