Update the example in the help and amend the TODO list following the fixes from today.