Collision issues

Should fix the first to issues pointed out by a reddit user [here](https://github.com/hawkthorne/hawkthorne-journey/issues/2247#issuecomment-61226490).