Subtitle detector and some minor changes