Better collision detection ; TODO : better repulsion !