Add todos and fix wording