Updated imports, untouched_dims and nan comparisons