Update the todo lists
Add a scan option in cases with several arguments + minor debug