Improved collisions, still might need a bit of work in that area.
I think I finally got colisions right