Minor changes to collision code.

Preparing to start on Y finally.
Fixed Y collision bugs.

Finally got around to debugging y-collision math.