more fixes per first iteration