update todos and wording