Streamlined collision detection

- Still not perfect though
- Text rendering stopped working for some reason