Fix collision detection on functions
Clarify variable name
Hopefully prevent repulsion aggressiveness a bit ?