Tweak wording
Add more todos