Collision seems to work again
Small changes
Merge