add todo and remove wording