Added basic subtitle support for movies
Cleanup