Fix collisions glitch and more cleanup