some post iteration 3 fixes and changes