Fix masking; topojson update