Add support for subtitles
Massive development changes
Cleanup