improvements of subtitles
merge conflicts