improve iso handling and doc string