added more collision detection stuff, still need to make it more efficient and add in proper bounding box checks