Tweaks for #7. Also unbreaks subtitles.