better collision

still needs work