Tweaking content and adding TODO