Fixed a few Bugs and rebuilt some functionality with the collisions