Map Update

Fixed warps and layer issues.