Add warping support. Tweak collision detection and rendering.