some iterative fixes