Updates to Collision

continuing bug fixing on collisions.