Added warps and changed small things. Warp creation will change, though.