Update to collision detection, other stuff