progress made, but todo items still targeting oddly