playing around with collisions and other slight code changes