cleaning and minor fixes in natz