Rework collision code
Improve debug