added some collision fixes and bounding box