Updated collision detection. Doesn't suck as much any more