Collisions and Optimizations

I fixed all the collision issues and optimized some other stuff, the game should be fully operational again :)