Physics improvements, still sketchy

I added some more featues to the physics, and started to have a look at
how the water would interface with the player. I'm not sure how well that
part of the code is designed, it might pay to have a look at re-doing that
better.