Collisions fixed

Still not perfect, but they work