blah
merge
added half-implemented subtitles
fixed subtitles with bad font