Advancing a bit the text and adding TODOs