made the collision detection MUCH easier and bug-cleaner