Fixed Collision Problems

For the most part...