Collision

Added collisions. plus other fixes. Collisions needs work