Fixed collisions, now more accurate