Settings are mostly fixed, collisions are being fixed