Trying to fix collision detection (almost)

Halfway through the fixing of collision detection. No longer jitters
when stationary.