Improves physics and collision detection for player and blocks.
Merges with master branch.