Collision rework (corners are buggy among a few other things)