Subtitle fixes and added features