collision detection - fixed

i think. (finally)