Remove todo flags
Make subtitles consistent
Round of edits