Added delwarp command and refactored warps a bit