More changes for collision logic (collidedObject still null for some reason)