final rev 1: fixed bugs, added subtitle functions
Merge