Collision detection

+ fix for energy exchange