more small changes in zero_width and which_na