Changes to collision detection, movement, etc.
Fixed versioning conflicts.... I think...