update TODOs
Correct stepping