Added ability to ignore collisions based on name and refactored some code