Cleaned up collision resolving.
Removed glm, it was kinda overkill.